1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Commit graph

525 commits

Author SHA1 Message Date
schaeff
b4ad991bde port most examples to new syntax 2018-08-20 16:43:53 +02:00
schaeff
eed0f8aaaa fix parse of for loop 2018-08-20 16:29:16 +02:00
schaeff
762999c0c3 add type annotation to definitions, unify reserved keyword handling 2018-08-16 18:06:00 +02:00
schaeff
8380ec6c0c split function parsing, add return types, parse signature, check return statement 2018-08-16 17:28:16 +02:00
JacobEberhardt
09131020cc
Merge pull request #112 from Schaeff/move-examples-to-right-folder
Adjust runtime failure tests
2018-08-15 21:44:07 +02:00
JacobEberhardt
8e9a43722f
Merge pull request #109 from Schaeff/modularize-parser
Modularize the parser
2018-08-15 18:48:29 +02:00
schaeff
7d536ec66d move examples, adjust example code 2018-08-15 18:38:08 +02:00
schaeff
2bb70f7436 remove comments 2018-08-15 18:17:12 +02:00
JacobEberhardt
c52a21f6ce
Merge pull request #104 from Schaeff/upgrade-develop
Upgrade develop to include master patches
2018-08-15 17:59:24 +02:00
schaeff
2bc40f0640 structure, move identifier list to statements, reexport absy 2018-08-15 15:36:07 +02:00
JacobEberhardt
bdcce525d4
Merge pull request #107 from Schaeff/fix-typed-lt
Fix lt output
2018-08-15 15:03:33 +02:00
schaeff
276ab8891d break parser into pieces 2018-08-15 11:38:42 +02:00
schaeff
dd72dc3399 rename condition output to please optimizer 2018-08-13 14:49:15 +02:00
schaeff
4b6d25b698 move examples to cli, fix lt output 2018-08-13 13:33:05 +02:00
schaeff
d77eed0d40 revert cargo.toml 2018-08-10 08:45:17 +02:00
schaeff
e9fb1bc1b3 revert Jenkinsfile 2018-08-10 08:43:59 +02:00
schaeff
62af48c0ba redo merge for Jenkinsfile 2018-08-10 08:42:31 +02:00
schaeff
7deae155d5 merge master changes 2018-08-09 18:40:02 +02:00
JacobEberhardt
da5b13f845
Merge pull request #79 from Schaeff/split-project
Split the project into lib and cli
2018-08-09 18:03:28 +02:00
schaeff
7048332bf5 merge develop 2018-08-09 17:21:49 +02:00
schaeff
ed4a9ce63d Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into split-project 2018-08-09 17:20:37 +02:00
JacobEberhardt
8a5c611bd6
Merge pull request #101 from Schaeff/call-in-assertion-lhs
Allow function call in left hand side of assertion
2018-08-09 17:09:01 +02:00
schaeff
4d43cfb84e allow function call in left hand side of assertion 2018-08-09 11:42:56 +02:00
schaeff
90d016136a rename binary to zokrates 2018-08-08 18:18:33 +02:00
schaeff
f2e727cc03 put helpers in folder, add libsnark flags 2018-08-08 16:27:20 +02:00
schaeff
101bbb17f4 merge develop, resolve conflicts 2018-08-08 12:46:25 +02:00
JacobEberhardt
97c2a30e59
Merge pull request #86 from Schaeff/type-system
Add basic types to the semantics and flattening
2018-08-08 11:18:32 +02:00
schaeff
69d832268e adapt test 2018-08-07 17:42:10 +02:00
schaeff
7b872d6c1e fix conflict 2018-08-07 17:10:58 +02:00
schaeff
2d1b0ac16d simplify dockerfile, adapt jenkinsfile to path 2018-08-06 10:25:20 +02:00
JacobEberhardt
a79a47b2df
Merge pull request #98 from Schaeff/use_variable-everywhere
Call use_variable instead of low level insert in flattening
2018-08-03 11:58:49 -03:00
schaeff
2755fc0c2c call use_variable instead of low level insert 2018-08-03 10:04:45 +02:00
JacobEberhardt
454da1f839
Merge pull request #97 from Schaeff/fix-argument-reassign
Support reassignment of arguments
2018-08-02 19:37:11 +02:00
schaeff
13b28e82ff remove root workdir 2018-08-01 18:34:27 +02:00
schaeff
9d2cdd21a7 add arguments to variables map 2018-08-01 18:14:05 +02:00
schaeff
a93bb54589 include all packages in tests and build 2018-08-01 11:50:35 +02:00
schaeff
41cec981f7 ignore integration tests outside development and master 2018-07-31 23:50:51 +02:00
schaeff
dafa6439b0 use sh in jenkins 2018-07-31 23:31:37 +02:00
schaeff
9f5f9d03f5 remove expected output from integration tests 2018-07-31 19:19:26 +02:00
schaeff
ec1b84a6b5 fix integration tests 2018-07-31 19:15:19 +02:00
schaeff
b3c0009615 extract fs resolver into new crate, rename crates, refactor importer 2018-07-31 16:57:21 +02:00
schaeff
2ccbaefb6f fix integration test 2018-07-30 20:13:06 +02:00
schaeff
fb18c05cd0 fix warning 2018-07-30 19:29:33 +02:00
schaeff
03bf84bb61 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into split-project 2018-07-30 19:15:44 +02:00
schaeff
ddc2e6222e add integration tests for if_else 2018-07-30 19:00:43 +02:00
schaeff
6099898b80 remove unrelated code added by error 2018-07-30 18:49:56 +02:00
schaeff
6ed8d6c86a remove expected flattened code check, fix warnings, add nolibsnark flags 2018-07-30 18:46:16 +02:00
schaeff
e68ec69447 better panic messages, fix TODOs 2018-07-25 13:00:27 +02:00
schaeff
9a7c2382b2 rename annotated to typed 2018-07-25 11:48:38 +02:00
schaeff
914b21daa3 implement Into for expressions to reduce verbosity 2018-07-25 11:39:08 +02:00