0.0.33

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "circom",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "circom",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Language to generate logic circuits",
   "main": "index.js",
   "directories": {

src/compiler.js

@@ -277,7 +277,12 @@ function reduceConstrains(ctx) {
                 c.a={ type: "LINEARCOMBINATION", values: {} };
                 c.b={ type: "LINEARCOMBINATION", values: {} };
                 c.c={ type: "LINEARCOMBINATION", values: {} };
-                isolatedSignal.category = "constant";
+
+                let lSignal = ctx.signals[isolatedSignal];
+                while (lSignal.equivalence) {
+                    lSignal = ctx.signals[lSignal.equivalence];
+                }
+                lSignal.category = "constant";
             }
         }
 

src/exec.js

@@ -1046,6 +1046,8 @@ function execSignalAssign(ctx, ast) {
 }
 
 function execConstrain(ctx, ast) {
+    ast.fileName = ctx.fileName;
+    ast.filePath = ctx.filePath;
     const a = exec(ctx, ast.values[0]);
     if (ctx.error) return;
     const b = exec(ctx, ast.values[1]);

src/gencode.js

@@ -422,11 +422,13 @@ function genConstrain(ctx, ast) {
     if (ctx.error) return;
     const b = gen(ctx, ast.values[1]);
     if (ctx.error) return;
-    return `ctx.assert(${a}, ${b})`;
+    const strErr = ast.fileName +": "+ast.first_line;
+    return `ctx.assert(${a}, ${b}, \"${strErr}\")`;
 }
 
 function genSignalAssignConstrain(ctx, ast) {
-    return genVarAssignement(ctx, ast) + ";\n" + genConstrain(ctx, ast);
+//    return genVarAssignement(ctx, ast) + ";\n" + genConstrain(ctx, ast);
+    return genVarAssignement(ctx, ast);
 }
 
 function genVarAddAssignement(ctx, ast) {