johnson 2.0.0.pre2 → 2.0.0.pre3

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 2.0.0.pre3 / 2010-03-02
+
+* convert/protect predicates so that exceptions don't cause stack-jumping SEGVs
+* various cleanup of ext functions
+* convert runtime size parameter correctly
+
 === 2.0.0.pre2 / 2010-02-23
 
 * Raise NoMemoryError as appropriate; acccept a size parameter or env variable for runtime size

data/ext/tracemonkey/js.cc

@@ -101,13 +101,13 @@ split_addProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         uintN attrs = 0;
         JSBool found;
 
-        JS_GetPropertyAttrsGetterAndSetterById(cx, obj, id, &attrs, &found, &getter, &setter);
-
-        if (!JS_ValueToId(cx, *vp, &asId)) {
+        if (!JS_ValueToId(cx, id, &asId)) {
             return JS_FALSE;
         }
         
-        return JS_DefinePropertyById(cx, cpx->inner, id, asId, getter, setter, attrs | JSPROP_ENUMERATE);
+        JS_GetPropertyAttrsGetterAndSetterById(cx, obj, asId, &attrs, &found, &getter, &setter);
+
+        return JS_DefinePropertyById(cx, cpx->inner, asId, *vp, getter, setter, attrs | JSPROP_ENUMERATE);
     }
     return JS_TRUE;
 }

data/ext/tracemonkey/js_land_proxy.cc

@@ -99,35 +99,61 @@ JSBool call_ruby_from_js2(JohnsonRuntime* runtime, VALUE* retval, VALUE self, ID
   return okay;
 }
 
-static bool autovivified_p(VALUE UNUSED(ruby_context), VALUE self, char* name)
+static VALUE autovivified_p(VALUE self, VALUE name, ID id);
+
+DECLARE_RUBY_WRAPPER(autovivified_p, VALUE self; VALUE name; ID id);
+DEFINE_RUBY_WRAPPER(autovivified_p, autovivified_p, ARGLIST3(self, name, id));
+
+static VALUE autovivified_p(VALUE self, VALUE name, ID UNUSED(id))
 {
   return RTEST(rb_funcall(Johnson_TraceMonkey_JSLandProxy(), rb_intern("autovivified?"), 2,
-    self, rb_str_new2(name)));
+    self, name)) ? Qtrue : Qfalse;
 }
 
-static bool const_p(VALUE self, char* name)
+static VALUE const_p(VALUE self, VALUE name, ID id);
+
+DECLARE_RUBY_WRAPPER(const_p, VALUE self; VALUE name; ID id);
+DEFINE_RUBY_WRAPPER(const_p, const_p, ARGLIST3(self, name, id));
+
+static VALUE const_p(VALUE self, VALUE UNUSED(name), VALUE id)
 {
-  return rb_obj_is_kind_of(self, rb_cModule)
-    && rb_is_const_id(rb_intern(name))
-    && RTEST( rb_funcall(self, rb_intern("const_defined?"), 1, ID2SYM(rb_intern(name))) );
+  
+  return (rb_obj_is_kind_of(self, rb_cModule)
+    && rb_is_const_id(id)
+    && RTEST( rb_funcall(self, rb_intern("const_defined?"), 1, ID2SYM(id) )))  ? Qtrue : Qfalse;
 }
 
-static bool global_p(char* name)
+static VALUE global_p(VALUE name);
+
+DECLARE_RUBY_WRAPPER(global_p, VALUE name);
+DEFINE_RUBY_WRAPPER(global_p, global_p, ARGLIST1(name));
+
+static VALUE global_p(VALUE name)
 {
-  return *name == '$' && rb_ary_includes(rb_f_global_variables(), rb_str_new2(name));
+  return (*StringValuePtr(name) == '$' && rb_ary_includes(rb_f_global_variables(), name)) ? Qtrue : Qfalse;
 }
 
-static bool method_p(VALUE self, char* name)
+static VALUE method_p(VALUE self, VALUE name, ID id);
+
+DECLARE_RUBY_WRAPPER(method_p, VALUE self; VALUE name; ID id);
+DEFINE_RUBY_WRAPPER(method_p, method_p, ARGLIST3(self, name, id));
+
+static VALUE method_p(VALUE self, VALUE UNUSED(name), ID id)
 {
-  return RTEST( rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern(name))) );
+  return (RTEST( rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(id) ) )) ? Qtrue : Qfalse;
 }
 
-static bool attribute_p(VALUE self, char* name)
+static VALUE attribute_p(VALUE self, VALUE name, ID id);
+
+DECLARE_RUBY_WRAPPER(attribute_p, VALUE self; VALUE name; ID id);
+DEFINE_RUBY_WRAPPER(attribute_p, attribute_p, ARGLIST3(self, name, id));
+
+static VALUE attribute_p(VALUE self, VALUE name, ID id)
 {
-  if (!method_p(self, name))
-    return false;
+  if (!method_p(self, name, id))
+    return Qfalse;
 
-  VALUE rb_id = rb_intern(name);
+  VALUE rb_id = id;
   VALUE rb_method = rb_funcall(self, rb_intern("method"), 1, ID2SYM(rb_id));
 
   if (TYPE(rb_method) == T_DATA)
@@ -139,50 +165,56 @@ static bool attribute_p(VALUE self, char* name)
       Data_Get_Struct(rb_method, METHOD, method);
 
       if (method && nd_type(method->body) == NODE_IVAR)
-        return true;
+        return Qtrue;
     }
   }
 
-  return RTEST(rb_funcall(Johnson_TraceMonkey_JSLandProxy(),
-    rb_intern("js_property?"), 2, self, ID2SYM(rb_id)));
+  return (RTEST(rb_funcall(Johnson_TraceMonkey_JSLandProxy(),
+    rb_intern("js_property?"), 2, self, ID2SYM(rb_id)))) ? Qtrue : Qfalse;
 }
 
-static bool indexable_p(VALUE self)
+static VALUE indexable_p(VALUE self);
+
+DECLARE_RUBY_WRAPPER(indexable_p, VALUE self);
+DEFINE_RUBY_WRAPPER(indexable_p, indexable_p, ARGLIST1(self));
+
+static VALUE indexable_p(VALUE self)
 {
-  return RTEST(rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]"))));
+  return (RTEST(rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]"))))) ? Qtrue : Qfalse;
 }
 
-static bool has_key_p(VALUE self, char* name)
+static VALUE has_key_p(VALUE self, VALUE name, ID id);
+
+DECLARE_RUBY_WRAPPER(has_key_p, VALUE self; VALUE name; ID id);
+DEFINE_RUBY_WRAPPER(has_key_p, has_key_p, ARGLIST3(self, name, id));
+
+static VALUE has_key_p(VALUE self, VALUE name, ID UNUSED(id))
 {
-  return RTEST(rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]"))))
+  return (RTEST(rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]"))))
     && RTEST(rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("key?"))))
-    && RTEST(rb_funcall(self, rb_intern("key?"), 1, rb_str_new2(name)));
+    && RTEST(rb_funcall(self, rb_intern("key?"), 1, name))) ? Qtrue : Qfalse;
 }
 
-static bool respond_to_p(JSContext* js_context, JSObject* obj, char* name)
-{
-  VALUE ruby_context = (VALUE)JS_GetContextPrivate(js_context);
-
-  JohnsonContext* context;
-  Data_Get_Struct(ruby_context, JohnsonContext, context);
-
-  VALUE self = (VALUE)JS_GetInstancePrivate(
-    context->js, obj, JS_GET_CLASS(context->js, obj), NULL);
+static VALUE respond_to_p(VALUE self, VALUE name, ID id);
 
-  if (!self) return false;
+DECLARE_RUBY_WRAPPER(respond_to_p, VALUE self; VALUE name; ID id);
+DEFINE_RUBY_WRAPPER(respond_to_p, respond_to_p, ARGLIST3(self, name, id));
 
-  return autovivified_p(ruby_context, self, name)
-    || const_p(self, name)
+static VALUE respond_to_p(VALUE self, VALUE name, ID id)
+{
+  return (autovivified_p(self, name, id)
+    || const_p(self, name, id)
     || global_p(name)
-    || attribute_p(self, name)
-    || method_p(self, name)
-    || has_key_p(self, name);
+    || attribute_p(self, name, id)
+    || method_p(self, name, id)
+    || has_key_p(self, name, id)) ? Qtrue : Qfalse;
 }
 
-static jsval evaluate_js_property_expression(JohnsonRuntime * runtime, const char * property, jsval* retval) {
-  JSContext * context = johnson_get_current_context(runtime);
+static jsval evaluate_js_property_expression(JohnsonRuntime * runtime,
+                                                   JSContext * js_context,
+                                                   const char * property, jsval* retval) {
   assert(strlen(property) < INT_MAX);
-  return JS_EvaluateScript(context, runtime->global,
+  return JS_EvaluateScript(js_context, runtime->global,
       property, (unsigned int)strlen(property), "johnson:evaluate_js_property_expression", 1,
       retval);
 }
@@ -213,7 +245,8 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
   
   if (JSVAL_IS_INT(id))
   {
-    if (indexable_p(self)) {
+    if (CALL_RUBY_WRAPPER(indexable_p, self))
+    {
       VALUE idx = INT2FIX(JSVAL_TO_INT(id));
       JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("[]"), 1, idx));
     }
@@ -222,19 +255,20 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
   }
   
   char* name = JS_GetStringBytes(JSVAL_TO_STRING(id));
-  VALUE ruby_id = rb_intern(name);
+  VALUE name_value = rb_str_new2(name);
+  VALUE ruby_id = rb_to_id(name_value);
 
   // FIXME: we should probably just JS_DefineProperty this, and it shouldn't be enumerable
   
   if (!strcasecmp("__iterator__", name)) {
-    JCHECK(evaluate_js_property_expression(runtime, "Johnson.Generator.create", retval));
+    JCHECK(evaluate_js_property_expression(runtime, js_context, "Johnson.Generator.create", retval));
   }
   
   // if the Ruby object has a dynamic js property with a key
   // matching the property we're looking for, pull the value out of
   // that map.
   
-  else if (autovivified_p(ruby_context, self, name))
+  else if (CALL_RUBY_WRAPPER(autovivified_p, self, name_value, ruby_id))
   {
     JCHECK(call_ruby_from_js(runtime, retval, Johnson_TraceMonkey_JSLandProxy(),
       rb_intern("autovivified"), 2, self, rb_str_new2(name)));
@@ -243,14 +277,14 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
   // if the Ruby object is a Module or Class and has a matching
   // const defined, return the converted result of const_get
   
-  else if (const_p(self, name))
+  else if (CALL_RUBY_WRAPPER(const_p, self, name_value, ruby_id))
   {
     JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("const_get"),
       1, ID2SYM(ruby_id)));
   }  
 
   // otherwise, if it's a global, return the global
-  else if (global_p(name))
+  else if (CALL_RUBY_WRAPPER(global_p, name_value))
   {
     JCHECK(convert_to_js(runtime, rb_gv_get(name), retval));
   }
@@ -258,7 +292,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
   // otherwise, if the Ruby object has a an attribute method matching
   // the property we're trying to get, call it and return the converted result
   
-  else if (attribute_p(self, name))
+  else if (CALL_RUBY_WRAPPER(attribute_p, self, name_value, ruby_id))
   {
     JCHECK(call_ruby_from_js(runtime, retval, self, ruby_id, 0));
   }
@@ -266,7 +300,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
   // otherwise, if the Ruby object quacks sorta like a hash (it responds to
   // "[]" and "key?"), index it by key and return the converted result
   
-  else if (has_key_p(self, name))
+  else if (CALL_RUBY_WRAPPER(has_key_p, self, name_value, ruby_id))
   {
     JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("[]"), 1, rb_str_new2(name)));
   }
@@ -277,7 +311,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
   // FIXME: this should really wrap the Method  for 'name' in a JS class
   // rather than generating a wrapper Proc
   
-  else if (method_p(self, name))
+  else if (CALL_RUBY_WRAPPER(method_p, self, name_value, ruby_id))
   {
     JCHECK(call_ruby_from_js(runtime, retval, self, rb_intern("method"), 1, rb_str_new2(name)));
   }
@@ -319,7 +353,7 @@ static JSBool set(JSContext* js_context, JSObject* obj, jsval id, jsval* value)
   
   if (JSVAL_IS_INT(id))
   {
-    if (indexable_p(self))
+    if (CALL_RUBY_WRAPPER(indexable_p, self))
     {
       VALUE idx = INT2FIX(JSVAL_TO_INT(id));
       VALUE val = CONVERT_TO_RUBY(runtime, *value);
@@ -403,11 +437,17 @@ static JSBool resolve(JSContext *js_context, JSObject *obj, jsval id, uintN UNUS
   PREPARE_JROOTS(js_context, 1);
   JROOT(id);
   
-  char* name = JS_GetStringBytes(JS_ValueToString(js_context, id));
+  VALUE self =
+    (VALUE)JS_GetInstancePrivate(js_context, obj, JS_GET_CLASS(js_context, obj), NULL);
 
-  if (respond_to_p(js_context, obj, name))
+  char* cname = JS_GetStringBytes(JS_ValueToString(js_context, id));
+
+  VALUE name = rb_str_new2(cname);
+  ID ruby_id = rb_intern(cname);
+
+  if (CALL_RUBY_WRAPPER(respond_to_p, self, name, ruby_id))
   {
-    JCHECK(JS_DefineProperty(js_context, obj, name, JSVAL_VOID,
+    JCHECK(JS_DefineProperty(js_context, obj, cname, JSVAL_VOID,
         get_and_destroy_resolved_property, set, JSPROP_ENUMERATE));
 
     *objp = obj;
@@ -512,8 +552,9 @@ static JSBool call(JSContext* js_context, JSObject* UNUSED(obj), uintN argc, jsv
 
 bool js_value_is_proxy(JohnsonRuntime* MAYBE_UNUSED(runtime), jsval maybe_proxy)
 {
+  JSContext* js_context = johnson_get_current_context(runtime);
   JSClass* klass = JS_GET_CLASS(
-      johnson_get_current_context(runtime),
+      js_context,
       JSVAL_TO_OBJECT(maybe_proxy));  
   
   return &JSLandProxyClass == klass
@@ -565,7 +606,7 @@ JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval)
   PREPARE_JROOTS(context, 2);
 
   jsval johnson = JSVAL_NULL;
-  JCHECK(evaluate_js_property_expression(runtime, "Johnson", &johnson));
+  JCHECK(evaluate_js_property_expression(runtime, context, "Johnson", &johnson));
   JROOT(johnson);
 
   if (base_value)
@@ -618,3 +659,8 @@ JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval)
     JRETURN;
   }
 }
+
+// Local Variables:
+// c-basic-offset:2
+// tab-width:2
+// End:

data/ext/tracemonkey/runtime.cc

@@ -19,6 +19,7 @@ static VALUE global(VALUE self)
 {
   JohnsonRuntime* runtime;
   Data_Get_Struct(self, JohnsonRuntime, runtime);
+  JSContext * context = johnson_get_current_context(runtime);
   return convert_to_ruby(runtime, OBJECT_TO_JSVAL(runtime->global));
 }
 
@@ -27,10 +28,8 @@ static VALUE new_global(VALUE self)
   JohnsonRuntime* runtime;
   Data_Get_Struct(self, JohnsonRuntime, runtime);
   JSContext * context = johnson_get_current_context(runtime);
-
-  PREPARE_RUBY_JROOTS(context, 0);
   JSObject* obj = johnson_create_global_object(context);
-  JRETURN_RUBY(convert_to_ruby(runtime, OBJECT_TO_JSVAL(obj)));
+  return convert_to_ruby(runtime, OBJECT_TO_JSVAL(obj));
 }
 
 static VALUE new_split_global_outer(VALUE self)
@@ -38,12 +37,8 @@ static VALUE new_split_global_outer(VALUE self)
   JohnsonRuntime* runtime;
   Data_Get_Struct(self, JohnsonRuntime, runtime);
   JSContext * context = johnson_get_current_context(runtime);
-
-  PREPARE_RUBY_JROOTS(context, 0);
-
   JSObject* new_split_global_outer_object = johnson_create_split_global_outer_object(context);
-
-  JRETURN_RUBY(convert_to_ruby(runtime, OBJECT_TO_JSVAL(new_split_global_outer_object)));
+  return convert_to_ruby(runtime, OBJECT_TO_JSVAL(new_split_global_outer_object));
 }
 
 static VALUE new_split_global_inner(VALUE self, VALUE ruby_outer)
@@ -51,17 +46,10 @@ static VALUE new_split_global_inner(VALUE self, VALUE ruby_outer)
   JohnsonRuntime* runtime;
   Data_Get_Struct(self, JohnsonRuntime, runtime);
   JSContext * context = johnson_get_current_context(runtime);
-
-  PREPARE_RUBY_JROOTS(context, 1);
-
   jsval outer;
-
-  JCHECK(convert_to_js(runtime,ruby_outer,&outer));
-  JROOT(outer);
-
+  convert_to_js(runtime,ruby_outer,&outer);
   JSObject* new_inner_object = johnson_create_split_global_inner_object(context,JSVAL_TO_OBJECT(outer));
-  
-  JRETURN_RUBY(convert_to_ruby(runtime, OBJECT_TO_JSVAL(new_inner_object)));
+  return convert_to_ruby(runtime, OBJECT_TO_JSVAL(new_inner_object));
 }
 
 static VALUE seal(VALUE self, VALUE ruby_object, VALUE deep)
@@ -75,11 +63,11 @@ static VALUE seal(VALUE self, VALUE ruby_object, VALUE deep)
   jsval object;
 
   JCHECK(convert_to_js(runtime,ruby_object,&object));
-  JROOT(object);
 
-  JSBool ok = JS_SealObject(context, JSVAL_TO_OBJECT(object), deep == Qfalse || deep == Qnil ? JS_FALSE : JS_TRUE);
+  JROOT(object);
 
-  JRETURN_RUBY(convert_to_ruby(runtime, ok ? JSVAL_TRUE : JSVAL_FALSE));
+  JCHECK(JS_SealObject(context, JSVAL_TO_OBJECT(object), RTEST(deep) ? JS_TRUE : JS_FALSE));
+  JRETURN_RUBY(Qtrue);
 }
 
 static JSTrapStatus trap_handler( JSContext *context,
@@ -253,7 +241,8 @@ static VALUE evaluate_compiled_script(VALUE self, VALUE compiled_script, VALUE r
     return Qnil;
   }
 
-  return convert_to_ruby(runtime, js);
+  PREPARE_RUBY_JROOTS(context, 0);
+  JRETURN_RUBY(CONVERT_TO_RUBY(runtime, js));
 }
 
 #ifdef JS_GC_ZEAL
@@ -525,7 +514,7 @@ void init_Johnson_TraceMonkey_Runtime(VALUE tracemonkey)
   rb_define_private_method(klass, "initialize_native", (ruby_callback)initialize_native, 2);
 
   rb_define_method(klass, "global", (ruby_callback)global, 0);
-  rb_define_method(klass, "new_global", (ruby_callback)global, 0);
+  rb_define_method(klass, "new_global", (ruby_callback)new_global, 0);
 
   rb_define_method(klass, "new_split_global_outer", (ruby_callback)new_split_global_outer, 0);
   rb_define_method(klass, "new_split_global_inner", (ruby_callback)new_split_global_inner, 1);

data/lib/johnson.rb

@@ -16,7 +16,7 @@ require "johnson/visitors"
 require "johnson/nodes"
 
 module Johnson
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre3"
 
   def self.version
     VERSION

data/lib/johnson/js/prelude.js

@@ -157,7 +157,10 @@ this.__defineGetter__("__FILE__", function() {
 
 Johnson.getStack = function() {
   try { throw new Error; } catch(e) {
-    return e.stack.replace(/(.*\n){3}/, '');
+    return e.stack.
+      replace(/^Error\(\)@:0\n/,"").
+      replace(/^\(\)@[^\n]*prelude\.js[^\n]*\n/,"").
+      replace(/^@:0\n/,"");
   }
 };
 

data/lib/johnson/tracemonkey/runtime.rb

@@ -12,7 +12,7 @@ module Johnson #:nodoc:
         @debugger = nil
         @gcthings = {}
         @traps = []
-        size = (options[:size] || options["size"] || ENV["JOHNSON_HEAP_SIZE"] || 0x2000000).to_i
+        size = (options[:size] || options["size"] || Integer(ENV["JOHNSON_HEAP_SIZE"] || 0x2000000))
         options.delete(:size)
         initialize_native(size, options)
         super()

data/test/johnson/tracemonkey/ruby_land_proxy_test.rb

@@ -252,23 +252,12 @@ module Johnson
         assert_equal(3, z)
       end
 
-      # FIXME: If you uncomment this test, we get this error:
-      #
-      # JS API usage error: the address passed to JS_AddNamedRoot currently holds an
-      # invalid jsval.  This is usually caused by a missing call to JS_RemoveRoot.
-      # The root's name is "ruby_land_proxy.c[210]:native_call: proxy_value".
-      # Assertion failure: root_points_to_gcArenaList, at jsgc.c:2618
-      # 
-      # WTF?
-      #
-      # -Aaron
-      #
-      #def test_throwing_in_js_goes_to_ruby
-      #  func = @runtime.evaluate('function () { throw "foo"; }')
-      #  assert_raise(Johnson::Error) {
-      #    func.call
-      #  }
-      #end
+      def test_throwing_in_js_goes_to_ruby
+        func = @runtime.evaluate('function () { throw "foo"; }')
+        assert_raise(Johnson::Error) {
+          func.call
+        }
+      end
     end
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - pre2
-  version: 2.0.0.pre2
+  - pre3
+  version: 2.0.0.pre3
 platform: ruby
 authors: 
 - John Barnette
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency