Changeset 3261

Timestamp:

12/18/07 12:46:51 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: added parsing 'def'

Location:

lang/javascript/jsruby/trunk/src

Files:

• head.js (modified) (1 diff)
• interpreter.js (modified) (1 diff)
• parse.js (modified) (9 diffs)

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

@@ -40 +40 @@
 RubyEngine.RESERVED = {
   "if":true, "then":true, "elsif":true, "else":true, "end":true,
-  "while":true, "unless":true, "until":true,
+  "while":true, "unless":true, "until":true, "def":true,
   "nil":true
 }

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

@@ -104 +104 @@
                 } else if (RubyEngine.Node.Operator.prototype.isPrototypeOf(x)) {
                         switch (x.name) {
-                        case "neg":
+                        case "-@":
                                 stk.push(stk.pop().neg());
                                 break;

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

@@ -12 +12 @@
 RubyEngine.Parser.prototype.compstmt = function() {
         var x;
+        while(this.term());
         if ((x=this.stmt())==undefined) return undefined;
         var ret = [x];
@@ -141 +142 @@
 }
 
-// Primary : ('-'|'+') Primary | Primary2 ( '[' Args ']' | '.'Operation ('(' Args ')')? ('{' ('|'Varname'|')? CompStmt '}')? )* Args?
-// # for removing left recursions of Primary in BNF of Ruby
+// Primary : ('-'|'+') Primary 
+//      | Primary2 ( '['Args']' | '.'Operation ('('Args')')? ('{' ('|'Varname'|')? CompStmt '}')? )* Args?
 RubyEngine.Parser.prototype.primary = function() {
 //console.log(this.body);console.trace();if(!confirm("continue?")) exit();
@@ -151 +152 @@
         if ((y=this.primary())!=undefined) {
       if (x=='+') return y;
-                return new RubyEngine.Node.Expression([new RubyEngine.Node.Operator('neg'), y]);
-    }
-                this.body = prebody;
-  }
+                return new RubyEngine.Node.Expression([new RubyEngine.Node.Operator('-@'), y]);
+    }
+                this.body = prebody;
+  }
+
         var prim = this.primary2();
   while(prim != undefined) {
@@ -198 +200 @@
                         prebody = this.body;
                         this.body = RegExp.rightContext;
-                        y = this.blockvars();
-                        while(this.term());
+                        y=this.blockvars();  // it is maybe 'undefined'
       z=this.compstmt();
       if (z==undefined) z=null;
@@ -219 +220 @@
 
 //  Primary2: '(' Expr ')' | Literal | Reference | '[' Args ']'
-//         if Arg Then CompStmt (elsif Arg Then CompStmt)* (else CompStmt)? end
+//        | if Arg Then CompStmt (elsif Arg Then CompStmt)* (else CompStmt)? end
+//        | def Operation ArgDecl CompStmt end
 //  Literal: / $INT:push | $JS_STRING:push /,
 RubyEngine.Parser.prototype.primary2 = function() {
@@ -271 +273 @@
                 x = RegExp.$1;
                 if ((y = this.arg())!=undefined && this.then()) {
-                        while (this.term());
                         if (z=this.compstmt()) {
                           var args = [y, z];
@@ -278 +279 @@
                                         this.body = RegExp.rightContext;
                                         if ((y = this.arg()) && this.then()) {
-                                                while (this.term());
                                                 if (!(z=this.compstmt())) { this.body = prebody2; break; }
                                                 args.push(y, z)
@@ -286 +286 @@
                                         var prebody2 = this.body;
                                         this.body = RegExp.rightContext;
-                                        while (this.term());
                                         if (z=this.compstmt()) { 
                                                 args.push(true, z)
@@ -301 +300 @@
                 this.body = prebody;
         }
-        return undefined;
+
+  // def Fname ArgDecl CompStmt end
+        if (this.body.match(/^[ \t]*def/)) {
+                this.body=RegExp.rightContext;
+                x=this.operation();
+                y=this.argdecl();
+                z=this.compstmt();
+                if(x!=undefined && z!=undefined && this.body.match(/^[ \s]*(end)/)) {
+                        this.body = RegExp.rightContext;
+                ret = new RubyEngine.Node.Method("def", null, [new RubyEngine.RubyObject.String(x)]);
+                ret.block = new RubyEngine.Node.Block(y, z);
+                return ret;
+    }
+                this.body = prebody;
+        }
+
+        return undefined;
+}
+
+// ArgDecl : `(' ArgList `)' | ArgList Term
+RubyEngine.Parser.prototype.argdecl = function() {
+//console.log(this.body);console.trace();if(!confirm("continue?")) exit();
+  var x;
+        var prebody = this.body;
+        if (this.body.match(/^[ \t]*\(/)) {
+    this.body=RegExp.rightContext;
+    if ((x=this.arglist())!=undefined && this.body.match(/^[ \t]*\)/) ) {
+      this.body=RegExp.rightContext;
+      return x;
+    }
+  } else {
+    if ((x=this.arglist())!=undefined && this.term() ) return x;
+  }
+  this.body=prebody;
+        return undefined;
+}
+
+// ArgList : varname(`,'varname)*[`,'`*'[varname]][`,'`&'varname] | `*'varname[`,'`&'varname] | [`&'varname]
+RubyEngine.Parser.prototype.arglist = function() {
+  var x;
+  if ((x=this.varname())==undefined) return [];
+  var ret=[x], prebody=this.body;
+  while (this.body.match(/^[ \t]*,/)) {
+    prebody=this.body;
+    this.body=RegExp.rightContext;
+    if ((x=this.varname())==undefined) break;
+    ret.push(x);
+  }
+  this.body=prebody;
+  return ret;
 }