X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=24da7e53b44b2c78090ab213c4a60f3965c717ca;hp=c6880bcd3909f7b7e79175228aea3294ca2d7759;hb=311a1ae9ad87d3378c913e4e23efd008a56c8df7;hpb=542fdbb830207dd38aa62c61648bdd0f00d055ec
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index c6880bc..24da7e5 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) {
+ 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());
-
+ //!this.debug|| print( token.toString());
+ //print('SCOPE-VAR-VAL:' + token.toString());
if (!token) { // can return false at EOF!
break;
}
@@ -261,7 +266,7 @@ ScopeParser.prototype = {
continue;
}
//this.logR("parseScope GOT VAR : " + token.toString() + "");
- 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());
}
@@ -272,10 +277,10 @@ ScopeParser.prototype = {
if (this.mode == "BUILDING_SYMBOL_TREE") {
- identifier = scope.getIdentifier(token.data) ;
+ identifier = thisScope.getIdentifier(token.data) ;
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,39 +327,56 @@ ScopeParser.prototype = {
break;
case "PUNC.LEFT_CURLY": // {
-
+ case "PUNC.LEFT_PAREN": // (
+ //print('SCOPE-CURLY/PAREN:' + token.toString());
//println(""+token.data+"");
-
+ var curTS = this.ts;
if (token.props) {
- var curTS = this.ts;
+
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.parseScope(false);
}
this.ts = curTS;
// it's an object literal..
// the values could be replaced..
-
+ break;
}
- print('SCOPE-CURLY:' + JSON.stringify(token,null,4));
- print("NOT PROPS"); Seed.quit();
- isObjectLitAr.push(false);
- this.braceNesting++;
+
+ 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(""+token.data+"");
this.braceNesting--;
isObjectLitAr.pop();
@@ -374,7 +397,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
@@ -382,13 +405,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;
@@ -403,7 +426,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 == ':') {
@@ -433,7 +456,7 @@ ScopeParser.prototype = {
break;
case "NAME.NAME":
- print('SCOPE-NAME:' + token.toString());
+ //print('SCOPE-NAME:' + token.toString());
//print("DEAL WITH NAME:");
// got identifier..
@@ -474,7 +497,7 @@ ScopeParser.prototype = {
//println("GOT IDENT: " + symbol + "
");
//println("GOT IDENT (2): " + symbol + "
");
- identifier = this.getIdentifier(symbol, scope);
+ identifier = this.getIdentifier(symbol, thisScope);
if (identifier == false) {
// BUG!find out where builtin is defined...
@@ -500,7 +523,7 @@ ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
- print('SCOPE-KEYW:' + token.toString());
+ //print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
@@ -514,7 +537,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);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -527,7 +550,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);
}
@@ -545,6 +568,7 @@ ScopeParser.prototype = {
//if (this.ts.nextT()) break;
}
+ //print("<<< EXIT SCOPE");
//print("<<<<<<> ENTER EXPRESSION" + this.expN);
- while (token = this.ts.lookTok()) {
+ while (token = this.ts.nextTok()) {
-
+
/*
// moved out of loop?
@@ -595,115 +616,116 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + this.expN + ':' + token.toString());
+ //print('EXP' + token.toString());
//println(""+token.data+"");
//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) {
- print(scopeIndent + "<< 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());
+ //println(""+token.data+"");
+ var curTS = this.ts;
+ if (token.props) {
+
+ for (var prop in token.props) {
+ if (token.props[prop].val.data == 'function') {
+ // parse a function..
+ this.parseFunctProp(token.props[prop]);
+ continue;
+ }
+ // key value..
+
+ this.ts = new TokenStream(token.props[prop].val);
+ this.parseScope(currentScope);
+
+ }
+ 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':
-
+ 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 (this.mode == 'PASS2_SYMBOL_TREE') {
+
+ if (this.mode == 'PASS2_SYMBOL_TREE') {
identifier = this.getIdentifier(symbol, currentScope);
//println("??");
@@ -716,8 +738,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())
}
@@ -734,8 +758,9 @@ ScopeParser.prototype = {
//println("EID");
- case 'KEYW':
-
+ case 'KEYW':
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@ -771,11 +796,14 @@ ScopeParser.prototype = {
}
break;
}
-
+ default:
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ break;
}
- if (!this.ts.nextTok()) break;
+
}
- print(scopeIndent + "<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
this.expN--;
},
@@ -791,10 +819,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') {
@@ -844,21 +872,21 @@ ScopeParser.prototype = {
//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') {
@@ -868,7 +896,7 @@ ScopeParser.prototype = {
// Exception for Prototype 1.6...
identifier.preventMunging();
}
- argpos++;
+ //argpos++;
}
}