Commit Graph

4923 Commits

Author SHA1 Message Date
Christian Rinderknecht
c7bd986772 Merge remote-tracking branch 'origin/dev' into rinderknecht-dev 2019-12-18 14:22:57 +01:00
Christian Rinderknecht
f497ba4aba Merge branch 'reasonligo-improvemtns' into 'dev'
ReasonLIGO improvements

See merge request ligolang/ligo!266
2019-12-18 10:50:15 +00:00
Sander Spies
7518005532 Merge branch 'dev' of https://gitlab.com/ligolang/ligo into reasonligo-improvemtns 2019-12-18 09:59:19 +01:00
John David Pressman
09a1db2fcb Merge branch 'feature/cameligo-type-tuple-destruct' into 'dev'
[LIGO-286] Tuple destructuring doesn't do left hand type inference in CameLIGO

Closes LIGO-286

See merge request ligolang/ligo!252
2019-12-17 21:04:54 +00:00
John David Pressman
310dde6dc9 [LIGO-286] Tuple destructuring doesn't do left hand type inference in CameLIGO 2019-12-17 21:04:53 +00:00
John David Pressman
7067644b1d Merge branch 'dev' into feature/set-delegate 2019-12-17 12:17:02 -08:00
Suzanne Dupéron
56001384b5 Merge branch 'feature/typer-error-messages' into 'dev'
First negative tests for the old typer & improvement of error messages

See merge request ligolang/ligo!261
2019-12-17 19:07:44 +00:00
Suzanne Dupéron
1bf3d8f02a First negative tests for the old typer & improvement of error messages 2019-12-17 18:18:49 +00:00
John David Pressman
a4b1c9951d Add ReasonLIGO and CameLIGO tests for SET_DELEGATE 2019-12-17 09:50:47 -08:00
John David Pressman
fdeb95288d Passing SET_DELEGATE test for PascaLIGO 2019-12-17 09:34:05 -08:00
Christian Rinderknecht
078dd06132 Merge branch 'rinderknecht-dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2019-12-17 17:07:10 +01:00
Christian Rinderknecht
7ae8d9340b Merge remote-tracking branch 'origin/dev' into rinderknecht-dev 2019-12-17 17:04:59 +01:00
Christian Rinderknecht
8210a4e186 Added basic support for Menhir's incremental API.
I added the token Bytes to ReasonLIGO's [LexToken.mll] for the build.
2019-12-17 17:03:43 +01:00
Christian Rinderknecht
757b0da78c Removed the open type [Error.t] (less [assert false]).
I also had to remove the keywords [Down], [Fail] and [Step] in
PascaLIGO that made a mysterious and unwanted come back. (I did not
bother with [git blame]).
2019-12-17 15:58:27 +00:00
Christian Rinderknecht
531dd238a7 Added unlexer for PascaLIGO. 2019-12-17 15:58:27 +00:00
Rémi Lesenechal
56677ad2d6 Merge branch 'contract-replaceable-id' into 'dev'
Contracts: replaceable ID

See merge request ligolang/ligo!200
2019-12-17 14:18:09 +00:00
Rémi Lesenechal
e6cb4e63c6 Contracts: replaceable ID 2019-12-17 14:18:09 +00:00
Christian Rinderknecht
35d4b64a02 Removed the open type [Error.t] (less [assert false]).
I also had to remove the keywords [Down], [Fail] and [Step] in
PascaLIGO that made a mysterious and unwanted come back. (I did not
bother with [git blame]).
2019-12-17 14:56:16 +01:00
Sander Spies
ebba74e7a7 Merge branch 'dev' of https://gitlab.com/ligolang/ligo into reasonligo-improvemtns 2019-12-17 14:34:58 +01:00
Gabriel Alfour
362bb1edb9 Merge branch '89-current-address-does-not-compile' into 'dev'
Resolve "Current.address does not compile"

Closes #89

See merge request ligolang/ligo!265
2019-12-17 10:57:11 +00:00
Lesenechal Remi
ffb225e269 fix address arity and update test 2019-12-17 11:10:29 +01:00
John David Pressman
20285f2b9e Add broken set_delegate test to LIGO, get to typer error 2019-12-16 16:26:39 -08:00
Gabriel Alfour
4e304f01cf Merge branch 'feature/version2' into 'dev'
Workaround to fix --version

See merge request ligolang/ligo!263
2019-12-17 00:19:58 +00:00
Tom Jack
3110ae87e1 Pass CI_JOB_ID to docker container 2019-12-16 22:50:25 +00:00
Tom Jack
c83813456a Relocate .opam 2019-12-16 22:50:25 +00:00
John David Pressman
9c9e0e0a2b Merge branch 'feature/cameligo-implicit-account-regress' into 'dev'
Fix IMPLICIT_ACCOUNT, again and this time add regression expect test

Closes #88

See merge request ligolang/ligo!262
2019-12-16 21:04:40 +00:00
John David Pressman
fb8fae05d7 Fix IMPLICIT_ACCOUNT, again and this time add regression expect test 2019-12-16 12:10:31 -08:00
Sander Spies
52eff4e764 Incorrect function arguments message for ReasonLIGO. 2019-12-16 18:04:15 +01:00
Christian Rinderknecht
d4b750eff8 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2019-12-16 17:38:09 +01:00
Christian Rinderknecht
257ef4f5d2 Added unlexer for PascaLIGO. 2019-12-16 17:37:46 +01:00
Sander Spies
09875cf1da Make type_expr_simple less complicated. 2019-12-16 14:54:12 +01:00
Eowyn Dean
dc9747610a Merge branch 'website-alignment-fix' into 'dev'
Fixed alignment issue on wider screens

See merge request ligolang/ligo!259
2019-12-16 12:42:12 +00:00
Sander Spies
ee33a4a6a3 Fixed alignment issue on wider screens 2019-12-16 12:51:48 +01:00
Christian Rinderknecht
f5aebffd0b Merge branch 'rinderknecht-dev' into 'dev'
Refactoring of the parsers

See merge request ligolang/ligo!257
2019-12-16 10:23:35 +00:00
Christian Rinderknecht
a94ee53fd3 Finished the refactoring of the parsers. 2019-12-15 20:59:04 +01:00
Christian Rinderknecht
fca439558b Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2019-12-15 17:46:58 +01:00
Christian Rinderknecht
f8d6396fcd Refactoring of the parsers
* [CameLIGO/ReasonLIGO] The AST node [EAnnot] (expressions
    annotated by a type) now records the region in the source
    code for the colon.

  * [CameLIGO/ReasonLIGO/PascaLIGO] I added the syntax
     %token <...> TOKEN "lexeme"

  * [ReasonLIGO] I changed the AST nodes [Mtz] and [Str] to
    [Mutez] and [String], respectively (in accordance with the
    PascaLIGO front-end). I changed token [DOTDOTDOT] to
    [ELLIPSIS].

  * [ReasonLIGO] I added what was missing to make a loca build
    with my Makefile.
2019-12-15 17:46:08 +01:00
Christian Rinderknecht
9fa2a4281f Merge branch 'rinderknecht-dev' into 'dev'
Refactoring of the front-end

See merge request ligolang/ligo!256
2019-12-13 19:11:11 +00:00
Christian Rinderknecht
6692643cc5 Streamlined LexerMain and ParserMain for ReasonLIGO. 2019-12-13 17:28:15 +01:00
Christian Rinderknecht
2904a40373 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2019-12-13 14:53:33 +01:00
Gabriel Alfour
36794120f0 Merge branch 'feature/version2' into 'dev'
Add --version via dune rule

See merge request ligolang/ligo!254
2019-12-13 12:20:24 +00:00
Christian Rinderknecht
e685e313f0 Fixed the build after I made a small error when fixing the latest
merge conflict.
2019-12-13 12:30:59 +01:00
Christian Rinderknecht
c7ffa6d563 Merge remote-tracking branch 'origin/dev' into rinderknecht-dev 2019-12-13 12:28:33 +01:00
Christian Rinderknecht
0226b9f23c Refactoring of comments (for [dune build @doc]).
Refactoring of parsing command-line arguments

  * The type [options] is now abstract and implemented as an
    object type to avoid struggling with scoping and type
    inference when record types share some common field names.

Refactoring of ParserLog for PascaLIGO and CameLIGO

  * The immediate motivation behind that refactoring was to
    remove the use of a couple of global references. A
    consequence is that we have a nicer and more compact code, by
    threading a state. The files [pascaligo/Tests/pp.ligo] and
    [ligodity/Tests/pp.mligo].

  * Another consequence is that the choice of making strings from
    AST nodes depends on the CLI (offsets? mode?). After this
    refactoring, that choice is hardcoded in the simplifiers in a
    few places (TODO), waiting for a general solution that would
    have all CL options flow through the compiler.

  * I removed the use of vendors [x_option.ml], [x_map.ml] and
    [x_list.ml] when handling optional values. (Less dependencies
    this way.)

Refactoring of the ASTs

  * I removed the node [local_decl], which was set to [[]]
    already in a previous commit (which removed local
    declarations as being redundant, as statements could already
    be instructions or declarations).

  * I changed [StrLit] to [String] in the AST of CameLIGO and
    ReasonLIGO.

  * I also changed the type [fun_expr] so now either a block is
    present, and therefore followed by the [with] keyword, or it
    is not. (Before, the presence of a block was not enforced in
    the type with the presence of the keyword.)

Notes

  * [LexerMain.ml] and [ParserMain.ml] for CameLIGO and PascaLIGO
    are almost identical and differ in the same way (language
    name and file extension), which suggests that they should be
    in the [shared] folder and instanciated as a functor in the
    future (TODO).

  * I removed the blank characters at the end of many lines in
    the parser of ReasonLIGO.
2019-12-13 12:21:52 +01:00
Tom Jack
611bd0382a dune runtest ; dune promote 2019-12-13 03:11:51 -06:00
Tom Jack
e914833600 Add --version via dune rule 2019-12-13 08:12:35 +00:00
John David Pressman
32d53cf9e6 Merge branch 'docs/cameligo-cheat-sheet' into 'dev'
Add CameLIGO cheat sheet to docs

Closes LIGO-274

See merge request ligolang/ligo!251
2019-12-12 20:06:23 +00:00
John David Pressman
3df33345c0 Add CameLIGO cheat sheet to docs 2019-12-12 10:07:13 -08:00
Sander
480cf8a7a0 Merge branch 'gardening-ligodity-to-cameligo' into 'dev'
Remove original Cameligo and rename Ligodity to Cameligo.

See merge request ligolang/ligo!250
2019-12-12 14:22:08 +00:00
Sander Spies
6f9134834f Remove original Cameligo and rename Ligodity to Cameligo. 2019-12-12 14:35:07 +01:00