X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=45943b4a8087695f0602d44a1cc58ed8f7d5c8c7;hb=e56710032e15cc902472306c6fb27c83fbe45b6b;hp=ada3fadbe32b7ee80d6639726c451f32d599aa43;hpb=f040fdbc8e04e11fae7fbf4bc87e9231e36e3dee;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index ada3fad..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 == ':') {
@@ -456,27 +456,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 +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() + "
");
@@ -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;
@@ -568,7 +556,7 @@ ScopeParser.prototype = {
//if (this.ts.nextT()) break;
}
- print("<<< EXIT SCOPE");
+ //print("<<< EXIT SCOPE");
//print("<<<<<<"+token.data+"");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
- print("EXPR-PUNC:" + token.toString());
+ //print("EXPR-PUNC:" + token.toString());
switch(token.data) {
case ';':
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
break;
case ',':
@@ -639,7 +627,7 @@ ScopeParser.prototype = {
case '(': //Token.LP:
case '{': //Token.LC:
case '[': //Token.LB:
- print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+ //print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
//println(""+token.data+"");
var curTS = this.ts;
if (token.props) {
@@ -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;
@@ -683,7 +671,7 @@ ScopeParser.prototype = {
case ')': //Token.RP:
case ']': //Token.RB:
case '}': //Token.RB:
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
return;
@@ -697,8 +685,8 @@ ScopeParser.prototype = {
break;
case 'STRN': // used for object lit detection..
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print("EXPR-STR:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ //print("EXPR-STR:" + JSON.stringify(token, null, 4));
break;
@@ -708,9 +696,9 @@ ScopeParser.prototype = {
case 'NAME':
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+ //print("EXPR-NAME:" + JSON.stringify(token, null, 4));
} else {
- print("EXPR-NAME:" + token.toString());
+ //print("EXPR-NAME:" + token.toString());
}
symbol = token.data;
//print("in NAME = " + token.toString());
@@ -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())
}
@@ -759,8 +749,8 @@ ScopeParser.prototype = {
//println("EID");
case 'KEYW':
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@ -797,13 +787,13 @@ ScopeParser.prototype = {
break;
}
default:
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
break;
}
}
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
this.expN--;
},
@@ -879,14 +869,14 @@ ScopeParser.prototype = {
fnScope = this.indexedScopes[token.id];
}
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- 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') {