Commit Graph

5672 Commits

Author SHA1 Message Date
Christian Rinderknecht
c379d1078e Fixed builds of ParserMain.exe. Fixed parser (code_inj). 2020-06-23 00:37:57 +02:00
Christian Rinderknecht
e42381fb84 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@fix-sequences 2020-06-22 21:50:42 +02:00
Christian Rinderknecht
fb4a888867 Merge branch 'rinderknecht@code_inclusion' into 'dev'
Improved code injection

See merge request ligolang/ligo!680
2020-06-22 19:36:45 +00:00
Christian Rinderknecht
94039c4d65 Added back return instead of ok. 2020-06-22 16:29:32 +02:00
Christian Rinderknecht
bc5a5cd75b Move ESeq back to its original semantic action. 2020-06-20 20:03:04 +02:00
Christian Rinderknecht
8f4ed11539 Added comments. 2020-06-20 18:10:18 +02:00
Christian Rinderknecht
92e6d55aa8 Improved code injection. Fixed a few bugs on the way. 2020-06-20 18:10:17 +02:00
Christian Rinderknecht
e26b142c3c Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@fix-sequences 2020-06-20 15:50:13 +02:00
Christian Rinderknecht
8ce7ae0f27 Fixed the parsing of sequences in CameLIGO. 2020-06-20 15:49:52 +02:00
Pierre-Emmanuel Wulfman
46bd0315e2 Merge branch 'contract/basic_multisig' into 'dev'
Add a basic multisig contrat

See merge request ligolang/ligo!643
2020-06-19 11:24:28 +00:00
Pierre-Emmanuel Wulfman
36df068dfc wip: new error monad 2020-06-19 12:56:13 +02:00
Pierre-Emmanuel Wulfman
027f73fa01 Merge branch 'refactor/simplifier' into 'dev'
Redesign Pascaligo simplifier

See merge request ligolang/ligo!678
2020-06-19 05:48:11 +00:00
Pierre-Emmanuel Wulfman
98487d8bb7 Add a basic multisig contract 2020-06-18 18:23:18 +02:00
Pierre-Emmanuel Wulfman
c2e4f2f36d Add pp can assert_value_eq for Literal_op 2020-06-18 18:23:16 +02:00
Pierre-Emmanuel Wulfman
c8b8492ed9 remaking PacscaLIGO simplifier 2020-06-18 17:53:00 +02:00
Rémi Lesenechal
429a1dc412 Merge branch 'refactor/display-and-result' into 'dev'
Refactoring:  errors / formatting / display

See merge request ligolang/ligo!519
2020-06-15 14:46:50 +00:00
Lesenechal Remi
4969b34225 more annotation on the global error type 2020-06-15 15:33:32 +02:00
Lesenechal Remi
3fd93fc7b5 result monad refactoring: update test 2020-06-15 15:25:40 +02:00
Lesenechal Remi
c6b95bf07a result monad refactoring:
- do not use plain JSON rep for errors and use polymorphic variants instead
- split formatting for human readable and JSON output
- no more simple_errors simple_fails
- much less result bindings used in stages
2020-06-15 14:45:28 +02:00
Sander
d53be83490 Merge branch 'bytes-sub-change' into 'dev'
Update bytes.sub doc.

See merge request ligolang/ligo!676
2020-06-11 16:03:09 +00:00
Sander Spies
9eabec28dc Update bytes.sub doc. 2020-06-11 17:49:48 +02:00
Pierre-Emmanuel Wulfman
1c5ea4b3f2 Merge branch 'feature/code_insertion' into 'dev'
Code insertion in Ligo

See merge request ligolang/ligo!579
2020-06-11 09:55:19 +00:00
Pierre-Emmanuel Wulfman
195175287a review 2 2020-06-11 11:40:45 +02:00
Sander
c6ad617524 Merge branch 'doc-failwith' into 'dev'
Documentation improvements

See merge request ligolang/ligo!666
2020-06-11 09:28:19 +00:00
Sander Spies
9ea4c97dd4 Merge branch 'doc-failwith' of https://gitlab.com/ligolang/ligo into doc-failwith 2020-06-11 11:13:32 +02:00
Sander Spies
8937b762cd Merge branch 'dev' of https://gitlab.com/ligolang/ligo into doc-failwith 2020-06-11 11:12:59 +02:00
Pierre-Emmanuel Wulfman
44ee2be055 rebase on dev 2020-06-11 10:56:01 +02:00
Pierre-Emmanuel Wulfman
0b8effbf2b move the work from lexer to parser: this makes the rules symetrics but impose the language to have the same syntax as constructor. This may change in the future 2020-06-11 10:10:08 +02:00
Pierre-Emmanuel Wulfman
f25456a7a6 remove unsed symbol in parsers 2020-06-11 09:32:37 +02:00
Pierre-Emmanuel Wulfman
c110670a38 fix errors messages in parser 2020-06-11 09:32:36 +02:00
Pierre-Emmanuel Wulfman
dd4abbf46a test passing 2020-06-11 09:14:51 +02:00
Pierre-Emmanuel Wulfman
a4e2fe2447 WIP:handling parsing errors 2020-06-11 09:14:51 +02:00
Tom Jack
97e33a99da Emit LAMBDA directly from compiler 2020-06-11 09:14:51 +02:00
Pierre-Emmanuel Wulfman
dfcccff748 generating good code 2020-06-11 09:14:45 +02:00
Pierre-Emmanuel Wulfman
b044a4fbc5 wip: compiling code that doesn't typecheck 2020-06-11 09:13:29 +02:00
Pierre-Emmanuel Wulfman
5f4e1b83c7 remove {| and |} while transpling + error on wrong language 2020-06-11 09:13:29 +02:00
Pierre-Emmanuel Wulfman
9e5ae133d2 fix old typer 2020-06-11 09:13:28 +02:00
Pierre-Emmanuel Wulfman
fa7cc825eb parser and test 2020-06-11 09:13:21 +02:00
Pierre-Emmanuel Wulfman
7872a1d4bc first attempt 2020-06-11 09:10:44 +02:00
Sander
5365f97f47 Merge branch 'bitwise-examples' into 'dev'
Bitwise pseudomodule examples.

See merge request ligolang/ligo!670
2020-06-10 17:12:25 +00:00
Sander
62e9cd5796 Merge branch 'remove-ghost-selection' into 'dev'
Remove ghost selection on tabs.

See merge request ligolang/ligo!675
2020-06-10 17:12:20 +00:00
Eowyn Dean
fd26ad82cd Changed 'gast' to gas 2020-06-10 17:10:34 +00:00
Sander
82a8ee5697 Merge branch 'rinderknecht@pprint' into 'dev'
Adding a pretty-printer for CameLIGO source files

See merge request ligolang/ligo!599
2020-06-10 15:16:53 +00:00
Christian Rinderknecht
358ae530b8 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-06-10 16:59:39 +02:00
Christian Rinderknecht
c57f499fea Final touches to the pretty printers.
Fixed the syntaxes for field_assignment and field_path_assignment.
2020-06-10 16:58:59 +02:00
Sander Spies
a0d2eb733d Remove ghost selection on tabs. 2020-06-10 09:20:19 +02:00
Jev Björsell
29b483aa0c Merge branch 'tools/ligo-snippets-ide-fix' into 'dev'
update to use @ligolang/ligo-snippets@1.0.1

See merge request ligolang/ligo!674
2020-06-10 01:11:02 +00:00
Edmond Lee
eb2facfc11 update to use @ligolang/ligo-snippets@1.0.1 2020-06-09 17:33:50 -07:00
Jev Björsell
22699525b3 Merge branch 'tools/ligo-snippets-ide-fix' into 'dev'
add @babel/plugin-transform-runtime to ligo-snippets

See merge request ligolang/ligo!672
2020-06-10 00:11:52 +00:00
Edmond Lee
582dacf5d5 add @babel/plugin-transform-runtime to ligo-snippets 2020-06-09 16:33:19 -07:00