Changeset 4221 for lang/javascript/jsruby

Timestamp:

01/08/08 19:26:12 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: enabled to pass function objects from javascript and to use 'new'

Location:

lang/javascript/jsruby/trunk/src

Files:

• builtinobjects.js (modified) (1 diff)
• interpreter.js (modified) (2 diffs)

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

@@ -299 +299 @@
 RubyEngine.RubyObject.JSObject.prototype.toValue = function(){ return this.obj; }
 RubyEngine.RubyObject.JSObject.methods = {
- "method_missing": function(self, args, block) {
+  "new": function(self, args, block) {
+    var jsargs = [];
+    if(args) for (var i=1;i<args.length;i++) jsargs.push( this.run(args[i]).toValue() );
+    return RubyEngine.RubyObject.js2r(new self.obj());
+  },
+  "method_missing": function(self, args, block) {
     var name = this.run(args[0]).str;
     if (args.length==1) {
       return RubyEngine.RubyObject.js2r(self.obj[name]);
     } else if (name[name.length-1] == "=") {
-      self.obj[name.slice(0, name.length-1)] = this.run(args[1]).toValue();
+      var v=this.run(args[1])
+      self.obj[name.slice(0, name.length-1)] = v.toValue();
+      return v;
     } else {
       if (name in self.obj) {

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

@@ -46 +46 @@
   if (typeof(ref) == "function") {
     return ref.apply(this, [args, block]);
+  } else if (RubyEngine.RubyObject.JSObject.prototype.isPrototypeOf(ref)) {
+    return RubyEngine.RubyObject.js2r(ref.obj.apply(ref.obj, args));
   } else if (RubyEngine.Node.Block.prototype.isPrototypeOf(ref)) {
     var block = ref;
@@ -193 +195 @@
 
 RubyEngine.Interpreter.prototype.kernelMethod = function(node){
-  var method = RubyEngine.Interpreter.KernelMethod[node.name];
+  //var method = RubyEngine.Interpreter.KernelMethod[node.name];
+  var method = this.scope.reference(node.name);
   if (typeof(method)=="function") {
     return method.apply(this, [node.args, node.block]);