//<Script type="text/javascript">
-Scope = imports.Scope.Scope;
-TokenStream = imports.TokenStream.TokenStream;
+const Scope = imports.Scope.Scope;
+const 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..
-*
-*
+* This code now uses the collapsed tree
*
*
*
*/
-ScopeParser = function(ts) {
+const ScopeParser = function(ts) {
this.ts = ts; // {TokenStream}
this.warnings = [];
- this.scopes = [];
- this.indexedScopes = {};
+ this.indexedg = {};
this.timer = new Date() * 1;
this.debug = false;
}
// defaults should not be initialized here =- otherwise they get duped on new, rather than initalized..
warnings : false,
ts : false,
- scopes : false,
global : false,
mode : "", //"BUILDING_SYMBOL_TREE",
braceNesting : 0,
this.ts.rewind();
this.braceNesting = 0;
- this.scopes = [];
-
+ // print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
- indexedScopes = { 0 : this.globalScope };
+ this.indexedScopes = { 0 : this.globalScope };
this.mode = 'BUILDING_SYMBOL_TREE';
this.parseScope(this.globalScope);
this.ts.rewind();
this.braceNesting = 0;
- this.scopes= [];
this.mode = 'PASS2_SYMBOL_TREE';
//println("MUNGING?");
this.parseScope(this.globalScope);
+
+ //this.globalScope.dump();
+
+
this.globalScope.munge();
},
var isObjectLitAr = [ false ];
var isInObjectLitAr;
- thisScope = scope;
- if (thisScope) {
- this.scopes.push(scope);
- } else {
- thisScope = this.scopes[this.scopes.length-1]
- }
+
//var scopeIndent = '';
//this.scopes.forEach(function() {
//this.dumpToken(token , this.scopes, this.braceNesting);
//print('SCOPE:' + token.toString());
//this.log(token.data);
- if (token.type == 'NAME') {
+ //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.
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
- //print('SCOPE-VAR-VAL:' + token.toString());
+ // print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
if (!token) { // can return false at EOF!
break;
}
if (this.mode == "BUILDING_SYMBOL_TREE") {
- identifier = thisScope.getIdentifier(token.data) ;
+ identifier = scope.getIdentifier(token.data,token) ;
if (identifier == false) {
- thisScope.declareIdentifier(token.data, token);
+ scope.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...");
} else {
//var bn = this.braceNesting;
var bn = this.braceNesting;
- this.parseExpression();
+ 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(scope);
+ this.ts = TS;
+ }
+
this.braceNesting = bn;
//this.braceNesting = bn;
//this.logR("parseScope DONE : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString());
token = this.ts.lookTok(1);
- !this.debug|| print("AFTER EXP: " + token.toString());
+ //!this.debug||
+ // print("AFTER EXP: " + token.toString());
if (token.data == ';') {
break;
}
//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();
+ this.parseFunctionDeclaration(scope);
this.braceNesting = bn;
break;
case "PUNC.LEFT_CURLY": // {
case "PUNC.LEFT_PAREN": // (
+ case "PUNC.LEFT_BRACE": // [
//print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
var curTS = this.ts;
if (token.props) {
+ // { a : ... , c : .... }
+
for (var prop in token.props) {
// parse a function..
this.ts = new TokenStream(token.props[prop].val);
this.ts.nextTok();
- this.parseFunctionDeclaration();
+ this.parseFunctionDeclaration(scope);
continue;
}
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parseScope(false);
+ this.parseExpression(scope);
}
this.ts = curTS;
break;
}
+ // ( ... ) or { .... } not object literals..
var _this = this;
- token.items.forEach(function(expr) {
- _this.ts = new TokenStream(expr);
- _this.parseExpression()
- });
+ for (var xx =0; xx < token.items.length; xx++) {
+ expr = token.items[xx];
+ //token.items.forEach(function(expr) {
+ //print(expr.toString());
+ _this.ts = new TokenStream(expr);
+ //if (curTS.data == '(') {
+ _this.parseScope(scope)
+ //} else {
+ // _this.parseExpression(scope)
+ //}
+
+ }
this.ts = curTS;
//print("NOT PROPS"); Seed.quit();
case "PUNC.RIGHT_CURLY": // }
//print("<< EXIT SCOPE");
return;
- /*
- //println("<i>"+token.data+"</i>");
- this.braceNesting--;
- isObjectLitAr.pop();
- //print(">>>>>> OBJLIT POP"+ this.braceNesting);
- //assert braceNesting >= scope.getBra ceNesting();
-
- if (this.braceNesting < expressionBraceNesting) {
- var ls = this.scopes.pop();
- ls.getUsedSymbols();
- // eat symbol if we are currently at {
- if (this.ts.look(0).data == '{') {
- this.ts.nextTok();
- }
-
- print("<<<<<<<EXIT SCOPE" +this.scopes.length);
- return;
- }
- break;
-*/
+
case "KEYW.WITH":
//print('SCOPE-WITH:' + token.toString());
//println("<i>"+token.data+"</i>");
// 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(thisScope);
+ this.protectScopeFromObfuscation(scope);
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();
+ this.parseCatch(scope);
break;
- /*
- case Token.SPECIALCOMMENT:
- if (mode == BUILDING_SYMBOL_TREE) {
- protectScopeFromObfuscation(scope);
- this.warn("Using JScript conditional comments is not recommended." + (munge ? " Moreover, using JScript conditional comments reduces the level of compression." : ""), true);
- }
- break;
- */
-
+
case "STRN.DOUBLE_QUOTE": // used for object lit detection..
case "STRN.SINGLE_QUOTE":
// print('SCOPE-STRING:' + token.toString());
}
-
-
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 ..
-
-
// skip anyting with "." before it..!!
if (this.ts.lookTok(-1).data == ".") {
//println("GOT IDENT: <B>" + symbol + "</B><BR/>");
//println("GOT IDENT (2): <B>" + symbol + "</B><BR/>");
- identifier = this.getIdentifier(symbol, thisScope);
+ identifier = this.getIdentifier(symbol, scope, token);
if (identifier == false) {
// BUG!find out where builtin is defined...
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, thisScope);
+ token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
+ //print("GOT: " + a);
+ var hi = _t.getIdentifier(a, scope, 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(thisScope);
+ this.protectScopeFromObfuscation(scope);
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);
}
},
expN : 0,
- parseExpression : function() {
+ parseExpression : function(scope) {
// Parse the expression until we encounter a comma or a semi-colon
// in the same brace nesting, bracket nesting and paren nesting.
var symbol;
var token;
- var currentScope;
+
var identifier;
var expressionBraceNesting = this.braceNesting + 0;
var isInObjectLitAr;
var isObjectLitAr = [ false ];
- currentScope = this.scopes[this.scopes.length-1];
+
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
- while (token = this.ts.nextTok()) {
+ while ((token = this.ts.nextTok())) {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXPR' + token.toString());
//println("<i>"+token.data+"</i>");
case '{': //Token.LC:
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.data == 'function') {
+ 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.parseFunctProp(token.props[prop]);
+ this.ts = new TokenStream(token.props[prop].val);
+ this.ts.nextTok();
+ this.parseFunctionDeclaration(scope);
continue;
}
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parseScope(currentScope);
+ this.parseExpression(scope);
}
this.ts = curTS;
var _this = this;
token.items.forEach(function(expr) {
_this.ts = new TokenStream(expr);
- _this.parseExpression()
+ _this.parseExpression(scope)
});
this.ts = curTS;
if (this.mode == 'PASS2_SYMBOL_TREE') {
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, scope, token);
//println("<B>??</B>");
if (identifier == false) {
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();
+ this.parseFunctionDeclaration(scope);
break;
}
-
-
+
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, scope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
});
} else {
- this.protectScopeFromObfuscation(currentScope);
+ this.protectScopeFromObfuscation(scope);
this.warn("Using 'eval' is not recommended." + (this.munge ? " Moreover, using 'eval' reduces the level of compression!" : ""), true);
}
},
- parseCatch : function() {
+ parseCatch : function(scope) {
var symbol;
var token;
- var currentScope;
+
var identifier;
-
+
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
- token = this.ts.nextTok();
+ token = this.ts.nextTok(1);
+ token = this.ts.nextTok(1);
+
+
+ //print(JSON.stringify(this.ts,null,4));
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
- symbol = token.items[0].data;
- currentScope = this.scopes[this.scopes.length-1];
+ symbol = token.items[0][0].data;
+
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);
+ scope.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, scope, token.items[0][0]);
identifier.refcount++;
}
-
- token = this.ts.nextTok();
+
+ //token = this.ts.nextTok();
//assert token.getType() == Token.RP; // )
},
- parseFunctionDeclaration : function()
+ parseFunctionDeclaration : function(scope)
{
//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();
if (token.type == "NAME") {
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 (scope.getIdentifier(symbol,token) != false) {
this.warn("The function " + symbol + " has already been declared in the same scope...", true);
}
- currentScope.declareIdentifier(symbol,token);
+ scope.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, scope, token.n, '', token);
//println("STORING SCOPE" + this.ts.cursor);
} else {
//qln("FETCHING SCOPE" + this.ts.cursor);
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++) {
_this.ts = new TokenStream(tar);
_this.parseScope(fnScope);
+
});
//print(JSON.stringify(this.ts,null,4));
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;
}
return false;
}
-};
\ No newline at end of file
+};
projects / gnome.introspection-doc-generator / blobdiff