X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=51929dc44e886ba7b37391e1977a4d084c21804e;hb=ac2c44449275085c8ce9ea348a75f84844d33a64;hp=e0ac2e6b92c4a0db24e44482dcc126cccf67188c;hpb=8d8fb54b0ee037592b30bf931dd6f1f507c51798;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index e0ac2e6..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();
@@ -321,7 +322,8 @@ ScopeParser.prototype = {
break;
case "PUNC.LEFT_CURLY": // {
-
+ case "PUNC.LEFT_PAREN": // (
+ print('SCOPE-CURLY/PAREN:' + token.toString());
//println(""+token.data+"");
var curTS = this.ts;
if (token.props) {
@@ -345,7 +347,7 @@ ScopeParser.prototype = {
break;
}
- print('SCOPE-CURLY:' + JSON.stringify(token,null,4));
+
var _this = this;
token.items.forEach(function(expr) {
_this.ts = new TokenStream(expr);
@@ -610,68 +612,82 @@ 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;
-
+ case '(': //Token.LP:
case '{': //Token.LC:
- isObjectLitAr.push(false);
+ case '[': //Token.LB:
+ print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+ //println(""+token.data+"");
+ var curTS = this.ts;
+ if (token.props) {
+
+ for (var prop in token.props) {
+ if (token.props[prop].val.data == 'function') {
+ // parse a function..
+ this.parseFunctProp(token.props[prop]);
+ continue;
+ }
+ // key value..
+
+ this.ts = new TokenStream(token.props[prop].val);
+ this.parseScope(currentScope);
+
+ }
+ this.ts = curTS;
+
+ // it's an object literal..
+ // the values could be replaced..
+ break;
+ }
+
- this.braceNesting++;
+ var _this = this;
+ token.items.forEach(function(expr) {
+ _this.ts = new TokenStream(expr);
+ _this.parseExpression()
+ });
+ this.ts = curTS;
+
+
+
///print(">>>>> EXP PUSH(false)"+this.braceNesting);
break;
- case '}': //Token.RC:
- this.braceNesting--;
- isObjectLitAr.pop();
- //print(">>>>> EXP POP" + this.braceNesting);
- // assert braceNesting >= expressionBraceNesting;
- break;
-
- case '[': //Token.LB:
+
- var ts = this.ts;
- var _this = this;
- token.items.forEach(function(ns) {
- print("EXPR-PUNC-MAKE:" + JSON.stringify(ns, null, 4));
- _this.ts = new TokenStream(ns);
- //_this.ts.cursor--;
- _this.parseExpression();
- });
- this.ts = ts;
+
- break;
-
+ case ')': //Token.RP:
case ']': //Token.RB:
+ case '}': //Token.RB:
print("<< EXIT EXPRESSION");
return;
- case '(': //Token.LP:
+
parensNesting++;
break;
- case ')': //Token.RP:
- parensNesting--;
- break;
+
+
}
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();
@@ -700,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());
@@ -757,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();
@@ -793,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;
}
@@ -875,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++) {