Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add function statements, an ECMA Ed. 3 extension supported by SpiderMonkey.

Browse Source
This commit is contained in:
brendan%mozilla.org 2005-06-30 18:16:19 +00:00
parent 1639879aa6
commit a48f461e71
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/narcissus/jsexec.js
View File

@ -210,8 +210,12 @@ function execute(n, x) {
switch (n.type) {
case FUNCTION:
if (!n.declared) {
if (n.name) {
if (n.functionForm != DECLARED_FORM) {
if (!n.name || n.functionForm == STATEMENT_FORM) {
v = new FunctionObject(n, x.scope);
if (n.functionForm == STATEMENT_FORM)
x.scope.object.__defineProperty__(n.name, v, true);
} else {
t = new Object;
x.scope = {object: t, parent: x.scope};
try {
@ -220,8 +224,6 @@ function execute(n, x) {
} finally {
x.scope = x.scope.parent;
}
} else {
v = new FunctionObject(n, x.scope);
}
}
break;

19
js/narcissus/jsparse.js
View File

@ -315,6 +315,8 @@ function Block(t, x) {
return n;
}
const DECLARED_FORM = 0, EXPRESSED_FORM = 1, STATEMENT_FORM = 2;
function Statement(t, x) {
var i, label, n, n2, ss, tt = t.get();
@ -322,7 +324,10 @@ function Statement(t, x) {
// common semicolon insertion magic after this switch.
switch (tt) {
case FUNCTION:
return FunctionDeclaration(t, x, true, true);
return FunctionDeclaration(t, x, true,
(x.stmtStack.length > 1)
? STATEMENT_FORM
: DECLARED_FORM);
case LEFT_CURLY:
n = Statements(t, x);
@ -557,7 +562,7 @@ function Statement(t, x) {
return n;
}
function FunctionDeclaration(t, x, requireName, declaration) {
function FunctionDeclaration(t, x, requireName, functionForm) {
var f = new Node(t);
if (f.type != FUNCTION)
f.type = (f.value == "get") ? GETTER : SETTER;
@ -581,10 +586,10 @@ function FunctionDeclaration(t, x, requireName, declaration) {
var x2 = new CompilerContext(true);
f.body = Script(t, x2);
t.mustMatch(RIGHT_CURLY);
f.end = t.token.end;
f.declared = declaration;
if (declaration)
f.functionForm = functionForm;
if (functionForm == DECLARED_FORM)
x.funDecls.push(f);
return f;
}
@ -798,7 +803,7 @@ loop:
case FUNCTION:
if (!t.scanOperand)
break loop;
operands.push(FunctionDeclaration(t, x, false, false));
operands.push(FunctionDeclaration(t, x, false, EXPRESSED_FORM));
t.scanOperand = false;
break;
@ -859,7 +864,7 @@ loop:
t.peek() == IDENTIFIER) {
if (x.ecmaStrictMode)
throw t.newSyntaxError("Illegal property accessor");
n.push(FunctionDeclaration(t, x, true, false));
n.push(FunctionDeclaration(t, x, true, EXPRESSED_FORM));
} else {
switch (tt) {
case IDENTIFIER: