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 (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;
}
var bn = this.braceNesting;
var nts = [];
while (true) {
- var n = this.ts.lookTok();
- if (!n || n.data == ',') {
+ if (!token || token.type == 'VOID' || token.data == ',') {
break;
}
- nts.push(n);
- this.ts.nextTok();
+ nts.push(token);
+ token = this.ts.nextTok();
}
if (nts.length) {
var TS = this.ts;
break;
case "KEYW.CATCH":
- //print('SCOPE-CATCH:' + token.toString());
+ print('SCOPE-CATCH:' + token.toString());
//println("<i>"+token.data+"</i>");
this.parseCatch();
break;
var token;
var currentScope;
var identifier;
-
+
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
+
+ //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);
+ 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);
+ identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]);
identifier.refcount++;
}
-
+
token = this.ts.nextTok();
//assert token.getType() == Token.RP; // )
},