Merge pull request #51 from zksecurity/rebase/basic-constraints

Refactor with basic constraints
zksecurity · May 1, 2024 · 1e76440 · 1e76440
2 parents b834a58 + 4fad17a
commit 1e76440
Show file tree

Hide file tree

Showing 11 changed files with 389 additions and 424 deletions.
diff --git a/examples/bool.asm b/examples/bool.asm
@@ -1,11 +1,21 @@
 @ noname.0.7.0
 
 DoubleGeneric<1>
-DoubleGeneric<-1,0,0,1>
-DoubleGeneric<-1,0,0,1>
-DoubleGeneric<0,-1,-1,0,1>
-DoubleGeneric<0,-1,0,0,1>
-DoubleGeneric<0,-1,0,0,1>
-(0,0) -> (1,0) -> (1,1) -> (5,1)
-(2,0) -> (2,1) -> (3,1)
-(3,2) -> (4,1)
+DoubleGeneric<1,0,-1,0,-1>
+DoubleGeneric<0,0,-1,1>
+DoubleGeneric<1>
+DoubleGeneric<1,0,-1,0,-1>
+DoubleGeneric<0,0,-1,1>
+DoubleGeneric<1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,0,-1,0,1>
+DoubleGeneric<1,0,0,0,-1>
+DoubleGeneric<1,0,0,0,-1>
+(0,0) -> (1,0) -> (2,0) -> (10,0)
+(1,2) -> (2,1)
+(2,2) -> (3,0)
+(4,0) -> (5,0) -> (7,0)
+(4,2) -> (5,1)
+(5,2) -> (6,0)
+(7,1) -> (8,0)
+(8,2) -> (9,0)
diff --git a/examples/equals.asm b/examples/equals.asm
@@ -2,23 +2,39 @@
 
 DoubleGeneric<1>
 DoubleGeneric<1>
-DoubleGeneric<1,-1,-1>
-DoubleGeneric<1,1,0,0,-1>
-DoubleGeneric<0,0,0,1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,1,-1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,0,-1,0,1>
 DoubleGeneric<0,0,-1,1>
-DoubleGeneric<0,-1,0,0,1>
+DoubleGeneric<1>
+DoubleGeneric<0,0,-1,1>
+DoubleGeneric<1,-1>
+DoubleGeneric<1,0,0,0,-1>
 DoubleGeneric<1,0,0,0,-3>
-DoubleGeneric<1,-1,-1>
-DoubleGeneric<1,1,0,0,-1>
-DoubleGeneric<0,0,0,1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,1,-1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,0,-1,0,1>
+DoubleGeneric<0,0,-1,1>
+DoubleGeneric<1>
 DoubleGeneric<0,0,-1,1>
-DoubleGeneric<0,-1,0,0,1>
-(0,0) -> (2,1) -> (8,1)
-(1,0) -> (2,0)
-(2,2) -> (4,1) -> (5,1)
-(3,0) -> (5,2)
-(3,1) -> (4,0) -> (6,1)
-(7,0) -> (8,0)
-(8,2) -> (10,1) -> (11,1)
-(9,0) -> (11,2)
-(9,1) -> (10,0) -> (12,1)
+DoubleGeneric<1,-1>
+DoubleGeneric<1,0,0,0,-1>
+(0,0) -> (2,0) -> (12,0)
+(1,0) -> (3,0)
+(2,1) -> (3,1)
+(3,2) -> (6,1) -> (8,1)
+(4,0) -> (6,0) -> (10,0)
+(4,1) -> (5,0)
+(5,2) -> (9,1)
+(6,2) -> (7,0)
+(8,2) -> (9,0)
+(11,0) -> (13,0)
+(12,1) -> (13,1)
+(13,2) -> (16,1) -> (18,1)
+(14,0) -> (16,0) -> (20,0)
+(14,1) -> (15,0)
+(15,2) -> (19,1)
+(16,2) -> (17,0)
+(18,2) -> (19,0)
diff --git a/examples/if_else.asm b/examples/if_else.asm
@@ -3,20 +3,32 @@
 DoubleGeneric<1>
 DoubleGeneric<1,0,-1,0,1>
 DoubleGeneric<1,0,0,0,-1>
-DoubleGeneric<1,-1,-1>
-DoubleGeneric<1,1,0,0,-1>
-DoubleGeneric<0,0,0,1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,1,-1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,0,-1,0,1>
+DoubleGeneric<0,0,-1,1>
+DoubleGeneric<1>
 DoubleGeneric<0,0,-1,1>
-DoubleGeneric<1,-1,-1>
-DoubleGeneric<1,-1,-1>
+DoubleGeneric<1,-1>
+DoubleGeneric<1,1>
+DoubleGeneric<1,1,-1>
 DoubleGeneric<0,0,-1,1>
+DoubleGeneric<1,1,-1>
+DoubleGeneric<1,-1>
 DoubleGeneric<1,0,0,0,-2>
-(0,0) -> (1,0) -> (3,1) -> (7,1) -> (8,1)
-(1,2) -> (7,0)
-(2,0) -> (3,0)
-(3,2) -> (5,1) -> (6,1)
-(4,0) -> (6,2)
-(4,1) -> (5,0) -> (9,0)
-(7,2) -> (9,1)
-(8,0) -> (10,0)
-(8,2) -> (9,2)
+(0,0) -> (1,0) -> (3,0) -> (11,0) -> (14,1)
+(1,2) -> (12,0)
+(2,0) -> (4,0)
+(3,1) -> (4,1)
+(4,2) -> (7,1) -> (9,1)
+(5,0) -> (7,0) -> (13,0)
+(5,1) -> (6,0)
+(6,2) -> (10,1)
+(7,2) -> (8,0)
+(9,2) -> (10,0)
+(11,1) -> (12,1)
+(12,2) -> (13,1)
+(13,2) -> (14,0)
+(14,2) -> (15,1)
+(15,0) -> (16,0)