arnaucube/circom
1
0
Fork 0
mirror of https://github.com/arnaucube/circom.git synced 2026-02-06 18:56:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from kobigurk/master

Browse Source 
fix: fixes ^ to do xor
This commit is contained in:
Jordi Baylina
2019-05-11 20:32:49 +02:00
committed by GitHub
parent 54092044ae b8068e8d05
commit 4a8bcff3da
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser/jaz.jison
View File

@@ -514,7 +514,7 @@ e12
: e12 '^' e11 : e12 '^' e11
{ {
if (($1.type == "NUMBER") && ($3.type == "NUMBER")) { 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 { } else {
$$ = { type: "OP", op: "^", values: [$1, $3] }; $$ = { type: "OP", op: "^", values: [$1, $3] };
} }

2
parser/jaz.js
View File

@@ -361,7 +361,7 @@ break;
case 59: case 59:
if (($$[$0-2].type == "NUMBER") && ($$[$0].type == "NUMBER")) { 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 { } else {
this.$ = { type: "OP", op: "^", values: [$$[$0-2], $$[$0]] }; this.$ = { type: "OP", op: "^", values: [$$[$0-2], $$[$0]] };
} }