},
warn: function(s) {
+ //print('****************' + s);
this.warnings.push(s);
//println("WARNING:" + htmlescape(s) + "<BR>");
},
this.mode = 'BUILDING_SYMBOL_TREE';
this.parseScope(this.globalScope);
+
+ //print("---------------END PASS 1 ---------------- ");
+
},
mungeSymboltree : function()
{
log : function(str)
{
- //println("<B>LOG:</B>" + htmlescape(str) + "<BR/>\n");
+ print (" ".substring(0, this.braceNesting*2) + str);
+
+ //println("<B>LOG:</B>" + htmlescape(str) + "<BR/>\n");
},
logR : function(str)
{
parseScope : function(scope) // parse a token stream..
{
//this.timerPrint("parseScope EnterScope");
+ //this.log(">>> ENTER SCOPE" + this.scopes.length);
var symbol;
var token;
var identifier;
var expressionBraceNesting = this.braceNesting;
- var bracketNesting = 0;
+
var parensNesting = 0;
var isObjectLitAr = [ false ];
-
+ var isInObjectLitAr;
this.scopes.push(scope);
token = this.ts.lookTok(1);
while (token) {
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
- !this.debug|| print(token.type + '.' + token.name+ ":" + token.data);
+ //this.log(token.data);
+ if (token.type == 'NAME') {
+ // print('*' + token.data);
+ }
switch(token.type + '.' + token.name) {
case "KEYW.VAR":
case "KEYW.CONST": // not really relivant as it's only mozzy that does this.
if (!token) { // can return false at EOF!
break;
}
- if (token.name == "VAR") { // kludge..
+ if (token.name == "VAR" || token.data == ',') { // kludge..
continue;
}
//this.logR("parseScope GOT VAR : <B>" + token.toString() + "</B>");
if (token.type !="NAME") {
- print(token.toString());
+ for(var i = Math.max(this.ts.cursor-10,0); i < this.ts.cursor+1; i++) {
+ print(this.ts.tokens[i].toString());
+ }
+
print( "var without ident");
Seed.quit()
}
scope.declareIdentifier(token.data, token);
} else {
token.identifier = identifier;
- this.warn("The variable " + token.data + ' (line:' + token.line + ") has already been declared in the same scope...");
+ this.warn("(SCOPE) The variable " + token.data + ' (line:' + token.line + ") has already been declared in the same scope...");
}
}
if (token.name == "IN") {
break;
} else {
+ //var bn = this.braceNesting;
this.parseExpression();
+ //this.braceNesting = bn;
//this.logR("parseScope DONE : <B>ParseExpression</B> - tok is:" + this.ts.lookT(0).toString());
token = this.ts.lookTok(1);
break;
case "KEYW.FUNCTION":
//println("<i>"+token.data+"</i>");
+ var bn = this.braceNesting;
this.parseFunctionDeclaration();
+ this.braceNesting = bn;
break;
- case "KEYW.LEFT_CURLY": // {
+ case "PUNC.LEFT_CURLY": // {
//println("<i>"+token.data+"</i>");
isObjectLitAr.push(false);
this.braceNesting++;
+
+ //print(">>>>>> OBJLIT PUSH(false)" + this.braceNesting);
break;
- case "KEYW.RIGHT_CURLY": // }
+ case "PUNC.RIGHT_CURLY": // }
//println("<i>"+token.data+"</i>");
this.braceNesting--;
isObjectLitAr.pop();
- //assert braceNesting >= scope.getBraceNesting();
- if (this.braceNesting == scope.braceN) {
+ //print(">>>>>> OBJLIT POP"+ this.braceNesting);
+ //assert braceNesting >= scope.getBra ceNesting();
+
+ if (this.braceNesting < expressionBraceNesting) {
var ls = this.scopes.pop();
ls.getUsedSymbols();
+ // eat symbol if we are currently at {
+ if (this.ts.look(0).data == '{') {
+ this.ts.nextTok();
+ }
+
+ //print("<<<<<<<EXIT SCOPE" +this.scopes.length);
return;
}
break;
// then we are in an object lit.. -> we need to flag the brace as such...
isObjectLitAr.pop();
isObjectLitAr.push(true);
+ //print(">>>>>> OBJLIT REPUSH(true)");
}
- var isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
+ isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
if (isInObjectLitAr && this.ts.lookTok(1).data == ':' &&
( this.ts.lookTok(-1).data == '{' || this.ts.lookTok(-1).data == ':' )) {
if ((this.ts.lookTok(-1).data == "{") && (this.ts.lookTok(1).data == ":")) {
isObjectLitAr.pop();
isObjectLitAr.push(true);
+ //print(">>>>>> OBJLIT REPUSH(true)");
//println("<i>"+token.data+"</i>");
break;
}
// print("DEAL WITH obj lit:");
- var isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
+ isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
if (isInObjectLitAr && (this.ts.lookTok(1).data == ":") && (this.ts.lookTok(-1).data == ",")) {
// skip, it's an object lit key..
//if (this.ts.nextT()) break;
}
+ //print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
},
var expressionBraceNesting = this.braceNesting;
var bracketNesting = 0;
var parensNesting = 0;
-
+ var isInObjectLitAr;
var isObjectLitAr = [ false ];
while (token = this.ts.lookTok()) {
currentScope = this.scopes[this.scopes.length-1];
//println("<i>"+token.data+"</i>");
- !this.debug|| print ("EXP" + token.toString());
+ //this.log("EXP:" + token.data);
switch (token.type) {
case 'PUNC':
switch(token.data) {
isObjectLitAr.push(false);
this.braceNesting++;
+ ///print(">>>>> EXP PUSH(false)"+this.braceNesting);
break;
case '}': //Token.RC:
this.braceNesting--;
isObjectLitAr.pop();
-
+ //print(">>>>> EXP POP" + this.braceNesting);
// assert braceNesting >= expressionBraceNesting;
break;
// then we are in an object lit.. -> we need to flag the brace as such...
isObjectLitAr.pop();
isObjectLitAr.push(true);
+ //print(">>>>> EXP PUSH(true)");
}
- var isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
+ isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
if (isInObjectLitAr && this.ts.lookTok(1).data == ":" &&
( this.ts.lookTok(-1).data == "{" || this.ts.lookTok(-1).data == "," )) {
// see if we can replace..
case 'NAME':
symbol = token.data;
- if (this.ts.lookTok(-1).data == "{" && this.ts.lookTok(1).data == ":") {
+
+ if (this.ts.look(0).data == "{" && this.ts.lookTok(2).data == ":") {
// then we are in an object lit.. -> we need to flag the brace as such...
isObjectLitAr.pop();
isObjectLitAr.push(true);
+ //print(">>>>> EXP PUSH(true)");
break;
}
- var isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
- if (isInObjectLitAr && this.ts.lookTok(-1).data == "," && this.ts.lookTok(1).data == ":") {
+ isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
+ if (isInObjectLitAr && this.ts.lookTok(0).data == "," && this.ts.lookTok(2).data == ":") {
break;
}
-
- if (this.ts.lookTok(-1).data == ".") {
+ //print(this.ts.lookTok(0).data);
+ if (this.ts.lookTok(0).data == ".") {
//skip '.'
break;
}
parseFunctionDeclaration : function()
{
-
+ // print("PARSE FUNCTION");
var symbol;
var token;
var currentScope = false;
this.indexedScopes[this.ts.cursor] = fnScope;
} else {
- //println("FETCHING SCOPE" + this.ts.cursor);
+ //qln("FETCHING SCOPE" + this.ts.cursor);
fnScope = this.indexedScopes[this.ts.cursor];
+
}
// Parse function arguments.
var argpos = 0;
- while (!this.ts.lookTok().data == ')') { //(token = consumeToken()).getType() != Token.RP) {
+ while (this.ts.lookTok().data != ')') { //(token = consumeToken()).getType() != Token.RP) {
token = this.ts.nextTok();
-
+ // print ("FUNC ARGS: " + token.toString())
//assert token.getType() == Token.NAME ||
// token.getType() == Token.COMMA;
if (token.type == 'NAME' && this.mode == 'BUILDING_SYMBOL_TREE') {
projects / gnome.introspection-doc-generator / blobdiff