X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=51929dc44e886ba7b37391e1977a4d084c21804e;hb=ac2c44449275085c8ce9ea348a75f84844d33a64;hp=d515586748615901df5a0ebe752e48f8e68bca63;hpb=0c1f4c84d2c895a915a71327ce0de52250b1e11d;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index d515586..51929dc 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -313,7 +313,8 @@ ScopeParser.prototype = {
break;
case "KEYW.FUNCTION":
- print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
+ if (this.mode == 'BUILDING_SYMBOL_TREE')
+ print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
//println(""+token.data+"");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
@@ -611,19 +612,16 @@ ScopeParser.prototype = {
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
- print("EXPR-PUNC:" + JSON.stringify(token, null, 4));
+ print("EXPR-PUNC:" + token.toString());
switch(token.data) {
case ';':
+ print("<< EXIT EXPRESSION");
+ break;
+
case ',':
- if (this.braceNesting == expressionBraceNesting &&
- bracketNesting == 0 &&
- parensNesting == 0) {
- print("<< EXIT EXPRESSION");
- this.expN--;
- return;
- }
+
break;
@@ -688,7 +686,8 @@ ScopeParser.prototype = {
break;
case 'STRN': // used for object lit detection..
- print("EXPR-STR:" + JSON.stringify(token, null, 4));
+ 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();
@@ -717,7 +716,8 @@ ScopeParser.prototype = {
case 'NAME':
- print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+ if (this.mode == 'BUILDING_SYMBOL_TREE')
+ print("EXPR-NAME:" + JSON.stringify(token, null, 4));
symbol = token.data;
//print("in NAME = " + token.toString());
//print("in NAME 0: " + this.ts.look(0).toString());
@@ -774,7 +774,8 @@ ScopeParser.prototype = {
//println("EID");
case 'KEYW':
- 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();
@@ -810,8 +811,9 @@ ScopeParser.prototype = {
}
break;
}
- default:
- print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ default:
+ if (this.mode == 'BUILDING_SYMBOL_TREE')
+ print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
break;
}
@@ -892,8 +894,8 @@ ScopeParser.prototype = {
fnScope = this.indexedScopes[this.ts.cursor];
}
-
- 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++) {