X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=45943b4a8087695f0602d44a1cc58ed8f7d5c8c7;hb=e56710032e15cc902472306c6fb27c83fbe45b6b;hp=9358f9afbd9b9940e9cea312ba62579ae8ef09f9;hpb=62f2a68f8778cd542dccf38e9186241170c71ee0;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 9358f9a..45943b4 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -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() + "
");
@@ -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,7 +711,9 @@ ScopeParser.prototype = {
//skip '.'
break;
}
-
+ if (symbol == 'this') {
+ break;
+ }
if (this.mode == 'PASS2_SYMBOL_TREE') {
@@ -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())
}