X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=a0d02bc0b283aa253bef29382c170e94e5c032ac;hp=ea9a3f58e4428d5e5cd1d20178ea5838a4a8e8c4;hb=b7a44d56fcd63ee57ebd6e649f72b0f3a1304376;hpb=cc9bb0968a03501441c1077480697a7ec3d2c909
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index ea9a3f5..a0d02bc 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -223,13 +223,18 @@ ScopeParser.prototype = {
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");
+ //print(">> ENTER SCOPE");
@@ -238,7 +243,7 @@ ScopeParser.prototype = {
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);
@@ -246,14 +251,14 @@ ScopeParser.prototype = {
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());
+ //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());
- print('SCOPE-VAR:' + token.toString());
+ //print('SCOPE-VAR-VAL:' + token.toString());
if (!token) { // can return false at EOF!
break;
}
@@ -272,10 +277,10 @@ ScopeParser.prototype = {
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...");
@@ -313,7 +318,8 @@ ScopeParser.prototype = {
break;
case "KEYW.FUNCTION":
- print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
//println(""+token.data+"");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
@@ -321,21 +327,29 @@ ScopeParser.prototype = {
break;
case "PUNC.LEFT_CURLY": // {
-
+ case "PUNC.LEFT_PAREN": // (
+ case "PUNC.LEFT_BRACE": // (
+ //print('SCOPE-CURLY/PAREN:' + token.toString());
//println(""+token.data+"");
var curTS = this.ts;
if (token.props) {
for (var prop in token.props) {
- if (token.props[prop].val.data == 'function') {
+
+
+ // print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],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();
+
continue;
}
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parseScope(scope);
+ this.parseExpression();
}
this.ts = curTS;
@@ -345,11 +359,11 @@ ScopeParser.prototype = {
break;
}
- print('SCOPE-CURLY:' + JSON.stringify(token,null,4));
+
var _this = this;
token.items.forEach(function(expr) {
_this.ts = new TokenStream(expr);
- _this.parseExpression(scope)
+ _this.parseExpression()
});
this.ts = curTS;
//print("NOT PROPS"); Seed.quit();
@@ -359,8 +373,11 @@ ScopeParser.prototype = {
//print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
break;
-/*
+
case "PUNC.RIGHT_CURLY": // }
+ //print("<< EXIT SCOPE");
+ return;
+ /*
//println(""+token.data+"");
this.braceNesting--;
isObjectLitAr.pop();
@@ -381,7 +398,7 @@ ScopeParser.prototype = {
break;
*/
case "KEYW.WITH":
- print('SCOPE-WITH:' + token.toString());
+ //print('SCOPE-WITH:' + token.toString());
//println(""+token.data+"");
if (this.mode == "BUILDING_SYMBOL_TREE") {
// Inside a 'with' block, it is impossible to figure out
@@ -389,13 +406,13 @@ 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(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());
+ //print('SCOPE-CATCH:' + token.toString());
//println(""+token.data+"");
this.parseCatch();
break;
@@ -410,7 +427,7 @@ ScopeParser.prototype = {
case "STRN.DOUBLE_QUOTE": // used for object lit detection..
case "STRN.SINGLE_QUOTE":
- print('SCOPE-STRING:' + token.toString());
+ // print('SCOPE-STRING:' + token.toString());
//println(""+token.data+"");
if (this.ts.lookTok(-1).data == '{' && this.ts.lookTok(1).data == ':') {
@@ -440,27 +457,12 @@ ScopeParser.prototype = {
break;
case "NAME.NAME":
- print('SCOPE-NAME:' + token.toString());
+ //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(""+token.data+"");
- 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(""+token.data+"");
- break;
- }
-
+
// skip anyting with "." before it..!!
@@ -472,6 +474,9 @@ ScopeParser.prototype = {
//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() + "
..... -1 : " + this.ts.lookT(-1).toString() + "
");
@@ -481,7 +486,7 @@ ScopeParser.prototype = {
//println("GOT IDENT: " + symbol + "
");
//println("GOT IDENT (2): " + symbol + "
");
- identifier = this.getIdentifier(symbol, scope);
+ identifier = this.getIdentifier(symbol, thisScope, token);
if (identifier == false) {
// BUG!find out where builtin is defined...
@@ -507,7 +512,7 @@ ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
- print('SCOPE-KEYW:' + token.toString());
+ //print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
@@ -521,7 +526,7 @@ ScopeParser.prototype = {
var _t = this;
this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
- var hi = _t.getIdentifier(a, scope);
+ var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -534,7 +539,7 @@ ScopeParser.prototype = {
} 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);
}
@@ -552,6 +557,7 @@ ScopeParser.prototype = {
//if (this.ts.nextT()) break;
}
+ //print("<<< EXIT SCOPE");
//print("<<<<<<"+token.data+"");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
- print("EXPR-PUNC:" + JSON.stringify(token, null, 4));
+ //print("EXPR-PUNC:" + token.toString());
switch(token.data) {
case ';':
+ //print("<< EXIT EXPRESSION");
+ break;
+
case ',':
- if (this.braceNesting == expressionBraceNesting &&
- bracketNesting == 0 &&
- parensNesting == 0) {
- print("<< EXIT EXPRESSION");
- this.expN--;
- 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(""+token.data+"");
+ var curTS = this.ts;
+ if (token.props) {
+
+ for (var prop in token.props) {
+ 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:
+
- var ts = this.ts;
- var _this = this;
- token.items.forEach(function(ns) {
- print("EXPR-PUNC-MAKE:" + JSON.stringify(ns, null, 4));
- _this.ts = new TokenStream(ns);
- //_this.ts.cursor--;
- _this.parseExpression();
- });
- this.ts = ts;
+
- break;
-
+ case ')': //Token.RP:
case ']': //Token.RB:
+ case '}': //Token.RB:
+ //print("<< EXIT EXPRESSION");
return;
- case '(': //Token.LP:
+
parensNesting++;
break;
- case ')': //Token.RP:
- parensNesting--;
- break;
+
+
}
break;
case 'STRN': // used for object lit detection..
- print("EXPR-STR:" + JSON.stringify(token, null, 4));
- 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':
- print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+ if (this.mode == 'BUILDING_SYMBOL_TREE') {
+
+ //print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+ } else {
+ //print("EXPR-NAME:" + token.toString());
+ }
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());
- 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];
- //print ("isInObjectLitAr : " + isInObjectLitAr + ' ' + token.toString());
-
- if (isInObjectLitAr && this.ts.lookTok(0).data == "," && this.ts.lookTok(2).data == ":") {
- break;
- }
- //print(this.ts.lookTok(0).data);
- if (this.ts.lookTok(0).data == ".") {
+ //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("??");
if (identifier == false) {
@@ -733,8 +732,10 @@ ScopeParser.prototype = {
// 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())
}
@@ -752,7 +753,8 @@ ScopeParser.prototype = {
//println("EID");
case 'KEYW':
- print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@ -769,7 +771,7 @@ ScopeParser.prototype = {
// look for eval:var:noreplace\n
var _t = this;
this.ts.look(-1).data.replace(/eval:var:([a-z]+)/ig, function(m, a) {
- var hi = _t.getIdentifier(a, currentScope);
+ var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -788,13 +790,14 @@ ScopeParser.prototype = {
}
break;
}
- default:
- print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ default:
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
break;
}
}
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
this.expN--;
},
@@ -810,10 +813,10 @@ ScopeParser.prototype = {
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
//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].data;
currentScope = this.scopes[this.scopes.length-1];
if (this.mode == 'BUILDING_SYMBOL_TREE') {
@@ -823,7 +826,7 @@ ScopeParser.prototype = {
currentScope.declareIdentifier(symbol, token);
} else {
//?? why inc the refcount?? - that should be set when building the tree???
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, currentScope, token);
identifier.refcount++;
}
@@ -849,7 +852,7 @@ ScopeParser.prototype = {
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);
@@ -859,25 +862,25 @@ ScopeParser.prototype = {
//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];
}
-
- print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
var args = token.items;
for (var argpos =0; argpos < args.length; argpos++) {
token = args[argpos][0];
- // print ("FUNC ARGS: " + token.toString())
+ //print ("FUNC ARGS: " + token.toString())
//assert token.getType() == Token.NAME ||
// token.getType() == Token.COMMA;
if (token.type == 'NAME' && this.mode == 'BUILDING_SYMBOL_TREE') {
@@ -887,7 +890,7 @@ ScopeParser.prototype = {
// Exception for Prototype 1.6...
identifier.preventMunging();
}
- argpos++;
+ //argpos++;
}
}
@@ -906,6 +909,7 @@ ScopeParser.prototype = {
_this.ts = new TokenStream(tar);
_this.parseScope(fnScope);
+
});
//print(JSON.stringify(this.ts,null,4));
@@ -937,10 +941,10 @@ ScopeParser.prototype = {
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;