1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Commit graph

324 commits

Author SHA1 Message Date
schaeff
a04440495d remove print 2019-02-11 16:33:14 +01:00
schaeff
8e64cc68b1 remove call to unimplemented cast 2019-02-11 16:20:47 +01:00
schaeff
6ecc2c9885 patch unconstrained cast 2019-02-11 16:15:43 +01:00
schaeff
8bf0d72725 bump versions 2019-02-06 11:24:03 +01:00
schaeff
90024508c8 Merge branch 'master' of github.com:JacobEberhardt/ZoKrates into develop 2019-02-04 15:56:04 +01:00
schaeff
541cd44997 bump versions: fs_resolver and cli minor, core and field patch 2019-02-01 18:30:36 +01:00
Thibaut Schaeffer
e7a943dbf9
Merge pull request #220 from Zokrates/update-G2-lib
Update G2 library
2019-02-01 17:43:19 +01:00
Thibaut Schaeffer
718158717f
Merge pull request #221 from Zokrates/add-sharound
Simplify SHA gadgets and add a stdlib
2019-02-01 17:42:40 +01:00
JacobEberhardt
033217b520
Merge pull request #224 from Zokrates/useful-semantic-errors
Output more, better errors in the CLI
2019-02-01 13:46:42 +01:00
Thibaut Schaeffer
02157bf312
Merge branch 'develop' into display-empty-lincomb 2019-02-01 13:13:52 +01:00
schaeff
c55fdf98b8 update docs, implement agreed change ie only print compact for in zir 2019-01-30 18:33:55 +01:00
schaeff
60719998da display empty lincomb 2019-01-29 14:03:14 +01:00
schaeff
a50b546714 merge develop 2019-01-29 10:39:48 +01:00
Thibaut Schaeffer
17682a94af
Merge branch 'develop' into add-sharound 2019-01-28 10:22:21 +01:00
schaeff
b731a7c296 solve conflict 2019-01-28 10:18:27 +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
283d18db85 fix libsnark magic path error 2019-01-18 20:32:05 +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
schaeff
e084165adc add multiple errors, add node for all AST, fix tests ignoring positions 2019-01-18 11:49:16 +01:00
schaeff
d1295adc49 pass positions to absy, allow one error per function 2019-01-16 22:59:37 +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
schaeff
00dbb650c9 update G2 lib to aa02c35d2883a1a01844c543e552e915cfbaed9a 2019-01-14 23:55:52 +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