Commit Graph

5036 Commits

Author SHA1 Message Date
Eowyn Dean
204aeb4f85 Merge branch 'fixing-broken-images-on-contact-page' into 'dev'
Fix for broken images

See merge request ligolang/ligo!241
2019-12-09 19:48:29 +00:00
Maksym Bykovskyy
ea69032c4a Fix for broken images 2019-12-09 19:48:28 +00:00
Christian Rinderknecht
c07247d076 Merge branch 'rinderknecht-dev' into 'dev'
Gardening

See merge request ligolang/ligo!243
2019-12-09 16:44:15 +00:00
Christian Rinderknecht
04a770e22d To enable local builds of the PascaLIGO parser. 2019-12-09 15:52:17 +00:00
Christian Rinderknecht
aeb868311d To enable local builds of the PascaLIGO parser. 2019-12-09 16:49:48 +01:00
Christian Rinderknecht
d907be7904 Merge branch 'rinderknecht-dev' of gitlab.com:ligolang/ligo into rinderknecht-dev 2019-12-09 12:10:33 +01:00
Christian Rinderknecht
4112182aad Merge branch 'rinderknecht-dev' into 'dev'
I rewrote some comments so [dune build @doc] can extract HTML

See merge request ligolang/ligo!238
2019-12-09 11:04:50 +00:00
Christian Rinderknecht
6cc17f9a3f I rewrote some comments so [dune build @doc] can extract HTML from
module interfaces.

This is meant as an exercise and an example to all team members.

I fixed a minor shadowing issue in [x_list.ml].
2019-12-07 15:09:49 +00:00
Christian Rinderknecht
9829a35653 Merge remote-tracking branch 'origin/dev' into rinderknecht-dev 2019-12-07 15:13:55 +01:00
Christian Rinderknecht
3d9971c909 Merge branch 'feature/cameligo-map-mem' into 'dev'
[LIGO-222] Add Michelson map membership to CameLIGO and PascaLIGO

See merge request ligolang/ligo!239
2019-12-06 18:35:37 +00:00
John David Pressman
f043135df1 Add Michelson map membership to CameLIGO and PascaLIGO 2019-12-06 09:35:08 -08:00
Christian Rinderknecht
c4182fa6fd I rewrote some comments so [dune build @doc] can extract HTML from
module interfaces.

This is meant as an exercise and an example to all team members.

I fixed a minor shadowing issue in [x_list.ml].
2019-12-06 11:49:19 +01:00
Eowyn Dean
c3e904ca00 Merge branch 'website-new-design' into 'dev'
LIGO-225 Website new design

See merge request ligolang/ligo!233
2019-12-05 16:10:59 +00:00
Maksym Bykovskyy
7a8e96d4b2 LIGO-225 Website new design 2019-12-05 16:10:59 +00:00
Pierre-Emmanuel Wulfman
cc0e94de64 Merge branch 'ast/main' into 'dev'
ADT for type

See merge request ligolang/ligo!206
2019-12-04 11:40:58 +00: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
Gabriel Alfour
0312f1bf64 Merge branch 'feature/cameligo-tuple-order-fix' into 'dev'
Fix bug where tuples are destructured with the members in the wrong order

Closes #63

See merge request ligolang/ligo!235
2019-12-03 19:59:19 +00:00
John David Pressman
6a4d58d467 Overkill the tuple ordering bug 2019-12-03 11:10:53 -08: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
b9a2eab834 Merge branch 'feature/implicit-account-fix' into 'dev'
Fix IMPLICIT_ACCOUNT

See merge request ligolang/ligo!234
2019-12-03 08:53:18 +00:00
John David Pressman
8609196bac Fix IMPLICIT_ACCOUNT 2019-12-03 00:00:01 -08:00
Tom Jack
dcf5a7f9c9 Merge branch 'fix-merlin-confusion' into 'dev'
Rename executable to fix merlin confusion

See merge request ligolang/ligo!232
2019-12-02 00:42:30 +00:00
Tom Jack
317313ecc6 Rename executable to fix merlin confusion 2019-12-01 23:08:05 +00:00
Gabriel Alfour
d1d9cea599 Merge branch 'feature/self-account-address-ops' into 'dev'
Add SELF_ADDRESS, ADDRESS, and IMPLICIT ACCOUNT to LIGO

See merge request ligolang/ligo!230
2019-12-01 22:46:16 +00: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
Rémi Lesenechal
f1c9c11ae4 Merge branch 'refactoring-eval-run-functions' into 'dev'
Refactoring eval run functions

**Purpose of the refactoring (approx 250 lines of code removed):**

1. "flatten" the different compilation steps (in the tests & CLI), avoiding the russian doll effect of the `Of_**` modules. What is being done is now clearer (not perfect but way better IMO
2. Make the Run module actually only run code.. instead of being responsible for both compilation & michelson evaluation. As a result, only the `Run.Of_michelson` module remains.
3. I added a module Compile.Wrapper, which make use of the functions defined in the `Compile.Of_*` modules. They are both use by the tests and the CLI.
4. delete dead/duplicated code in the `Compile.Of_*` modules to keep it as minimal as possible

See merge request ligolang/ligo!229
2019-11-29 21:22:56 +00:00
Rémi Lesenechal
4be2d6fb6a Refactoring eval run functions 2019-11-29 21:22:56 +00:00
Tom Jack
a121766a89 Fix semantic merge conflict w/ expect tests 2019-11-29 10:00:58 -06: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
Gabriel Alfour
bfb01d371a Merge branch 'feature/more-subtraction' into 'dev'
Type subtraction also as nat->int->int and int->nat->int

See merge request ligolang/ligo!228
2019-11-29 10:13:29 +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
6c7e1af0c1 Merge branch 'feature/better-man' into 'dev'
Better man

See merge request ligolang/ligo!216
2019-11-28 12:43:50 +00:00
Suzanne Dupéron
16a2d76e66 Merge branch 'feature/nocrlf' into 'dev'
Stop using docker `-it` to avoid spurious CRLF

See merge request ligolang/ligo!226
2019-11-28 09:54:49 +00:00
Tom Jack
0040b1f460 Mention subcommand --help only once 2019-11-27 11:00:21 -06:00
Tom Jack
e3fbc58e7a Show help instead of "Do ligo --help" 2019-11-27 11:00:21 -06:00
Tom Jack
32625bb075 Use doc not docs in cli 2019-11-27 11:00:21 -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
John David Pressman
adb4572bde Merge branch 'docs/iterators' into 'dev'
Add better explanation of tuples and map iterator docs

See merge request ligolang/ligo!223
2019-11-27 10:13:57 +00:00
Tom Jack
ca1025b705 Stop using docker -it to avoid spurious CRLF 2019-11-26 18:29:25 -06:00
Rémi Lesenechal
7a7b9cc038 Merge branch 'contract-better-multisigv2' into 'dev'
Better multisigv2 contract

See merge request ligolang/ligo!220
2019-11-26 22:04:43 +00:00
Lesenechal Remi
e7195c4c41 mutisig v2 some renaming and counter reset fix 2019-11-26 19:21:51 +01:00
Lesenechal Remi
39c7766b08 multisig v2 comments 2019-11-26 19:11:30 +01:00
Lesenechal Remi
cf540a1a78 multisigv2 default entry point 2019-11-26 19:11:30 +01:00
Lesenechal Remi
c8eb1a3fa6 multisigv2 with less user uncertainty 2019-11-26 19:11:30 +01:00
Lesenechal Remi
b82383751c multisigv2 more robust to spam
Set limits to the number of approvals and message sizes
2019-11-26 19:11:30 +01:00
Lesenechal Remi
652138b115 new 'expect' test helpers working on expressions 2019-11-26 19:11:30 +01:00
Lesenechal Remi
00def6d20e Fix a bug, test added:
A never accounted message was not adding anything to the map
2019-11-26 19:11:30 +01:00