Commit Graph

5383 Commits

Author SHA1 Message Date
Christian Rinderknecht
255e381e01 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@fix_endif 2020-05-16 18:55:02 +02:00
Jev Björsell
9ead5f2f24 Merge branch 'patch-2' into 'dev'
fix wrong source code path and missing opening quote

See merge request ligolang/ligo!622
2020-05-15 22:43:28 +00:00
Brandon Jeong
2934e49f93 fix wrong source code path and missing opening quote 2020-05-15 19:58:34 +00:00
Christian Rinderknecht
1c9240703c Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@fix_endif 2020-05-15 21:24:57 +02:00
Christian Rinderknecht
34b9ee14da [Bug fix] Case #include followed by newline or eof.
I added cases for scanning eof (followed by a rollback).
2020-05-15 21:23:49 +02:00
Christian Rinderknecht
c021254cd4 Merge branch 'rinderknecht@fix_preprocessor' into 'dev'
[Bug] I forgot the check whether to perform #include or not.

See merge request ligolang/ligo!619
2020-05-15 18:07:31 +00:00
Ligo Lang
57f0106fd4 Merge branch 'versioning/tests' into 'dev'
Versioning/tests

See merge request ligolang/ligo!618
2020-05-15 17:43:04 +00:00
f7a2bffd77 Merge branch 'balsoft/nix-update' into 'dev'
Fix website build by updating package-lock.json

See merge request ligolang/ligo!614
2020-05-15 17:18:45 +00:00
Christian Rinderknecht
b44da17ee0 [Bug] I forgot the check whether to perform #include or not. 2020-05-15 18:31:01 +02:00
Lesenechal Remi
41eded82f4 versioning stage in gitlab-ci.yml 2020-05-15 17:57:22 +02:00
Lesenechal Remi
9e81aaa1f8 script tagging branch 2020-05-15 17:56:00 +02:00
a2557d7893
Fix website build by updating package-lock.json 2020-05-14 15:13:50 +03:00
Pierre-Emmanuel Wulfman
7bcf46d3bc Merge branch 'refactoring_mini-c_type' into 'dev'
Refactor Mini-c types for conformity with the other stage

See merge request ligolang/ligo!598
2020-05-13 11:01:20 +00:00
Suzanne Dupéron
599944343d Merge branch 'bugfix@recompute-environment' into 'dev'
add a pass to recompute environments

See merge request ligolang/ligo!612
2020-05-09 22:30:25 +00:00
Suzanne Dupéron
673fb67c1c Added test case from GitLab issue 2020-05-09 22:05:54 +01:00
Gabriel Alfour
da5b9c1612 Remove erroneous comment 2020-05-09 20:15:33 +00:00
galfour
98d49959b7
add a pass to recompute environments 2020-05-09 13:21:19 +02:00
Tom Jack
c307f251c8 Merge branch 'docker-version-info' into 'dev'
Export COMMIT_DATE also in build_binary

See merge request ligolang/ligo!606
2020-05-08 15:50:25 +00:00
Jev Björsell
0160c1b7ef Merge branch 'unblock_pages_ci' into 'dev'
remove compact-ligo-ide import and implementation

See merge request ligolang/ligo!609
2020-05-07 17:32:31 +00:00
Edmond Lee
eb098d12e3 remove compact-ligo-ide import and implementation 2020-05-07 17:32:31 +00:00
Rémi Lesenechal
19866476d7 Merge branch 'cleanup/environment' into 'dev'
some environment cleanup

See merge request ligolang/ligo!608
2020-05-07 15:53:09 +00:00
Lesenechal Remi
9eeac11628 some environment cleanup 2020-05-07 16:30:06 +02:00
Tom Jack
5d06630b2c Export COMMIT_DATE also in build_binary 2020-05-06 06:06:16 -05:00
Tom Jack
e93e3ccbdd Merge branch 'docker-version-info' into 'dev'
Pass version info through to docker

See merge request ligolang/ligo!604
2020-05-05 20:25:46 +00:00
Tom Jack
ec99230c63 Pass version info through to docker 2020-05-05 20:25:46 +00:00
Pierre-Emmanuel Wulfman
288e6646eb Merge branch 'bugfix/default_env_for_interpret_and_expression' into 'dev'
Bugfix/default env for interpret and expression

See merge request ligolang/ligo!603
2020-05-05 16:56:33 +00:00
Pierre-Emmanuel Wulfman
e0be6fc36f done 2020-05-05 17:24:03 +02:00
Rémi Lesenechal
77b5e15088 Merge branch 'feature/fix-michelson-pair-detection' into 'dev'
now check the label to detect michelson pairs

Closes #183

See merge request ligolang/ligo!602
2020-05-05 14:47:09 +00:00
Lesenechal Remi
c54d650a2a now check the label to detect michelson pairs 2020-05-05 15:21:28 +02:00
Rémi Lesenechal
cadd0d66a9 Merge branch 'feature/quickfix-uncapitalize-michelson-or' into 'dev'
uncapitalize micheslon_or's %-annotations

See merge request ligolang/ligo!601
2020-05-05 12:40:00 +00:00
Lesenechal Remi
7bbfa9ff97 uncapitalize micheslon_or's %-annotations 2020-05-04 18:22:39 +02:00
Suzanne Dupéron
38af497cc3 Merge branch 'feature/adt-generator-promote-until-clean' into 'dev'
Adt generator : promote until-clean

See merge request ligolang/ligo!597
2020-05-04 15:19:05 +00:00
Rémi Lesenechal
29de1278b4 Merge branch 'feature/converter-generation' into 'dev'
michelson layout converters

Closes #74

See merge request ligolang/ligo!585
2020-05-04 13:45:26 +00:00
Rémi Lesenechal
51c043b7cb Merge branch 'feature/new-typer-3' into 'dev'
Add a reason string explaining why constraints are added by the typer

See merge request ligolang/ligo!596
2020-05-04 13:08:00 +00:00
Lesenechal Remi
5891a6f4cc 'convert_from_left_comb' and 'convert_from_right_comb' for sum types 2020-05-04 14:19:04 +02:00
Lesenechal Remi
8fdf9a8b95 fix weird bug in matching cases 2020-05-02 15:41:50 +02:00
Lesenechal Remi
0a44a22cac 'michelson_or_right_comb' and 'michelson_or_left_comb' type operators 2020-05-02 15:41:02 +02:00
Lesenechal Remi
8e3230bf29 'Layout.convert_to_right_comb' and 'Layout.convert_to_left_comb' for sum types 2020-05-02 15:38:58 +02:00
Lesenechal Remi
b54bcb8db7 rename 'michelson_right/left_comb' to 'michelson_pair_right/left_comb' 2020-05-02 15:38:58 +02:00
Lesenechal Remi
fb2f3e89e7 replace field name 'decl_position' by 'field_decl_pos' 2020-05-02 15:35:50 +02:00
Lesenechal Remi
1f6bc4fc6b convert_from for pairs/record 2020-05-02 15:35:50 +02:00
Lesenechal Remi
9d200a1b56 michelson_right_comb and michelson_left_comb type operators 2020-05-02 15:35:50 +02:00
Lesenechal Remi
3333742037 Converters for michelson types 2020-05-02 15:30:10 +02:00
Christian Rinderknecht
82b3d634c1 Merge branch 'parser-promote-generated-error-files' into 'dev'
Promote generated error files by dune.

See merge request ligolang/ligo!427
2020-04-30 09:48:23 +00:00
Pierre-Emmanuel Wulfman
62f97e2f7f replace type_value by type_expresion end expression' by
expression_content for conformity
2020-04-30 11:22:56 +02:00
Pierre-Emmanuel Wulfman
b0998f417a Merge branch 'ast/remove-match-bool' into 'dev'
Remove match_bool from the AST

See merge request ligolang/ligo!589
2020-04-30 09:05:58 +00:00
Pierre-Emmanuel Wulfman
8d59389f7d review 2020-04-30 09:39:49 +02:00
Pierre-Emmanuel Wulfman
2c62f9d32e remove match_bool from the ast 2020-04-30 09:39:49 +02:00
Suzanne Dupéron
f4deb32561 Merge branch 'bugfix/new-typer-2' into 'dev'
Fix in new typer: propagator for break_ctor was too permissive

See merge request ligolang/ligo!595
2020-04-30 04:30:46 +00:00
Suzanne Dupéron
71e0509910 Merge branch 'bugfix/new-typer' into 'dev'
Solve T_arrow vs. TC_arrow bug in new typer

See merge request ligolang/ligo!593
2020-04-30 03:37:45 +00:00