X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=8676d813649665cbdb157e30b09b6b7406ec4e34;hb=a0aaaf1f4c0b40c6d613c61d89f2049321f1020d;hp=5ecc388a22825f0ff897fbff8dfb8c6ef2efeb2d;hpb=3cc16040a01e94ec391a7b32b4abca0621581dd6;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 5ecc388..8676d81 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, '');
@@ -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;
@@ -533,18 +533,22 @@ ScopeParser.prototype = {
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- if (symbol == "eval") {
+ if (token.name == "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/')) {
+ if (token.prefix && token.prefix.match(/eval/)) {
// look for eval:var:noreplace\n
+ //print("MATCH!?");
var _t = this;
token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-
+ //print("GOT: " + a);
var hi = _t.getIdentifier(a, thisScope, token);
// println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
- // println("PROTECT "+a+" from munge");
+ // print("PROTECT "+a+" from munge");
+ //print(JSON.stringify(hi,null,4));
hi.toMunge = false;
}
@@ -620,7 +624,7 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXPR' + token.toString());
//println(""+token.data+"");
@@ -770,6 +774,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,12 +786,18 @@ ScopeParser.prototype = {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
- if (symbol == "eval") {
- if (token.prefix && token.prefix.match('/eval/')) {
+
+ if (token.name == "EVAL") {
+ //print(JSON.stringify(token,null,4));
+ if (token.prefix && token.prefix.match(/eval:var:/g)) {
// look for eval:var:noreplace\n
+ // print("GOT MATCH?");
var _t = this;
token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+
+ //print("PROTECT: " + a);
+
+
var hi = _t.getIdentifier(a, currentScope, token);
//println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING"));
if (hi) {
@@ -876,13 +888,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 +913,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++) {