arnaucube
arnaucube/circomPublic Self-hosted repository
Fix and and or
Jordi Baylina jordi@baylina.cat
Mon, 03 Jun 2019 07:23:25 +0200
commit

8048a5ef7d459cbf523fe40c4cb0f955434dc461

parent

b7a41cda14bc09b08b3663fc75aad0e3afdc249f

1 files changed, 8 insertions(+), 2 deletions(-)

jump to
M src/exec.js → src/exec.js

@@ -397,6 +397,12 @@ }

function execFunctionCall(ctx, ast) { + if (ast.name == "log") { + const v = exec(ctx, ast.params[0]); + console.log(v.value.toString()); + return; + } + const scopeLevel = getScopeLevel(ctx, ast.name); if (scopeLevel == -1) return error(ctx, ast, "Function not defined: " + ast.name); const fnc = getScope(ctx, ast.name);

@@ -750,7 +756,7 @@ if (b.type != "NUMBER") return { type: "NUMBER" };

if (!a.value || !b.value) return { type: "NUMBER" }; return { type: "NUMBER", - value: (a.value.neq(0) && a.value.neq(0)) ? bigInt(1) : bigInt(0) + value: (a.value.neq(0) && b.value.neq(0)) ? bigInt(1) : bigInt(0) }; }

@@ -764,7 +770,7 @@ if (b.type != "NUMBER") return { type: "NUMBER" };

if (!a.value || !b.value) return { type: "NUMBER" }; return { type: "NUMBER", - value: (a.value.neq(0) || a.value.neq(0)) ? bigInt(1) : bigInt(0) + value: (a.value.neq(0) || b.value.neq(0)) ? bigInt(1) : bigInt(0) }; }