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

Various small fixes

Browse Source
This commit is contained in:
Jordi Baylina
2018-11-28 10:27:06 +01:00
parent d35d438107
commit 38fa024745
10 changed files with 243 additions and 2442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parser/jaz.jison
View File

@@ -78,6 +78,7 @@ include { return 'include'; }
\- { return '-'; }
\* { return '*'; }
\/ { return '/'; }
\\ { return '\\'; }
\% { return '%'; }
\^ { return '^'; }
\& { return '&'; }
@@ -118,7 +119,7 @@ include { return 'include'; }
%left '<<' '>>'
%left '+' '-'
%left '*' '/' '%'
%left '*' '/' '\\' '%'
%left '**'
%right '++' '--' UMINUS UPLUS '!' '~'
%left '.'
@@ -627,7 +628,7 @@ e7
{
if (($1.type == "NUMBER") && ($3.type == "NUMBER")) {
let v = $3.value.greater(256) ? 256 : $3.value.value;
$$ = {t1ype: "NUMBER", value: $1.value.shiftRight(v).and(__MASK__) };
$$ = {type: "NUMBER", value: $1.value.shiftRight(v).and(__MASK__) };
} else {
$$ = { type: "OP", op: ">>", values: [$1, $3] };
}
@@ -684,6 +685,15 @@ e5
}
setLines($$, @1, @3);
}
| e5 '\\' e4
{
if (($1.type == "NUMBER") && ($3.type == "NUMBER")) {
$$ = { type: "NUMBER", value: ($1.value.divide($3.value)) };
} else {
$$ = { type: "OP", op: "\\", values: [$1, $3] };
}
setLines($$, @1, @3);
}
| e5 '%' e4
{
if (($1.type == "NUMBER") && ($3.type == "NUMBER")) {

144
parser/jaz.js
View File

File diff suppressed because one or more lines are too long