arnaucube
arnaucube/circomPublic Self-hosted repository
Merge pull request #30 from kobigurk/master

fix: fixes ^ to do xor
Jordi Baylina jordi@baylina.cat
Sat, 11 May 2019 20:32:49 +0200
commit

4a8bcff3da45c074dbee112c916cdca0ab994ccc

parent

54092044ae138e797b83b6073fa1b05afb8711bb

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

jump to
M parser/jaz.jison → parser/jaz.jison

@@ -514,7 +514,7 @@ e12

: e12 '^' e11 { if (($1.type == "NUMBER") && ($3.type == "NUMBER")) { - $$ = { type: "NUMBER", value: $1.value.or($3.value).and(__MASK__) }; + $$ = { type: "NUMBER", value: $1.value.xor($3.value).and(__MASK__) }; } else { $$ = { type: "OP", op: "^", values: [$1, $3] }; }
M parser/jaz.js → parser/jaz.js

@@ -361,7 +361,7 @@ break;

case 59: if (($$[$0-2].type == "NUMBER") && ($$[$0].type == "NUMBER")) { - this.$ = { type: "NUMBER", value: $$[$0-2].value.or($$[$0].value).and(__MASK__) }; + this.$ = { type: "NUMBER", value: $$[$0-2].value.xor($$[$0].value).and(__MASK__) }; } else { this.$ = { type: "OP", op: "^", values: [$$[$0-2], $$[$0]] }; }