0.5.7

add `-pthread` for linux g++ command

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "circom",
-  "version": "0.5.4",
+  "version": "0.5.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -592,9 +592,9 @@
       }
     },
     "ffjavascript": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.0.4.tgz",
-      "integrity": "sha512-6eiRvy+YuGCRjH4U8KdJbRel5VBW0zeuUL1FXQ+fFxTp5xv2ClqTfCYf5ClUtq0voGpd9XJAdUCvgIxHDbAQ0Q==",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.0.5.tgz",
+      "integrity": "sha512-7je6PydOWLDUj3vU8JeCUgeezg4yrG/6qjlukQNuPHeeavnM4REcrN9LA2+xtqIMIPdx/wdUkPMQpixsz+CdIw==",
       "requires": {
         "big-integer": "^1.6.48"
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "circom",
-  "version": "0.5.4",
+  "version": "0.5.7",
   "description": "Language to generate logic circuits",
   "main": "index.js",
   "directories": {
@@ -33,7 +33,7 @@
     "chai": "^4.2.0",
     "circom_runtime": "0.0.3",
     "ffiasm": "0.0.2",
-    "ffjavascript": "0.0.4",
+    "ffjavascript": "0.0.5",
     "ffwasm": "0.0.6",
     "fnv-plus": "^1.3.1",
     "r1csfile": "0.0.3",

ports/c/tester.js

@@ -42,11 +42,14 @@ async function  c_tester(circomFile, _options) {
     await fs.promises.writeFile(path.join(dir.path, "fr.h"), source.h, "utf8");
     await fs.promises.writeFile(path.join(dir.path, "fr.c"), source.c, "utf8");
 
+    let pThread = "";
+
     if (process.platform === "darwin") {
         await exec("nasm -fmacho64 --prefix _ " +
             ` ${path.join(dir.path,  "fr.asm")}`
         );
     }  else if (process.platform === "linux") {
+        pThread = "-pthread";
         await exec("nasm -felf64 " +
             ` ${path.join(dir.path,  "fr.asm")}`
         );
@@ -54,7 +57,7 @@ async function  c_tester(circomFile, _options) {
 
     const cdir = path.join(path.dirname(require.resolve("circom_runtime")), "c");
 
-    await exec("g++" +
+    await exec("g++" + ` ${pThread}` +
                ` ${path.join(cdir,  "main.cpp")}` +
                ` ${path.join(cdir,  "calcwit.cpp")}` +
                ` ${path.join(cdir,  "utils.cpp")}` +

ports/wasm/builder.js

@@ -923,41 +923,41 @@ class BuilderWasm {
     }
 
     _buildComponents(module) {
-        const bytes = [];
+        const bytes = new Array(this.components.length*5*4);
+        bytes.length=0;
         for (let i=0; i<this.components.length; i++) {
             const c = this.components[i];
 
-            bytes.push(intToBytes32(this.hashMaps[c.hashMapName].pointer));
-            bytes.push(intToBytes32(this.componentEntriesTables[c.entryTableName].pointer));
-            bytes.push(intToBytes32(i));
-            bytes.push(intToBytes32(c.nInSignals));
-            bytes.push(intToBytes32(c.newThread ? 1 : 0));
+            bytes.push(...intToBytes32(this.hashMaps[c.hashMapName].pointer));
+            bytes.push(...intToBytes32(this.componentEntriesTables[c.entryTableName].pointer));
+            bytes.push(...intToBytes32(i));
+            bytes.push(...intToBytes32(c.nInSignals));
+            bytes.push(...intToBytes32(c.newThread ? 1 : 0));
 
             module.addFunctionToTable(c.functionName);
         }
 
-        const fBytes = [].concat(...bytes);
-        this.pComponents = module.alloc(fBytes);
+        this.pComponents = module.alloc(bytes);
     }
 
     _buildMapIsInput(module) {
-        const bytes = [];
+        const bytes = new Array(this.mapIsInput.length*4);
+        bytes.length=0;
         for (let i=0; i<this.mapIsInput.length; i++) {
-            bytes.push(intToBytes32(this.mapIsInput[i]));
+            bytes.push(...intToBytes32(this.mapIsInput[i]));
         }
 
-        const fBytes = [].concat(...bytes);
-        this.pMapIsInput = module.alloc(fBytes);
+        this.pMapIsInput = module.alloc(bytes);
     }
 
     _buildWit2Sig(module) {
-        const bytes = [];
+        const bytes = new Array(this.wit2sig.length*4);
+        bytes.length =0;
         for (let i=0; i<this.wit2sig.length; i++) {
-            bytes.push(intToBytes32(this.wit2sig[i]));
+            bytes.push(...intToBytes32(this.wit2sig[i]));
         }
 
-        const fBytes = [].concat(...bytes);
-        this.pWit2sig = module.alloc(fBytes);
+        this.pWit2sig = module.alloc(bytes);
     }
 
     _buildCircuitVar(module) {

src/construction_phase.js

@@ -359,7 +359,7 @@ function execAssignement(ctx, ast) {
 
     }
 
-    if (!left.s) return ctx.throwError(ast, "variable. not defined yet");
+    if ((!left)||(!left.s)) return ctx.throwError(ast, "variable. not defined yet");
 
     if (left.t == "C") return execInstantiateComponet(ctx, left, ast.values[1], leftSels);
     if ((left.t == "S")&&( ["<--", "<==", "-->", "==>"].indexOf(ast.op) < 0)) return ctx.throwError(ast, "Cannot assign to a signal with `=` use <-- or <== ops");
@@ -444,14 +444,14 @@ function execInstantiateComponet(ctx, vr, fn, sels) {
     const templateName = fn.name;
 
     const template = ctx.templates[templateName];
-    if (!template) return ctx.throwError("Invalid Template");
+    if (!template) return ctx.throwError(fn, "Invalid Template");
 
     const paramValues = [];
     for (let i=0; i< fn.params.length; i++) {
         const v = exec(ctx, fn.params[i]);
         if (ctx.error) return;
         for (let j=0; j<v.s[0]; j++) {
-            if (v.v[j].t != "N") ctx.throwError("Parameters of a template must be constant");
+            if (v.v[j].t != "N") ctx.throwError(fn, "Parameters of a template must be constant");
         }
         paramValues.push(v);
     }
@@ -873,6 +873,8 @@ function execOpOp(ctx, ast, op, lr) {
         right = {t:"N", v: ctx.field.one};
     }
 
+    if (!right) return ctx.throwError(ast, "adding a no number");
+
     const resAfter = ctx.lc[op](resBefore, right);
     left.v[o] = resAfter;