Incremental Shamu updates

git-svn-id: svn://10.0.0.236/trunk@117679 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js2/src/js2runtime.cpp

@@ -3362,7 +3362,12 @@ Context::Context(JSObject **global, World &world, Arena &a, Pragma::Flags flags)
       mLocals(NULL),
       mArgumentBase(NULL),
       mReader(NULL),
-      mGlobal(global) 
+      mGlobal(global),
+
+      mErrorReporter(NULL),
+      argumentFormatMap(NULL)
+
+
 
 {
     uint32 i;

mozilla/js2/src/js2runtime.h

@@ -2041,6 +2041,7 @@ XXX ...couldn't get this to work...
 
 
         void *mErrorReporter;
+        void *argumentFormatMap;
 
     private:
         JSObject **mGlobal;

mozilla/js2/src/world.h

@@ -34,6 +34,8 @@
 #ifndef world_h___
 #define world_h___
 
+#include <vector>
+
 #include "strings.h"
 #include "token.h"
 #include "hash.h"
@@ -70,6 +72,9 @@ namespace JavaScript {
         StringAtom &operator[](const char *s) {return operator[](widenCString(s));}
     };
 
+    namespace JS2Runtime {
+        class Context;
+    }
 
     class World {
       public:
@@ -77,6 +82,8 @@ namespace JavaScript {
 
         World();
 
+        std::vector<JS2Runtime::Context *> contextList;
+
         /* Random number generator state, used by jsmath.c. */
         bool                rngInitialized;
         int64               rngMultiplier;

mozilla/js2/tests/cpp/shamu.h

@@ -1,13 +1,7 @@
-struct JSRuntime {
-    double jsNaN;
-    double jsNegativeInfinity;
-    double jsPositiveInfinity;
-    JSString *emptyString;
-};
 
-struct JSContext {
-    JSRuntime *runtime;
-};
+typedef struct JSStackFrame         JSStackFrame;
+typedef struct JSPropertyDescArray  JSPropertyDescArray;
+
 
 
 #ifdef JS_ARGUMENT_FORMATTER_DEFINED

mozilla/js2/tests/cpp/winbuild/shamu.dsp

@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHAMU_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\..\js\src" /I "..\..\..\src" /I "..\..\..\src\regexp" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHAMU_EXPORTS" /D "DEBUG" /D "XP_PC" /D "EXPORT_JS_API" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\..\js\src" /I "..\..\..\src" /I "..\..\..\src\regexp" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHAMU_EXPORTS" /D "DEBUG" /D "XP_PC" /D "EXPORT_JS_API" /D "JS_THREADSAFE" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -91,6 +91,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\..\..\..\js\src\jsdhash.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\shamu.cpp
 
 !IF  "$(CFG)" == "shamu - Win32 Release"