Changeset 3083

Timestamp:

12/12/07 16:05:23 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: ensured javascript object wrapper

Location:

lang/javascript/jsruby/trunk

Files:

• src/builtinobjects.js (modified) (2 diffs)
• src/parse.js (modified) (2 diffs)
• tests/jsobject.html (added)
• testsuite.html (modified) (1 diff)

lang/javascript/jsruby/trunk/src/builtinobjects.js

@@ -25 +25 @@
   return undefined;
 };
+RubyEngine.RubyObject.js2r = function(obj){
+  if (obj==undefined) return obj;
+  if (obj==null) return obj; // TODO:
+  var clzname = Object.prototype.toString.call(obj);
+  if (clzname == "[object String]") {
+    return new RubyEngine.RubyObject.String(obj); // string
+  } else if (typeof(obj)=="object" && ("length" in obj)) {
+    // like array (including collection)
+    var ary = []
+    for (var i=0;i<obj.length;i++) ary.push(RubyEngine.RubyObject.js2r(obj[i]));
+    return ary
+  } else if (clzname == "[object Number]") {
+    return new RubyEngine.RubyObject.Numeric(obj); // number
+  } else if (clzname == "[object Boolean]") {
+    return obj; // TODO: boolean
+  } else {
+    return new RubyEngine.RubyObject.JSObject(obj); // others
+  }
+}
 
 
@@ -194 +213 @@
  "method_missing": function(self, args, block) {
     if (args.length==1) {
-      return new RubyEngine.RubyObject.JSObject(self.obj[args[0].str]);
+      return RubyEngine.RubyObject.js2r(self.obj[args[0].str]);
     } else {
       var jsargs = [];
       for (var i=1;i<args.length;i++) jsargs.push( args[i].toValue() );
-      return new RubyEngine.RubyObject.JSObject(self.obj[args[0].str].apply(self.obj, jsargs));
+      return RubyEngine.RubyObject.js2r(self.obj[args[0].str].apply(self.obj, jsargs));
     }
  }

lang/javascript/jsruby/trunk/src/parse.js

@@ -147 +147 @@
         var prim = this.primary2();
   while(prim != undefined) {
-    var y, z;
+    var y, z=null;
     var prebody = this.body;
 
@@ -203 +203 @@
   // Args ( but only Method without arguments and block )
   var y;
-  if (RubyEngine.Node.Method.prototype.isPrototypeOf(prim) && prim.args==null && prim.block==undefined && (y=this.args())!=undefined) prim.args = y;
+  if (RubyEngine.Node.Method.prototype.isPrototypeOf(prim) && prim.args==null && prim.block==undefined && (y=this.args())!=undefined) {console.log(y.toSource());prim.args = y;}
 
   return prim;

lang/javascript/jsruby/trunk/testsuite.html

@@ -13 +13 @@
   newsuite.addTestPage('../tests/if.html');
   newsuite.addTestPage('../tests/range.html');
+  newsuite.addTestPage('../tests/jsobject.html');
   return newsuite;
 }