X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=473b5d999af64601b6157477b45bd32f058a30ee;hp=955e7ed2b5fdfa0dcb3a2133c71ee4efc0811b4f;hb=07d1a8a6e055b88eac9de3c6c3d0575e157b8d1b;hpb=d2bce8cb44af0ea493948c38292a5ae1d4afa8f3
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 955e7ed..473b5d9 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -141,7 +141,7 @@ ScopeParser.prototype = {
this.braceNesting = 0;
this.scopes = [];
-
+ //print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
@@ -224,7 +224,7 @@ ScopeParser.prototype = {
var isObjectLitAr = [ false ];
var isInObjectLitAr;
thisScope = scope;
- if (thisScope) {
+ if (thisScope && thisScope.gid != this.scopes[this.scopes.length-1]) {
this.scopes.push(scope);
} else {
thisScope = this.scopes[this.scopes.length-1]
@@ -258,7 +258,7 @@ ScopeParser.prototype = {
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;
}
@@ -277,7 +277,7 @@ ScopeParser.prototype = {
if (this.mode == "BUILDING_SYMBOL_TREE") {
- identifier = thisScope.getIdentifier(token.data) ;
+ identifier = thisScope.getIdentifier(token.data,token) ;
if (identifier == false) {
thisScope.declareIdentifier(token.data, token);
@@ -300,7 +300,21 @@ ScopeParser.prototype = {
} 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();
+ this.ts = TS;
+ }
+
this.braceNesting = bn;
//this.braceNesting = bn;
//this.logR("parseScope DONE : ParseExpression - tok is:" + this.ts.lookT(0).toString());
@@ -328,6 +342,7 @@ ScopeParser.prototype = {
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;
@@ -348,7 +363,7 @@ ScopeParser.prototype = {
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parseScope(false);
+ this.parseExpression();
}
this.ts = curTS;
@@ -411,7 +426,7 @@ ScopeParser.prototype = {
break;
case "KEYW.CATCH":
- //print('SCOPE-CATCH:' + token.toString());
+ print('SCOPE-CATCH:' + token.toString());
//println(""+token.data+"");
this.parseCatch();
break;
@@ -426,7 +441,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 == ':') {
@@ -456,27 +471,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..!!
@@ -488,6 +488,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() + "
");
@@ -497,7 +500,7 @@ ScopeParser.prototype = {
//println("GOT IDENT: " + symbol + "
");
//println("GOT IDENT (2): " + symbol + "
");
- identifier = this.getIdentifier(symbol, thisScope);
+ identifier = this.getIdentifier(symbol, thisScope, token);
if (identifier == false) {
// BUG!find out where builtin is defined...
@@ -523,7 +526,7 @@ ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
- print('SCOPE-KEYW:' + token.toString());
+ //print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
@@ -532,12 +535,13 @@ ScopeParser.prototype = {
if (symbol == "eval") {
// 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
var _t = this;
- this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
+ token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
- var hi = _t.getIdentifier(a, thisScope);
+ var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -568,7 +572,7 @@ ScopeParser.prototype = {
//if (this.ts.nextT()) break;
}
- print("<<< EXIT SCOPE");
+ //print("<<< EXIT SCOPE");
//print("<<<<<<"+token.data+"");
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[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(currentScope);
+ this.parseExpression();
}
this.ts = curTS;
@@ -723,11 +730,13 @@ ScopeParser.prototype = {
//skip '.'
break;
}
-
+ if (symbol == 'this') {
+ break;
+ }
if (this.mode == 'PASS2_SYMBOL_TREE') {
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, currentScope, token);
//println("??");
if (identifier == false) {
@@ -741,7 +750,7 @@ ScopeParser.prototype = {
//print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')');
//throw "OOPS";
} else {
- print("undeclared:" + token.toString())
+ //print("undeclared:" + token.toString())
}
@@ -773,11 +782,11 @@ ScopeParser.prototype = {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
if (symbol == "eval") {
- if (this.ts.look(-1).type == 'COMM') {
+ if (token.prefix && token.prefix.match('/eval/')) {
// 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);
+ token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+ var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -814,10 +823,11 @@ ScopeParser.prototype = {
var token;
var currentScope;
var identifier;
-
+
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
+ print(token.toString());
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
@@ -829,10 +839,10 @@ ScopeParser.prototype = {
// 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);
+ currentScope.declareIdentifier(symbol, token.items[0]);
} else {
//?? why inc the refcount?? - that should be set when building the tree???
- identifier = this.getIdentifier(symbol, currentScope);
+ identifier = this.getIdentifier(symbol, currentScope, token.items[0]);
identifier.refcount++;
}
@@ -858,17 +868,23 @@ 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);
}
token = this.ts.nextTok();
}
-
+ // return function() {....
+ if (token.name == "RETURN") {
+ token = this.ts.nextTok();
+ }
+ if (token.name == "FUNCTION") {
+ 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, currentScope, token.n, '', token);
//println("STORING SCOPE" + this.ts.cursor);
@@ -877,10 +893,9 @@ ScopeParser.prototype = {
} 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++) {
@@ -915,6 +930,7 @@ ScopeParser.prototype = {
_this.ts = new TokenStream(tar);
_this.parseScope(fnScope);
+
});
//print(JSON.stringify(this.ts,null,4));
@@ -946,10 +962,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;