Commit Graph

5184 Commits

Author SHA1 Message Date
Suzanne Dupéron
2cbc8bbf0c Revert "Revert "Merge branch 'feature/adt-generator-poly-3' into 'dev'""
This reverts commit 8b83e375bd.
2020-04-13 19:23:12 +02:00
Christian Rinderknecht
f524692370 Merge branch 'rinderknecht@preproc' into 'dev'
Replacing CPP

See merge request ligolang/ligo!512
2020-04-13 16:07:09 +00:00
Christian Rinderknecht
bdb8c5a612 Removed cpp as a dependency in the dockerfile. 2020-04-13 17:08:39 +02:00
Christian Rinderknecht
1ccf6f247d Fixed format of syntax error messages. 2020-04-13 16:31:56 +02:00
Christian Rinderknecht
ffb3d05864 Changed a bit how syntax error messages are formulated.
Resolved a warning.
2020-04-13 14:19:56 +02:00
Christian Rinderknecht
af48efe195 Fix by Sander. 2020-04-13 14:03:30 +02:00
Christian Rinderknecht
f7b0c4fe6b Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@preproc 2020-04-13 14:01:41 +02:00
Sander
ce1b55e548 Merge branch 'fix-wrong-wild-call' into 'dev'
Ensure that the right error is called when using the wild pattern incorrectly.

See merge request ligolang/ligo!565
2020-04-12 13:54:18 +00:00
Christian Rinderknecht
b23b2d1dbb Plugged the preprocessor into the compiler's CLI. 2020-04-12 15:26:47 +02:00
Sander Spies
6f0fb02bf6 Ensure that the right error is called when using the wild pattern incorrectly. 2020-04-12 14:57:39 +02:00
Christian Rinderknecht
6c02482bf9 Fixed the #include directive. 2020-04-09 18:41:55 +02:00
Christian Rinderknecht
3ed303f60d In EvalOpt modules, the CLI input ["-"] is becomes now [None],
like the absence of an input filename. (This simplifies all the
clients codes.) Fixed the dune file for the preprocessor. Fixed
the build of PreprocMain.exe and PreprocMain.byte. Restricted
preprocessing errors [Preproc.Newline_in_string] and
[Preproc.Open_string] to the argument of the #include
directive (instead of general strings: this is for the LIGO lexer
to report the error). I removed the error [Preproc.Open_comment]
as this is for the LIGO lexer to report. The preprocessor scanner
[Preproc.lex] does not take a parameter [is_file:bool] now: the
source file (if any) is determined from the lexing
buffer. Accordingly, the field [is_file] of the state of the
preprocessing lexer has been removed: the lexing buffer becomes
now the reference for the input source (bug fix and interface
improvement). Fixed the comments of the test contract
pledge.religo. I removed the data constructor [Lexer.Stdin], as
redundant with [Lexer.Channel].
2020-04-09 16:18:26 +02:00
Christian Rinderknecht
46eecb4027 Marked the errors that should be skipped (because catched by the
LIGO lexer later). Added field [is_file] to the state of the
lexer to know if the input is a file or not (insert or not a
first line directive). Fixed ReasonLIGO comments in
entrypoints-contracts.md and website2.religo. WIP on the LIGO
lexer to properly handle comments for all the syntaxes.
2020-04-08 20:24:34 +02:00
Christian Rinderknecht
79967be726 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@preproc 2020-04-08 17:40:13 +02:00
Sander
3359848565 Merge branch 'ediv-doc' into 'dev'
Add ediv description

See merge request ligolang/ligo!557
2020-04-08 09:55:03 +00:00
Sander Spies
a12febe08b Merge 2020-04-08 10:58:06 +02:00
Sander Spies
432877f954 Merge branch 'dev' of https://gitlab.com/ligolang/ligo into ediv-doc 2020-04-08 10:56:54 +02:00
Gabriel Alfour
1f0519c8ee Merge branch 'feature/michelson-or-type' into 'dev'
michelson or type

See merge request ligolang/ligo!530
2020-04-07 22:35:57 +00:00
Tom Jack
6613883296 Fix description 2020-04-07 17:33:20 -05:00
Tom Jack
b15694b5bc Fix some types, describe more details 2020-04-07 17:11:19 -05:00
Lesenechal Remi
f9d1928d8e michelson_or tests and changelog 2020-04-07 21:38:12 +02:00
Lesenechal Remi
be5ad35fb9 Force annotation for michelson_or 2020-04-07 21:36:59 +02:00
Lesenechal Remi
4af42cb1bd michelson_or types are transformed into variant types 2020-04-07 21:36:59 +02:00
Christian Rinderknecht
951348feb9 Deletion of Parser.msg 2020-04-07 19:56:52 +02:00
Sander Spies
e983ef4c94 Add ediv description 2020-04-07 19:45:06 +02:00
Christian Rinderknecht
53223e9d8e Cosmetics. 2020-04-07 18:57:43 +02:00
Christian Rinderknecht
a343989a6b Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@preproc 2020-04-07 18:57:10 +02:00
Christian Rinderknecht
c0ee726fb2 Simple_utils is now used as a library by the local builds.
Preprocessor is now a library installed by opam.
Replaced ligolang@gmail.com by contact@ligolang.org in opam files.
Reformatted some opam files.
Removed #line directive from preprocessor.
Added to the interface of ParserUnit.
Script messages.sh now checks the identity of .msg and .msg.old
to avoid undue warning about possibly different LR items.
2020-04-07 18:33:46 +02:00
Pierre-Emmanuel Wulfman
96b3ecf248 Merge branch 'feature/EDIV' into 'dev'
Add michelson's EDIV

See merge request ligolang/ligo!556
2020-04-07 13:50:25 +00:00
Sander
a021038991 Merge branch 'fix-bitwise-reasonligo-arrow' into 'dev'
-> to =>

See merge request ligolang/ligo!555
2020-04-06 17:07:27 +00:00
Pierre-Emmanuel Wulfman
79540f9a40 ediv implemented and tested; parser gives error 2020-04-06 18:23:26 +02:00
Sander Spies
4770a6e0d5 -> to => 2020-04-06 18:09:23 +02:00
Sander
f1274497bd Merge branch 'sitemap-deployment' into 'dev'
Deploy sitemap.xml to actual website

See merge request ligolang/ligo!554
2020-04-06 15:13:58 +00:00
Sander Spies
954558da60 Deploy sitemap.xml to actual website 2020-04-06 16:16:34 +02:00
Sander
edb5d4b6bf Merge branch 'add-sitemap-xml' into 'dev'
Add sitemap xml

See merge request ligolang/ligo!552
2020-04-06 10:52:34 +00:00
Sander
4f61c75799 Merge branch 'contact-page-change' into 'dev'
Contact page change

See merge request ligolang/ligo!549
2020-04-06 10:32:38 +00:00
Sander Spies
2ed7ea4112 Add sitemap 2020-04-06 11:53:21 +02:00
Christian Rinderknecht
1941f9ae4b Shared more code in ParserUnit.ml
Rewrite of the integration of the preprocessor.
Compiles bt DOES NOT PASS THE CI.
2020-04-03 19:08:14 +02:00
Christian Rinderknecht
6c1a1f91e2 Removed error "Invalid directive" as PascaLIGO has the operator #. 2020-04-03 19:06:35 +02:00
Pierre-Emmanuel Wulfman
5a8dd7233b Merge branch 'gardening/combinators' into 'dev'
Clean-up combinators

See merge request ligolang/ligo!550
2020-04-03 16:41:41 +00:00
Pierre-Emmanuel Wulfman
b41a59d2cf ast-imperative 2020-04-03 17:40:35 +02:00
Pierre-Emmanuel Wulfman
1f118f7233 ast-sugar 2020-04-03 17:40:35 +02:00
Pierre-Emmanuel Wulfman
bc7df6a5b4 ast_core 2020-04-03 17:40:35 +02:00
Pierre-Emmanuel Wulfman
2b09906a37 remove unwanted files at root 2020-04-03 17:40:35 +02:00
Sander Spies
588306ecd3 Modify contact page 2020-04-03 15:39:46 +02:00
Sander
82c60cbdd1 Merge branch 'fix-toplevel2' into 'dev'
Another toplevel fix.

See merge request ligolang/ligo!547
2020-04-03 09:10:53 +00:00
Sander Spies
d09205aebc Another toplevel fix. 2020-04-03 10:14:12 +02:00
Sander
13799b3181 Merge branch 'fix-toplevel-error' into 'dev'
Fix wrong closing element.

See merge request ligolang/ligo!546
2020-04-02 14:11:20 +00:00
Sander Spies
d449231421 Fix wrong closing element. 2020-04-02 15:14:07 +02:00
Sander
cbf2c7680e Merge branch 'wild-args-reasonligo' into 'dev'
ReasonLIGO: Add support for _ as an argument

See merge request ligolang/ligo!527
2020-04-02 11:57:32 +00:00