Merge pull request #482 from Zokrates/patch-not-propagation

Patch NOT propagation
Zokrates · Oct 1, 2019 · 478e08a · 478e08a
2 parents 542c4c1 + 3dd5783
commit 478e08a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,9 +54,9 @@ jobs:
       - run:
           name: Run tests
           command: ZOKRATES_HOME=$(pwd)/zokrates_stdlib/stdlib/ WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./test.sh
-      - run:
-          name: Generate code coverage report
-          command: ./scripts/cov.sh
+      # - run:
+      #     name: Generate code coverage report
+      #     command: ./scripts/cov.sh
   wasm_test:
     docker:
       - image: rustlang/rust:nightly-slim

diff --git a/zokrates_core/src/static_analysis/propagation.rs b/zokrates_core/src/static_analysis/propagation.rs
@@ -418,7 +418,7 @@ impl<'ast, T: Field> Folder<'ast, T> for Propagator<'ast, T> {
                 let e = self.fold_boolean_expression(e);
                 match e {
                     BooleanExpression::Value(v) => BooleanExpression::Value(!v),
-                    e => e,
+                    e => BooleanExpression::Not(box e),
                 }
             }
             BooleanExpression::IfElse(box condition, box consequence, box alternative) => {
@@ -567,6 +567,31 @@ mod tests {
         mod boolean {
             use super::*;
 
+            #[test]
+            fn not() {
+                let e_true: BooleanExpression<FieldPrime> =
+                    BooleanExpression::Not(box BooleanExpression::Value(false));
+
+                let e_false: BooleanExpression<FieldPrime> =
+                    BooleanExpression::Not(box BooleanExpression::Value(true));
+
+                let e_default: BooleanExpression<FieldPrime> =
+                    BooleanExpression::Not(box BooleanExpression::Identifier("a".into()));
+
+                assert_eq!(
+                    Propagator::new().fold_boolean_expression(e_true),
+                    BooleanExpression::Value(true)
+                );
+                assert_eq!(
+                    Propagator::new().fold_boolean_expression(e_false),
+                    BooleanExpression::Value(false)
+                );
+                assert_eq!(
+                    Propagator::new().fold_boolean_expression(e_default.clone()),
+                    e_default
+                );
+            }
+
             #[test]
             fn eq() {
                 let e_true = BooleanExpression::Eq(