From ebe4b12f61173cae101b80858ce25cc9b7c616c4 Mon Sep 17 00:00:00 2001
From: "rogerl%netscape.com"
 <rogerl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 16 Apr 2003 17:59:00 +0000
Subject: [PATCH] Fixed FrameSlotRef for nested functions. Bug in octal
 parsing.

git-svn-id: svn://10.0.0.236/trunk@141247 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js2/src/js2metadata.cpp  | 6 +++---
 mozilla/js2/src/js2op_access.cpp | 4 ++--
 mozilla/js2/src/lexer.cpp        | 4 ++--
 mozilla/js2/src/strings.h        | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mozilla/js2/src/js2metadata.cpp b/mozilla/js2/src/js2metadata.cpp
index 7c6e5b30877..43739bc7260 100644
--- a/mozilla/js2/src/js2metadata.cpp
+++ b/mozilla/js2/src/js2metadata.cpp
@@ -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));
     }
 
 
diff --git a/mozilla/js2/src/js2op_access.cpp b/mozilla/js2/src/js2op_access.cpp
index 3f0a46a8234..991777acf31 100644
--- a/mozilla/js2/src/js2op_access.cpp
+++ b/mozilla/js2/src/js2op_access.cpp
@@ -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);
diff --git a/mozilla/js2/src/lexer.cpp b/mozilla/js2/src/lexer.cpp
index cfa18fcfdf9..fb03578309f 100644
--- a/mozilla/js2/src/lexer.cpp
+++ b/mozilla/js2/src/lexer.cpp
@@ -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();
             }
diff --git a/mozilla/js2/src/strings.h b/mozilla/js2/src/strings.h
index 8233df162aa..040c8521e51 100644
--- a/mozilla/js2/src/strings.h
+++ b/mozilla/js2/src/strings.h
@@ -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);