Commit Graph

1528 Commits

Author SHA1 Message Date
Sander Spies
c770aa3541 Merge branch 'rinderknecht@pprint' of https://gitlab.com/ligolang/ligo into reasonligo-pretty-printer 2020-06-08 13:23:03 +02:00
Christian Rinderknecht
838fdf6a5f Fixed build. 2020-06-08 12:40:14 +02:00
Christian Rinderknecht
2d65ba638e Updated syntax error messages. 2020-06-08 12:06:19 +02:00
Christian Rinderknecht
8d291b2d2e Finished v1 of PascaLIGO pretty-printer. 2020-06-08 11:59:58 +02:00
Christian Rinderknecht
534447dc9e More printers. 2020-06-08 00:19:05 +02:00
Christian Rinderknecht
bfac7f3b0a * Fixed AST node for_int (step clause)
* Fixed Parser and ParserLog (step clause missing).
  * Added more printers.
2020-06-06 20:47:31 +02:00
Christian Rinderknecht
77920a1c58 Fixed parsing of lambdas (cannot be recursive) in PascaLIGO.
Added more to the pretty-printing of PascaLIGO.
Improved pretty-printing of CameLIGO.
2020-06-05 23:24:49 +02:00
Pierre-Emmanuel Wulfman
574903ed2f fix name 2020-06-05 18:20:43 +02:00
Pierre-Emmanuel Wulfman
be9478bec1 Refactor updates and accessors 2020-06-05 18:17:17 +02:00
Sander Spies
cb39217c8c Improve ReasonLIGO pretty printer output. 2020-06-05 16:20:31 +02:00
Sander Spies
63086db0f1 More ReasonLIGO pretty printer improvements. 2020-06-05 16:01:18 +02:00
Sander Spies
db0fdf4abd Improve ReasonLIGO output. 2020-06-05 14:26:32 +02:00
Sander Spies
49d2c870ae Change names. 2020-06-05 13:02:23 +02:00
Sander Spies
623e6f1251 Add tests for CameLIGO. 2020-06-05 12:51:37 +02:00
Sander Spies
54cefddd51 Merge 2020-06-05 12:27:06 +02:00
Sander Spies
9495901b75 Merge 2020-06-05 12:23:32 +02:00
Sander Spies
3dd4568a3d Cleanup. 2020-06-05 12:21:40 +02:00
Sander Spies
4c2a271898 Fix small printing bug. 2020-06-05 11:32:30 +02:00
Sander Spies
a952cc496d Fix not properly handling function types as arguments. 2020-06-05 10:47:23 +02:00
Sander Spies
57caa4ea85 More testing and fine tuning. 2020-06-04 21:36:12 +02:00
Christian Rinderknecht
6f56b297f2 Improved the pretty-printers. 2020-06-04 19:01:31 +02:00
Pierre-Emmanuel Wulfman
5896b2a63a Add new matching cases and fix compilation of match_tuples 2020-06-04 16:37:18 +02:00
Christian Rinderknecht
a6972bf28b Putting back .links. 2020-06-04 14:59:15 +02:00
Christian Rinderknecht
8606528ddb More pretty-printing. 2020-06-04 14:55:40 +02:00
Christian Rinderknecht
3bec051115 Added back test LIGO input. 2020-06-04 13:32:35 +02:00
Christian Rinderknecht
c67fc4aa34 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-06-04 13:26:29 +02:00
Christian Rinderknecht
adee60c444 Improved example for testing the pretty-printer. 2020-06-04 13:26:03 +02:00
Sander Spies
64076d882b Merge 2020-06-04 10:27:19 +02:00
Sander Spies
fbc854f4d1 Improve ReasonLIGO pretty printing output. 2020-06-04 10:05:33 +02:00
Sander Spies
c30ade3b85 Contracts now compile. 2020-06-04 09:54:25 +02:00
Edmond Lee
18bf6f92e4 update to shorten example names in webide 2020-06-03 09:55:37 -07:00
Edmond Lee
2b0f3ce969 update webide example names for consistency 2020-06-03 08:46:09 -07:00
Pierre-Emmanuel Wulfman
8f529a059a reorder folder 2020-06-03 14:47:36 +02:00
Pierre-Emmanuel Wulfman
cc615f1c9f Change type_operator 2020-06-03 14:29:46 +02:00
Pierre-Emmanuel Wulfman
b29c667901 Merge branch 'feature-cleanup-typer-13' into 'dev'
Cleanup of the solver, use a list of heuristics instead of hardcoding them

See merge request ligolang/ligo!657
2020-06-03 12:28:36 +00:00
Suzanne Dupéron
81358db582 Cleanup of solver.ml, separated the heuristic's definition from its state in the solver (propagator_heuristic vs. propagator_state) 2020-06-03 13:07:48 +01:00
Suzanne Dupéron
7257aaaff4 Solver: use a list of heuristics instead of hardcoding them. 2020-06-03 13:07:48 +01:00
Suzanne Dupéron
861ab57a43 move solver_types to typesystem/ (because of dependencies. It should be merged with the AST really) 2020-06-03 13:07:41 +01:00
Sander Spies
c8ed8c38cc ReasonLIGO pretty printing testing. 2020-06-03 12:41:26 +02:00
Edmond Lee
d18837a6a6 add generate deploy script default values to id cameligo example 2020-06-02 14:51:16 -07:00
Christian Rinderknecht
562f08dabc Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-06-02 22:14:14 +02:00
Christian Rinderknecht
62fe3b793a More cases. 2020-06-02 22:14:06 +02:00
Edmond Lee
c82e3ffa6a add generate deploy script default values to id reasonligo example 2020-06-02 12:53:03 -07:00
Edmond Lee
7fbac4dc1b add generate deploy script default values to id pascaligo example 2020-06-02 12:27:41 -07:00
Edmond Lee
08ee216f1b Merge branch 'dev' of gitlab.com:edmondlee/ligo into webide/generate-deploy-script 2020-06-02 10:29:06 -07:00
Pierre-Emmanuel Wulfman
267e282174 rebase 2020-06-02 17:02:16 +02:00
Jev Björsell
9d0da34f96 Improve formatting of default webide values 2020-06-02 16:56:10 +02:00
technomad21c
a5419d0158 add default parameters for deploy and modify the hashvalue for share-link test 2020-06-02 16:54:47 +02:00
technomad21c
f29cf5a612 add the ID Contract example for cameligo and reasonligo 2020-06-02 16:54:47 +02:00
technomad21c
5b398b47c2 add an ID Contract example 2020-06-02 16:54:47 +02:00
Pierre-Emmanuel Wulfman
4d51aa62cb removing wrong dryRun and evaluateFunction in ide examples 2020-06-02 16:54:47 +02:00
Pierre-Emmanuel Wulfman
0c9aeeeb64 checking contracts 2020-06-02 16:54:47 +02:00
Pierre-Emmanuel Wulfman
74dab76fb4 optimizing contract 2020-06-02 16:54:47 +02:00
John David Pressman
e42e79eff3 Add ID contract examples to web ide without command defaults 2020-06-02 16:54:47 +02:00
John David Pressman
37a3fde6fd Add ReasonLIGO version of ID layer contract
Change CameLIGO version tests to say they're for CameLIGO in test suite
2020-06-02 16:54:47 +02:00
John David Pressman
4d16b006c6 Fix PascaLIGO ID contract to pass tests 2020-06-02 16:54:47 +02:00
John David Pressman
4e984850c1 Add syntactically passing PascaLIGO ID contract that does not typecheck 2020-06-02 16:54:47 +02:00
John David Pressman
8d781eebca Refactor id layer contract to use records instead of tuples 2020-06-02 16:54:45 +02:00
Christian Rinderknecht
b12e9a5baa Aligned printing of tuples of expressions on CameLIGO. 2020-06-01 19:17:59 +02:00
Christian Rinderknecht
c376650ee5 More to the PascaLIGO pretty-printer. 2020-06-01 18:47:42 +02:00
Christian Rinderknecht
2d74681c96 Added more to the PascaLIGO pretty-printer.
Improved the AST of PascaLIGO to better capture the struture.
2020-05-30 20:24:47 +02:00
Christian Rinderknecht
3264277310 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-30 13:50:43 +02:00
Suzanne Dupéron
e2bf0f6466 Split the solver into separate files, no meaningful changes to the code. 2020-05-29 21:23:11 +02:00
Suzanne Dupéron
4a860830b9 bugfix: replace very bogus implementation of add_list with a clean one 2020-05-29 21:23:11 +02:00
Suzanne Dupéron
d5a6f46452 Fix indentation of one function (only whitespace change) 2020-05-29 21:23:11 +02:00
Suzanne Dupéron
b2ee003577 bugfix: new typer did not keep the state between the program and the test case's function call 2020-05-29 21:23:08 +02:00
Suzanne Dupéron
4cb34a1d7e bugfix: new typer did not check a lambda's result' type against its annotation. 2020-05-29 21:18:57 +02:00
Suzanne Dupéron
2633d732a3 bugfix: Use Var.equal 2020-05-29 21:18:57 +02:00
Suzanne Dupéron
36e4c426c9 assert that the selectors of rules elected constraints that match the propagator's expecations 2020-05-29 21:18:57 +02:00
Suzanne Dupéron
69a007cca9 Describe the reason why a constraint or type was produced for more typer internals 2020-05-29 21:18:57 +02:00
Sander Spies
e9f5c3e1ae Initial work for the ReasonLIGO pretty printer. 2020-05-29 19:07:44 +02:00
Pierre-Emmanuel Wulfman
b7da8e3fd4 remove unecessary files 2020-05-29 15:30:03 +02:00
Gabriel Alfour
54a0fb63d8 Merge branch 'opt-strip-annots' into 'dev'
Strip type annotations from some instructions

See merge request ligolang/ligo!638
2020-05-28 15:30:29 +00:00
Christian Rinderknecht
4779d12295 Merge branch 'rinderknecht@pprint' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-28 12:57:06 +02:00
Christian Rinderknecht
96f9c032c0 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-28 12:52:15 +02:00
Pierre-Emmanuel Wulfman
e661416056 review 1 2020-05-28 10:53:54 +02:00
Gabriel ALFOUR
294e048aff remove environments from the ast 2020-05-27 23:01:07 +02:00
Edmond Lee
6d6556107a fix merge conflict 2020-05-26 11:35:19 -07:00
Edmond Lee
8e2a889b1d fix merge conflict 2020-05-26 11:28:12 -07:00
Edmond Lee
b816a2e529 update examples to remove command from the generate-deploy-script default configurations 2020-05-26 11:15:17 -07:00
Edmond Lee
a4831a05e7 remove extra setting for evaluatefunction in pascaligo example 2020-05-26 09:28:52 -07:00
Lesenechal Remi
66c1e51cb2 updating tests 2020-05-26 15:39:06 +02:00
Lesenechal Remi
f455fa2376 add a test case for double fold env recomputing 2020-05-26 15:39:06 +02:00
Lesenechal Remi
2de18b8727 solve bug in environment recomputing 2020-05-26 15:39:06 +02:00
Lesenechal Remi
705c29aeed remove old cases in transpiler 2020-05-26 15:39:06 +02:00
Christian Rinderknecht
d4801d942a Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-26 14:53:41 +02:00
Sander Spies
cade57a47c Fix expect help tests. 2020-05-26 12:41:42 +02:00
Sander Spies
88c652a25f Fix issue caused by addition of PPar. 2020-05-26 12:33:32 +02:00
Sander Spies
a4128d037b Add PPar around PTyped for proper pretty printing and CST equality with CameLIGO. 2020-05-26 11:06:38 +02:00
Edmond Lee
b88348ce60 update ligo examples to add generate-deploy-script tool and command defaults 2020-05-25 16:43:10 -07:00
Tom Jack
daa1c18573 Strip type annotations from some instructions 2020-05-25 17:42:31 -05:00
Suzanne Dupéron
851132528d auto-generated folds: have a distinct input and output type for the state 2020-05-25 21:49:00 +01:00
Suzanne Dupéron
ee5e484bf4 Use the auto-generated comparators as the implementations for the typeclass-like requirements for comparison functions 2020-05-25 20:42:16 +01:00
Suzanne Dupéron
008f228ed7 Hide the intermediate functions from PP_generic's signature 2020-05-25 20:42:16 +01:00
Suzanne Dupéron
92069077df Auto-generated comparator for AST_typed 2020-05-25 20:42:16 +01:00
Suzanne Dupéron
9a017e5f63 ADT generator: Fixes LIGO-656 Generated fold_maps are unusable because some collection types need extra info (e.g. sets need a comparison operator for their elements) 2020-05-25 20:42:16 +01:00
Suzanne Dupéron
b2d80e0154 Rename src/stages/4-ast_typed/types.ml (part 1: does not build) 2020-05-25 20:42:16 +01:00
Jev Björsell
7db2c24bd3 update example.ts, generate-deploy-script.ts, and load-state.ts to support default generateDeployScript values for examples 2020-05-25 18:47:50 +00:00
Christian Rinderknecht
b97d2d4000 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-25 20:31:19 +02:00
Christian Rinderknecht
320e31cb41 * [ligo pretty-print foo.mligo] works.
* [ligo pretty-print foo.religo] is a transpiler (for now) and needs
    more work.

  * Renamed functions *_ast into *_cst. One day, module AST should be
    renamed CST for clarity and consistency.
2020-05-25 20:29:48 +02:00
Edmond Lee
22b0c9ec46
add default values generateDeployScript values to example contracts 2020-05-25 10:12:41 -07:00
Christian Rinderknecht
041a48bc7b [PascaLIGO] Fixed the build of ParserMain.exe. 2020-05-25 16:04:35 +02:00
Pierre-Emmanuel Wulfman
41d1f5e1b0 fix 2 missing loc in cameligo simplifier EProj et ETuple 2020-05-25 15:43:57 +02:00
Christian Rinderknecht
2d88d2145e Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-25 15:15:27 +02:00
Christian Rinderknecht
7992a4e507 Added cased to test the pretty-printer. 2020-05-25 12:42:19 +02:00
Christian Rinderknecht
6a3dab69a2 Exported pretty-printing function for CameLIGO and ReasonLIGO (transpiler). 2020-05-25 12:37:30 +02:00
Christian Rinderknecht
36cecfb019 * Renamed AST.TStringLiteral into AST.TString
* Fixed parsing of "begin let x = e1 in e2; e3 end"
2020-05-20 16:36:44 +00:00
galfour
0199f3e448 produce I_LAMBDA instead of I_PUSH directly for functions 2020-05-19 23:53:55 +02:00
Pierre-Emmanuel Wulfman
ea306bf685 Merge branch 'fix/srcloc_different_constructor' into 'dev'
FIX/Solve two bug with location

See merge request ligolang/ligo!627
2020-05-19 21:49:23 +00:00
Pierre-Emmanuel Wulfman
e04918047c Merge branch 'fix/srloc_in_mini-c' into 'dev'
fix/Add srcloc in mini-c

See merge request ligolang/ligo!582
2020-05-19 21:37:40 +00:00
Pierre-Emmanuel Wulfman
85dc95dc7b solve to bug with location 2020-05-19 18:53:20 +02:00
Sander
7f32937d6d Merge branch 'interop-doc' into 'dev'
Interop docs

See merge request ligolang/ligo!537
2020-05-19 15:49:09 +00:00
Sander
a0f8bd941e Interop docs 2020-05-19 15:49:09 +00:00
Jev Björsell
e6e1bc5876 Merge branch 'contract/F1.2_example' into 'dev'
TZIP-12: FA1.2 example contract

See merge request ligolang/ligo!600
2020-05-19 15:28:02 +00:00
Pierre-Emmanuel Wulfman
0f7fde19f5 Merge branch 'fix/region_simplifier' into 'dev'
fix/keep region information in the cameligo simplifier

See merge request ligolang/ligo!617
2020-05-18 14:32:42 +00:00
Pierre-Emmanuel Wulfman
fdb7697806 Merge branch 'fix/comparable-pair' into 'dev'
Allow comparison of "comparable pair"

See merge request ligolang/ligo!616
2020-05-18 14:32:36 +00:00
Pierre-Emmanuel Wulfman
551bf176fe add srcloc in mini-c 2020-05-18 15:47:59 +02:00
Pierre-Emmanuel Wulfman
6c8b76b3de add verbatim in lexer and parser 2020-05-18 13:28:31 +02:00
Pierre-Emmanuel Wulfman
7244b91c45 fix/keep region information in the simplifier 2020-05-15 18:28:24 +02:00
Pierre-Emmanuel Wulfman
0ccc637c9b Allow comparison of "comparable pair" (left is a simple comparable type, right is a comparable type) 2020-05-15 17:25:23 +02:00
Christian Rinderknecht
937bc99738 Finished second version based on test contracts. 2020-05-15 16:32:30 +02:00
Christian Rinderknecht
f3ed135926 More fixes to the pretty-printer. 2020-05-15 00:44:15 +02:00
Christian Rinderknecht
ec0a0dbd01 More pretty-printing. 2020-05-14 21:09:14 +02:00
Christian Rinderknecht
44c85daee4 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-13 21:02:17 +02:00
Christian Rinderknecht
85aa1a21d1 Some expressions remain to be pretty-printed.
Fixed a bug in the semantic action of the parser for record updates.
2020-05-13 21:01:27 +02: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
Christian Rinderknecht
262f34f214 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-12 19:25:30 +02:00
Christian Rinderknecht
8c0275b42c Tuples of types are pretty-printed now. 2020-05-12 19:25:02 +02: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
Christian Rinderknecht
546856e14a Fixed ParserLog. First complete version of the pretty-printer. 2020-05-08 19:01:51 +02:00
Christian Rinderknecht
2b96bbbdc3 Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-08 19:00:57 +02:00
Christian Rinderknecht
f1c444da22 A bit more nodes added. 2020-05-07 20:26:47 +02:00
Lesenechal Remi
9eeac11628 some environment cleanup 2020-05-07 16:30:06 +02:00
Christian Rinderknecht
736860611f Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht@pprint 2020-05-07 15:41:33 +02:00
Christian Rinderknecht
a1c5b471fe More cases added. 2020-05-07 11:11:16 +02: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
Pierre-Emmanuel Wulfman
ddb2eac6ca add test 2020-05-04 15:14:56 +02:00
Pierre-Emmanuel Wulfman
426a1b6620 adding ReasonLigo contract 2020-05-04 15:12:44 +02: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
Pierre-Emmanuel Wulfman
059a566d4b add PascaLigo contract 2020-05-04 13:39:44 +02:00
Christian Rinderknecht
66aea1b8d1 Added more cases. 2020-05-04 12:34:42 +02:00