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

4122 commits

Author SHA1 Message Date
schaeff
8f5e4d9985 fix conflicts 2022-07-04 19:50:12 +02:00
Thibaut Schaeffer
80f4aa4939
Merge pull request #1151 from Zokrates/split-to-crates
Split project into crates
2022-07-04 17:20:23 +02:00
schaeff
0413d845f9 Merge branch 'split-to-crates' of github.com:Zokrates/ZoKrates into split-to-crates 2022-07-01 13:58:10 +02:00
schaeff
0f54b94df9 simplify test 2022-07-01 13:57:33 +02:00
Darko Macesic
fdd4d7895d
Merge pull request #1175 from Zokrates/fq2-enum-infer
Fq2 enum infer
2022-06-30 16:51:15 +02:00
schaeff
b2336420b9 add g2type to field and parse accordingly 2022-06-30 13:31:55 +02:00
schaeff
61f9b33aa9 merge staging 2022-06-29 11:45:46 +02:00
Thibaut Schaeffer
588943567f
Merge pull request #1174 from Zokrates/fix-docs
Fix inconsistencies in docs
2022-06-29 10:37:01 +02:00
Thibaut Schaeffer
7d2d61fe35
Merge pull request #1168 from Zokrates/add-mut-keyword
Add mut keyword, make variables immutable by default
2022-06-29 10:35:50 +02:00
schaeff
aec95d9fe5 fix tests 2022-06-29 10:21:54 +02:00
dark64
79db6ca3b8 fix indentation 2022-06-28 19:31:59 +02:00
dark64
e75552b0eb merge staging 2022-06-28 19:23:45 +02:00
schaeff
c4971779d8 merge staging 2022-06-28 18:22:36 +02:00
dark64
9e1f3ae7e3 fix inconsistencies in docs 2022-06-28 13:19:13 +02:00
Thibaut Schaeffer
70f4291b40
Merge pull request #1172 from Zokrates/infer-return-type
Use signature output for inference
2022-06-28 11:49:58 +02:00
dark64
94a3ce511d add failing test 2022-06-28 11:23:57 +02:00
dark64
44b212bc99 fix naming 2022-06-28 10:46:11 +02:00
schaeff
5b1c2dab07 wip 2022-06-28 09:54:10 +02:00
dark64
f560413ccc fmt 2022-06-27 16:16:16 +02:00
dark64
0736c4b976 fix tests 2022-06-27 14:24:09 +02:00
dark64
935930ccc5 add changelog 2022-06-25 02:07:02 +02:00
dark64
3f1358acfe use signature ouput for inference 2022-06-25 01:58:53 +02:00
Thibaut Schaeffer
aa9dc9740f
Merge pull request #1170 from Zokrates/deprecate-multi-returns
Remove multi returns
2022-06-23 17:52:12 +02:00
dark64
91d14017d9 apply suggestions 2022-06-23 13:31:22 +02:00
Thibaut Schaeffer
b852907248
Merge pull request #1121 from Zokrates/syntax-revamp
Use curly braces and semi colons
2022-06-23 11:46:46 +02:00
dark64
30c66ca075 fix integration tests 2022-06-23 11:38:04 +02:00
dark64
253ff1f8f6 fix tests 2022-06-22 18:33:14 +02:00
dark64
ffd489f5c0 add changelog, change output struct in tests 2022-06-22 17:22:45 +02:00
dark64
63c1e22978 merge syntax-revamp 2022-06-21 15:10:33 +02:00
dark64
b7e787dfd1 deprecate multi returns 2022-06-21 15:03:53 +02:00
schaeff
4a593664e3 clean 2022-06-15 17:46:06 +02:00
schaeff
15dcee9978 changelog, docs 2022-06-15 16:14:13 +02:00
schaeff
88ae13f80d fix integration tests 2022-06-15 15:52:26 +02:00
schaeff
d8d082b649 fix core tests 2022-06-15 14:54:13 +02:00
schaeff
aad6622488 fix tests 2022-06-15 14:28:40 +02:00
schaeff
4606d42a27 Merge branch 'syntax-revamp' of github.com:Zokrates/ZoKrates into split-to-crates 2022-06-14 10:53:49 +02:00
dark64
4d9d000742 revert hacky formatting on conditional expression 2022-06-14 10:43:05 +02:00
schaeff
241447a09c implement and update zok files 2022-06-13 20:17:40 +02:00
Thibaut Schaeffer
7781819bb3
Merge pull request #1165 from Zokrates/change-default-backend
Change default backend in the CLI
2022-06-13 20:02:00 +02:00
dark64
9283aceeaf fix mpc integration test 2022-06-13 15:42:49 +02:00
dark64
99f08015a1 add changelog 2022-06-13 12:49:28 +02:00
dark64
b29bc75779 change default backend in the cli 2022-06-13 12:47:54 +02:00
schaeff
62d339f485 wip 2022-06-08 12:10:44 +02:00
schaeff
5fd4af7f58 merge syntax revamp 2022-06-08 10:34:14 +02:00
dark64
86990c81e0 fix format, apply suggestions 2022-06-03 15:24:14 +02:00
dark64
a047fe3c18 clippy 2022-06-01 00:05:36 +02:00
dark64
68dac762db spaces > tabs 2022-06-01 00:04:40 +02:00
dark64
65d5df091e merge develop 2022-05-31 23:55:38 +02:00
dark64
dc29b70957 revert removal of if-else expression 2022-05-31 23:52:09 +02:00
schaeff
8c5611dd09 merge dev 2022-05-31 18:19:51 +02:00