* Scope stuff
*
* // FIXME - I need this to do next() without doccomments..
+*
+*
+*
+* Need to make this alot simpler...
+*
+* so debugging is possible.
+*
+*
+* at present it just runs along the stream and finds stuff then calls parseExpr .. etc,,
+*
+*
+* It would be better to parse blocks of code rather than the whole stream..
+*
+*
+*
+*
+*
*/
ScopeParser = function(ts) {
//println("<B>LOG:</B>" + str + "<BR/>");
},
-
-
-
+
+
parseScope : function(scope) // parse a token stream..
var identifier;
- var expressionBraceNesting = this.braceNesting;
+ var expressionBraceNesting = this.braceNesting + 0;
var parensNesting = 0;
var isObjectLitAr = [ false ];
var isInObjectLitAr;
this.scopes.push(scope);
+
+ var scopeIndent = '';
+ this.scopes.forEach(function() {
+ scopeIndent += ' ';
+ });
+ //print(scopeIndent + ">> ENTER SCOPE");
+
+
+
+
token = this.ts.lookTok(1);
while (token) {
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
-
+ //this.dumpToken(token , this.scopes, this.braceNesting);
+ //print('SCOPE:' + token.toString());
//this.log(token.data);
if (token.type == 'NAME') {
// print('*' + token.data);
switch(token.type + '.' + token.name) {
case "KEYW.VAR":
case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
+ print('SCOPE-VAR:' + token.toString());
+ var vstart = this.ts.cursor +1;
//this.log("parseScope GOT VAR/CONST : " + token.toString());
while (true) {
break;
} else {
//var bn = this.braceNesting;
+ var bn = this.braceNesting;
this.parseExpression();
+ this.braceNesting = bn;
//this.braceNesting = bn;
//this.logR("parseScope DONE : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString());
}
}
}
+
+ //print("VAR:")
+ //this.ts.dump(vstart , this.ts.cursor);
+
break;
case "KEYW.FUNCTION":
+ print('SCOPE-FUNC:' + token.toString());
//println("<i>"+token.data+"</i>");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
break;
case "PUNC.LEFT_CURLY": // {
+ print('SCOPE-CURLY:' + token.toString());
//println("<i>"+token.data+"</i>");
isObjectLitAr.push(false);
this.braceNesting++;
//print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
break;
-
+/*
case "PUNC.RIGHT_CURLY": // }
//println("<i>"+token.data+"</i>");
this.braceNesting--;
this.ts.nextTok();
}
- //print("<<<<<<<EXIT SCOPE" +this.scopes.length);
+ print("<<<<<<<EXIT SCOPE" +this.scopes.length);
return;
}
break;
-
+*/
case "KEYW.WITH":
+ print('SCOPE-WITH:' + token.toString());
//println("<i>"+token.data+"</i>");
if (this.mode == "BUILDING_SYMBOL_TREE") {
// Inside a 'with' block, it is impossible to figure out
break;
case "KEYW.CATCH":
+ print('SCOPE-CATCH:' + token.toString());
//println("<i>"+token.data+"</i>");
this.parseCatch();
break;
case "STRN.DOUBLE_QUOTE": // used for object lit detection..
case "STRN.SINGLE_QUOTE":
+ print('SCOPE-STRING:' + token.toString());
//println("<i>"+token.data+"</i>");
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...
break;
case "NAME.NAME":
-
+ print('SCOPE-NAME:' + token.toString());
//print("DEAL WITH NAME:");
// got identifier..
//println("<i>"+token.data+"</i>");
break;
}
+ //print("SYMBOL: " + token.toString());
+
symbol = token.data;
if (this.mode == 'PASS2_SYMBOL_TREE') {
if (token.type != 'KEYW') {
break;
}
+ print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
} // end switch
- //this.timerPrint("parseScope TOK : " + token.toString());
+ //print("parseScope TOK : " + token.toString());
token = this.ts.nextTok();
//if (this.ts.nextT()) break;
//print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
},
-
+ expN : 0,
parseExpression : function() {
// Parse the expression until we encounter a comma or a semi-colon
// Parse functions if any...
//println("<i>EXP</i><BR/>");
!this.debug || print("PARSE EXPR");
+ this.expN++;
+
+ // for printing stuff..
+
+
+
var symbol;
var token;
var currentScope;
var identifier;
- var expressionBraceNesting = this.braceNesting;
+ var expressionBraceNesting = this.braceNesting + 0;
var bracketNesting = 0;
var parensNesting = 0;
var isInObjectLitAr;
var isObjectLitAr = [ false ];
+
+ 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()) {
- currentScope = this.scopes[this.scopes.length-1];
+ /*
+ // moved out of loop?
+ currentScope = this.scopes[this.scopes.length-1];
+
+ var scopeIndent = '';
+ this.scopes.forEach(function() {
+ scopeIndent += ' ';
+ });
+ */
+
+ //this.dumpToken(token, this.scopes, this.braceNesting );
+ //print('EXP' + this.expN + ':' + token.toString());
+
//println("<i>"+token.data+"</i>");
//this.log("EXP:" + token.data);
if (this.braceNesting == expressionBraceNesting &&
bracketNesting == 0 &&
parensNesting == 0) {
-
+ print(scopeIndent + "<< EXIT EXPRESSION");
+ this.expN--;
return;
}
break;
case 'NAME':
symbol = token.data;
-
+ //print("in NAME = " + token.toString());
+ //print("in NAME 0: " + this.ts.look(0).toString());
+ //print("in NAME 2: " + this.ts.lookTok(2).toString());
if (this.ts.look(0).data == "{" && this.ts.lookTok(2).data == ":") {
// then we are in an object lit.. -> we need to flag the brace as such...
isObjectLitAr.pop();
//print(">>>>> EXP PUSH(true)");
break;
}
+
isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
+ //print ("isInObjectLitAr : " + isInObjectLitAr + ' ' + token.toString());
+
if (isInObjectLitAr && this.ts.lookTok(0).data == "," && this.ts.lookTok(2).data == ":") {
break;
}
}
if (!this.ts.nextTok()) break;
}
+ print(scopeIndent + "<< EXIT EXPRESSION");
+ this.expN--;
},
parseFunctionDeclaration : function()
{
- // print("PARSE FUNCTION");
+ //print("PARSE FUNCTION");
var symbol;
var token;
var currentScope = false;
var fnScope = false;
var identifier;
+ var b4braceNesting = this.braceNesting + 0;
+
//this.logR("<B>PARSING FUNCTION</B>");
currentScope = this.scopes[this.scopes.length-1];
}
token = this.ts.nextTok();
+ //print(token.toString());
// assert token.getType() == Token.LC;
this.braceNesting++;
token = this.ts.nextTok();
- if (token.type == "STRN" && this.ts.lookTok(1).data == ';') {
- /*
-
- NOT SUPPORTED YET!?!!?!
-
- // This is a hint. Hints are empty statements that look like
- // "localvar1:nomunge, localvar2:nomunge"; They allow developers
- // to prevent specific symbols from getting obfuscated (some heretic
- // implementations, such as Prototype 1.6, require specific variable
- // names, such as $super for example, in order to work appropriately.
- // Note: right now, only "nomunge" is supported in the right hand side
- // of a hint. However, in the future, the right hand side may contain
- // other values.
- consumeToken();
- String hints = token.getValue();
- // Remove the leading and trailing quotes...
- hints = hints.substring(1, hints.length() - 1).trim();
- StringTokenizer st1 = new StringTokenizer(hints, ",");
- while (st1.hasMoreTokens()) {
- String hint = st1.nextToken();
- int idx = hint.indexOf(':');
- if (idx <= 0 || idx >= hint.length() - 1) {
- if (mode == BUILDING_SYMBOL_TREE) {
- // No need to report the error twice, hence the test...
- this.warn("Invalid hint syntax: " + hint, true);
- }
- break;
- }
- String variableName = hint.substring(0, idx).trim();
- String variableType = hint.substring(idx + 1).trim();
- if (mode == BUILDING_SYMBOL_TREE) {
- fnScope.addHint(variableName, variableType);
- } else if (mode == CHECKING_SYMBOL_TREE) {
- identifier = fnScope.getIdentifier(variableName);
- if (identifier != null) {
- if (variableType.equals("nomunge")) {
- identifier.preventMunging();
- } else {
- this.warn("Unsupported hint value: " + hint, true);
- }
- } else {
- this.warn("Hint refers to an unknown identifier: " + hint, true);
- }
- }
- }
- */
- }
+ //print(token.toString());
+
this.parseScope(fnScope);
// now pop it off the stack!!!
-
-
+ this.braceNesting = b4braceNesting;
+ //print("ENDFN -1: " + this.ts.lookTok(-1).toString());
+ //print("ENDFN 0: " + this.ts.lookTok(0).toString());
+ //print("ENDFN 1: " + this.ts.lookTok(1).toString());
},
protectScopeFromObfuscation : function(scope) {