Commit Graph

5184 Commits

Author SHA1 Message Date
Christian Rinderknecht
e2363d558c Merge branch 'dev' of gitlab.com:ligolang/ligo into feature/doc-pascaligo-loop 2020-01-29 16:32:47 +01:00
Christian Rinderknecht
04381b9dcf Merge branch 'feature/doc-pascaligo-loop' into 'dev'
Some doc update for Ligo training

See merge request 
2020-01-29 14:56:50 +00:00
Christian Rinderknecht
037f33a2c5 Merge branch 'feature/doc-pascaligo-loop' of gitlab.com:ligolang/ligo into feature/doc-pascaligo-loop 2020-01-29 15:07:48 +01:00
Lesenechal Remi
daba161105 review request: better description for entry points 2020-01-29 15:02:07 +01:00
Christian Rinderknecht
4c115e7fdd Merge branch 'dev' of gitlab.com:ligolang/ligo into feature/doc-pascaligo-loop 2020-01-29 12:18:32 +01:00
Suzanne Dupéron
27df6df8bb Merge branch 'bugfix/new-typer-7' into 'dev'
bugfix/new typer 7

See merge request 
2020-01-28 23:30:53 +00:00
Suzanne Dupéron
5ff9803989 Merge remote-tracking branch 'origin/dev' into dev 2020-01-28 22:30:31 +00:00
Suzanne Dupéron
a9a12ae244 Changes requested in MR review 2020-01-28 20:23:11 +00:00
Sander
378dfe5cef Merge branch 'reasonligo-docs-improvements' into 'dev'
ReasonLIGO cheat-sheet.

See merge request 
2020-01-28 16:36:55 +00:00
Sander
c3137d9fa8 ReasonLIGO cheat-sheet. 2020-01-28 16:36:55 +00:00
Lesenechal Remi
e55c8400a7 better explaination for entry points 2020-01-28 17:00:51 +01:00
Christian Rinderknecht
149242a371 Updates. 2020-01-28 17:00:51 +01:00
Christian Rinderknecht
729575af11 Updates. 2020-01-28 15:13:50 +01:00
Pierre-Emmanuel Wulfman
391b06733b Merge branch 'ast/update_with_path' into 'dev'
Modify record update, using path for update

See merge request 
2020-01-28 14:12:46 +00:00
Pierre-Emmanuel Wulfman
f36d6a01de Modify record update, using path for update 2020-01-28 14:12:46 +00:00
Christian Rinderknecht
a29b5acb31 Finished refactoring the front-end. 2020-01-27 17:28:31 +01:00
Christian Rinderknecht
8047e98124 WIP: Refactoring of the front-end. 2020-01-27 16:36:04 +01:00
Suzanne Dupéron
1734d31a41 Merge branch 'dev' of gitlab.com:ligolang/ligo into dev 2020-01-27 15:10:30 +00:00
Christian Rinderknecht
fc3385389b [WIP] Refactoring the front-end. 2020-01-27 16:05:47 +01:00
Christian Rinderknecht
0131b0c23d Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2020-01-27 13:00:18 +01:00
Rémi Lesenechal
334deea8ec Merge branch 'feature/fix-compile-storage' into 'dev'
fix bad copy paste ?

See merge request 
2020-01-27 11:38:30 +00:00
Lesenechal Remi
088c5560c4 test for compile-storage 2020-01-27 11:42:32 +01:00
Lesenechal Remi
1a6a682584 fix bad copy paste ? 2020-01-27 11:36:51 +01:00
John David Pressman
a9bac17415 Merge branch 'contract/id-layer' into 'dev'
[LIGO-269] ID Layer Contract

See merge request 
2020-01-24 22:52:06 +00:00
John David Pressman
e025eab45d [LIGO-269] ID Layer Contract 2020-01-24 22:52:06 +00:00
John David Pressman
62a4482ff3 Change commit.salted_hash to be hash, reorder salt in tests, still failing 2020-01-24 13:28:02 -08:00
Christian Rinderknecht
8843a46975 Added missing check for reserved names in CameLIGO.
The calls to the lexer and parser of CameLIGO through the compiler use
now their error messages, like in PascaLIGO.
2020-01-24 15:57:41 +01:00
Christian Rinderknecht
3c9dd93c8b Fixed again priority of "->" vs "*" in type expressions.
Fixed negative tests.
2020-01-24 14:35:15 +01:00
Christian Rinderknecht
47a41971d7 Fixed the parsing of [a * b -> c] as [(a * b) -> c]. 2020-01-24 14:15:07 +01:00
Christian Rinderknecht
1a1a8d986c Merge branch 'dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2020-01-24 14:04:25 +01:00
Christian Rinderknecht
e85486eae4 Improved slightly the formatting of some error messages.
Fixed the bug in the parser: I wrongly closed [stdout].
2020-01-24 14:03:25 +01:00
John David Pressman
13de36d6db Merge branch 'contract/timelock-repeat' into 'dev'
[LIGO-410] Contract/timelock repeat

See merge request 
2020-01-24 12:01:15 +00:00
Christian Rinderknecht
41d6956b66 [WIP] Added traces to debug 2020-01-24 12:56:05 +01:00
John David Pressman
3a320c26c8 Modify hashlock to use commit-reveal and add non-working commit test 2020-01-24 03:29:00 -08:00
John David Pressman
98f85bb2fe Merge branch 'dev' into contract/hashlock 2020-01-24 02:49:53 -08:00
Rémi Lesenechal
85319cc0bb Merge branch '46-get-a-list-of-all-functions-from-source-code' into 'dev'
Resolve "Get a list of all functions from source code"

Closes 

See merge request 
2020-01-23 22:09:56 +00:00
Lesenechal Remi
ba0548d6b8 some list-declarations tests 2020-01-23 22:12:33 +01:00
Lesenechal Remi
fd47f51031 add a new CLI command: list-declarations 2020-01-23 22:12:33 +01:00
Tom Jack
a8fdb46a3a Merge branch 'feature/merge-ci' into 'dev'
CI for "merge_requests"

See merge request 
2020-01-23 21:09:30 +00:00
Tom Jack
6f4c147a31 Don't merge to master 2020-01-23 11:48:27 -06:00
Tom Jack
6bcd75e5b6 CI for "merge_requests" 2020-01-23 11:43:43 -06:00
Christian Rinderknecht
4f4294bf56 Refactoring of the front-end towards integration of the local builds
and the globol build, using the parser error messages, for instance.
2020-01-23 18:28:04 +01:00
John David Pressman
0636994ffb Fix interval advance test for repeating time lock contract 2020-01-23 08:32:43 -08:00
Francis Brunelle
af23dcaebb
add Telegram link 2020-01-23 09:20:42 -05:00
Rémi Lesenechal
c73c563461 Merge branch 'feature/fix-evaluate-value' into 'dev'
fix evaluate-value and added tests

See merge request 
2020-01-23 13:59:20 +00:00
Lesenechal Remi
69d125b667 fix evaluate-value and added tests 2020-01-23 14:29:04 +01:00
Rémi Lesenechal
74c57776d8 Merge branch 'bugfix/bytes-constructors' into 'dev'
Fixed semantic conflict (split bytes into several constructor functions)

See merge request 
2020-01-23 12:23:49 +00:00
Suzanne Dupéron
1592404e03 Merge commit '4977c18e' into bugfix/new-typer 2020-01-23 11:56:02 +01:00
Suzanne Dupéron
4977c18e05 Fixed semantic conflict (split bytes into several constructor functions) 2020-01-23 11:43:43 +01:00
John David Pressman
f166748757 Merge branch 'gardening/e-bytes-split' into 'dev'
[LIGO-374] Split e_bytes into e_bytes_hex, e_bytes_raw and e_bytes_string

See merge request 
2020-01-23 08:35:30 +00:00