Changeset 2337 for lang/javascript/jsruby

Timestamp:

12/03/07 16:08:52 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby/trunk/src/parse.js : tidied up some of the code

Files:

• lang/javascript/jsruby/trunk/src/parse.js (modified) (7 diffs)

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

@@ -11 +11 @@
 //  CompStmt: Stmt (Term+ Stmt)*
 RubyEngine.Parser.prototype.compstmt = function() {
-        var x, y;
-        x=this.stmt();
-        if (x==null || typeof(x)=="undefined") return undefined;
+        var x;
+        if ((x=this.stmt())==undefined) return undefined;
         var ret = [x];
         var prebody = this.body;
-        while (x=this.term()) {
+        while (this.term()) {
                 while(this.term());
-                if (!(y=this.stmt())) break;
+                if (!(x=this.stmt())) break;
                 prebody = this.body;
-                ret.push(y);
+                ret.push(x);
         }
         this.body = prebody;
@@ -34 +33 @@
 RubyEngine.Parser.prototype.expr = function() {
         var x, y;
-        x=this.expr2();
-        if (x==null || typeof(x)=="undefined") return undefined;
+        if ((x=this.expr2())==undefined) return undefined;
         var ret = [x]
         while (this.body.match(/^[ \t]*(if|unless|while|until)/)) {
@@ -52 +50 @@
 //  Expr2: Command | Arg 
 RubyEngine.Parser.prototype.expr2 = function() {
-        var x, y, z;
-        var prebody = this.body;
-        if (x=this.command()) return x;
-  x=this.arg()
-        if (x!=null && typeof(x)!="undefined") return x;
-        this.body = prebody;
+        var x;
+        if ((x=this.command())!=undefined) return x;
+        if ((x=this.arg())!=undefined) return x;
         return undefined;
 }
@@ -69 +64 @@
                 this.body=prebody;
         }
-  x=this.primary()
-        if (x!=null && typeof(x)!="undefined") {
+
+        if ((x=this.primary())!=undefined) {
                 if (this.body.match(/^[ \t]*\./)) {
                         this.body = RegExp.rightContext;
@@ -88 +83 @@
 RubyEngine.Parser.prototype.args = function() {
         var x, y;
-        if (!(x=this.arg())) return undefined;
+        if ((x=this.arg())==undefined) return undefined;
         var ret = [x];
         var prebody = this.body;
@@ -110 +105 @@
                 this.body=prebody;
         }
-        x=this.primary();
-        if (x!=null && typeof(x)!="undefined") {
+
+        if ((x=this.primary())!=undefined) {
                 var ret = [x];
                 prebody = this.body;
-                while ((x=this.operator()) && ((y=this.primary())!=null)) {
+                while ((x=this.operator()) && ((y=this.primary())!=undefined)) {
                         prebody = this.body;
                         ret.push(x, y);
@@ -223 +218 @@
                 return x;
         }
+
+  // if Arg Then CompStmt (elsif Arg Then CompStmt)* (else CompStmt)? end
         if (this.body.match(/^[ \t]*(if)/)) {
                 this.body = RegExp.rightContext;