johnson 2.0.0.pre1 → 2.0.0.pre2

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+=== 2.0.0.pre2 / 2010-02-23
+
+* Raise NoMemoryError as appropriate; acccept a size parameter or env variable for runtime size
+* pull latest 1.9.2 SM
+* Allow ruby code to create new gobal objects and add preliminary seal support
+* Clear parent and prototype on new globals
+* Cooperate with StackDeck's new backtrace-manipulating ways.
+* remove thread ref to context (allows collection)
+* Bump Hoe and Rake Compiler deps. Automatically grab submodules.
+* Remove the old spidermonkey extension.
+* Fix include guard for base TM header [Quin Hoxie]
+
 === 2.0.0.pre1 / 2010-02-11
 
 * Split global fix; covers all known issues

data/Manifest.txt

@@ -4,31 +4,6 @@ Manifest.txt
 README.rdoc
 Rakefile
 bin/johnson
-ext/spidermonkey/context.c
-ext/spidermonkey/context.h
-ext/spidermonkey/conversions.c
-ext/spidermonkey/conversions.h
-ext/spidermonkey/debugger.c
-ext/spidermonkey/debugger.h
-ext/spidermonkey/extconf.rb
-ext/spidermonkey/extensions.c
-ext/spidermonkey/extensions.h
-ext/spidermonkey/global.c
-ext/spidermonkey/global.h
-ext/spidermonkey/idhash.c
-ext/spidermonkey/idhash.h
-ext/spidermonkey/immutable_node.c
-ext/spidermonkey/immutable_node.c.erb
-ext/spidermonkey/immutable_node.h
-ext/spidermonkey/jroot.h
-ext/spidermonkey/js_land_proxy.c
-ext/spidermonkey/js_land_proxy.h
-ext/spidermonkey/ruby_land_proxy.c
-ext/spidermonkey/ruby_land_proxy.h
-ext/spidermonkey/runtime.c
-ext/spidermonkey/runtime.h
-ext/spidermonkey/spidermonkey.c
-ext/spidermonkey/spidermonkey.h
 ext/tracemonkey/context.cc
 ext/tracemonkey/context.h
 ext/tracemonkey/conversions.cc
@@ -76,14 +51,6 @@ lib/johnson/parser.rb
 lib/johnson/parser/syntax_error.rb
 lib/johnson/ruby_land_proxy.rb
 lib/johnson/runtime.rb
-lib/johnson/spidermonkey.rb
-lib/johnson/spidermonkey/context.rb
-lib/johnson/spidermonkey/debugger.rb
-lib/johnson/spidermonkey/immutable_node.rb
-lib/johnson/spidermonkey/js_land_proxy.rb
-lib/johnson/spidermonkey/mutable_tree_visitor.rb
-lib/johnson/spidermonkey/ruby_land_proxy.rb
-lib/johnson/spidermonkey/runtime.rb
 lib/johnson/tracemonkey.rb
 lib/johnson/tracemonkey/context.rb
 lib/johnson/tracemonkey/debugger.rb
@@ -153,11 +120,6 @@ test/johnson/generic/version_test.rb
 test/johnson/generic/visitors/dot_visitor_test.rb
 test/johnson/generic/visitors/enumerating_visitor_test.rb
 test/johnson/generic/visitors/helper.rb
-test/johnson/spidermonkey/context_test.rb
-test/johnson/spidermonkey/immutable_node_test.rb
-test/johnson/spidermonkey/js_land_proxy_test.rb
-test/johnson/spidermonkey/ruby_land_proxy_test.rb
-test/johnson/spidermonkey/runtime_test.rb
 test/johnson/tracemonkey/context_test.rb
 test/johnson/tracemonkey/immutable_node_test.rb
 test/johnson/tracemonkey/js_land_proxy_test.rb
@@ -165,253 +127,6 @@ test/johnson/tracemonkey/ruby_land_proxy_test.rb
 test/johnson/tracemonkey/runtime_test.rb
 test/johnson/tracemonkey/split_global_test.html
 test/johnson/tracemonkey/split_global_test.rb
-vendor/spidermonkey/.cvsignore
-vendor/spidermonkey/Makefile.in
-vendor/spidermonkey/Makefile.ref
-vendor/spidermonkey/README.html
-vendor/spidermonkey/SpiderMonkey.rsp
-vendor/spidermonkey/Y.js
-vendor/spidermonkey/build.mk
-vendor/spidermonkey/config.mk
-vendor/spidermonkey/config/AIX4.1.mk
-vendor/spidermonkey/config/AIX4.2.mk
-vendor/spidermonkey/config/AIX4.3.mk
-vendor/spidermonkey/config/Darwin.mk
-vendor/spidermonkey/config/Darwin1.3.mk
-vendor/spidermonkey/config/Darwin1.4.mk
-vendor/spidermonkey/config/Darwin5.2.mk
-vendor/spidermonkey/config/Darwin5.3.mk
-vendor/spidermonkey/config/HP-UXB.10.10.mk
-vendor/spidermonkey/config/HP-UXB.10.20.mk
-vendor/spidermonkey/config/HP-UXB.11.00.mk
-vendor/spidermonkey/config/IRIX.mk
-vendor/spidermonkey/config/IRIX5.3.mk
-vendor/spidermonkey/config/IRIX6.1.mk
-vendor/spidermonkey/config/IRIX6.2.mk
-vendor/spidermonkey/config/IRIX6.3.mk
-vendor/spidermonkey/config/IRIX6.5.mk
-vendor/spidermonkey/config/Linux_All.mk
-vendor/spidermonkey/config/Mac_OS10.0.mk
-vendor/spidermonkey/config/OSF1V4.0.mk
-vendor/spidermonkey/config/OSF1V5.0.mk
-vendor/spidermonkey/config/SunOS4.1.4.mk
-vendor/spidermonkey/config/SunOS5.10.mk
-vendor/spidermonkey/config/SunOS5.3.mk
-vendor/spidermonkey/config/SunOS5.4.mk
-vendor/spidermonkey/config/SunOS5.5.1.mk
-vendor/spidermonkey/config/SunOS5.5.mk
-vendor/spidermonkey/config/SunOS5.6.mk
-vendor/spidermonkey/config/SunOS5.7.mk
-vendor/spidermonkey/config/SunOS5.8.mk
-vendor/spidermonkey/config/SunOS5.9.mk
-vendor/spidermonkey/config/WINNT4.0.mk
-vendor/spidermonkey/config/WINNT5.0.mk
-vendor/spidermonkey/config/WINNT5.1.mk
-vendor/spidermonkey/config/WINNT5.2.mk
-vendor/spidermonkey/config/WINNT6.0.mk
-vendor/spidermonkey/config/dgux.mk
-vendor/spidermonkey/editline/Makefile.ref
-vendor/spidermonkey/editline/README
-vendor/spidermonkey/editline/editline.3
-vendor/spidermonkey/editline/editline.c
-vendor/spidermonkey/editline/editline.h
-vendor/spidermonkey/editline/sysunix.c
-vendor/spidermonkey/editline/unix.h
-vendor/spidermonkey/fdlibm/.cvsignore
-vendor/spidermonkey/fdlibm/Makefile.in
-vendor/spidermonkey/fdlibm/Makefile.ref
-vendor/spidermonkey/fdlibm/e_acos.c
-vendor/spidermonkey/fdlibm/e_acosh.c
-vendor/spidermonkey/fdlibm/e_asin.c
-vendor/spidermonkey/fdlibm/e_atan2.c
-vendor/spidermonkey/fdlibm/e_atanh.c
-vendor/spidermonkey/fdlibm/e_cosh.c
-vendor/spidermonkey/fdlibm/e_exp.c
-vendor/spidermonkey/fdlibm/e_fmod.c
-vendor/spidermonkey/fdlibm/e_gamma.c
-vendor/spidermonkey/fdlibm/e_gamma_r.c
-vendor/spidermonkey/fdlibm/e_hypot.c
-vendor/spidermonkey/fdlibm/e_j0.c
-vendor/spidermonkey/fdlibm/e_j1.c
-vendor/spidermonkey/fdlibm/e_jn.c
-vendor/spidermonkey/fdlibm/e_lgamma.c
-vendor/spidermonkey/fdlibm/e_lgamma_r.c
-vendor/spidermonkey/fdlibm/e_log.c
-vendor/spidermonkey/fdlibm/e_log10.c
-vendor/spidermonkey/fdlibm/e_pow.c
-vendor/spidermonkey/fdlibm/e_rem_pio2.c
-vendor/spidermonkey/fdlibm/e_remainder.c
-vendor/spidermonkey/fdlibm/e_scalb.c
-vendor/spidermonkey/fdlibm/e_sinh.c
-vendor/spidermonkey/fdlibm/e_sqrt.c
-vendor/spidermonkey/fdlibm/fdlibm.h
-vendor/spidermonkey/fdlibm/fdlibm.mak
-vendor/spidermonkey/fdlibm/fdlibm.mdp
-vendor/spidermonkey/fdlibm/k_cos.c
-vendor/spidermonkey/fdlibm/k_rem_pio2.c
-vendor/spidermonkey/fdlibm/k_sin.c
-vendor/spidermonkey/fdlibm/k_standard.c
-vendor/spidermonkey/fdlibm/k_tan.c
-vendor/spidermonkey/fdlibm/s_asinh.c
-vendor/spidermonkey/fdlibm/s_atan.c
-vendor/spidermonkey/fdlibm/s_cbrt.c
-vendor/spidermonkey/fdlibm/s_ceil.c
-vendor/spidermonkey/fdlibm/s_copysign.c
-vendor/spidermonkey/fdlibm/s_cos.c
-vendor/spidermonkey/fdlibm/s_erf.c
-vendor/spidermonkey/fdlibm/s_expm1.c
-vendor/spidermonkey/fdlibm/s_fabs.c
-vendor/spidermonkey/fdlibm/s_finite.c
-vendor/spidermonkey/fdlibm/s_floor.c
-vendor/spidermonkey/fdlibm/s_frexp.c
-vendor/spidermonkey/fdlibm/s_ilogb.c
-vendor/spidermonkey/fdlibm/s_isnan.c
-vendor/spidermonkey/fdlibm/s_ldexp.c
-vendor/spidermonkey/fdlibm/s_lib_version.c
-vendor/spidermonkey/fdlibm/s_log1p.c
-vendor/spidermonkey/fdlibm/s_logb.c
-vendor/spidermonkey/fdlibm/s_matherr.c
-vendor/spidermonkey/fdlibm/s_modf.c
-vendor/spidermonkey/fdlibm/s_nextafter.c
-vendor/spidermonkey/fdlibm/s_rint.c
-vendor/spidermonkey/fdlibm/s_scalbn.c
-vendor/spidermonkey/fdlibm/s_signgam.c
-vendor/spidermonkey/fdlibm/s_significand.c
-vendor/spidermonkey/fdlibm/s_sin.c
-vendor/spidermonkey/fdlibm/s_tan.c
-vendor/spidermonkey/fdlibm/s_tanh.c
-vendor/spidermonkey/fdlibm/w_acos.c
-vendor/spidermonkey/fdlibm/w_acosh.c
-vendor/spidermonkey/fdlibm/w_asin.c
-vendor/spidermonkey/fdlibm/w_atan2.c
-vendor/spidermonkey/fdlibm/w_atanh.c
-vendor/spidermonkey/fdlibm/w_cosh.c
-vendor/spidermonkey/fdlibm/w_exp.c
-vendor/spidermonkey/fdlibm/w_fmod.c
-vendor/spidermonkey/fdlibm/w_gamma.c
-vendor/spidermonkey/fdlibm/w_gamma_r.c
-vendor/spidermonkey/fdlibm/w_hypot.c
-vendor/spidermonkey/fdlibm/w_j0.c
-vendor/spidermonkey/fdlibm/w_j1.c
-vendor/spidermonkey/fdlibm/w_jn.c
-vendor/spidermonkey/fdlibm/w_lgamma.c
-vendor/spidermonkey/fdlibm/w_lgamma_r.c
-vendor/spidermonkey/fdlibm/w_log.c
-vendor/spidermonkey/fdlibm/w_log10.c
-vendor/spidermonkey/fdlibm/w_pow.c
-vendor/spidermonkey/fdlibm/w_remainder.c
-vendor/spidermonkey/fdlibm/w_scalb.c
-vendor/spidermonkey/fdlibm/w_sinh.c
-vendor/spidermonkey/fdlibm/w_sqrt.c
-vendor/spidermonkey/javascript-trace.d
-vendor/spidermonkey/js.c
-vendor/spidermonkey/js.mdp
-vendor/spidermonkey/js.msg
-vendor/spidermonkey/js.pkg
-vendor/spidermonkey/js3240.rc
-vendor/spidermonkey/jsOS240.def
-vendor/spidermonkey/jsapi.c
-vendor/spidermonkey/jsapi.h
-vendor/spidermonkey/jsarena.c
-vendor/spidermonkey/jsarena.h
-vendor/spidermonkey/jsarray.c
-vendor/spidermonkey/jsarray.h
-vendor/spidermonkey/jsatom.c
-vendor/spidermonkey/jsatom.h
-vendor/spidermonkey/jsbit.h
-vendor/spidermonkey/jsbool.c
-vendor/spidermonkey/jsbool.h
-vendor/spidermonkey/jsclist.h
-vendor/spidermonkey/jscntxt.c
-vendor/spidermonkey/jscntxt.h
-vendor/spidermonkey/jscompat.h
-vendor/spidermonkey/jsconfig.h
-vendor/spidermonkey/jsconfig.mk
-vendor/spidermonkey/jscpucfg.c
-vendor/spidermonkey/jscpucfg.h
-vendor/spidermonkey/jsdate.c
-vendor/spidermonkey/jsdate.h
-vendor/spidermonkey/jsdbgapi.c
-vendor/spidermonkey/jsdbgapi.h
-vendor/spidermonkey/jsdhash.c
-vendor/spidermonkey/jsdhash.h
-vendor/spidermonkey/jsdtoa.c
-vendor/spidermonkey/jsdtoa.h
-vendor/spidermonkey/jsdtracef.c
-vendor/spidermonkey/jsdtracef.h
-vendor/spidermonkey/jsemit.c
-vendor/spidermonkey/jsemit.h
-vendor/spidermonkey/jsexn.c
-vendor/spidermonkey/jsexn.h
-vendor/spidermonkey/jsfile.c
-vendor/spidermonkey/jsfile.h
-vendor/spidermonkey/jsfile.msg
-vendor/spidermonkey/jsfun.c
-vendor/spidermonkey/jsfun.h
-vendor/spidermonkey/jsgc.c
-vendor/spidermonkey/jsgc.h
-vendor/spidermonkey/jshash.c
-vendor/spidermonkey/jshash.h
-vendor/spidermonkey/jsify.pl
-vendor/spidermonkey/jsinterp.c
-vendor/spidermonkey/jsinterp.h
-vendor/spidermonkey/jsinvoke.c
-vendor/spidermonkey/jsiter.c
-vendor/spidermonkey/jsiter.h
-vendor/spidermonkey/jskeyword.tbl
-vendor/spidermonkey/jskwgen.c
-vendor/spidermonkey/jslibmath.h
-vendor/spidermonkey/jslock.c
-vendor/spidermonkey/jslock.h
-vendor/spidermonkey/jslocko.asm
-vendor/spidermonkey/jslog2.c
-vendor/spidermonkey/jslong.c
-vendor/spidermonkey/jslong.h
-vendor/spidermonkey/jsmath.c
-vendor/spidermonkey/jsmath.h
-vendor/spidermonkey/jsnum.c
-vendor/spidermonkey/jsnum.h
-vendor/spidermonkey/jsobj.c
-vendor/spidermonkey/jsobj.h
-vendor/spidermonkey/jsopcode.c
-vendor/spidermonkey/jsopcode.h
-vendor/spidermonkey/jsopcode.tbl
-vendor/spidermonkey/jsotypes.h
-vendor/spidermonkey/jsparse.c
-vendor/spidermonkey/jsparse.h
-vendor/spidermonkey/jsprf.c
-vendor/spidermonkey/jsprf.h
-vendor/spidermonkey/jsproto.tbl
-vendor/spidermonkey/jsprvtd.h
-vendor/spidermonkey/jspubtd.h
-vendor/spidermonkey/jsregexp.c
-vendor/spidermonkey/jsregexp.h
-vendor/spidermonkey/jsreops.tbl
-vendor/spidermonkey/jsscan.c
-vendor/spidermonkey/jsscan.h
-vendor/spidermonkey/jsscope.c
-vendor/spidermonkey/jsscope.h
-vendor/spidermonkey/jsscript.c
-vendor/spidermonkey/jsscript.h
-vendor/spidermonkey/jsshell.msg
-vendor/spidermonkey/jsstddef.h
-vendor/spidermonkey/jsstr.c
-vendor/spidermonkey/jsstr.h
-vendor/spidermonkey/jstypes.h
-vendor/spidermonkey/jsutil.c
-vendor/spidermonkey/jsutil.h
-vendor/spidermonkey/jsxdrapi.c
-vendor/spidermonkey/jsxdrapi.h
-vendor/spidermonkey/jsxml.c
-vendor/spidermonkey/jsxml.h
-vendor/spidermonkey/lock_SunOS.s
-vendor/spidermonkey/perfect.js
-vendor/spidermonkey/plify_jsdhash.sed
-vendor/spidermonkey/prmjtime.c
-vendor/spidermonkey/prmjtime.h
-vendor/spidermonkey/resource.h
-vendor/spidermonkey/rules.mk
-vendor/spidermonkey/win32.order
 vendor/tracemonkey/Makefile.in
 vendor/tracemonkey/Makefile.ref
 vendor/tracemonkey/README.html
@@ -1622,6 +1337,8 @@ vendor/tracemonkey/tests/ecma/Math/15.8.2.8.js
 vendor/tracemonkey/tests/ecma/Math/15.8.2.9.js
 vendor/tracemonkey/tests/ecma/Math/jstests.list
 vendor/tracemonkey/tests/ecma/Math/shell.js
+vendor/tracemonkey/tests/ecma/NativeObjects/browser.js
+vendor/tracemonkey/tests/ecma/NativeObjects/jstests.list
 vendor/tracemonkey/tests/ecma/NativeObjects/shell.js
 vendor/tracemonkey/tests/ecma/Number/15.7.1.js
 vendor/tracemonkey/tests/ecma/Number/15.7.2.js
@@ -2466,6 +2183,8 @@ vendor/tracemonkey/tests/js1_3/inherit/proto_9.js
 vendor/tracemonkey/tests/js1_3/inherit/shell.js
 vendor/tracemonkey/tests/js1_3/jsref.js
 vendor/tracemonkey/tests/js1_3/jstests.list
+vendor/tracemonkey/tests/js1_3/misc/browser.js
+vendor/tracemonkey/tests/js1_3/misc/jstests.list
 vendor/tracemonkey/tests/js1_3/misc/shell.js
 vendor/tracemonkey/tests/js1_3/regress/delete-001.js
 vendor/tracemonkey/tests/js1_3/regress/function-001-n.js

data/Rakefile

@@ -1,17 +1,16 @@
 require "rubygems"
 
-gem "hoe", "~> 2.3"
+gem "hoe", "~> 2.5"
 require "hoe"
 
-gem "rake-compiler", "~> 0.6"
+gem "rake-compiler", "~> 0.7"
 require "rake/extensiontask"
 
 FILTER = ENV['FILTER'] || ENV['TESTOPTS']
 
-INTERPRETERS = [ "spidermonkey", "tracemonkey" ]
+INTERPRETERS = [ "tracemonkey" ]
 
 SUFFIXES = {}
-SUFFIXES[ "spidermonkey" ] = "c"
 SUFFIXES[ "tracemonkey" ] = "cc"
 
 generated_nodes = []
@@ -24,7 +23,8 @@ INTERPRETERS.each do |interpreter|
   
   generated_node = "ext/#{interpreter}/immutable_node.#{suffix}"
   
-  file generated_node => "ext/#{interpreter}/immutable_node.#{suffix}.erb"  do |t|
+  file generated_node => ["ext/#{interpreter}/immutable_node.#{suffix}.erb",
+                          "vendor/#{interpreter}/.git"] do |t|
     template = ERB.new(File.open(t.prerequisites.first, "rb") { |x| x.read })
     jsops = jsops interpreter
     tokens = tokens interpreter
@@ -50,20 +50,17 @@ Hoe.spec "johnson" do
   self.extra_rdoc_files         = FileList["*.rdoc"]
   self.history_file             = "CHANGELOG.rdoc"
   self.readme_file              = "README.rdoc"
-  self.spec_extras[:extensions] = %w(ext/spidermonkey/extconf.rb 
-                                     ext/tracemonkey/extconf.rb)
+  self.spec_extras[:extensions] = %w(ext/tracemonkey/extconf.rb)
 
-  extra_deps << ["stackdeck", "~> 0.1"]
+  extra_deps << ["stackdeck", "~> 0.2"]
   extra_dev_deps << ["rake-compiler", "~> 0.6"]
 
   clean_globs    << "ext/**/Makefile"
   clean_globs    << "ext/**/*.{o,so,dylib,bundle,a,log}"
   clean_globs    << "vendor/**/*.{o,so,dylib,bundle,a,log}"
-  clean_globs    << "ext/spidermonkey/immutable_node.c"
   clean_globs    << "ext/tracemonkey/immutable_node.cc"
   clean_globs    << "lib/johnson/**/*.{bundle,so}"
   clean_globs    << "tmp"
-  clean_globs    << "vendor/spidermonkey/**/*.OBJ"
 
   clean_globs    << "vendor/tracemonkey/**/.deps"
   clean_globs    << "vendor/tracemonkey/dist"
@@ -96,26 +93,22 @@ Hoe.spec "johnson" do
   clean_globs    << "vendor/tracemonkey/{lirasm,shell,tests}/Makefile"
   clean_globs    << "vendor/tracemonkey/unallmakefiles"
 
-  Rake::ExtensionTask.new "spidermonkey", spec do |ext|
-    ext.lib_dir = "lib/johnson/spidermonkey"
-    ext.source_pattern = "*.{c,h}"
-  end
-
   Rake::ExtensionTask.new "tracemonkey", spec do |ext|
     ext.lib_dir = "lib/johnson/tracemonkey"
     ext.source_pattern = "*.{cc,h}"
   end
 end
 
-task(:test).clear
+file "vendor/tracemonkey/.git" do
+  sh "git submodule update --init"
+end
+
+task :compile => "vendor/tracemonkey/.git"
 
+task(:test).clear
 task :test => :compile
 
 task :clean do
-  Dir.chdir "vendor/spidermonkey" do
-    sh "make clean -f Makefile.ref" unless Dir["**/libjs.a"].empty?
-  end
-
   Dir.chdir "vendor/tracemonkey" do
     sh "make clean -f Makefile.ref" unless Dir["**/libjs.a"].empty?
   end

data/ext/tracemonkey/global.cc

@@ -36,5 +36,8 @@ static JSClass OurGlobalClass = {
 
 JSObject* johnson_create_global_object(JSContext* context)
 {
-  return JS_NewObject(context, &OurGlobalClass, NULL, NULL);
+  JSObject* obj = JS_NewObject(context, &OurGlobalClass, NULL, NULL);
+  JS_SetParent(context, obj, NULL);
+  JS_SetPrototype(context, obj, NULL);
+  return obj;
 }

data/ext/tracemonkey/js.cc

@@ -70,6 +70,9 @@ split_create_inner(JSContext *cx, JSObject *outer);
 static ComplexObject *
 split_get_private(JSContext *cx, JSObject *obj);
 
+int trace_split = 0;
+int trace_mark = 0;
+
 static JSBool
 split_addProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 {
@@ -85,6 +88,14 @@ split_addProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
         /* Patched. See https://bugzilla.mozilla.org/show_bug.cgi?id=542864 */
 
+        /*
+        JSString* s = JS_ValueToString(cx, id);
+        char* c = JS_GetStringBytes(s);
+        if(strcmp(c,"Document")==0){
+            fprintf(stderr,"%s\n",c );
+        }
+        */
+
         JSPropertyOp setter = 0;
         JSPropertyOp getter = 0;
         uintN attrs = 0;
@@ -92,15 +103,11 @@ split_addProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
         JS_GetPropertyAttrsGetterAndSetterById(cx, obj, id, &attrs, &found, &getter, &setter);
 
-        if (attrs&(JSPROP_GETTER|JSPROP_SETTER)) {
-            asId = id;
-        } else {
-            if (!JS_ValueToId(cx, *vp, &asId)) {
-                return JS_FALSE;
-            }
+        if (!JS_ValueToId(cx, *vp, &asId)) {
+            return JS_FALSE;
         }
         
-        return JS_DefinePropertyById(cx, cpx->inner, asId, *vp, getter, setter, attrs | JSPROP_ENUMERATE);
+        return JS_DefinePropertyById(cx, cpx->inner, id, asId, getter, setter, attrs | JSPROP_ENUMERATE);
     }
     return JS_TRUE;
 }
@@ -271,6 +278,7 @@ split_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
 static void
 split_finalize(JSContext *cx, JSObject *obj)
 {
+    if (trace_split) fprintf(stderr,"finalize 0x%08x\n", obj);
     JS_free(cx, JS_GetPrivate(cx, obj));
 }
 
@@ -281,7 +289,16 @@ split_mark(JSContext *cx, JSObject *obj, void *arg)
 
     cpx = (ComplexObject *) JS_GetPrivate(cx, obj);
 
+    if (trace_mark) fprintf(stderr,"mark  0x%08x %s\n", obj, cpx->isInner ? "" : "outer");
+
+    /*
+    if (!cpx->isInner) {
+        fprintf(stderr,"mark %016x\n", obj);
+    }
+    */
+
     if (!cpx->isInner && cpx->inner) {
+        // if (trace_mark) fprintf(stderr,"mark inner 0x%08x\n", cpx->inner);
         /* Mark the inner object. */
         JS_MarkGCThing(cx, cpx->inner, "ComplexObject.inner", arg);
     }
@@ -357,7 +374,6 @@ static JSExtendedClass split_global_class = {
     NULL, NULL, NULL, NULL, NULL
 };
 
-#if 1
 static JSBool
 split_equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
 {
@@ -378,31 +394,6 @@ split_equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
     *bp = (cpx == ourCpx);
     return JS_TRUE;
 }
-#else
-static JSBool
-split_equality(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
-{
-    *bp = JS_FALSE;
-    if (JSVAL_IS_PRIMITIVE(v))
-        return JS_TRUE;
-
-    JSObject *obj2 = JSVAL_TO_OBJECT(v);
-    if (JS_GET_CLASS(cx, obj2) != &split_global_class.base)
-        return JS_TRUE;
-
-    ComplexObject *cpx = (ComplexObject *) JS_GetPrivate(cx, obj2);
-    ComplexObject *ourCpx = (ComplexObject *) JS_GetPrivate(cx, obj);
-
-    if( cpx == ourCpx ) {
-      *bp = JS_TRUE;
-    } else if ( cpx->inner ) {
-      *bp = ( cpx->inner == obj && ourCpx->outer == obj2);
-    } else {
-      *bp = ( cpx->outer == obj && ourCpx->inner == obj2);
-    }
-    return JS_TRUE;
-}
-#endif
 
 JSObject *
 split_create_outer(JSContext *cx)
@@ -429,6 +420,8 @@ split_create_outer(JSContext *cx)
         return NULL;
     }
 
+    if (trace_split) fprintf(stderr,"outer 0x%08x\n", obj);
+
     return obj;
 }
 
@@ -453,11 +446,15 @@ split_create_inner(JSContext *cx, JSObject *outer)
         JS_free(cx, cpx);
         return NULL;
     }
+    
+    JS_SetPrototype(cx,obj,NULL);
 
     outercpx = (ComplexObject *) JS_GetPrivate(cx, outer);
     outercpx->inner = obj;
     outercpx->frozen = JS_FALSE;
 
+    if (trace_split) fprintf(stderr,"inner 0x%08x 0x%08x\n", outer, obj);
+
     return obj;
 }