Changeset 2991

Timestamp:

12/10/07 17:59:32 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: added class method (i.e. Array.new) support

Location:

lang/javascript/jsruby/trunk

Files:

• src/interpreter.js (modified) (3 diffs)
• tests/array.html (modified) (1 diff)

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

@@ -2 +2 @@
 
 RubyEngine.Scope = function(){ this.clear(); }
-RubyEngine.Scope.copy = function(scope, src) {
-  for(var i in src) scope[i] = src[i];
-  return scope;
-}
 
 RubyEngine.Scope.prototype.clear = function(){
   this.level = [{}]
   this.stack = []
-  this.global = RubyEngine.Scope.copy({}, RubyEngine.Interpreter.KernelMethod)
+  this.global = {}
+  for(var i in RubyEngine.Interpreter.KernelMethod) {
+    if (i.match(/^[a-z_]/)) this.global[i] = RubyEngine.Interpreter.KernelMethod[i];
+  }
+  for(var i in RubyEngine.RubyObject) {
+    if (i.match(/^[A-Z\$]/)) this.global[i] = RubyEngine.RubyObject[i];
+  }
 }
 RubyEngine.Scope.prototype.substitute = function(name, value){
@@ -51 +53 @@
 
 RubyEngine.Interpreter.prototype.run = function(node){
-//console.log(args[idx].toSource());console.trace();if(!confirm("continue?")) exit();
+//console.log(node.toSource());console.trace();if(!confirm("continue?")) exit();
         var ret = null;
         if (Array.prototype.isPrototypeOf(node)) {
@@ -146 +148 @@
 }
 RubyEngine.Interpreter.prototype.objectMethod = function(node){
-//console.log(node.toSource());console.trace();if(!confirm("continue?")) exit();
-  var obj = this.run(node.target);
+//console.log(node.toSource());console.dir(node);console.trace();if(!confirm("continue?")) exit();
+  var obj;
+  if (RubyEngine.Node.Ref.prototype.isPrototypeOf(node.target)) {
+    obj = this.scope.reference(node.target.name);
+  } else {
+    obj = this.run(node.target);
+  }
   var method = obj.clz.methods[node.name];
   if (method) {

lang/javascript/jsruby/trunk/tests/array.html

@@ -25 +25 @@
 }
 
+function testArrayNew() {
+        assertArrayEquals("array new 1", ruby.exec(" Array.new() "), []);
+        assertArrayEquals("array new 2", ruby.exec(" Array.new(1) "), [1]);
+        assertArrayEquals("array new 3", ruby.exec(" Array.new(1, 2, 3) "), [1, 2, 3]);
+        assertArrayEquals("array new 4", ruby.exec(" Array.new([1, 2], Array.new(3, 4)) "), [[1, 2], [3, 4]]);
+        assertArrayEquals("array new 5", ruby.exec(" Array.new(1, '2', 3) "), [1, '2', 3]);
+}
+
 function testBrackett() {
         ruby.exec(' a=["x", "y", "z"] ')