wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional expressions (401405, r=mrbkap).

Browse Source
This commit is contained in:
brendan@mozilla.org 2007-10-29 19:35:02 -07:00
parent fb122790a3
commit cf0905a942
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/narcissus/jsexec.js
View File

@ -499,7 +499,7 @@ function execute(n, x) {
putValue(r, v, n[0]);
break;
case CONDITIONAL:
case HOOK:
v = getValue(execute(n[0], x)) ? getValue(execute(n[1], x))
: getValue(execute(n[2], x));
break;

5
js/narcissus/jsparse.js
View File

@ -642,7 +642,7 @@ function ParenExpression(t, x) {
var opPrecedence = {
SEMICOLON: 0,
COMMA: 1,
ASSIGN: 2, HOOK: 2, COLON: 2, CONDITIONAL: 2,
ASSIGN: 2, HOOK: 2, COLON: 2,
// The above all have to have the same precedence, see bug 330975.
OR: 4,
AND: 5,
@ -668,7 +668,7 @@ for (i in opPrecedence)
var opArity = {
COMMA: -2,
ASSIGN: 2,
CONDITIONAL: 3,
HOOK: 3,
OR: 2,
AND: 2,
BITWISE_OR: 2,
@ -751,7 +751,6 @@ loop:
n = operators.top();
if (n.type != HOOK)
throw t.newSyntaxError("Invalid label");
n.type = CONDITIONAL;
--x.hookLevel;
} else {
operators.push(new Node(t));