X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=111bbc5a6edfbdddee1c98cb72dafaccc882db10;hb=0ff3cbd55bdbbd1a914eaa8ecf63ca1d372b0cb4;hp=b4bfc12268a18d989bc1a161042aeed2614d7916;hpb=37793f028e134d00b7fe00ee6427a60a61cd72f4;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index b4bfc12..111bbc5 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -229,7 +229,7 @@ ScopeParser.prototype = {
//this.scopes.forEach(function() {
// scopeIndent += ' ';
//});
- //print(scopeIndent + ">> ENTER SCOPE");
+ print(">> ENTER SCOPE");
@@ -238,7 +238,7 @@ ScopeParser.prototype = {
while (token) {
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
//this.dumpToken(token , this.scopes, this.braceNesting);
- //print('SCOPE:' + token.toString());
+ print('SCOPE:' + token.toString());
//this.log(token.data);
if (token.type == 'NAME') {
// print('*' + token.data);
@@ -252,8 +252,8 @@ ScopeParser.prototype = {
//this.log("parseScope GOT VAR/CONST : " + token.toString());
while (true) {
token = this.ts.nextTok();
- !this.debug|| print( token.toString());
-
+ //!this.debug|| print( token.toString());
+ print('SCOPE-VAR:' + token.toString());
if (!token) { // can return false at EOF!
break;
}
@@ -261,7 +261,7 @@ ScopeParser.prototype = {
continue;
}
//this.logR("parseScope GOT VAR : " + token.toString() + "");
- if (token.type !="NAME") {
+ if (token.type != "NAME") {
for(var i = Math.max(this.ts.cursor-10,0); i < this.ts.cursor+1; i++) {
print(this.ts.tokens[i].toString());
}
@@ -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,15 +322,22 @@ 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) {
- var curTS = this.ts;
+
for (var prop in token.props) {
- if (token.props[prop].val.data == 'function') {
+
+
+ // print('SCOPE-PROPS:' + JSON.stringify(token.props[prop],null,4));
+ if (token.props[prop].val[0].data == 'function') {
// parse a function..
- this.parseFunctProp(token.props[prop]);
+ this.ts = new TokenStream(token.props[prop].val);
+ this.ts.nextTok();
+ this.parseFunctionDeclaration();
+
continue;
}
// key value..
@@ -342,18 +350,28 @@ ScopeParser.prototype = {
// it's an object literal..
// the values could be replaced..
-
+ break;
}
- print('SCOPE-CURLY:' + JSON.stringify(token,null,4));
- print("NOT PROPS"); Seed.quit();
- isObjectLitAr.push(false);
- this.braceNesting++;
+
+ var _this = this;
+ token.items.forEach(function(expr) {
+ _this.ts = new TokenStream(expr);
+ _this.parseExpression(scope)
+ });
+ this.ts = curTS;
+ //print("NOT PROPS"); Seed.quit();
+
+ //isObjectLitAr.push(false);
+ //this.braceNesting++;
//print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
break;
-/*
+
case "PUNC.RIGHT_CURLY": // }
+ print("<< EXIT SCOPE");
+ return;
+ /*
//println(""+token.data+"");
this.braceNesting--;
isObjectLitAr.pop();
@@ -545,6 +563,7 @@ ScopeParser.prototype = {
//if (this.ts.nextT()) break;
}
+ print("<<< EXIT SCOPE");
//print("<<<<<<> ENTER EXPRESSION" + this.expN);
- while (token = this.ts.lookTok()) {
+ while (token = this.ts.nextTok()) {
-
+
/*
// moved out of loop?
@@ -595,61 +611,89 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + this.expN + ':' + token.toString());
+ print('EXP' + token.toString());
//println(""+token.data+"");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
+ print("EXPR-PUNC:" + token.toString());
+
switch(token.data) {
case ';':
+ print("<< EXIT EXPRESSION");
+ break;
+
case ',':
- if (this.braceNesting == expressionBraceNesting &&
- bracketNesting == 0 &&
- parensNesting == 0) {
- print(scopeIndent + "<< 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:
- bracketNesting++;
- break;
-
+
+
+
+
+ case ')': //Token.RP:
case ']': //Token.RB:
- bracketNesting--;
- break;
-
- case '(': //Token.LP:
+ case '}': //Token.RB:
+ print("<< EXIT EXPRESSION");
+ return;
+
+
+
parensNesting++;
break;
- case ')': //Token.RP:
- parensNesting--;
- break;
+
+
}
break;
case 'STRN': // used for object lit detection..
+ 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();
@@ -678,7 +722,8 @@ ScopeParser.prototype = {
case 'NAME':
-
+ 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());
@@ -734,8 +779,9 @@ ScopeParser.prototype = {
//println("EID");
- case 'KEYW':
-
+ case 'KEYW':
+ if (this.mode == 'BUILDING_SYMBOL_TREE')
+ print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@ -771,11 +817,14 @@ ScopeParser.prototype = {
}
break;
}
-
+ default:
+ if (this.mode == 'BUILDING_SYMBOL_TREE')
+ print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ break;
}
- if (!this.ts.nextTok()) break;
+
}
- print(scopeIndent + "<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
},
@@ -851,8 +900,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++) {
@@ -873,7 +922,7 @@ ScopeParser.prototype = {
}
token = this.ts.nextTok();
- // print('FUNC-BODY:' + JSON.stringify(token,null,4));
+ //print('FUNC-BODY:' + JSON.stringify(token.items,null,4));
//Seed.quit();
//print(token.toString());
// assert token.getType() == Token.LC;
@@ -882,9 +931,15 @@ ScopeParser.prototype = {
//token = this.ts.nextTok();
//print(token.toString());
var outTS = this.ts;
- this.ts = new TokenStream(token.items);
- print(JSON.stringify(this.ts,null,4));
- this.parseScope(fnScope);
+ var _this = this;
+ token.items.forEach(function(tar) {
+ _this.ts = new TokenStream(tar);
+ _this.parseScope(fnScope);
+
+ });
+
+ //print(JSON.stringify(this.ts,null,4));
+ //this.parseScope(fnScope);
this.ts = outTS;
// now pop it off the stack!!!