X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=333a7f78f2b894df4cc32a47b9dc336cc0e9bc40;hb=fbd039402e2ec47410eb1e2cb388b9d8321d30f6;hp=eeb6c48ae28da9e767315f6565cbeef00814d981;hpb=a47776c300f55723476f7bf4423e7da82d3dfc86;p=gnome.introspection-doc-generator
diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index eeb6c48..333a7f7 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -234,7 +234,7 @@ ScopeParser.prototype = {
//this.scopes.forEach(function() {
// scopeIndent += ' ';
//});
- print(">> ENTER SCOPE");
+ //print(">> ENTER SCOPE");
@@ -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);
@@ -251,14 +251,14 @@ ScopeParser.prototype = {
switch(token.type + '.' + token.name) {
case "KEYW.VAR":
case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
- print('SCOPE-VAR:' + token.toString());
+ //print('SCOPE-VAR:' + token.toString());
var vstart = this.ts.cursor +1;
//this.log("parseScope GOT VAR/CONST : " + token.toString());
while (true) {
token = this.ts.nextTok();
//!this.debug|| print( token.toString());
- print('SCOPE-VAR-VAL:' + token.toString());
+ //print('SCOPE-VAR-VAL:' + token.toString());
if (!token) { // can return false at EOF!
break;
}
@@ -318,8 +318,8 @@ ScopeParser.prototype = {
break;
case "KEYW.FUNCTION":
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print('SCOPE-FUNC:' + JSON.stringify(token,null,4));
//println(""+token.data+"");
var bn = this.braceNesting;
this.parseFunctionDeclaration();
@@ -328,7 +328,7 @@ ScopeParser.prototype = {
case "PUNC.LEFT_CURLY": // {
case "PUNC.LEFT_PAREN": // (
- print('SCOPE-CURLY/PAREN:' + token.toString());
+ //print('SCOPE-CURLY/PAREN:' + token.toString());
//println(""+token.data+"");
var curTS = this.ts;
if (token.props) {
@@ -374,7 +374,7 @@ ScopeParser.prototype = {
break;
case "PUNC.RIGHT_CURLY": // }
- print("<< EXIT SCOPE");
+ //print("<< EXIT SCOPE");
return;
/*
//println(""+token.data+"");
@@ -397,7 +397,7 @@ ScopeParser.prototype = {
break;
*/
case "KEYW.WITH":
- print('SCOPE-WITH:' + token.toString());
+ //print('SCOPE-WITH:' + token.toString());
//println(""+token.data+"");
if (this.mode == "BUILDING_SYMBOL_TREE") {
// Inside a 'with' block, it is impossible to figure out
@@ -411,7 +411,7 @@ ScopeParser.prototype = {
break;
case "KEYW.CATCH":
- print('SCOPE-CATCH:' + token.toString());
+ //print('SCOPE-CATCH:' + token.toString());
//println(""+token.data+"");
this.parseCatch();
break;
@@ -456,7 +456,7 @@ ScopeParser.prototype = {
break;
case "NAME.NAME":
- print('SCOPE-NAME:' + token.toString());
+ //print('SCOPE-NAME:' + token.toString());
//print("DEAL WITH NAME:");
// got identifier..
@@ -616,19 +616,19 @@ ScopeParser.prototype = {
*/
//this.dumpToken(token, this.scopes, this.braceNesting );
- print('EXP' + token.toString());
+ //print('EXP' + token.toString());
//println(""+token.data+"");
//this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
- print("EXPR-PUNC:" + token.toString());
+ //print("EXPR-PUNC:" + token.toString());
switch(token.data) {
case ';':
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
break;
case ',':
@@ -639,7 +639,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());
//println(""+token.data+"");
var curTS = this.ts;
if (token.props) {
@@ -683,7 +683,7 @@ ScopeParser.prototype = {
case ')': //Token.RP:
case ']': //Token.RB:
case '}': //Token.RB:
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
return;
@@ -697,8 +697,8 @@ ScopeParser.prototype = {
break;
case 'STRN': // used for object lit detection..
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print("EXPR-STR:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ //print("EXPR-STR:" + JSON.stringify(token, null, 4));
break;
@@ -708,18 +708,18 @@ ScopeParser.prototype = {
case 'NAME':
if (this.mode == 'BUILDING_SYMBOL_TREE') {
- print("EXPR-NAME:" + JSON.stringify(token, null, 4));
+ //print("EXPR-NAME:" + JSON.stringify(token, null, 4));
} else {
- print("EXPR-NAME:" + token.toString());
- }
+ //print("EXPR-NAME:" + token.toString());
+ }
symbol = token.data;
//print("in NAME = " + token.toString());
//print("in NAME 0: " + this.ts.look(0).toString());
//print("in NAME 2: " + this.ts.lookTok(2).toString());
- //print(this.ts.lookTok(0).data);
+ //print(this.ts.lookTok(-1).data);
// prefixed with '.'
- if (this.ts.lookTok(0).data == ".") {
+ if (this.ts.lookTok(-1).data == ".") {
//skip '.'
break;
}
@@ -738,6 +738,8 @@ ScopeParser.prototype = {
// any conflict with other munged symbols.
this.globalScope.declareIdentifier(symbol, token);
this.warn("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')', true);
+ //print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')');
+ //throw "OOPS";
} else {
print("undeclared:" + token.toString())
}
@@ -757,8 +759,8 @@ ScopeParser.prototype = {
//println("EID");
case 'KEYW':
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-KEYW:" + JSON.stringify(token, null, 4));
if (token.name == "FUNCTION") {
this.parseFunctionDeclaration();
@@ -795,13 +797,13 @@ ScopeParser.prototype = {
break;
}
default:
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print("EXPR-SKIP:" + JSON.stringify(token, null, 4));
break;
}
}
- print("<< EXIT EXPRESSION");
+ //print("<< EXIT EXPRESSION");
this.expN--;
},
@@ -817,10 +819,10 @@ ScopeParser.prototype = {
//assert token.getType() == Token.CATCH;
token = this.ts.nextTok();
//assert token.getType() == Token.LP; (
- token = this.ts.nextTok();
+ //token = this.ts.nextTok();
//assert token.getType() == Token.NAME;
- symbol = token.data;
+ symbol = token.items[0].data;
currentScope = this.scopes[this.scopes.length-1];
if (this.mode == 'BUILDING_SYMBOL_TREE') {
@@ -870,21 +872,21 @@ ScopeParser.prototype = {
//println("STORING SCOPE" + this.ts.cursor);
- this.indexedScopes[this.ts.cursor] = fnScope;
+ this.indexedScopes[token.id] = fnScope;
} else {
//qln("FETCHING SCOPE" + this.ts.cursor);
- fnScope = this.indexedScopes[this.ts.cursor];
+ fnScope = this.indexedScopes[token.id];
}
- if (this.mode == 'BUILDING_SYMBOL_TREE')
- print('FUNC-PARSE:' + JSON.stringify(token,null,4));
+ //if (this.mode == 'BUILDING_SYMBOL_TREE')
+ // print('FUNC-PARSE:' + JSON.stringify(token,null,4));
// Parse function arguments.
var args = token.items;
for (var argpos =0; argpos < args.length; argpos++) {
token = args[argpos][0];
- print ("FUNC ARGS: " + token.toString())
+ //print ("FUNC ARGS: " + token.toString())
//assert token.getType() == Token.NAME ||
// token.getType() == Token.COMMA;
if (token.type == 'NAME' && this.mode == 'BUILDING_SYMBOL_TREE') {