projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JSDOC/ScopeParser.js
[gnome.introspection-doc-generator]
/
JSDOC
/
ScopeParser.js
diff --git
a/JSDOC/ScopeParser.js
b/JSDOC/ScopeParser.js
index
ad53d87
..
619dd6c
100644
(file)
--- a/
JSDOC/ScopeParser.js
+++ b/
JSDOC/ScopeParser.js
@@
-1,7
+1,7
@@
//<Script type="text/javascript">
//<Script type="text/javascript">
-Scope = imports
['JSDOC/Scope.js']
.Scope;
-
+Scope = imports
.Scope
.Scope;
+TokenStream = imports.TokenStream.TokenStream;
/**
* Scope stuff
*
/**
* Scope stuff
*
@@
-229,7
+229,7
@@
ScopeParser.prototype = {
//this.scopes.forEach(function() {
// scopeIndent += ' ';
//});
//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);
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);
//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.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;
}
if (!token) { // can return false at EOF!
break;
}
@@
-261,7
+261,7
@@
ScopeParser.prototype = {
continue;
}
//this.logR("parseScope GOT VAR : <B>" + token.toString() + "</B>");
continue;
}
//this.logR("parseScope GOT VAR : <B>" + token.toString() + "</B>");
- 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());
}
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,7
@@
ScopeParser.prototype = {
break;
case "KEYW.FUNCTION":
break;
case "KEYW.FUNCTION":
- print('SCOPE-FUNC:' +
token.toString(
));
+ print('SCOPE-FUNC:' +
JSON.stringify(token,null,4
));
//println("<i>"+token.data+"</i>");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
//println("<i>"+token.data+"</i>");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
@@
-321,11
+321,12
@@
ScopeParser.prototype = {
break;
case "PUNC.LEFT_CURLY": // {
break;
case "PUNC.LEFT_CURLY": // {
-
+ case "PUNC.LEFT_PAREN": // (
+ print('SCOPE-CURLY/PAREN:' + token.toString());
//println("<i>"+token.data+"</i>");
//println("<i>"+token.data+"</i>");
-
+ var curTS = this.ts;
if (token.props) {
if (token.props) {
- var curTS = this.ts;
+
for (var prop in token.props) {
if (token.props[prop].val.data == 'function') {
// parse a function..
for (var prop in token.props) {
if (token.props[prop].val.data == 'function') {
// parse a function..
@@
-342,18
+343,28
@@
ScopeParser.prototype = {
// it's an object literal..
// the values could be replaced..
// 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;
//print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
break;
-/*
+
case "PUNC.RIGHT_CURLY": // }
case "PUNC.RIGHT_CURLY": // }
+ print("<< EXIT SCOPE");
+ return;
+ /*
//println("<i>"+token.data+"</i>");
this.braceNesting--;
isObjectLitAr.pop();
//println("<i>"+token.data+"</i>");
this.braceNesting--;
isObjectLitAr.pop();
@@
-545,6
+556,7
@@
ScopeParser.prototype = {
//if (this.ts.nextT()) break;
}
//if (this.ts.nextT()) break;
}
+ print("<<< EXIT SCOPE");
//print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
},
//print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
},
@@
-575,14
+587,11
@@
ScopeParser.prototype = {
currentScope = this.scopes[this.scopes.length-1];
currentScope = this.scopes[this.scopes.length-1];
- var scopeIndent = '';
- this.scopes.forEach(function() {
- scopeIndent += ' ';
- });
+
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
//print(scopeIndent + ">> ENTER EXPRESSION" + this.expN);
- while (token = this.ts.
look
Tok()) {
+ while (token = this.ts.
next
Tok()) {
-
+
/*
// moved out of loop?
/*
// moved out of loop?
@@
-595,13
+604,15
@@
ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
-
//print('EXP' + this.expN + ':' +
token.toString());
+
print('EXP' +
token.toString());
//println("<i>"+token.data+"</i>");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
//println("<i>"+token.data+"</i>");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
+ print("EXPR-PUNC:" + JSON.stringify(token, null, 4));
+
switch(token.data) {
case ';':
switch(token.data) {
case ';':
@@
-609,7
+620,7
@@
ScopeParser.prototype = {
if (this.braceNesting == expressionBraceNesting &&
bracketNesting == 0 &&
parensNesting == 0) {
if (this.braceNesting == expressionBraceNesting &&
bracketNesting == 0 &&
parensNesting == 0) {
- print(
scopeIndent +
"<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
return;
}
this.expN--;
return;
}
@@
-632,13
+643,24
@@
ScopeParser.prototype = {
break;
case '[': //Token.LB:
break;
case '[': //Token.LB:
- bracketNesting++;
+
+ 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;
break;
-
+
case ']': //Token.RB:
case ']': //Token.RB:
- bracketNesting--;
- break;
-
+ print("<< EXIT EXPRESSION");
+ return;
+
+
case '(': //Token.LP:
parensNesting++;
break;
case '(': //Token.LP:
parensNesting++;
break;
@@
-650,6
+672,7
@@
ScopeParser.prototype = {
break;
case 'STRN': // used for object lit detection..
break;
case 'STRN': // used for object lit detection..
+ 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();
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
+701,7
@@
ScopeParser.prototype = {
case 'NAME':
case 'NAME':
-
+ 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());
symbol = token.data;
//print("in NAME = " + token.toString());
//print("in NAME 0: " + this.ts.look(0).toString());
@@
-734,8
+757,8
@@
ScopeParser.prototype = {
//println("<B>EID</B>");
//println("<B>EID</B>");
-
case 'KEYW':
-
+ case 'KEYW':
+ print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@
-771,11
+794,13
@@
ScopeParser.prototype = {
}
break;
}
}
break;
}
-
+ default:
+ print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ break;
}
}
- if (!this.ts.nextTok()) break;
+
}
}
- print(
scopeIndent +
"<< EXIT EXPRESSION");
+ print("<< EXIT EXPRESSION");
this.expN--;
},
this.expN--;
},
@@
-852,10
+877,12
@@
ScopeParser.prototype = {
}
}
+ print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
// Parse function arguments.
- var argpos = 0;
- while (this.ts.lookTok().data != ')') { //(token = consumeToken()).getType() != Token.RP) {
- token = this.ts.nextTok();
+ var args = token.items;
+ for (var argpos =0; argpos < args.length; argpos++) {
+
+ token = args[argpos][0];
// print ("FUNC ARGS: " + token.toString())
//assert token.getType() == Token.NAME ||
// token.getType() == Token.COMMA;
// print ("FUNC ARGS: " + token.toString())
//assert token.getType() == Token.NAME ||
// token.getType() == Token.COMMA;
@@
-869,20
+896,30
@@
ScopeParser.prototype = {
argpos++;
}
}
argpos++;
}
}
-
+
token = this.ts.nextTok();
token = this.ts.nextTok();
+ //print('FUNC-BODY:' + JSON.stringify(token.items,null,4));
+ //Seed.quit();
//print(token.toString());
// assert token.getType() == Token.LC;
//print(token.toString());
// assert token.getType() == Token.LC;
- this.braceNesting++;
-
- token = this.ts.nextTok();
+
//
this.braceNesting++;
+
+
//
token = this.ts.nextTok();
//print(token.toString());
//print(token.toString());
-
-
- this.parseScope(fnScope);
+ var outTS = this.ts;
+ 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!!!
// now pop it off the stack!!!
- this.braceNesting = b4braceNesting;
+
//
this.braceNesting = b4braceNesting;
//print("ENDFN -1: " + this.ts.lookTok(-1).toString());
//print("ENDFN 0: " + this.ts.lookTok(0).toString());
//print("ENDFN 1: " + this.ts.lookTok(1).toString());
//print("ENDFN -1: " + this.ts.lookTok(-1).toString());
//print("ENDFN 0: " + this.ts.lookTok(0).toString());
//print("ENDFN 1: " + this.ts.lookTok(1).toString());