Fixes and tests passed

Author: jbaylina

c/calcwit.cpp

@@ -122,14 +122,29 @@ void Circom_CalcWit::freeBigInts(PBigInt bi, int n) {
 }
 
 void Circom_CalcWit::getSignal(int cIdx, int sIdx, PBigInt value) {
+#ifdef SANITY_CHECK
+    if (signalAssigned[sIdx] == false) {
+        fprintf(stderr, "Accessing a not assigned signal: %d\n", sIdx);
+        assert(false);
+    }
+#endif
     mpz_set(*value, signalValues[sIdx]);
 }
 
 void Circom_CalcWit::setSignal(int cIdx, int sIdx, PBigInt value) {
 #ifdef SANITY_CHECK
-    assert(signalAssigned[sIdx] == false);
+    if (signalAssigned[sIdx] == true) {
+        fprintf(stderr, "Signal assigned twice: %d\n", sIdx);
+        assert(false);
+    }
     signalAssigned[sIdx] = true;
 #endif
+    /*
+    // Log assignement
+    char *valueStr = mpz_get_str(0, 10, *value);
+    printf("%d --> %s\n", sIdx, valueStr);
+    free(valueStr);
+    */
     mpz_set(signalValues[sIdx], *value);
     if ( BITMAP_ISSET(circuit->mapIsInput, sIdx) ) {
         inputSignalsToTrigger[cIdx]--;
@@ -147,7 +162,7 @@ void Circom_CalcWit::checkConstraint(PBigInt value1, PBigInt value2, char const
         std::string sV2 = std::string(pcV2);
         free(pcV1);
         free(pcV2);
-        throw std::runtime_error(std::string("Constraint does not match,") + err + ". " + sV1 + " != " + sV2 );
+        throw std::runtime_error(std::string("Constraint doesn't match, ") + err + ". " + sV1 + " != " + sV2 );
     }
 #endif
 }
@@ -160,3 +175,10 @@ void Circom_CalcWit::triggerComponent(int newCIdx) {
     cIdx = oldCIdx;
 }
 
+void Circom_CalcWit::log(PBigInt value) {
+    char *pcV = mpz_get_str(0, 10, *value);
+    printf("Log: %s\n", pcV);
+    free(pcV);
+}
+
+

c/calcwit.h

@@ -43,6 +43,8 @@ class Circom_CalcWit {
 
     void checkConstraint(PBigInt value1, PBigInt value2, char const *err);
 
+    void log(PBigInt value);
+
 
 // Public functions
     inline void setInput(int idx, PBigInt val) {

cli.js

@@ -67,7 +67,6 @@ if (argv._.length == 0) {
 
 const fullFileName = path.resolve(process.cwd(), inputFile);
 const fileName = path.basename(fullFileName, ".circom");
-const outName = argv.output ?  argv.output : fileName + ".json";
 const cSourceName = typeof(argv.csource) === "string" ?  argv.csource : fileName + ".cpp";
 const r1csName = typeof(argv.r1cs) === "string" ?  argv.r1cs : fileName + ".r1cs";
 const symName = typeof(argv.sym) === "string" ?  argv.sym : fileName + ".sym";
@@ -79,24 +78,15 @@ if (argv.csource) {
     options.cSourceWriteStream = fs.createWriteStream(cSourceName);
 }
 if (argv.r1cs) {
-    options.r1csWriteStream = fs.createWriteStream(r1csName);
+    options.r1csFileName = r1csName;
 }
 if (argv.sym) {
     options.symWriteStream = fs.createWriteStream(symName);
 }
 
 compiler(fullFileName, options).then( () => {
-    let r1csDone = false;
     let cSourceDone = false;
     let symDone = false;
-    if (options.r1csWriteStream) {
-        options.r1csWriteStream.end(() => {
-            r1csDone = true;
-            finishIfDone();
-        });
-    } else {
-        r1csDone = true;
-    }
     if (options.cSourceWriteStream) {
         options.cSourceWriteStream.end(() => {
             cSourceDone = true;
@@ -111,11 +101,13 @@ compiler(fullFileName, options).then( () => {
             finishIfDone();
         });
     } else {
-        cSourceDone = true;
+        symDone = true;
     }
     function finishIfDone() {
-        if ((r1csDone)&&(cSourceDone)&&(symDone)) {
-            process.exit(0);
+        if ((cSourceDone)&&(symDone)) {
+            setTimeout(() => {
+                process.exit(0);
+            }, 300);
         }
     }
 }, (err) => {