X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=7f3864511bc08024b0872ce9015ea36f9e699001;hp=ccb0acf9906ad6758b6beb710ceddd97a7d44a81;hb=2dc85a1416c3105a7436bc00cdc27c54888125d1;hpb=20d93120c51a8996942ec6f3707fce12f5a537ae
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index ccb0acf..7f38645 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -258,7 +258,7 @@ ScopeParser.prototype = {
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
- print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
+ //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
if (!token) { // can return false at EOF!
break;
}
@@ -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;
@@ -620,7 +620,7 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXPR' + token.toString());
//println(""+token.data+"");
@@ -780,8 +780,9 @@ ScopeParser.prototype = {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
+
if (symbol == "eval") {
+ print(JSON.stringify(token,null,4));
if (token.prefix && token.prefix.match('/eval/')) {
// look for eval:var:noreplace\n
var _t = this;
@@ -828,7 +829,7 @@ ScopeParser.prototype = {
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
- print(JSON.stringify(token,null,4));
+ //print(JSON.stringify(token,null,4));
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
@@ -876,13 +877,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 +902,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++) {