Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed FrameSlotRef for nested functions. Bug in octal parsing.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@141247 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
2003-04-16 17:59:00 +00:00
parent f466d51c0b
commit ebe4b12f61
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/js2/src/js2metadata.cpp
View File

@@ -4456,7 +4456,7 @@ XXX see EvalAttributeExpression, where identifiers are being handled for now...
ASSERT(plural->positional[i]->cloneContent->memberKind == Member::VariableMember);
(checked_cast<Variable *>(plural->positional[i]->cloneContent))->value = argBase[i];
}
meta->arrayClass->writePublic(meta, OBJECT_TO_JS2VAL(argsObj), meta->arrayClass, meta->engine->numberToString(i), true, argBase[i]);
meta->objectClass->writePublic(meta, OBJECT_TO_JS2VAL(argsObj), meta->objectClass, meta->engine->numberToString(i), true, argBase[i]);
}
while (i++ < length) {
if (i < plural->positionalCount) {
@@ -4464,10 +4464,10 @@ XXX see EvalAttributeExpression, where identifiers are being handled for now...
ASSERT(plural->positional[i]->cloneContent->memberKind == Member::VariableMember);
(checked_cast<Variable *>(plural->positional[i]->cloneContent))->value = JS2VAL_UNDEFINED;
}
meta->arrayClass->writePublic(meta, OBJECT_TO_JS2VAL(argsObj), meta->arrayClass, meta->engine->numberToString(i), true, JS2VAL_UNDEFINED);
meta->objectClass->writePublic(meta, OBJECT_TO_JS2VAL(argsObj), meta->objectClass, meta->engine->numberToString(i), true, JS2VAL_UNDEFINED);
}
setLength(meta, argsObj, argCount);
meta->arrayClass->writePublic(meta, OBJECT_TO_JS2VAL(argsObj), meta->arrayClass, meta->engine->allocStringPtr("callee"), true, OBJECT_TO_JS2VAL(fnObj));
meta->objectClass->writePublic(meta, OBJECT_TO_JS2VAL(argsObj), meta->objectClass, meta->engine->allocStringPtr("callee"), true, OBJECT_TO_JS2VAL(fnObj));
}

4
mozilla/js2/src/js2op_access.cpp
View File

@@ -284,7 +284,7 @@
push((*localFrame->slots)[slotIndex]);
}
break;
/*
case eFrameSlotRef:
{
uint16 slotIndex = BytecodeContainer::getShort(pc);
@@ -294,7 +294,7 @@
push((*localFrame->slots)[slotIndex]);
}
break;
*/
case ePackageSlotWrite:
{
uint16 slotIndex = BytecodeContainer::getShort(pc);

4
mozilla/js2/src/lexer.cpp
View File

@@ -363,10 +363,10 @@ bool JS::Lexer::lexNumeral()
} else
reader.setPos(pos);
goto done;
} else if (isASCIIDecimalDigit(ch)) {
} else if (isASCIIOctalDigit(ch)) {
// Backward compatible hack, support octal for SpiderMonkey's sake
octal = true;
while (isASCIIDecimalDigit(ch)) {
while (isASCIIOctalDigit(ch)) {
reader.recordChar(ch);
ch = getChar();
}

1
mozilla/js2/src/strings.h
View File

@@ -235,6 +235,7 @@ namespace JavaScript
};
inline bool isASCIIDecimalDigit(char16 c) {return c >= '0' && c <= '9';}
inline bool isASCIIOctalDigit(char16 c) {return c >= '0' && c <= '7';}
bool isASCIIHexDigit(char16 c, uint &digit);
const char16 *skipWhiteSpace(const char16 *str, const char16 *strEnd);