Changeset 2328

Timestamp:

12/03/07 11:30:58 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: added power operator supported

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/integer.html (modified) (1 diff)
• tests/string.html (modified) (1 diff)

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

@@ -46 +46 @@
 RubyEngine.RubyObject.Numeric.prototype.div = function(x){ return new RubyEngine.RubyObject.Numeric(parseInt(this.num / x.num)); }
 RubyEngine.RubyObject.Numeric.prototype.mod = function(x){ return new RubyEngine.RubyObject.Numeric(this.num % x.num); }
+RubyEngine.RubyObject.Numeric.prototype.pow = function(x){ return new RubyEngine.RubyObject.Numeric(Math.pow(this.num, x.num)); }
 RubyEngine.RubyObject.Numeric.prototype.eql = function(x){ return this.num == x.num; }
 RubyEngine.RubyObject.Numeric.methods = {

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

@@ -85 +85 @@
                                 stk.push(stk.pop().mod(a));
                                 break;
+                        case "**":
+                                var a = stk.pop();
+                                stk.push(stk.pop().pow(a));
+                                break;
                         case "..":
                                 var to = stk.pop();

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

@@ -294 +294 @@
 
 RubyEngine.Parser.prototype.operator = function() {
-        if (this.body.match(/^[ \t]*(\.\.|\+|\-|\*|\/|%|==)/)) {
+        if (this.body.match(/^[ \t]*(\.\.|\+|\-|\*{1,2}|\/|%|==|[<>]=?|&&|\|\||<<|>>)/)) {
                 this.body = RegExp.rightContext;
                 return new RubyEngine.Node.Operator(RegExp.$1);

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

@@ -45 +45 @@
         assertEquals("calc 3", ruby.exec("3-4"), -1);
         assertEquals("calc 4", ruby.exec("3/4"), 0);
-        //assertEquals("calc 5", ruby.exec("3**4"), 81);
+        assertEquals("calc 5", ruby.exec("3**4"), 81);
         assertFalse("calc 6", ruby.exec("3==4") );
         assertTrue("calc 7", ruby.exec("4==4") );

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

@@ -24 +24 @@
 }
 
+function testAdd() {
+        assertEquals("string add 1", ruby.exec(" 'a'+'b' "), "ab");
+        assertEquals("string add 2", ruby.exec(" 'd'+'e'+'f' "), "def");
+        assertEquals("string add 3", ruby.exec(" x='u'+'b'; \"r\"+x+\"y\" "), "ruby");
+}
+
 function testReverse() {
         assertEquals("reverse 1", ruby.exec(' "a".reverse '), "a");