Changeset 2310 for lang/javascript/jsruby

Timestamp:

12/03/07 00:58:09 (6 years ago)

Author:

tokuhirom

Message:

lang/ruby/javascript: support more literal type :)

Location:

lang/javascript/jsruby/trunk

Files:

• src/parse.js (modified) (2 diffs)
• tests/integer.html (modified) (1 diff)

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

@@ -202 +202 @@
                 this.body = prebody;
         }
-        if (this.body.match(/^[ \t]*(0x[0-9A-Fa-f]+|0b([01]+)|[0-9]+)/)) {
+        if (this.body.match(/^[ \t]*(0x[0-9A-F]+|0b([01]+)|0o?[0-7]+|(?:0d)?[0-9]+)/i)) {
                 this.body = RegExp.rightContext;
     var i;
@@ -208 +208 @@
                   i = parseInt(RegExp.$2, 2);
     } else {
-                  i = parseInt(RegExp.$1);
+                  i = parseInt(RegExp.$1.replace(/^0d/i, '').replace(/^0o/i, '0'));
     }
                 return new RubyEngine.RubyObject.Numeric(i);

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

@@ -18 +18 @@
 function testLiteral() {
         assertEquals("hex", ruby.exec("0xfc84"),  64644);
+        assertEquals("hex", ruby.exec("0XFC84"),  64644);
+
         assertEquals("dec", ruby.exec("52525"),  52525);
+        assertEquals("dec", ruby.exec("0d52525"),  52525);
+        assertEquals("dec", ruby.exec("0D52525"),  52525);
+
         assertEquals("oct", ruby.exec("0744"),  484);
+        assertEquals("oct", ruby.exec("0o744"),  484);
+        assertEquals("oct", ruby.exec("0O744"),  484);
+
         assertEquals("bin", ruby.exec("0b01101001"),  105);
+        assertEquals("bin", ruby.exec("0B01101001"),  105);
 }