Changeset 2339

Timestamp:

12/03/07 16:43:25 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: added [] method parsing and string[nth] support

Location:

lang/javascript/jsruby/trunk

Files:

• src/builtinobjects.js (modified) (1 diff)
• src/interpreter.js (modified) (1 diff)
• src/parse.js (modified) (1 diff)
• tests/string.html (modified) (1 diff)

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

@@ -81 +81 @@
     for(var i=self.str.length-1;i>=0;i--) st += self.str.charAt(i);
     return new RubyEngine.RubyObject.String(st);
+  },
+  "[]": function(self, args, block) {
+    return new RubyEngine.RubyObject.Numeric(self.str.charCodeAt(args[0]));
   }
 };

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

@@ -121 +121 @@
     return method.apply(this, [obj, node.args, node.block]);
   } else {
-    alert("undefined method :" + obj.toSource() + "." + nodetree[idx].toSource());
+    alert("undefined method :" + obj.toSource() + "." + node[idx].toSource());
   }
 }

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

@@ -134 +134 @@
 }
 
-//  Primary : Primary2 ('.'Operation ('(' Args ')')? ('{' ('|'Varname'|')? CompStmt '}')? )* 
+// Primary : Primary2 ( '[' Args ']' | '.'Operation ('(' Args ')')? ('{' ('|'Varname'|')? CompStmt '}')? )* 
+// # for removing left recursions of Primary in BNF of Ruby
 RubyEngine.Parser.prototype.primary = function() {
 //console.log(this.body);console.trace();if(!confirm("continue?")) exit();
         var prim = this.primary2();
   while(prim != undefined) {
-                if (!this.body.match(/^[ \t]*\./)) return prim;
-
     var y, z;
     var prebody = this.body;
-                this.body = RegExp.rightContext;
+
+                if (!this.body.match(/^[ \t]*(\.|\[)/)) return prim;
+                this.body = RegExp.rightContext;
+
+    // '[' Args ']'
+    if (RegExp.$1=='[') {
+      y = this.args();
+      if (y==undefined || !this.body.match(/^[ \t]*\]/)) {
+        this.body = prebody;
+        return prim;
+      }
+                this.body = RegExp.rightContext;
+                prim = new RubyEngine.Node.Method('[]', prim, y);
+      continue;
+    }
 
     // '.'Operation

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

@@ -37 +37 @@
 }
 
+function testBrackett() {
+        assertEquals("string[nth] 1", ruby.exec(' "ABC"[0] '), 65);
+        assertEquals("string[nth] 2", ruby.exec(' "ABC"[1] '), 66);
+        //assertEquals("string[nth] 3", ruby.exec(' "ABC"[-1] '), 67);
+}
+
 </script>
 </head>