X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=127a1a9f7c0ada33f1f19943c3b5027d191e1299;hb=a575703598e2a3f53a81a47e043c749db3dea6f2;hp=99b31a3f35d284d9d8c00d7293854f5a61566b42;hpb=8677f8ca2cba818ea485064aa691a51de57f35df;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 99b31a3..127a1a9 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -223,7 +223,12 @@ ScopeParser.prototype = {
var isObjectLitAr = [ false ];
var isInObjectLitAr;
- this.scopes.push(scope);
+ thisScope = scope;
+ if (thisScope) {
+ this.scopes.push(scope);
+ } else {
+ thisScope = this.scopes[scopes.length-1]
+ }
//var scopeIndent = '';
//this.scopes.forEach(function() {
@@ -253,7 +258,7 @@ ScopeParser.prototype = {
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) ;
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...");
@@ -330,16 +335,20 @@ ScopeParser.prototype = {
for (var prop in token.props) {
- print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4));
- 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;
@@ -353,7 +362,7 @@ ScopeParser.prototype = {
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();
@@ -396,7 +405,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(scope);
+ this.protectScopeFromObfuscation(thisScope);
this.warn("Using 'with' is not recommended." + (this.munge ? " Moreover, using 'with' reduces the level of compression!" : ""), true);
}
break;
@@ -488,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...
@@ -528,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");
@@ -541,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);
}
@@ -690,29 +699,8 @@ ScopeParser.prototype = {
case 'STRN': // used for object lit detection..
if (this.mode == 'BUILDING_SYMBOL_TREE')
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)");
- }
-
-
+
- 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;
@@ -724,27 +712,16 @@ ScopeParser.prototype = {
//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);
+ // prefixed with '.'
if (this.ts.lookTok(0).data == ".") {
//skip '.'
break;
}
- if (this.mode == 'PASS2_SYMBOL_TREE') {
+
+ if (this.mode == 'PASS2_SYMBOL_TREE') {
identifier = this.getIdentifier(symbol, currentScope);
//println("??");
@@ -758,7 +735,7 @@ ScopeParser.prototype = {
this.globalScope.declareIdentifier(symbol, token);
this.warn("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')', true);
} else {
- //println("undeclared")
+ print("undeclared:" + token.toString())
}
@@ -903,7 +880,7 @@ ScopeParser.prototype = {
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') {
@@ -913,7 +890,7 @@ ScopeParser.prototype = {
// Exception for Prototype 1.6...
identifier.preventMunging();
}
- argpos++;
+ //argpos++;
}
}