//<Script type="text/javascript">
-Scope = imports['JSDOC/Scope.js'].Scope;
-
+Scope = imports.Scope.Scope;
+TokenStream = imports.TokenStream.TokenStream;
/**
* 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) {
this.braceNesting = 0;
this.scopes = [];
-
+ // print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
//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);
+ thisScope = scope;
+ if (thisScope && thisScope.gid != this.scopes[this.scopes.length-1]) {
+ this.scopes.push(scope);
+ } else {
+ thisScope = this.scopes[this.scopes.length-1]
+ }
+
+ //var scopeIndent = '';
+ //this.scopes.forEach(function() {
+ // scopeIndent += ' ';
+ //});
+ //print(">> 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) {
token = this.ts.nextTok();
- !this.debug|| print( token.toString());
-
+ //!this.debug|| print( token.toString());
+ //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
if (!token) { // can return false at EOF!
break;
}
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());
}
if (this.mode == "BUILDING_SYMBOL_TREE") {
- identifier = scope.getIdentifier(token.data) ;
+ identifier = thisScope.getIdentifier(token.data,token) ;
if (identifier == false) {
- scope.declareIdentifier(token.data, token);
+ thisScope.declareIdentifier(token.data, token);
} else {
token.identifier = identifier;
this.warn("(SCOPE) The variable " + token.data + ' (line:' + token.line + ") has already been declared in the same scope...");
break;
} else {
//var bn = this.braceNesting;
- this.parseExpression();
+ var bn = this.braceNesting;
+ var nts = [];
+ while (true) {
+ if (!token || token.type == 'VOID' || token.data == ',') {
+ break;
+ }
+ nts.push(token);
+ token = this.ts.nextTok();
+ }
+ if (nts.length) {
+ var TS = this.ts;
+ this.ts = new TokenStream(nts);
+ this.parseExpression();
+ this.ts = TS;
+ }
+
+ 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":
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
//println("<i>"+token.data+"</i>");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
break;
case "PUNC.LEFT_CURLY": // {
+ case "PUNC.LEFT_PAREN": // (
+ case "PUNC.LEFT_BRACE": // [
+ //print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
- isObjectLitAr.push(false);
- this.braceNesting++;
+ var curTS = this.ts;
+ if (token.props) {
+
+ for (var prop in token.props) {
+
+
+ // print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4));
+ if (token.props[prop].val[0].data == 'function') {
+ // parse a function..
+ this.ts = new TokenStream(token.props[prop].val);
+ this.ts.nextTok();
+ this.parseFunctionDeclaration();
+
+ continue;
+ }
+ // key value..
+
+ this.ts = new TokenStream(token.props[prop].val);
+ this.parseExpression();
+
+ }
+ this.ts = curTS;
+
+ // it's an object literal..
+ // the values could be replaced..
+ break;
+ }
+
+
+ var _this = this;
+ token.items.forEach(function(expr) {
+ _this.ts = new TokenStream(expr);
+ _this.parseExpression()
+ });
+ this.ts = curTS;
+ //print("NOT PROPS"); Seed.quit();
+
+ //isObjectLitAr.push(false);
+ //this.braceNesting++;
//print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
break;
case "PUNC.RIGHT_CURLY": // }
+ //print("<< EXIT SCOPE");
+ return;
+ /*
//println("<i>"+token.data+"</i>");
this.braceNesting--;
isObjectLitAr.pop();
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
// object member. As a consequence, the only thing we can
// do is turn the obfuscation off for the highest scope
// containing the 'with' block.
- this.protectScopeFromObfuscation(scope);
+ this.protectScopeFromObfuscation(thisScope);
this.warn("Using 'with' is not recommended." + (this.munge ? " Moreover, using 'with' reduces the level of compression!" : ""), true);
}
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...
isObjectLitAr.pop();
break;
case "NAME.NAME":
-
+ //print('SCOPE-NAME:' + token.toString());
//print("DEAL WITH NAME:");
// got identifier..
// look for { ** : <- indicates obj literal.. ** this could occur with numbers ..
- if ((this.ts.lookTok(-1).data == "{") && (this.ts.lookTok(1).data == ":")) {
- isObjectLitAr.pop();
- isObjectLitAr.push(true);
- //print(">>>>>> OBJLIT REPUSH(true)");
- //println("<i>"+token.data+"</i>");
- break;
- }
- // print("DEAL WITH obj lit:");
- isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
-
- if (isInObjectLitAr && (this.ts.lookTok(1).data == ":") && (this.ts.lookTok(-1).data == ",")) {
- // skip, it's an object lit key..
- //println("<i>"+token.data+"</i>");
- break;
- }
-
+
// skip anyting with "." before it..!!
//println("<i>"+token.data+"</i>");
break;
}
+ //print("SYMBOL: " + token.toString());
+
symbol = token.data;
+ if (symbol == 'this') {
+ break;
+ }
if (this.mode == 'PASS2_SYMBOL_TREE') {
//println("GOT IDENT: -2 : " + this.ts.lookT(-2).toString() + " <BR> ..... -1 : " + this.ts.lookT(-1).toString() + " <BR> ");
//println("GOT IDENT: <B>" + symbol + "</B><BR/>");
//println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
- identifier = this.getIdentifier(symbol, scope);
+ identifier = this.getIdentifier(symbol, thisScope, token);
if (identifier == false) {
// BUG!find out where builtin is defined...
if (token.type != 'KEYW') {
break;
}
+ //print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- if (symbol == "eval") {
+ if (token.name == "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 (this.ts.look(-1).type == "COMM") {
+ if (token.prefix && token.prefix.match(/eval/)) {
// look for eval:var:noreplace\n
+ //print("MATCH!?");
var _t = this;
- this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-
- var hi = _t.getIdentifier(a, scope);
+ token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
+ //print("GOT: " + a);
+ var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
- // println("PROTECT "+a+" from munge");
+ // print("PROTECT "+a+" from munge");
+ //print(JSON.stringify(hi,null,4));
hi.toMunge = false;
}
} else {
- this.protectScopeFromObfuscation(scope);
+ this.protectScopeFromObfuscation(thisScope);
this.warn("Using 'eval' is not recommended. (use eval:var:noreplace in comments to optimize) " + (this.munge ? " Moreover, using 'eval' reduces the level of compression!" : ""), true);
}
} // 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");
//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 ];
- while (token = this.ts.lookTok()) {
+
+ currentScope = this.scopes[this.scopes.length-1];
+
+
+ //print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
+ while (token = this.ts.nextTok()) {
-
+
+
+ /*
+ // 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('EXPR' + token.toString());
- currentScope = this.scopes[this.scopes.length-1];
//println("<i>"+token.data+"</i>");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
+ //print("EXPR-PUNC:" + token.toString());
+
switch(token.data) {
case ';':
+ //print("<< EXIT EXPRESSION");
+ break;
+
case ',':
- if (this.braceNesting == expressionBraceNesting &&
- bracketNesting == 0 &&
- parensNesting == 0) {
-
- return;
- }
+
break;
-
+ case '(': //Token.LP:
case '{': //Token.LC:
- isObjectLitAr.push(false);
+ case '[': //Token.LB:
+ //print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+ // print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4));
+ //println("<i>"+token.data+"</i>");
+ var curTS = this.ts;
+ if (token.props) {
+
+ for (var prop in token.props) {
+ if (!token.props[prop].val.length) {
+ print(JSON.stringify(token.props, null,4));
+ }
+
+ if (token.props[prop].val[0].data == 'function') {
+ // parse a function..
+ this.ts = new TokenStream(token.props[prop].val);
+ this.ts.nextTok();
+ this.parseFunctionDeclaration();
+ continue;
+ }
+ // key value..
+
+ this.ts = new TokenStream(token.props[prop].val);
+ this.parseExpression();
+
+ }
+ this.ts = curTS;
+
+ // it's an object literal..
+ // the values could be replaced..
+ break;
+ }
+
- this.braceNesting++;
+ var _this = this;
+ token.items.forEach(function(expr) {
+ _this.ts = new TokenStream(expr);
+ _this.parseExpression()
+ });
+ this.ts = curTS;
+
+
+
///print(">>>>> EXP PUSH(false)"+this.braceNesting);
break;
- case '}': //Token.RC:
- this.braceNesting--;
- isObjectLitAr.pop();
- //print(">>>>> EXP POP" + this.braceNesting);
- // assert braceNesting >= expressionBraceNesting;
- break;
-
- case '[': //Token.LB:
- bracketNesting++;
- break;
-
+
+
+
+
+ case ')': //Token.RP:
case ']': //Token.RB:
- bracketNesting--;
- break;
-
- case '(': //Token.LP:
+ case '}': //Token.RB:
+ //print("<< EXIT EXPRESSION");
+ return;
+
+
+
parensNesting++;
break;
- case ')': //Token.RP:
- parensNesting--;
- break;
+
+
}
break;
case 'STRN': // used for object lit detection..
- 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();
- isObjectLitAr.push(true);
- //print(">>>>> EXP PUSH(true)");
- }
-
-
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ //print("EXPR-STR:" + JSON.stringify(token, null, 4));
+
- isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
- if (isInObjectLitAr && this.ts.lookTok(1).data == ":" &&
- ( this.ts.lookTok(-1).data == "{" || this.ts.lookTok(-1).data == "," )) {
- // see if we can replace..
- // remove the quotes..
- var str = token.data.substring(1,token.data.length-1);
- if (/^[a-z_]+$/i.test(str) && ScopeParser.idents.indexOf(str) < 0) {
- token.outData = str;
- }
-
-
-
- }
-
break;
case 'NAME':
-
- symbol = token.data;
-
- 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();
- isObjectLitAr.push(true);
- //print(">>>>> EXP PUSH(true)");
- break;
- }
- isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
- if (isInObjectLitAr && this.ts.lookTok(0).data == "," && this.ts.lookTok(2).data == ":") {
- break;
+ if (this.mode == 'BUILDING_SYMBOL_TREE') {
+
+ //print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+ } else {
+ //print("EXPR-NAME:" + token.toString());
}
- //print(this.ts.lookTok(0).data);
- if (this.ts.lookTok(0).data == ".") {
+ 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());
+
+ //print(this.ts.lookTok(-1).data);
+ // prefixed with '.'
+ if (this.ts.lookTok(-1).data == ".") {
//skip '.'
break;
}
+ if (symbol == 'this') {
+ break;
+ }
- if (this.mode == 'PASS2_SYMBOL_TREE') {
+ if (this.mode == 'PASS2_SYMBOL_TREE') {
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, currentScope, token);
//println("<B>??</B>");
if (identifier == false) {
// any conflict with other munged symbols.
this.globalScope.declareIdentifier(symbol, token);
this.warn("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')', true);
+ //print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')');
+ //throw "OOPS";
} else {
- //println("undeclared")
+ //print("undeclared:" + token.toString())
}
//println("<B>EID</B>");
- case 'KEYW':
-
+ 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 (this.ts.look(-1).type == 'COMM') {
+
+ if (token.name == "EVAL") {
+ //print(JSON.stringify(token,null,4));
+ if (token.prefix && token.prefix.match(/eval:var:/g)) {
// look for eval:var:noreplace\n
+ // print("GOT MATCH?");
var _t = this;
- this.ts.look(-1).data.replace(/eval:var:([a-z]+)/ig, function(m, a) {
- var hi = _t.getIdentifier(a, currentScope);
+ token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+
+ //print("PROTECT: " + a);
+
+
+ var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
}
break;
}
-
+ default:
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ break;
}
- if (!this.ts.nextTok()) break;
+
}
+ //print("<< EXIT EXPRESSION");
+ this.expN--;
},
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();
+ //token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
- symbol = token.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);
+ identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]);
identifier.refcount++;
}
-
+
token = this.ts.nextTok();
//assert token.getType() == Token.RP; // )
},
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];
if (this.mode == 'BUILDING_SYMBOL_TREE') {
// Get the name of the function and declare it in the current scope.
symbol = token.data;
- if (currentScope.getIdentifier(symbol) != false) {
+ if (currentScope.getIdentifier(symbol,token) != false) {
this.warn("The function " + symbol + " has already been declared in the same scope...", true);
}
currentScope.declareIdentifier(symbol,token);
}
token = this.ts.nextTok();
}
-
+
+
+ // return 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(this.braceNesting, currentScope, token.n, '');
+ fnScope = new Scope(1, currentScope, token.n, '', token);
//println("STORING SCOPE" + this.ts.cursor);
- this.indexedScopes[this.ts.cursor] = fnScope;
+ this.indexedScopes[token.id] = fnScope;
} else {
//qln("FETCHING SCOPE" + this.ts.cursor);
- fnScope = this.indexedScopes[this.ts.cursor];
-
+ fnScope = this.indexedScopes[token.id];
}
-
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
- var argpos = 0;
- while (this.ts.lookTok().data != ')') { //(token = consumeToken()).getType() != Token.RP) {
- token = this.ts.nextTok();
- // print ("FUNC ARGS: " + token.toString())
+ var args = token.items;
+ for (var argpos =0; argpos < args.length; argpos++) {
+
+ token = args[argpos][0];
+ //print ("FUNC ARGS: " + token.toString())
//assert token.getType() == Token.NAME ||
// token.getType() == Token.COMMA;
if (token.type == 'NAME' && this.mode == 'BUILDING_SYMBOL_TREE') {
// Exception for Prototype 1.6...
identifier.preventMunging();
}
- argpos++;
+ //argpos++;
}
}
-
+
token = this.ts.nextTok();
+ //print('FUNC-BODY:' + JSON.stringify(token.items,null,4));
+ //Seed.quit();
+ //print(token.toString());
// assert token.getType() == Token.LC;
- this.braceNesting++;
-
- token = this.ts.nextTok();
- if (token.type == "STRN" && this.ts.lookTok(1).data == ';') {
- /*
+ //this.braceNesting++;
+
+ //token = this.ts.nextTok();
+ //print(token.toString());
+ var outTS = this.ts;
+ var _this = this;
+ token.items.forEach(function(tar) {
+ _this.ts = new TokenStream(tar);
+ _this.parseScope(fnScope);
- 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);
- }
- }
- }
- */
- }
-
- this.parseScope(fnScope);
+ });
+
+ //print(JSON.stringify(this.ts,null,4));
+ //this.parseScope(fnScope);
+ this.ts = outTS;
// 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) {
scope.preventMunging();
},
- getIdentifier: function(symbol, scope) {
+ getIdentifier: function(symbol, scope, token) {
var identifier;
while (scope != false) {
- identifier = scope.getIdentifier(symbol);
+ identifier = scope.getIdentifier(symbol, token);
//println("ScopeParser.getIdentgetUsedSymbols("+symbol+")=" + scope.getUsedSymbols().join(','));
if (identifier) {
return identifier;
projects / gnome.introspection-doc-generator / blobdiff