John David Pressman
f043135df1
Add Michelson map membership to CameLIGO and PascaLIGO
2019-12-06 09:35:08 -08:00
Pierre-Emmanuel Wulfman
034c92a64c
Use ADT for types and move type to ast_common
...
and Making name, type_variable, built-in, constructor, label and string uncompatible types in ligo (weird bug with types in ligodity)
2019-12-04 11:40:58 +00:00
John David Pressman
085a756ed3
Fix bug where tuples are destructured with the members in the wrong order
2019-12-03 10:49:58 -08:00
John David Pressman
8609196bac
Fix IMPLICIT_ACCOUNT
2019-12-03 00:00:01 -08:00
John David Pressman
0b3e057819
Add self address to CameLIGO and PascaLIGO
2019-12-01 21:56:49 +00:00
John David Pressman
03dd86c9ad
Expose address operator in PascaLIGO and CameLIGO
2019-12-01 21:56:49 +00:00
John David Pressman
694c3aea97
Add implicit_account to operators
2019-12-01 21:56:49 +00:00
Gabriel Alfour
c1dac64af3
Merge branch 'feature/inlining2' into 'dev'
...
Substitution-based inlining
See merge request ligolang/ligo!227
2019-11-29 14:17:25 +00:00
Tom Jack
49586b65be
Type subtraction also as nat->int->int and int->nat->int
2019-11-28 06:48:24 -06:00
Tom Jack
06603b594a
Mini_c: Identify more pure constants
2019-11-27 09:06:36 -06:00
Tom Jack
66d2cda107
Mini_c: Inlining optimization
2019-11-27 09:06:31 -06:00
Rémi Lesenechal
48bef70a6a
Merge branch 'record-accesses-fix' into 'dev'
...
Broken nested access to record
See merge request ligolang/ligo!225
2019-11-26 18:09:06 +00:00
Lesenechal Remi
c1c551e33f
fix and more tests
2019-11-26 18:08:53 +01:00
Lesenechal Remi
848b902cd9
generated variable name typo
2019-11-26 17:49:23 +01:00
Tom Jack
e16ddf7ddc
Merge branch 'region-invalid' into 'dev'
...
Fix a Region.Invalid error in Cameligo simplifier
See merge request ligolang/ligo!214
2019-11-22 21:53:59 +00:00
Rémi Lesenechal
c7dfd54f7e
Resolve "Error when dry-running a contract (having a storage which contains a lambda)"
2019-11-22 20:28:55 +00:00
Tom Jack
7f7d5972ac
Fix a Region.Invalid error in Cameligo simplifier
2019-11-21 16:53:17 -06:00
Lesenechal Remi
88a0f33fca
add key_hash type and crypto_key_hash operator to pascaligo
2019-11-21 17:21:39 +01:00
Lesenechal Remi
1185b8abda
add chain_id type and operator
2019-11-21 17:21:39 +01:00
Lesenechal Remi
edb1e3d607
add crypto_check function to pascaligo
2019-11-21 17:19:11 +01:00
Lesenechal Remi
2fa78bd0bd
add key and signature types
2019-11-21 17:19:11 +01:00
Tom Jack
81c49f4342
Fix/simplify big_maps using Babylon
2019-11-21 08:18:18 -06:00
Lesenechal Remi
f27f8c10d1
For collection loop: also capture variable in logical blocks
...
Also, the iterated element/s are appended tot he list of local declaration
2019-11-21 11:28:32 +01:00
John David Pressman
eb85595818
Add is_nat operator to CameLIGO
2019-11-20 12:48:55 +00:00
John David Pressman
598fbf96ed
Add is_nat operator to PascaLIGO
2019-11-20 12:48:55 +00:00
John David Pressman
4270cc0d22
[LIGO-229] Change ordering of collection operation args
2019-11-20 12:16:31 +00:00
Tom Jack
863dfbb39d
Merge branch 'feature/get-entrypoint' into 'dev'
...
Add `get_entrypoint`...
See merge request ligolang/ligo!184
2019-11-19 22:27:12 +00:00
John David Pressman
9b0eb636fb
Properly typed multi-variable binding simplification
...
Thanks for the help Sanders. :)
2019-11-19 21:13:52 +00:00
Rémi Lesenechal
f0655eab28
Pascaligo for collection loops: take locally declared variable into account
2019-11-19 13:25:48 +00:00
John David Pressman
bbcacc253b
Merge branch 'feature/pascaligo-anon-functions' into 'dev'
...
Feature/pascaligo anon functions
See merge request ligolang/ligo!201
2019-11-19 08:33:54 +00:00
John David Pressman
e1a05a27c5
Remove vestigial commented-out code
2019-11-18 23:45:26 -08:00
Tom Jack
723201ce5e
Add get_entrypoint
...
2019-11-18 09:28:20 -06:00
galfour
ddc4b7b7a5
add anon functions; remove pre-block declarations; update tests
2019-11-18 16:10:48 +01:00
Lesenechal Remi
91e245ef70
Fix issue with nested collection loop where inner loop iterated elements were shadowing outer loop iterated element
2019-11-18 14:14:54 +01:00
galfour
5422049dba
Merge branch 'dev' into feature/more-applications-pascaligo
2019-11-18 09:53:57 +01:00
Lesenechal Remi
e689d3d3b7
more doc
2019-11-15 20:05:35 +01:00
Lesenechal Remi
683bc0a72b
fix problems with nested for collection loop
2019-11-15 20:05:35 +01:00
galfour
d0efbd9f92
add and test more ways to do function application in pascaligo
2019-11-14 20:13:15 +01:00
Tom Jack
5b60109606
Improve purity test for dead code elimination
2019-11-13 14:05:22 -06:00
John David Pressman
3675aed76d
Merge branch 'dev' of ssh://gitlab.com/ligolang/ligo into feature/pascaligo-balance
2019-11-12 17:16:07 -08:00
Pierre-Emmanuel Wulfman
29a86ad411
Fix: deep access
2019-11-12 17:07:09 +00:00
John David Pressman
273ec8c280
Add ability to access balance to PascaLIGO
2019-11-12 08:01:18 -08:00
Pierre-Emmanuel Wulfman
f91de985d0
remove 'Access_Map'
2019-11-12 14:28:58 +00:00
Rémi Lesenechal
73919e3a5c
Merge branch 'rinderknecht-dev' into 'dev'
...
Removing the type annotation for variables iterating over collections.
See merge request ligolang/ligo!178
2019-11-07 11:23:31 +00:00
Christian Rinderknecht
02f58ee212
I removed the annotation for the variable that iterates over collections.
...
for x in set s block { ... } // now
for x : t in set s block { ... } // before
2019-11-06 20:12:25 +01:00
John David Pressman
7c291158c2
Finish balance operator and add test for CameLIGO
2019-11-06 11:08:18 -08:00
Christian Rinderknecht
759978393a
Merge branch 'rinderknecht-dev' into 'dev'
...
Refactoring of PascaLIGO's front-end
See merge request ligolang/ligo!176
2019-11-06 17:17:02 +00:00
Christian Rinderknecht
0fdbbe0a4c
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
2019-11-06 17:33:39 +01:00
Christian Rinderknecht
9da6d81a0f
Added local test file.
2019-11-06 17:33:00 +01:00
Christian Rinderknecht
fe90246e3a
Fixed the printing of some AST nodes.
2019-11-06 17:23:49 +01:00
Christian Rinderknecht
70a9afcce2
Merge branch 'rinderknecht-dev' into 'dev'
...
Refactoring of Ligodity (CameLIGO) and making an AST pretty-printer
See merge request ligolang/ligo!172
2019-11-06 12:18:54 +00:00
Pierre-Emmanuel Wulfman
e741531041
Merge branch 'clean-sts-solver' into 'dev'
...
New typer in a separate folder along with old typer
See merge request ligolang/ligo!166
2019-11-06 11:28:03 +00:00
Suzanne Dupéron
0b7a84e949
Fixed qwerty typo + small cleanup
2019-11-05 21:52:59 +00:00
Christian Rinderknecht
bd6ce2f28c
Bug fix: Some nodes were not indented.
2019-11-05 15:57:43 +01:00
Christian Rinderknecht
351025b52d
Refactoring of Ligodity (CameLIGO) and making an AST pretty-printer
...
- AST.ml/AST.mli:
- The AST now distinguishes the constructors `None` and `Some` as being
predefined, as in PascaLIGO. See type `AST.constr_pattern`.
- I removed the nodes specific to Liquidity,
e.g. `let%entry`, and, in particular, the natural literals
ending with `p`. Now it should be `n`, as in `10n`.
- I renamed the node `TAlias` to `TVar`.
- I have applied the rule of expanding type expressions after `of` when
those were not records.
- The type of the argument to a data constructor is now
`type_expr`, instead of `cartesian`.
- I added the patterns for bytes (`PBytes`) and natural literals (`PNat`).
- I renamed the node `Sugar` into
`PListComp` (meaning "pattern of list comprehension").
- Record types in CameLIGO now must have at least one field declaration.
- Replaced the type `closing` and `opening` with one type `compound`,
which captures only the right combinations of opening and closing.
- Components of tuples in a selection must not be written
between parentheses. For example, `a.b.(1).(0)` is now
`a.b.1.0`, as in PascaLIGO.
- LexToken.mli/LexToken.mll
- I renamed the string literal `Str` into `String`.
- I added the tokens `C_None` and `C_Some` (to distinguish the
constructors `None` and `Some`. See AST.ml)
- Fixed the function `mk_sym` so it does not fail with `failwith`, but
with `Error Invalid_symbol`.
- Lexer.mll (shared)
- I removed the character `%` from the identifiers (used to
support Liquidity, like `entry%point` and `match%nat`).
- I adde to the hint on broken strings: "or insert a backslash"
(from a Gitlab issue).
- ParToken.mly
- I added the tokens `C_None` and `C_Some` (to distinguish the
constructors `None` and `Some`. See AST.ml and LexToken.mll)
- Parser.mly
- Fixed the order of declarations in the AST (it was reversed).
- I removed syntax support for Liquidity.
- I added user-defined constructor applications to irrefutable
patterns (the ones afer a `let`), even though only the type
checker can decide that they are truly irrefutable because they
are the only constructors of their types.
- I added natural numbers and bytes to patterns.
- Access of tuple components do not require parentheses now, like
`a.b.1.0`.
- I refactored the semantic actions.
- I added the empty sequence `begin end`.
- ParserLog.ml/ParserLog.mli
- I added a pretty-printer for the AST (with source locations).
- ParserMain.ml
- The CLI for the pretty-printer is now `--verbose=ast`.
- The old CLI `--verbose=ast` is now `--verbose=ast-tokens`.
- ligodity.ml (simplifier)
- I removed the constructions of sets, lists and maps with
`Set [...]`, `List [...]` and `Map [...]`, as there are already
better ways (that is, more like the OCaml's way), like
`Set.literal [...]` and `Map.literal [...]`. (The case for lists
was entirely redundant with the rest of the language as it is.)
- Everywhere there is now a non-empty list of elements, I made a
change. In particular, I removed a corner case ("let without
binding"), thanks to more precise OCaml types for non-empty
lists.
- I ported all the changes to the AST above.
- region.ml (vendors)
- I changed the method `compact` so the end-line is not repeated
if it is the same as the start line: this is even more compact. I
use this in the new pretty-printer for the AST (see above)
- I updated all the CameLIGO contracts.
2019-11-04 23:51:47 +01:00
John David Pressman
aec572fc20
[LIGO-168] Add the while loop to CameLIGO
2019-11-04 19:06:18 +00:00
Suzanne Dupéron
4325ba7ee4
Merge branch 'clean-sts-solver' of gitlab.com:ligolang/ligo into clean-sts-solver
2019-11-04 18:44:09 +00:00
Suzanne Dupéron
40b318eff6
Rename 4-typer to 4-typer-old (part 2: make changes)
2019-11-04 18:40:49 +00:00
Suzanne Dupéron
f41625ceb3
Rename 4-typer to 4-typer-old (part 1: move files)
2019-11-04 18:39:56 +00:00
galfour
9fe5d821c3
Merge branch 'dev' into clean-sts-solver
2019-11-04 16:32:32 +01:00
Tom Jack
c969f306af
Eliminate dead lambdas
2019-11-02 18:43:46 -05:00
Tom Jack
e30b7faa9d
Mini_c: Remove T_deep_closure and D_function
2019-11-02 18:43:46 -05:00
Tom Jack
ba7a83d0f7
Deal with upstream MBytes changes
2019-11-02 17:54:33 -05:00
Suzanne Dupéron
45347e3e88
Bring back copy of the old typer (part 2: changes)
2019-10-31 18:19:01 -04:00
Suzanne Dupéron
d57a87a3ea
Moving new typer to separate folder
2019-10-31 17:43:44 -04:00
Suzanne Dupéron
5c3e1ad642
Hack for E_constant with loops shouldn't be necessary in new typer, thanks to typeclasses?
2019-10-31 17:19:01 -04:00
Suzanne Dupéron
1e06c24325
Merge branch 'dev' of gitlab.com:ligolang/ligo into clean-sts-solver
2019-10-31 17:18:09 -04:00
Lesenechal Remi
b9d32ddf4e
add bytes_pack
2019-10-31 17:39:07 +01:00
Lesenechal Remi
f341527aa6
add signature type
2019-10-31 16:46:07 +01:00
Tom Jack
76ecd56e3d
Merge branch 'feature/babylon-optimizer' into 'dev'
...
Update optimizer for Babylon
See merge request ligolang/ligo!158
2019-10-31 15:17:00 +00:00
Suzanne Dupéron
c0397f68a0
Wrap type names with a constructor Type_name, so that merlin does not think that all strings are type names
2019-10-30 12:50:19 -04:00
Suzanne Dupéron
3f0b9346a5
More but not enough of the fold. Filled in holes with failwith, need to implement enough that it passes a test.
2019-10-29 20:14:42 -04:00
John David Pressman
c09116211f
Merge branch 'feature/cameligo-negative-op' into 'dev'
...
[LIGO-172] Add negative operator to CameLIGO
See merge request ligolang/ligo!161
2019-10-29 18:12:17 +00:00
John David Pressman
dce98c06ec
Merge branch 'dev' of gitlab.com:ligolang/ligo into feature/cameligo-negative-op
2019-10-29 09:59:37 -07:00
John David Pressman
102ffda7c3
Make negative operator test pass
2019-10-29 09:28:20 -07:00
Lesenechal Remi
a140e12394
add test for nested for collection loops (not supported yet)
2019-10-29 16:32:28 +01:00
Lesenechal Remi
402d849cec
use intermediary tuple access to get key and value for maps. add tests.
2019-10-29 15:43:00 +01:00
Lesenechal Remi
c288f3c81e
simplify the simplifier and now find the free variables with a expression_fold
2019-10-29 11:56:21 +01:00
Lesenechal Remi
e86c92bc3b
improving simplifier
2019-10-29 11:41:59 +01:00
Lesenechal Remi
ba00db2b4c
add self_ast_simplified fold_expression
2019-10-29 10:43:38 +01:00
Lesenechal Remi
e77f3e4903
empty for collection loop
2019-10-28 20:52:14 +01:00
Lesenechal Remi
2ced2e784e
add doc
2019-10-28 20:52:14 +01:00
Lesenechal Remi
e16eac77a6
fixes for loop on map.
...
Untested because of issue with deep tuple access (LIGO-131 LIGO-134)
An error message is in the simplifier
2019-10-28 20:52:14 +01:00
Lesenechal Remi
b71309bfa2
proper error message for deep accesses in loops of collection body
2019-10-28 20:52:14 +01:00
Lesenechal Remi
5a77b08aa7
cleaning & documenting
2019-10-28 20:52:14 +01:00
Lesenechal Remi
a3deccf352
changing the name of the lambda to 'arguments' make its arguments available
2019-10-28 20:52:14 +01:00
Lesenechal Remi
164e88e818
remove shadowing of lambda name over the constant name
2019-10-28 20:52:14 +01:00
Lesenechal Remi
d651bfb3a3
remove misplaced 'skip'
2019-10-28 20:52:14 +01:00
Lesenechal Remi
0cf7471441
prepend the body of the lambda with let_in's
2019-10-28 20:52:14 +01:00
Lesenechal Remi
91d92e048d
special case for pascaligo generated LIST/SET/MAP_FOLD
2019-10-28 20:52:14 +01:00
Lesenechal Remi
70502f62cb
fix the way lambda arguments are accessed
2019-10-28 20:52:14 +01:00
Lesenechal Remi
db79b6b9da
select op_name from collection key word
2019-10-28 20:52:14 +01:00
Lesenechal Remi
79de96136d
Collection for translation without type annotation on record
2019-10-28 20:52:14 +01:00
Lesenechal Remi
730c130fb3
merge step and down reemoval
...
WIP
WIP
2019-10-28 20:52:14 +01:00
Lesenechal Remi
536b5648c8
some cleaning
2019-10-28 20:52:14 +01:00
Lesenechal Remi
1d3d57c7c5
not complete for collect tryout
2019-10-28 20:52:14 +01:00
Lesenechal Remi
3058a57c62
cleaning and better tests
2019-10-28 20:52:14 +01:00
Lesenechal Remi
b7961fc8ec
cleaning
2019-10-28 20:52:14 +01:00
Lesenechal Remi
d8e44476ba
First version for ForInt loops
2019-10-28 20:52:14 +01:00
Christian Rinderknecht
2c4183f008
Merge branch 'feature/cameligo-bitwise-operators' into 'dev'
...
[LIGO-177] Add bitwise operators to CameLIGO
See merge request ligolang/ligo!160
2019-10-28 18:13:54 +00:00
John David Pressman
c7e4f3f651
Remove lxor, land, and lor from reserved words
2019-10-28 09:18:16 -07:00
Suzanne Dupéron
dcf5a975d4
More of subst
2019-10-28 01:10:26 -04:00
Suzanne Dupéron
174c028406
Fixing issues in the new typer
2019-10-27 23:24:21 -04:00
John David Pressman
cae0dfb1aa
Change names to the standard library names for the functions in OCaml
2019-10-27 12:05:34 -07:00
Tom Jack
0191d8b0ed
Replace "mtz" with "mutez"
2019-10-27 11:50:24 -05:00
Tom Jack
076c245724
Merge branch 'get-contract-address' into 'dev'
...
Typecheck address argument to get_contract
See merge request ligolang/ligo!159
2019-10-26 13:33:23 +00:00
Suzanne Dupéron
1dc690bbba
Bugfix: only one propagator was called. Now they are all (both of them so far) called in turn.
2019-10-25 22:30:20 -04:00
John David Pressman
ea661247b6
Add bitwise operators to CameLIGO
...
Right now they're defined as '.bor' and '.band' because of a glitch
in CameLIGO's parser where 'X.Y' leads to a parse error if Y is a
keyword or reserved word in CameLIGO.
2019-10-25 16:12:54 -07:00
Rémi Lesenechal
5a5c3a8dd4
Merge branch 'feature/clean-big-map' into 'dev'
...
Feature/clean big map
See merge request ligolang/ligo!145
2019-10-25 21:30:09 +00:00
Tom Jack
ef05b47dc6
Typecheck address argument to get_contract
2019-10-25 11:27:55 -05:00
Tom Jack
afbf2ba2db
Less stupid way to combine adjacent drops
2019-10-25 00:42:31 -05:00
Tom Jack
7c99affd4b
Organize prims by their strangeness
2019-10-25 00:00:39 -05:00
Tom Jack
dae4f58297
Combine adjacent DROP
2019-10-24 23:58:21 -05:00
Tom Jack
9ae39bab97
Fix (latent?) Babylon bug in self_michelson pass
2019-10-24 23:58:15 -05:00
Christian Rinderknecht
c0f4aaf0c7
Fixed the regression on case clauses (blocks were removed).
2019-10-24 10:33:22 +02:00
Christian Rinderknecht
4a9150f560
WIP: Fixing a regression (blocks in case clauses as intructions).
2019-10-24 10:33:22 +02:00
Suzanne Dupéron
c4e996d5aa
Fixed module issue, thanks Christian
2019-10-23 12:17:18 -04:00
Suzanne Dupéron
535c291b3f
blabla
2019-10-23 10:45:48 -04:00
Suzanne Dupéron
10362426aa
blabla
2019-10-23 10:41:36 -04:00
Christian Rinderknecht
4730df6ea1
Merge branch 'rinderknecht-dev' into 'dev'
...
Forbidding empty patches (records, maps, sets)
See merge request ligolang/ligo!148
2019-10-23 10:06:26 +00:00
John David Pressman
1f50cc8f57
Remove PascaLIGO set_size
2019-10-22 20:24:05 -07:00
John David Pressman
c4cc4fcba9
Add set size op for CameLIGO and PascaLIGO
2019-10-22 19:28:13 -07:00
Christian Rinderknecht
eae3348d51
I forbade empty patches (parser). Fixed AST pretty-printer (PascaLIGO).
...
Changed accordingly the simplifier: the dead code for the error about
empty record patches is no long.
2019-10-23 00:35:29 +02:00
Suzanne Dupéron
79967e9067
Hit a module problem in OCaml.
2019-10-22 08:50:21 -04:00
Lesenechal Remi
2a2c708b54
adding Big_map.* operators for cameligo
2019-10-22 12:23:48 +02:00
Lesenechal Remi
cefac0d8e7
add big_map injection
2019-10-22 12:23:48 +02:00
Christian Rinderknecht
9ad0859a4c
Merge branch 'feature/pascaligo-remove-case-as-expression' into 'dev'
...
Feature/pascaligo add conditional as an expression
See merge request ligolang/ligo!144
2019-10-22 08:42:59 +00:00
Christian Rinderknecht
fa30b7d87d
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
2019-10-22 10:38:32 +02:00
John David Pressman
8f799321d6
Add string concatenation support to CameLIGO
2019-10-21 15:46:26 -07:00
Christian Rinderknecht
312dc65950
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
2019-10-21 21:42:52 +02:00
John David Pressman
97f2a44a24
Merge branch 'feature/pascaligo-expr-fun' into 'dev'
...
[LIGO-150] Add blockless functions to PascaLIGO
See merge request ligolang/ligo!143
2019-10-20 08:46:15 +00:00
John David Pressman
09230df60a
Remove kwd_expr
2019-10-19 10:55:39 -07:00
John David Pressman
daad15c57d
Write blockless function test and make it pass
2019-10-19 10:46:24 -07:00
John David Pressman
ec67d37f20
Gabriel wants to see the code
2019-10-19 09:11:18 -07:00
John David Pressman
6e0173a9a7
Fix type error when where blockfun types eat regions
2019-10-18 17:46:20 -07:00
Lesenechal Remi
6b55bf3630
cleaning
2019-10-18 17:44:10 +02:00
Lesenechal Remi
080b25a3bd
WIP: add test. still have two ECond implementation, none of them pass the test
2019-10-18 17:44:10 +02:00
Christian Rinderknecht
d95f345dbf
First attempt at adding conditionals as expressions.
...
Warning: The simplifier is not done yet.
2019-10-18 17:44:10 +02:00
Lesenechal Remi
bec3419936
cleaning
2019-10-18 14:47:04 +02:00
Lesenechal Remi
b721a19b00
WIP: add test. still have two ECond implementation, none of them pass the test
2019-10-18 14:32:58 +02:00
Christian Rinderknecht
704c744ace
First attempt at adding conditionals as expressions.
...
Warning: The simplifier is not done yet.
2019-10-18 13:52:26 +02:00
Gabriel Alfour
62e6b1d469
Merge branch 'feature/babylon' into 'dev'
...
upgrade to babylon
See merge request ligolang/ligo!141
2019-10-18 07:56:36 +00:00
John David Pressman
2bffba379d
Remove anonymous records
2019-10-17 22:34:38 -07:00
John David Pressman
35a59a0867
Add parser tokens, guru meditation on why the AST types don't work
2019-10-17 21:33:45 -07:00
John David Pressman
8997155a57
Rough draft of single-expr function syntax
2019-10-17 20:50:41 -07:00
Christian Rinderknecht
e53d4035d0
Removed corner case that could not be triggered in PascaLIGO simplifier.
2019-10-17 18:46:40 +02:00
Christian Rinderknecht
36d9858e97
Removed sub-blocks from PascaLIGO.
2019-10-17 18:33:58 +02:00
Lesenechal Remi
9f0b61659e
we don't need to check for closures in function arguments
2019-10-17 17:18:10 +02:00
galfour
27be6cfcba
use apply for closures
2019-10-17 16:34:02 +02:00
galfour
8a4b9695e7
use dig/dug for get/set
2019-10-17 15:48:24 +02:00