Commit Graph

4343 Commits

Author SHA1 Message Date
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
Gabriel Alfour
e558d23658 Merge branch 'feature/cli-interpret' into 'dev'
Feature/cli interpret

See merge request ligolang/ligo!249
2019-12-12 13:08:00 +00:00
Lesenechal Remi
0f6529fe94 fix test_cli.sh 2019-12-12 13:18:45 +01:00
Lesenechal Remi
1842d50ef1 some Ast_simplified PP improvements 2019-12-12 12:15:18 +01:00
Lesenechal Remi
61fd91a0d4 optional init file 2019-12-12 12:15:18 +01:00
Lesenechal Remi
a80ffae897 add interpret command 2019-12-12 12:15:18 +01:00
Rémi Lesenechal
a53d8ffadf Merge branch 'fix/not-totally-understood-issue' into 'dev'
[Refactoring] build the application at the ast_simplified level

See merge request ligolang/ligo!246
2019-12-12 10:52:58 +00:00
Lesenechal Remi
c62f147a01 MR requests 2019-12-12 11:00:04 +01:00
Lesenechal Remi
df0dfb029b better error message when a contract in invalid 2019-12-11 20:02:54 +01:00
Lesenechal Remi
c0472629b9 application at ast_simplified level 2019-12-11 20:02:54 +01:00
Lesenechal Remi
ebd073f5e2 Separate aggregation case for contract and expression 2019-12-11 20:02:54 +01:00
Sander
4fcbceef5d Improve ReasonLIGO syntax highlighting CSS. 2019-12-11 17:05:24 +00:00
Sander Spies
320371be05 CSS improvements. 2019-12-11 17:15:58 +01:00
Sander
94b524c21c Merge branch 'fix-reasonligo-docs2' into 'dev'
Fix more ReasonLIGO docs issues

See merge request ligolang/ligo!247
2019-12-11 14:36:17 +00:00
Sander Spies
aa52136b8a Add ReasonLIGO specific css. 2019-12-11 14:48:20 +01:00
Sander Spies
1cbf828bdb Improve ReasonLIGO documentation a bit more. 2019-12-11 14:47:52 +01:00
Christian Rinderknecht
079e59edff Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2019-12-11 14:11:11 +01:00
Sander
814785644c Merge branch 'fix_docs_reasonligo' into 'dev'
Improve ReasonLIGO documentation.

See merge request ligolang/ligo!244
2019-12-11 09:34:08 +00:00
Sander
20793b0924 Improve ReasonLIGO documentation. 2019-12-11 09:34:08 +00:00
Rémi Lesenechal
21a6749a81 Merge branch 'refactoring-unify' into 'dev'
Refactoring unify

See merge request ligolang/ligo!236
2019-12-10 15:58:31 +00:00
Lesenechal Remi
9d83159e89 merge with dev 2019-12-10 16:01:26 +01:00
Lesenechal Remi
5ac25bfe21 easy to interpret expressions. evaluate-value does the job. CLI refactoring might be necessary 2019-12-10 15:58:53 +01:00
Lesenechal Remi
1c346ead28 remove useless code in test helper 2019-12-10 15:58:53 +01:00
Lesenechal Remi
16fc55482d Remove wrapper. Flatten everything for now.
Now have a run function for contracts and a run function for everything else.
Run function for contract is only used in CLI dry-run
2019-12-10 15:58:53 +01:00
Lesenechal Remi
bbf6b7b860 sséssaoupa? 2019-12-10 15:58:53 +01:00
Lesenechal Remi
974fa6432b Revert "unify a little more" 2019-12-10 15:58:53 +01:00
Lesenechal Remi
85cffdfc52 remove comented function 2019-12-10 15:58:53 +01:00
Lesenechal Remi
255b9a6e00 type compile_main function in contracts tests 2019-12-10 15:58:53 +01:00
Lesenechal Remi
6ed2f2b3ae unify a little more 2019-12-10 15:58:53 +01:00
Lesenechal Remi
26f26171e6 Tests clean 2019-12-10 15:58:53 +01:00
Lesenechal Remi
d1f6c37f62 CLI clean 2019-12-10 15:58:53 +01:00