smparkes-johnson 1.1.2.3 → 1.1.2.4

data/ext/tracemonkey/conversions.cc

@@ -256,6 +256,9 @@ VALUE convert_to_ruby(JohnsonRuntime* runtime, jsval js)
       JRETURN_RUBY(Qnil);
       
     case JSTYPE_FUNCTION: 
+#if JS_HAS_XML_SUPPORT
+    case JSTYPE_XML:
+#endif JS_HAS_XML_SUPPORT
     case JSTYPE_OBJECT: {
       if (OBJECT_TO_JSVAL(runtime->global) == js)
         // global gets special treatment, since the Prelude might not be loaded

data/lib/johnson.rb

@@ -14,7 +14,7 @@ require "johnson/visitors"
 require "johnson/nodes"
 
 module Johnson
-  VERSION = "1.1.2.3"
+  VERSION = "1.1.2.4"
 
   def self.version
     VERSION

data/vendor/tracemonkey/jsobj.h

@@ -230,11 +230,8 @@ struct JSObject {
 
 #define STOBJ_GET_PROTO(obj)                                                  \
     JSVAL_TO_OBJECT((obj)->fslots[JSSLOT_PROTO])
-#define _STOBJ_SET_PROTO(obj,proto)                                            \
-    (void)(STOBJ_NULLSAFE_SET_DELEGATE(proto),                                \
-           (obj)->fslots[JSSLOT_PROTO] = OBJECT_TO_JSVAL(proto))
 #define STOBJ_SET_PROTO(obj,proto)                                            \
-    (void)(((obj!=proto)||(abort(),10)),STOBJ_NULLSAFE_SET_DELEGATE(proto), \
+    (void)(STOBJ_NULLSAFE_SET_DELEGATE(proto),                                \
            (obj)->fslots[JSSLOT_PROTO] = OBJECT_TO_JSVAL(proto))
 #define STOBJ_CLEAR_PROTO(obj)                                                \
     ((obj)->fslots[JSSLOT_PROTO] = JSVAL_NULL)

data/vendor/tracemonkey/jsparse.cpp

@@ -880,34 +880,25 @@ JSCompiler::compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *cal
             if (tt == TOK_EOF)
                 break;
             JS_ASSERT(tt == TOK_ERROR);
-            // fprintf(stderr,"1\n");
             goto out;
         }
 
         pn = Statement(cx, &jsc.tokenStream, &cg);
-        if (!pn) {
-            // fprintf(stderr,"2\n");
+        if (!pn)
             goto out;
-        }
         JS_ASSERT(!cg.blockNode);
 
-        if (!js_FoldConstants(cx, pn, &cg)) {
-            // fprintf(stderr,"3\n");
+        if (!js_FoldConstants(cx, pn, &cg))
             goto out;
-        }
 
         if (cg.functionList) {
-            if (!jsc.analyzeFunctions(cg.functionList, cg.flags)) {
-                // fprintf(stderr,"4\n");
+            if (!jsc.analyzeFunctions(cg.functionList, cg.flags))
                 goto out;
-            }
             cg.functionList = NULL;
         }
 
-        if (!js_EmitTree(cx, &cg, pn)) {
-            // fprintf(stderr,"5\n");
+        if (!js_EmitTree(cx, &cg, pn))
             goto out;
-        }
 #if JS_HAS_XML_SUPPORT
         if (PN_TYPE(pn) != TOK_SEMI ||
             !pn->pn_kid ||
@@ -918,8 +909,6 @@ JSCompiler::compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *cal
         RecycleTree(pn, &cg);
     }
 
-    // fprintf(stderr,"a\n");
-
 #if JS_HAS_XML_SUPPORT
     /*
      * Prevent XML data theft via <script src="http://victim.com/foo.xml">.
@@ -934,7 +923,6 @@ JSCompiler::compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *cal
     }
 #endif
 
-    // fprintf(stderr,"b\n");
     /*
      * Global variables and regexps share the index space with locals. Due to
      * incremental code generation we need to patch the bytecode to adjust the
@@ -983,7 +971,6 @@ JSCompiler::compileScript(JSContext *cx, JSObject *scopeChain, JSStackFrame *cal
     before = sbrk(0);
 #endif
 
-    // fprintf(stderr,"c\n");
     /*
      * Nowadays the threaded interpreter needs a stop instruction, so we
      * do have to emit that here.
@@ -4380,10 +4367,8 @@ Statement(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
 #if JS_HAS_GETTER_SETTER
     if (tt == TOK_NAME) {
         tt = CheckGetterOrSetter(cx, ts, TOK_FUNCTION);
-        if (tt == TOK_ERROR) {
-            // fprintf(stderr,"aa"); 
+        if (tt == TOK_ERROR)
             return NULL;
-        }
     }
 #endif
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smparkes-johnson
 version: !ruby/object:Gem::Version 
-  version: 1.1.2.3
+  version: 1.1.2.4
 platform: ruby
 authors: 
 - John Barnette
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency