X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=e7120b44aaf6306a442253560347058cc477d27e;hp=40b1e66963a9f2fea71f34e771484e6d6aa8664c;hb=d5e878422cd67f7dbde1f3b3b9ee4f12f89d0fae;hpb=56b6177ba991706820b123ac0a3edf7d9c9b3ea8
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 40b1e66..e7120b4 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));
this.globalScope = new Scope(-1, false, -1, '');
@@ -258,7 +258,7 @@ ScopeParser.prototype = {
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
- //print('SCOPE-VAR-VAL:' + token.toString());
+ //print('SCOPE-VAR-VAL:' + JSON.stringify(token, null, 4));
if (!token) { // can return false at EOF!
break;
}
@@ -300,7 +300,21 @@ ScopeParser.prototype = {
} else {
//var bn = this.braceNesting;
var bn = this.braceNesting;
- this.parseExpression();
+ var nts = [];
+ while (true) {
+ if (!token || token.type == 'VOID' || token.data == ',') {
+ break;
+ }
+ nts.push(token);
+ token = this.ts.nextTok();
+ }
+ if (nts.length) {
+ var TS = this.ts;
+ this.ts = new TokenStream(nts);
+ this.parseExpression();
+ this.ts = TS;
+ }
+
this.braceNesting = bn;
//this.braceNesting = bn;
//this.logR("parseScope DONE : ParseExpression - tok is:" + this.ts.lookT(0).toString());
@@ -512,20 +526,24 @@ ScopeParser.prototype = {
if (token.type != 'KEYW') {
break;
}
- //print('SCOPE-KEYW:' + token.toString());
+ print('SCOPE-KEYW:' + token.toString());
// print("Check eval:");
symbol = token.data;
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 (this.ts.look(-1).type == "COMM") {
+ if (token.prefix && token.prefix.match(/eval/)) {
// look for eval:var:noreplace\n
+ print("MATCH!?");
var _t = this;
- this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) {
-
+ 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) {
@@ -605,7 +623,7 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- //print('EXP' + token.toString());
+ //print('EXPR' + token.toString());
//println(""+token.data+"");
@@ -628,7 +646,7 @@ ScopeParser.prototype = {
case '(': //Token.LP:
case '{': //Token.LC:
case '[': //Token.LB:
- print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
+ //print('SCOPE-CURLY/PAREN/BRACE:' + token.toString());
// print('SCOPE-CURLY/PAREN/BRACE:' + JSON.stringify(token, null,4));
//println(""+token.data+"");
var curTS = this.ts;
@@ -755,6 +773,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();
@@ -765,12 +785,18 @@ ScopeParser.prototype = {
symbol = token.data;
if (this.mode == 'BUILDING_SYMBOL_TREE') {
-
- if (symbol == "eval") {
- if (this.ts.look(-1).type == 'COMM') {
+
+ 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;
- this.ts.look(-1).data.replace(/eval:var:([a-z]+)/ig, function(m, a) {
+ 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) {
@@ -808,28 +834,30 @@ ScopeParser.prototype = {
var token;
var currentScope;
var identifier;
-
+
//token = getToken(-1);
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
+
+ //print(JSON.stringify(token,null,4));
//assert token.getType() == Token.LP; (
//token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
- symbol = token.items[0].data;
+ symbol = token.items[0][0].data;
currentScope = this.scopes[this.scopes.length-1];
if (this.mode == 'BUILDING_SYMBOL_TREE') {
// We must declare the exception identifier in the containing function
// scope to avoid errors related to the obfuscation process. No need to
// display a warning if the symbol was already declared here...
- currentScope.declareIdentifier(symbol, token);
+ currentScope.declareIdentifier(symbol, token.items[0][0]);
} else {
//?? why inc the refcount?? - that should be set when building the tree???
- identifier = this.getIdentifier(symbol, currentScope, token);
+ identifier = this.getIdentifier(symbol, currentScope, token.items[0][0]);
identifier.refcount++;
}
-
+
token = this.ts.nextTok();
//assert token.getType() == Token.RP; // )
},
@@ -859,7 +887,18 @@ ScopeParser.prototype = {
}
token = this.ts.nextTok();
}
-
+
+
+ // return 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);
@@ -871,10 +910,9 @@ ScopeParser.prototype = {
} else {
//qln("FETCHING SCOPE" + this.ts.cursor);
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++) {