Changeset 5141 for lang/javascript

Timestamp:

01/21/08 02:30:33 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: fixed some bugs (experimentally)

Location:

lang/javascript/jsruby/trunk

Files:

• src/smachine.js (modified) (4 diffs)
• tests/jsobject.html (modified) (2 diffs)

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

@@ -8 +8 @@
 
         this.command = [];
-        this.stack = [];
+        this.stack = [null];
 
   // patch
@@ -48 +48 @@
     if (block.vars) b.varname = block.vars[0].name;
     this.command.push(b);
+    return self;
   }
 }
@@ -62 +63 @@
       this.command.push(self);
       this.command.push("popLevel");
-      this.command.push(this.compile(self.block.block));
+      this.compile(self.block.block);
     }
   }
@@ -184 +185 @@
                 if (Array.prototype.isPrototypeOf(x)) {
       if (x.length==1) {
-        this.command.push( this.compile(x[0]) );
+        this.stack.pop();  // anxious...
+        this.compile(x[0]);
       } else {
                         this.command.push( new RubyEngine.SMachine.Iterator(x) );

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

@@ -20 +20 @@
 def test2(x)
   x.new 2
+end
+
+def test3(x)
+  x.bar = 3
 end
 
@@ -45 +49 @@
 }
 
+function testSetProperty() {
+        var foo = {}
+        ruby.test3(foo);
+        assertEquals("set property 1", foo.bar, 3);
+}
+
 </script>
 </head>