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

Bug 594604: Various narcissus jsparse fixes. (r=taustin)

Browse Source
This commit is contained in:
Shu-yu Guo 2010-09-09 17:40:13 -07:00
parent fac216de69
commit 771a3d2b97
1 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
js/narcissus/jsparse.js
View File

@ -596,7 +596,7 @@ Narcissus.parser = (function() {
LET_BLOCK: {
build: function(t) {
var n = Node(t, LET_BLOCK);
var n = new Node(t, LET_BLOCK);
n.varDecls = [];
return n;
},
@ -636,19 +636,6 @@ Narcissus.parser = (function() {
}
},
EXPRESSION: {
build: function(t, tt) {
return new Node(t, tt);
},
addOperand: function(n, n2) {
n.push(n2);
},
finish: function(n) {
}
},
ASSIGN: {
build: function(t) {
return new Node(t, ASSIGN);
@ -741,8 +728,8 @@ Narcissus.parser = (function() {
PRIMARY: {
build: function(t, tt) {
// NB t.token.type must be NULL, THIS, TRUIE, FALSE, IDENTIFIER,
// NUMBER, STRING, or REGEXP.
// NULL | THIS | TRUE | FALSE | IDENTIFIER | NUMBER
// STRING | REGEXP.
return new Node(t, tt);
},
@ -810,6 +797,15 @@ Narcissus.parser = (function() {
}
},
PROPERTY_NAME: {
build: function(t) {
return new Node(t, IDENTIFIER);
},
finish: function(n) {
}
},
PROPERTY_INIT: {
build: function(t) {
return new Node(t, PROPERTY_INIT);
@ -1140,6 +1136,7 @@ Narcissus.parser = (function() {
// for-ins always get a for block to help desugaring.
if (!forBlock) {
var forBlock = builder.BLOCK.build(t, x.blockId++);
forBlock.isInternalForInBlock = true;
x.stmtStack.push(forBlock);
}
@ -1250,6 +1247,9 @@ Narcissus.parser = (function() {
i++;
if (i < ss.length - 1 && ss[i+1].isLoop)
i++;
else if (i < ss.length - 1 && ss[i+1].isInternalForInBlock
&& ss[i+2].isLoop)
i++;
else if (tt === CONTINUE)
throw t.newSyntaxError("Invalid continue");
} else {
@ -1409,7 +1409,7 @@ Narcissus.parser = (function() {
if (!x.inFunction)
throw t.newSyntaxError("Return not in function");
b = x.builder.RETURN;
} else /* (tt === YIELD) */ {
} else /* if (tt === YIELD) */ {
if (!x.inFunction)
throw t.newSyntaxError("Yield not in function");
x.isGenerator = true;
@ -1418,7 +1418,8 @@ Narcissus.parser = (function() {
n = b.build(t);
tt2 = t.peek(true);
if (tt2 !== END && tt2 !== NEWLINE && tt2 !== SEMICOLON && tt2 !== RIGHT_CURLY
if (tt2 !== END && tt2 !== NEWLINE &&
tt2 !== SEMICOLON && tt2 !== RIGHT_CURLY
&& (tt !== YIELD ||
(tt2 !== tt && tt2 !== RIGHT_BRACKET && tt2 !== RIGHT_PAREN &&
tt2 !== COLON && tt2 !== COMMA))) {
@ -1550,10 +1551,8 @@ Narcissus.parser = (function() {
* Statements.
*/
if (x2.needsHoisting) {
/*
* Order is important here! Builders expect funDecls to come after
* varDecls!
*/
// Order is important here! Builders expect funDecls to come
// after varDecls!
builder.setHoists(f.body.id, x2.varDecls.concat(x2.funDecls));
if (x.inFunction) {
@ -1595,10 +1594,9 @@ Narcissus.parser = (function() {
* initializations).
*/
function Variables(t, x, letBlock) {
var b, bDecl, bAssign, n, n2, n3, ss, i, s, tt, id, data;
var b, n, n2, ss, i, s, tt;
var builder = x.builder;
var bDecl = builder.DECL;
var bAssign = builder.ASSIGN;
switch (t.token.type) {
case VAR:
@ -1637,15 +1635,7 @@ Narcissus.parser = (function() {
do {
tt = t.get();
/*
* FIXME Should have a special DECLARATION node instead of overloading
* IDENTIFIER to mean both identifier declarations and destructured
* declarations.
*/
if (tt === LEFT_BRACKET || tt === LEFT_CURLY) {
// Pass in s if we need to add each pattern matched into
// its varDecls, else pass in x.
data = null;
// Need to unget to parse the full destructured expression.
t.unget();
@ -1844,11 +1834,9 @@ Narcissus.parser = (function() {
bVar.addDecl(n2, n3, x);
bVar.finish(n2);
bFor.setIterator(n, n3, n2);
/*
* Don't add to varDecls since the semantics of comprehensions is
* such that the variables are in their own function when
* desugared.
*/
// Don't add to varDecls since the semantics of comprehensions is
// such that the variables are in their own function when
// desugared.
break;
default:
@ -2182,7 +2170,10 @@ Narcissus.parser = (function() {
}
function MemberExpression(t, x, allowCallSyntax) {
var n, n2, tt, b = x.builder.MEMBER;
var n, n2, name, tt;
var builder = x.builder;
var b = builder.MEMBER
var b2 = builder.PROPERTY_NAME;
if (t.match(NEW)) {
n = b.build(t);
@ -2202,7 +2193,9 @@ Narcissus.parser = (function() {
n2 = b.build(t);
b.addOperand(n2, n);
t.mustMatch(IDENTIFIER);
b.addOperand(n2, b.build(t));
name = b2.build(t);
b2.finish(name);
b.addOperand(n2, name);
break;
case LEFT_BRACKET:
@ -2263,6 +2256,7 @@ Narcissus.parser = (function() {
var bArrayInit = builder.ARRAY_INIT;
var bArrayComp = builder.ARRAY_COMP;
var bPrimary = builder.PRIMARY;
var bPropName = builder.PROPERTY_NAME;
var bObjInit = builder.OBJECT_INIT;
var bPropInit = builder.PROPERTY_INIT;
@ -2293,7 +2287,7 @@ Narcissus.parser = (function() {
n = n2;
}
t.mustMatch(RIGHT_BRACKET);
bPrimary.finish(n);
bArrayInit.finish(n);
break;
case LEFT_CURLY:
@ -2313,8 +2307,8 @@ Narcissus.parser = (function() {
} else {
switch (tt) {
case IDENTIFIER: case NUMBER: case STRING:
id = bPrimary.build(t, IDENTIFIER);
bPrimary.finish(id);
id = bPropName.build(t);
bPropName.finish(id);
break;
case RIGHT_CURLY:
if (x.ecma3OnlyMode)
@ -2322,8 +2316,8 @@ Narcissus.parser = (function() {
break object_init;
default:
if (t.token.value in definitions.keywords) {
id = bPrimary.build(t, IDENTIFIER);
bPrimary.finish(id);
id = bPropName.build(t);
bPropName.finish(id);
break;
}
throw t.newSyntaxError("Invalid property name");