continue;
}
//this.logR("parseScope GOT VAR : <B>" + token.toString() + "</B>");
- if (token.type !="NAME") {
+ if (token.type != "NAME") {
for(var i = Math.max(this.ts.cursor-10,0); i < this.ts.cursor+1; i++) {
print(this.ts.tokens[i].toString());
}
currentScope = this.scopes[this.scopes.length-1];
- var scopeIndent = '';
- this.scopes.forEach(function() {
- scopeIndent += ' ';
- });
+
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
while (token = this.ts.lookTok()) {
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
+ print("EXPR-PUNC:" + JSON.stringify(token, null, 4));
+
switch(token.data) {
case ';':
if (this.braceNesting == expressionBraceNesting &&
bracketNesting == 0 &&
parensNesting == 0) {
- print(scopeIndent + "<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
return;
}
break;
case '[': //Token.LB:
- bracketNesting++;
+
+ var ts = this.ts;
+ var _this = this;
+ token.items.forEach(function(ns) {
+ _this.ts = new TokenStream(ns);
+ _this.parseExpression();
+ });
+
break;
-
+/*
case ']': //Token.RB:
bracketNesting--;
break;
-
+*/
case '(': //Token.LP:
parensNesting++;
break;
break;
case 'STRN': // used for object lit detection..
+ print("EXPR-STR:" + JSON.stringify(token, null, 4));
if (this.ts.lookTok(-1).data == "{" && this.ts.lookTok(1).data == ":" ) {
// then we are in an object lit.. -> we need to flag the brace as such...
isObjectLitAr.pop();
case 'NAME':
-
+ print("EXPR-NAME:" + JSON.stringify(token, null, 4));
symbol = token.data;
//print("in NAME = " + token.toString());
//print("in NAME 0: " + this.ts.look(0).toString());
//println("<B>EID</B>");
case 'KEYW':
-
+ print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
}
if (!this.ts.nextTok()) break;
}
- print(scopeIndent + "<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
},