X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=a908c682e078eb5c5db4f9eb3c26112b6297ad4c;hp=d608dbdf944af8af525ec14c73cd8cfd8dc4ff96;hb=5c841bcb4b00ac85ff8fd4db7d980170581140fe;hpb=b7ab614ecb5e9f0e484e743f19e4a774a35d9cc7
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index d608dbd..a908c68 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -5,21 +5,7 @@ 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
*
*
*
@@ -28,8 +14,7 @@ TokenStream = imports.TokenStream.TokenStream;
ScopeParser = function(ts) {
this.ts = ts; // {TokenStream}
this.warnings = [];
- this.scopes = [];
- this.indexedScopes = {};
+ this.indexedg = {};
this.timer = new Date() * 1;
this.debug = false;
}
@@ -122,7 +107,6 @@ ScopeParser.prototype = {
// 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,
@@ -139,13 +123,12 @@ ScopeParser.prototype = {
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);
@@ -183,12 +166,15 @@ ScopeParser.prototype = {
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();
},
@@ -223,12 +209,7 @@ ScopeParser.prototype = {
var isObjectLitAr = [ false ];
var isInObjectLitAr;
- 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() {
@@ -258,7 +239,7 @@ ScopeParser.prototype = {
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;
}
@@ -277,10 +258,10 @@ ScopeParser.prototype = {
if (this.mode == "BUILDING_SYMBOL_TREE") {
- identifier = thisScope.getIdentifier(token.data,token) ;
+ 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...");
@@ -311,7 +292,7 @@ ScopeParser.prototype = {
if (nts.length) {
var TS = this.ts;
this.ts = new TokenStream(nts);
- this.parseExpression();
+ this.parseExpression(scope);
this.ts = TS;
}
@@ -320,7 +301,8 @@ ScopeParser.prototype = {
//this.logR("parseScope DONE : ParseExpression - 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;
}
@@ -331,12 +313,14 @@ ScopeParser.prototype = {
//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(""+token.data+"");
var bn = this.braceNesting;
- this.parseFunctionDeclaration();
+ this.parseFunctionDeclaration(scope);
this.braceNesting = bn;
break;
@@ -356,14 +340,14 @@ ScopeParser.prototype = {
// 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.parseExpression();
+ this.parseExpression(scope);
}
this.ts = curTS;
@@ -376,8 +360,14 @@ ScopeParser.prototype = {
var _this = this;
token.items.forEach(function(expr) {
- _this.ts = new TokenStream(expr);
- _this.parseExpression()
+ //print(JSON.stringify(expr, null,4));
+ _this.ts = new TokenStream(expr);
+ //if (curTS.data == '(') {
+ _this.parseScope(scope)
+ //} else {
+ // _this.parseExpression(scope)
+ //}
+
});
this.ts = curTS;
//print("NOT PROPS"); Seed.quit();
@@ -391,26 +381,7 @@ ScopeParser.prototype = {
case "PUNC.RIGHT_CURLY": // }
//print("<< EXIT SCOPE");
return;
- /*
- //println(""+token.data+"");
- 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("<<<<<<"+token.data+"");
@@ -420,7 +391,7 @@ ScopeParser.prototype = {
// 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;
@@ -428,17 +399,9 @@ ScopeParser.prototype = {
case "KEYW.CATCH":
//print('SCOPE-CATCH:' + token.toString());
//println(""+token.data+"");
- 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());
@@ -466,18 +429,13 @@ ScopeParser.prototype = {
}
-
-
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 == ".") {
@@ -500,7 +458,7 @@ ScopeParser.prototype = {
//println("GOT IDENT: " + symbol + "
");
//println("GOT IDENT (2): " + symbol + "
");
- identifier = this.getIdentifier(symbol, thisScope, token);
+ identifier = this.getIdentifier(symbol, scope, token);
if (identifier == false) {
// BUG!find out where builtin is defined...
@@ -544,7 +502,7 @@ ScopeParser.prototype = {
var _t = this;
token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
//print("GOT: " + a);
- var hi = _t.getIdentifier(a, thisScope, token);
+ var hi = _t.getIdentifier(a, scope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// print("PROTECT "+a+" from munge");
@@ -558,7 +516,7 @@ ScopeParser.prototype = {
} 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);
}
@@ -581,7 +539,7 @@ ScopeParser.prototype = {
},
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.
@@ -596,7 +554,7 @@ ScopeParser.prototype = {
var symbol;
var token;
- var currentScope;
+
var identifier;
var expressionBraceNesting = this.braceNesting + 0;
@@ -605,7 +563,7 @@ ScopeParser.prototype = {
var isInObjectLitAr;
var isObjectLitAr = [ false ];
- currentScope = this.scopes[this.scopes.length-1];
+
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
@@ -624,7 +582,7 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXPR' + token.toString());
+ //print('EXPR' + token.toString());
//println(""+token.data+"");
@@ -662,13 +620,13 @@ ScopeParser.prototype = {
// 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.parseExpression();
+ this.parseExpression(scope);
}
this.ts = curTS;
@@ -682,7 +640,7 @@ ScopeParser.prototype = {
var _this = this;
token.items.forEach(function(expr) {
_this.ts = new TokenStream(expr);
- _this.parseExpression()
+ _this.parseExpression(scope)
});
this.ts = curTS;
@@ -744,7 +702,7 @@ ScopeParser.prototype = {
if (this.mode == 'PASS2_SYMBOL_TREE') {
- identifier = this.getIdentifier(symbol, currentScope, token);
+ identifier = this.getIdentifier(symbol, scope, token);
//println("??");
if (identifier == false) {
@@ -782,12 +740,11 @@ ScopeParser.prototype = {
//print('EXPR-KEYW:' + token.toString());
if (token.name == "FUNCTION") {
- this.parseFunctionDeclaration();
+ this.parseFunctionDeclaration(scope);
break;
}
-
-
+
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
@@ -802,7 +759,7 @@ ScopeParser.prototype = {
//print("PROTECT: " + a);
- var hi = _t.getIdentifier(a, currentScope, token);
+ var hi = _t.getIdentifier(a, scope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -813,7 +770,7 @@ ScopeParser.prototype = {
});
} 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);
}
@@ -833,33 +790,35 @@ ScopeParser.prototype = {
},
- parseCatch : function() {
+ parseCatch : function(scope) {
var symbol;
var token;
- var currentScope;
+ var scope;
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(token,null,4));
+
+ //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][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][0]);
+ 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, token.items[0][0]);
+ identifier = this.getIdentifier(symbol, scope, token.items[0][0]);
identifier.refcount++;
}
@@ -867,28 +826,28 @@ ScopeParser.prototype = {
//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("PARSING FUNCTION");
- 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,token) != 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();
}
@@ -896,7 +855,7 @@ ScopeParser.prototype = {
// return function() {....
while (token.data != "(") {
- print(token.toString());
+ //print(token.toString());
token = this.ts.nextTok();
@@ -906,7 +865,7 @@ ScopeParser.prototype = {
//assert token.getType() == Token.LP;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- fnScope = new Scope(1, currentScope, token.n, '', token);
+ fnScope = new Scope(1, scope, token.n, '', token);
//println("STORING SCOPE" + this.ts.cursor);