archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression with parsing constructors while not executing

Browse Source
This commit is contained in:
Gordon Williams 2013-10-21 18:37:28 +01:00
parent 477a878b7f
commit ec49936a18
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
1v42 : [ebirger] allowing 'new' with no brackets
Allow built-in functions with variable numbers of arguments (fix #83)
Implement 'String' constructor in the normal way (fix #110)
Fix regression with parsing constructors while not executing
1v41 : Fix Olimexino compile (https://github.com/espruino/Espruino/issues/6)
[ebirger] Member constructors (eg. new a.b() )

11
src/jsparse.c
View File

@ -950,11 +950,11 @@ JsVar *jspeFactor();
void jspEnsureIsPrototype(JsVar *prototypeName);
JsVar *jspeConstruct(JsVar *func, JsVar *funcName, bool hasArgs) {
assert(JSP_SHOULD_EXECUTE);
JsVar *thisObj = jsvNewWithFlags(JSV_OBJECT);
// Make sure the function has a 'prototype' var
JsVar *prototypeName = jsvFindChildFromString(func, JSPARSE_PROTOTYPE_VAR, true);
jspEnsureIsPrototype(prototypeName); // make sure it's an object
// TODO: if prototypeName is not an object, set the [[Prototype]] property of Result(1) to the original Object prototype object as described in 15.2.3.1.
jsvUnLock(jsvAddNamedChild(thisObj, prototypeName, JSPARSE_INHERITS_VAR));
jsvUnLock(prototypeName);
@ -988,7 +988,8 @@ JsVar *jspeFactorNew() {
else
a = jspeFactorMember(jspeFactor());
// Check for a constructor call with no arguments
if (execInfo.execute & EXEC_CONSTRUCT && execInfo.lex->tk!='(') {
if (JSP_SHOULD_EXECUTE &&
(execInfo.execute & EXEC_CONSTRUCT) && execInfo.lex->tk!='(') {
JsVar *func = jsvSkipNameKeepParent(a, 0);
execInfo.execute &= (JsExecFlags)~EXEC_CONSTRUCT;
a = jspeConstruct(func, a, false);
@ -1014,10 +1015,10 @@ JsVar *jspeFactorFunctionCall() {
parent = jsvLock(parentRef);
}
if (isConstruct) {
/* The constructor function doesn't change parsing, so if we're
* not executing, just short-cut it. */
if (isConstruct && JSP_SHOULD_EXECUTE)
a = jspeConstruct(func, funcName, true);
isConstruct = false;
}
else
a = jspeFunctionCall(func, funcName, parent, true, 0, 0);

8
tests/test_object_constructor_noexec.js Normal file
View File

@ -0,0 +1,8 @@
// Test a constructor when we're not executing
var a = 42;
function Foo() {}
if (false) a = new Foo();
if (false) a = new Foo;
result = a==42;