//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
- while (token = this.ts.lookTok()) {
+ while (token = this.ts.nextTok()) {
-
+
/*
// moved out of loop?
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + this.expN + ':' + token.toString());
+ print('EXP' + token.toString());
//println("<i>"+token.data+"</i>");
var ts = this.ts;
var _this = this;
token.items.forEach(function(ns) {
- print("EXPR-PUNC[:" + JSON.stringify(ns, null, 4));
+ print("EXPR-PUNC-MAKE:" + JSON.stringify(ns, null, 4));
_this.ts = new TokenStream(ns);
- _this.ts.cursor--;
+ //_this.ts.cursor--;
_this.parseExpression();
});
this.ts = ts;
break;
-/*
+
case ']': //Token.RB:
- bracketNesting--;
- break;
-*/
+ return;
+
+
case '(': //Token.LP:
parensNesting++;
break;
//println("<B>EID</B>");
- case 'KEYW':
+ case 'KEYW':
print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
}
break;
}
-
+ default:
+ print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ break;
}
- if (!this.ts.nextTok()) break;
+
}
print("<< EXIT EXPRESSION");
this.expN--;