Commit Graph

5658 Commits

Author SHA1 Message Date
Jev Björsell
8041ce5ddb Merge branch 'fix-webide' into 'dev'
Fix webide docker container

See merge request ligolang/ligo!635
2020-05-25 16:00:58 +00:00
76715ebee3
Fix webide docker container 2020-05-25 18:47:40 +03:00
Pierre-Emmanuel Wulfman
2a9a628861 Merge branch 'fix/another-loc' into 'dev'
Fix 2 missing loc in cameligo simplifier EProj et ETuple

See merge request ligolang/ligo!634
2020-05-25 14:08:39 +00:00
Christian Rinderknecht
041a48bc7b [PascaLIGO] Fixed the build of ParserMain.exe. 2020-05-25 16:04:35 +02:00
Sander
1a0db2fc87 Merge branch 'trigger-ci' into 'dev'
Trigger CI

See merge request ligolang/ligo!633
2020-05-25 13:53:18 +00:00
Pierre-Emmanuel Wulfman
41d1f5e1b0 fix 2 missing loc in cameligo simplifier EProj et ETuple 2020-05-25 15:43:57 +02:00
Sander Spies
9163caf3da Trigger CI 2020-05-25 15:41:38 +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
Suzanne Dupéron
07320d181d Merge branch 'update-documentation' into 'dev'
Nix fixes

See merge request ligolang/ligo!631
2020-05-22 18:54:19 +00:00
Suzanne Dupéron
a3e330da12 Update installation.md (punctuation) 2020-05-22 18:36:00 +00:00
Suzanne Dupéron
5ef842298d Update installation.md (changed my mind about the wording) 2020-05-22 18:34:14 +00:00
Suzanne Dupéron
ecebfb37cc Update installation.md (grammar) 2020-05-22 18:33:18 +00:00
Edmond Lee
5e14528a9a update GenerateDeployScript back to GenerateDeployScriptAction in generate-deploy-script.ts 2020-05-22 10:56:27 -07:00
Edmond Lee
a7c6eaf910 add default values generateDeployScript values to example contracts 2020-05-21 16:54:40 -07:00
Edmond Lee
8b7594c2d1 update example.ts, generate-deploy-script.ts, and load-state.ts to support default generateDeployScript values for examples 2020-05-21 16:54:17 -07:00
Edmond Lee
0e48b5bb54 updating generate command to generate deploy script 2020-05-21 16:22:33 -07:00
Edmond Lee
b871b7d64f updating generate command to generate deploy script 2020-05-21 15:50:10 -07:00
Edmond Lee
c8b1ff0e9e updating generate command to generate deploy script 2020-05-21 15:27:34 -07:00
b5d1cd6b5b
Run webide e2e tests on merge requests 2020-05-21 19:31:48 +03:00
3d78114b25
Pass COMMIT_DATE to the build 2020-05-21 19:14:41 +03:00
a14bf15e77
Run webide e2e tests 2020-05-21 19:13:11 +03:00
b522e50ce2
Fix webide deploy handoff 2020-05-21 19:03:15 +03:00
91f31f2914
Update install documentation to reflect packaging updates 2020-05-21 18:56:44 +03:00
Suzanne Dupéron
d5089bfa13 Merge branch 'nix-run-dev' into 'dev'
Switch to nix pipelines

See merge request ligolang/ligo!628
2020-05-21 15:26:04 +00:00
b6aa71d6ac
Remove /tmp from docker container 2020-05-21 18:09:35 +03:00
340622350d
Clarify the nix docs by pointing out the location of build results 2020-05-21 18:09:33 +03:00
Suzanne Dupéron
16bcee1aad
Fixes from MR review
- Fix quoting issues in nix/README.md
- Clarify about nix flakes
2020-05-21 18:09:02 +03:00
5c2b9646ec
Update nix-npm-buildpackage 2020-05-21 18:08:25 +03:00
85c7429f0c
Add documentation for nix expressions 2020-05-21 18:08:25 +03:00
f970a9a536
Use extends instead of anchors in gitlab-ci.yml 2020-05-21 18:08:24 +03:00
e8a69cb498
Switch to nix pipelines
- Remove old pipelines
- Run nix pipelines on a private runner
2020-05-21 18:08:22 +03:00
Jev Björsell
a72d95d9a1 Merge branch 'webide-share-logo-fix' into 'dev'
update logo src

See merge request ligolang/ligo!624
2020-05-20 22:59:02 +00:00
Sander
bd9b3cb012 Merge branch 'rinderknecht@sequences' into 'dev'
Fixing the parsing of sequences in CameLIGO and ReasonLIGO

See merge request ligolang/ligo!605
2020-05-20 16:36:45 +00: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
Gabriel Alfour
dd970385e4 Merge branch 'galfour@minor-optim' into 'dev'
Minor optimization

See merge request ligolang/ligo!613
2020-05-19 23:21:25 +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
Christian Rinderknecht
114a309aed Merge branch 'feature/Varbatim_string' into 'dev'
Add Verbatim string in the compiler

See merge request ligolang/ligo!592
2020-05-18 13:29:00 +00:00
Pierre-Emmanuel Wulfman
6c8b76b3de add verbatim in lexer and parser 2020-05-18 13:28:31 +02:00
Pierre-Emmanuel Wulfman
f6ff6b85c4 add ligo_string in simple_utils 2020-05-18 12:56:47 +02:00