X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=b77f6ee11d9b206b0c6a32400a53c1251d79d33d;hp=7c06bd2fe5f71c72332dd74e63ced7ccb18710a3;hb=632b7ff2d420baf9dd4a77edb7a714a5c8040fa4;hpb=676fe82f15f61f5921e29850c473dda33d7cebc5
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 7c06bd2..b77f6ee 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -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]
@@ -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);
@@ -426,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 == ':') {
@@ -461,22 +461,7 @@ ScopeParser.prototype = {
// 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 +473,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 +485,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 +511,7 @@ ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
- print('SCOPE-KEYW:' + token.toString());
+ //print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
@@ -537,7 +525,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, thisScope);
+ var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
// println("PROTECT "+a+" from munge");
@@ -653,7 +641,7 @@ ScopeParser.prototype = {
// key value..
this.ts = new TokenStream(token.props[prop].val);
- this.parseScope(currentScope);
+ this.parseScope(false);
}
this.ts = curTS;
@@ -723,11 +711,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 +731,7 @@ ScopeParser.prototype = {
//print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')');
//throw "OOPS";
} else {
- print("undeclared:" + token.toString())
+ //print("undeclared:" + token.toString())
}
@@ -777,7 +767,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");
@@ -832,7 +822,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++;
}
@@ -858,7 +848,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);
@@ -868,7 +858,7 @@ 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, '');
//println("STORING SCOPE" + this.ts.cursor);
@@ -915,6 +905,7 @@ ScopeParser.prototype = {
_this.ts = new TokenStream(tar);
_this.parseScope(fnScope);
+
});
//print(JSON.stringify(this.ts,null,4));
@@ -946,10 +937,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;