X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=f66bc5043db3767e6ee64007fb9e744a27b81b15;hp=d2ded369c73a3ad0e7c17a866af5a2db13b1cdd9;hb=9354acf44e74342895afebcf7408e6ea72f784c6;hpb=bf0dc74f117749576f2dbcf2ec602600c5f0c298
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index d2ded36..f66bc50 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -141,7 +141,7 @@ ScopeParser.prototype = {
this.braceNesting = 0;
this.scopes = [];
- //print(JSON.stringify(this.ts.tokens, null,4));
+ // print(JSON.stringify(this.ts.tokens, null,4));
this.globalScope = new Scope(-1, false, -1, '');
@@ -243,7 +243,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);
@@ -426,7 +426,7 @@ ScopeParser.prototype = {
break;
case "KEYW.CATCH":
- print('SCOPE-CATCH:' + token.toString());
+ //print('SCOPE-CATCH:' + token.toString());
//println(""+token.data+"");
this.parseCatch();
break;
@@ -526,7 +526,7 @@ ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
- //print('SCOPE-KEYW:' + token.toString());
+ print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
@@ -534,6 +534,8 @@ ScopeParser.prototype = {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
if (symbol == "eval") {
+
+ print(JSON.stringify(token, null,4));
// look back one and see if we can find a comment!!!
//if (this.ts.look(-1).type == "COMM") {
if (token.prefix && token.prefix.match('/eval/')) {
@@ -620,7 +622,7 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXPR' + token.toString());
//println(""+token.data+"");
@@ -770,6 +772,8 @@ ScopeParser.prototype = {
case 'KEYW':
//if (this.mode == 'BUILDING_SYMBOL_TREE')
// print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+
+ print('EXPR-KEYW:' + token.toString());
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@ -780,8 +784,9 @@ ScopeParser.prototype = {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
- if (symbol == "eval") {
+
+ if (token.name == "EVAL") {
+ print(JSON.stringify(token,null,4));
if (token.prefix && token.prefix.match('/eval/')) {
// look for eval:var:noreplace\n
var _t = this;
@@ -876,13 +881,18 @@ ScopeParser.prototype = {
}
token = this.ts.nextTok();
}
+
+
// return function() {....
- if (token.name == "RETURN") {
- token = this.ts.nextTok();
- }
- if (token.name == "FUNCTION") {
+ while (token.data != "(") {
+ print(token.toString());
token = this.ts.nextTok();
+
+
+
}
+
+
//assert token.getType() == Token.LP;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
fnScope = new Scope(1, currentScope, token.n, '', token);
@@ -896,7 +906,7 @@ ScopeParser.prototype = {
fnScope = this.indexedScopes[token.id];
}
//if (this.mode == 'BUILDING_SYMBOL_TREE')
- // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+ // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
var args = token.items;
for (var argpos =0; argpos < args.length; argpos++) {