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

306 commits

Author SHA1 Message Date
Thibaut Schaeffer
17682a94af
Merge branch 'develop' into add-sharound 2019-01-28 10:22:21 +01:00
schaeff
10fbe003c3 improve error handling in CLI 2019-01-25 15:35:50 +01:00
sdeml
00147b3917 Merge branch 'develop' into add-sharound
* develop: (53 commits)
  move book snippets to files in test folder, link to them from md
  handle case where path is a directory
  update cargo.lock
  update tests to use relative paths
  resolve cargo.lock conflict
  WASM crate import depends on the presence of the `wasm` feature
  Insert missing fi at the end of if statement
  change test to check flattening of 1-sized array is identical to flattening of single value
  implement variable access to ifelse array
  add support for ifelse array access, clean up semantic treatment
  recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already
  add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file
  remove commented out old serialization
  branch  based on first path component
  base decision on first character of path
  fallback to /Users/obit/.zokrates when importing source files
  Run the tests with WASM enabled
  Fix build after rebase
  Fix warning
  Move wasm plugin generation to a different repo
  ...

# Conflicts:
#	zokrates_book/src/sha256example.md
2019-01-23 17:43:14 +01:00
Stefan
6b916e779f
Merge pull request #225 from Zokrates/if-else-array
Add support for IfElse for arrays
2019-01-22 14:54:43 +01:00
Thibaut Schaeffer
3018c1ccbe
Merge branch 'develop' into optimize-subtraction 2019-01-21 14:25:59 +01:00
Guillaume Ballet
a025c59d84 WASM crate import depends on the presence of the wasm feature 2019-01-21 10:23:49 +01:00
sdeml
a2a977b75c free unused memory / fix memory leak 2019-01-18 21:05:40 +01:00
schaeff
ae7b5c0daa change test to check flattening of 1-sized array is identical to flattening of single value 2019-01-18 19:59:17 +01:00
schaeff
87fccb3457 implement variable access to ifelse array 2019-01-18 19:35:10 +01:00
schaeff
b74e0b6dc6 add support for ifelse array access, clean up semantic treatment 2019-01-18 18:56:56 +01:00
schaeff
e20f104c40 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into if-else-array 2019-01-18 17:48:23 +01:00
sdeml
91bf2c0ea8 fix further memory leaks 2019-01-18 17:37:36 +01:00
sdeml
710eab6eac fix memory overflow 2019-01-18 14:52:54 +01:00
sdeml
2ce56e1e36 more fmt fixes 2019-01-15 15:08:52 +01:00
sdeml
809e2f4018 fix fmt 2019-01-15 11:53:06 +01:00
sdeml
c0db24bb79 cleaning and adding docs 2019-01-15 11:47:51 +01:00
sdeml
a23b5fcda1 merge develop 2019-01-15 10:41:19 +01:00
Guillaume Ballet
2973df573a Run the tests with WASM enabled 2019-01-14 18:17:40 +01:00
Guillaume Ballet
e1d2df3e20 Fix build after rebase 2019-01-14 17:04:23 +01:00
Guillaume Ballet
1bc3947e5e Move wasm plugin generation to a different repo 2019-01-14 14:49:47 +01:00
Guillaume Ballet
de1a9d6292 Fix fmt 2019-01-14 14:49:47 +01:00
Guillaume Ballet
47dc8d0a16 Fix endianness in BITS 2019-01-14 14:49:47 +01:00
Guillaume Ballet
666d6760f7 Fix field test 2019-01-14 14:49:47 +01:00
Guillaume Ballet
df96ab59b7 Fix build warnings 2019-01-14 14:49:47 +01:00
Guillaume Ballet
ce7b7c1419 rebase and fix linter issue 2019-01-14 14:48:33 +01:00
Guillaume Ballet
2127ff2e34 Support the generation of multiple wasm plugins 2019-01-14 14:48:33 +01:00
Guillaume Ballet
311ee6275f Remove warning and fix naming error 2019-01-14 14:48:33 +01:00
Guillaume Ballet
a577f470ed fix linter issues 2019-01-14 14:48:33 +01:00
Guillaume Ballet
865c7786e5 fix rebase issue 2019-01-14 14:48:33 +01:00
Guillaume Ballet
cc21fd21be Add a repo to support the WASM version of partial_eq 2019-01-14 14:48:33 +01:00
Guillaume Ballet
0ce5406fc8 Remove dependency on std::fs::File 2019-01-14 14:48:33 +01:00
Guillaume Ballet
2113e1f588 Remove dependency on std::fs::File 2019-01-14 14:48:33 +01:00
Guillaume Ballet
ebdfd96bda Replace last hex dump with the wasm builder 2019-01-14 14:48:33 +01:00
Guillaume Ballet
4931710b6c fix unwinding issue in tests 2019-01-14 14:48:33 +01:00
Guillaume Ballet
a5a94bea89 Upgrade to wasmi 0.4.2 2019-01-14 14:46:21 +01:00
Guillaume Ballet
62ccc311d0 fix build 2019-01-14 14:43:55 +01:00
Guillaume Ballet
8df23cf1c0 rustfmt fix 2019-01-14 14:43:55 +01:00
Guillaume Ballet
a6ba865c40 fix unit tests and use the builder instead of hex strings 2019-01-14 14:43:55 +01:00
Guillaume Ballet
1320c28dad Move module to struct in order not to recreate it every time
This is an intermediate step, the module might be moved to the
interpreter and tests are broken.
2019-01-14 14:39:36 +01:00
Guillaume Ballet
163f2b42f4 Implement support for WASM helpers 2019-01-14 14:39:36 +01:00
schaeff
8e1821dca8 merge, solve conflicts, make tests pass 2019-01-14 00:03:28 +01:00
sdeml
f5911babfb delete unused variables 2019-01-13 18:02:05 +01:00
sdeml
622b0c628e merge with develop 2019-01-13 17:30:17 +01:00
sdeml
e84e0efd97 fix tests 2019-01-13 17:25:40 +01:00
sdeml
1d3f4268e7 fix tests 2019-01-13 17:24:30 +01:00
sdeml
a1a2de56f3 delete old sha variants 2019-01-13 17:24:21 +01:00
sdeml
b0e48e03a5 delete debug statements 2019-01-13 17:23:01 +01:00
sdeml
17db522108 add tripple round 2019-01-13 17:19:10 +01:00
sdeml
f33ad7a673 add sharound 2019-01-13 14:32:27 +01:00
schaeff
29403cfb50 bump patch 2019-01-06 22:41:43 +01:00