this.braceNesting = 0;
this.scopes = [];
- //print(JSON.stringify(this.ts.tokens, null,4));
+ // print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
while (token) {
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
//this.dumpToken(token , this.scopes, this.braceNesting);
- //print('SCOPE:' + token.toString());
+ print('SCOPE:' + token.toString());
//this.log(token.data);
if (token.type == 'NAME') {
// print('*' + token.data);
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
- print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
+ //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
if (!token) { // can return false at EOF!
break;
}
break;
case "KEYW.CATCH":
- print('SCOPE-CATCH:' + token.toString());
+ //print('SCOPE-CATCH:' + token.toString());
//println("<i>"+token.data+"</i>");
this.parseCatch();
break;
if (token.type != 'KEYW') {
break;
}
- //print('SCOPE-KEYW:' + token.toString());
+ print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
if (symbol == "eval") {
+
+ print(JSON.stringify(token, null,4));
// look back one and see if we can find a comment!!!
//if (this.ts.look(-1).type == "COMM") {
if (token.prefix && token.prefix.match('/eval/')) {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXPR' + token.toString());
//println("<i>"+token.data+"</i>");
case 'KEYW':
//if (this.mode == 'BUILDING_SYMBOL_TREE')
// print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+
+ print('EXPR-KEYW:' + token.toString());
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
- if (symbol == "eval") {
+
+ if (token.name == "EVAL") {
+ print(JSON.stringify(token,null,4));
if (token.prefix && token.prefix.match('/eval/')) {
// look for eval:var:noreplace\n
var _t = this;
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
- print(token.toString());
+
+ //print(JSON.stringify(token,null,4));
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
- symbol = token.items[0].data;
+ symbol = token.items[0][0].data;
currentScope = this.scopes[this.scopes.length-1];
if (this.mode == 'BUILDING_SYMBOL_TREE') {
// We must declare the exception identifier in the containing function
// scope to avoid errors related to the obfuscation process. No need to
// display a warning if the symbol was already declared here...
- currentScope.declareIdentifier(symbol, token.items[0]);
+ currentScope.declareIdentifier(symbol, token.items[0][0]);
} else {
//?? why inc the refcount?? - that should be set when building the tree???
- identifier = this.getIdentifier(symbol, currentScope, token.items[0]);
+ identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]);
identifier.refcount++;
}
-
+
token = this.ts.nextTok();
//assert token.getType() == Token.RP; // )
},
}
token = this.ts.nextTok();
}
+
+
// return function() {....
- if (token.name == "RETURN") {
- token = this.ts.nextTok();
- }
- if (token.name == "FUNCTION") {
+ while (token.data != "(") {
+ print(token.toString());
token = this.ts.nextTok();
+
+
+
}
+
+
//assert token.getType() == Token.LP;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
fnScope = new Scope(1, currentScope, token.n, '', token);
fnScope = this.indexedScopes[token.id];
}
//if (this.mode == 'BUILDING_SYMBOL_TREE')
- // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+ // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
var args = token.items;
for (var argpos =0; argpos < args.length; argpos++) {