X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=b77f6ee11d9b206b0c6a32400a53c1251d79d33d;hp=ada3fadbe32b7ee80d6639726c451f32d599aa43;hb=632b7ff2d420baf9dd4a77edb7a714a5c8040fa4;hpb=f040fdbc8e04e11fae7fbf4bc87e9231e36e3dee diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js index ada3fad..b77f6ee 100644 --- a/JSDOC/ScopeParser.js +++ b/JSDOC/ScopeParser.js @@ -224,7 +224,7 @@ ScopeParser.prototype = { var isObjectLitAr = [ false ]; var isInObjectLitAr; thisScope = scope; - if (thisScope) { + if (thisScope && thisScope.gid != this.scopes[this.scopes.length-1]) { this.scopes.push(scope); } else { thisScope = this.scopes[this.scopes.length-1] @@ -277,7 +277,7 @@ ScopeParser.prototype = { if (this.mode == "BUILDING_SYMBOL_TREE") { - identifier = thisScope.getIdentifier(token.data) ; + identifier = thisScope.getIdentifier(token.data,token) ; if (identifier == false) { thisScope.declareIdentifier(token.data, token); @@ -426,7 +426,7 @@ ScopeParser.prototype = { case "STRN.DOUBLE_QUOTE": // used for object lit detection.. case "STRN.SINGLE_QUOTE": - print('SCOPE-STRING:' + token.toString()); + // print('SCOPE-STRING:' + token.toString()); //println(""+token.data+""); if (this.ts.lookTok(-1).data == '{' && this.ts.lookTok(1).data == ':') { @@ -456,27 +456,12 @@ ScopeParser.prototype = { break; case "NAME.NAME": - print('SCOPE-NAME:' + token.toString()); + //print('SCOPE-NAME:' + token.toString()); //print("DEAL WITH NAME:"); // got identifier.. // look for { ** : <- indicates obj literal.. ** this could occur with numbers .. - if ((this.ts.lookTok(-1).data == "{") && (this.ts.lookTok(1).data == ":")) { - isObjectLitAr.pop(); - isObjectLitAr.push(true); - //print(">>>>>> OBJLIT REPUSH(true)"); - //println(""+token.data+""); - break; - } - // print("DEAL WITH obj lit:"); - isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1]; - - if (isInObjectLitAr && (this.ts.lookTok(1).data == ":") && (this.ts.lookTok(-1).data == ",")) { - // skip, it's an object lit key.. - //println(""+token.data+""); - break; - } - + // skip anyting with "." before it..!! @@ -488,6 +473,9 @@ ScopeParser.prototype = { //print("SYMBOL: " + token.toString()); symbol = token.data; + if (symbol == 'this') { + break; + } if (this.mode == 'PASS2_SYMBOL_TREE') { //println("GOT IDENT: -2 : " + this.ts.lookT(-2).toString() + "
..... -1 : " + this.ts.lookT(-1).toString() + "
"); @@ -497,7 +485,7 @@ ScopeParser.prototype = { //println("GOT IDENT: " + symbol + "
"); //println("GOT IDENT (2): " + symbol + "
"); - identifier = this.getIdentifier(symbol, thisScope); + identifier = this.getIdentifier(symbol, thisScope, token); if (identifier == false) { // BUG!find out where builtin is defined... @@ -523,7 +511,7 @@ ScopeParser.prototype = { if (token.type != 'KEYW') { break; } - print('SCOPE-KEYW:' + token.toString()); + //print('SCOPE-KEYW:' + token.toString()); // print("Check eval:"); symbol = token.data; @@ -537,7 +525,7 @@ ScopeParser.prototype = { var _t = this; this.ts.look(-1).data.replace(/eval:var:([a-z_]+)/ig, function(m, a) { - var hi = _t.getIdentifier(a, thisScope); + var hi = _t.getIdentifier(a, thisScope, token); // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); if (hi) { // println("PROTECT "+a+" from munge"); @@ -568,7 +556,7 @@ ScopeParser.prototype = { //if (this.ts.nextT()) break; } - print("<<< EXIT SCOPE"); + //print("<<< EXIT SCOPE"); //print("<<<<<<"+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 +627,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) { @@ -653,7 +641,7 @@ ScopeParser.prototype = { // key value.. this.ts = new TokenStream(token.props[prop].val); - this.parseScope(currentScope); + this.parseScope(false); } this.ts = curTS; @@ -683,7 +671,7 @@ ScopeParser.prototype = { case ')': //Token.RP: case ']': //Token.RB: case '}': //Token.RB: - print("<< EXIT EXPRESSION"); + //print("<< EXIT EXPRESSION"); return; @@ -697,8 +685,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,9 +696,9 @@ 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()); @@ -723,11 +711,13 @@ ScopeParser.prototype = { //skip '.' break; } - + if (symbol == 'this') { + break; + } if (this.mode == 'PASS2_SYMBOL_TREE') { - identifier = this.getIdentifier(symbol, currentScope); + identifier = this.getIdentifier(symbol, currentScope, token); //println("??"); if (identifier == false) { @@ -741,7 +731,7 @@ ScopeParser.prototype = { //print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')'); //throw "OOPS"; } else { - print("undeclared:" + token.toString()) + //print("undeclared:" + token.toString()) } @@ -759,8 +749,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(); @@ -777,7 +767,7 @@ ScopeParser.prototype = { // look for eval:var:noreplace\n var _t = this; this.ts.look(-1).data.replace(/eval:var:([a-z]+)/ig, function(m, a) { - var hi = _t.getIdentifier(a, currentScope); + var hi = _t.getIdentifier(a, currentScope, token); //println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); if (hi) { // println("PROTECT "+a+" from munge"); @@ -797,13 +787,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--; }, @@ -832,7 +822,7 @@ ScopeParser.prototype = { currentScope.declareIdentifier(symbol, token); } else { //?? why inc the refcount?? - that should be set when building the tree??? - identifier = this.getIdentifier(symbol, currentScope); + identifier = this.getIdentifier(symbol, currentScope, token); identifier.refcount++; } @@ -858,7 +848,7 @@ ScopeParser.prototype = { if (this.mode == 'BUILDING_SYMBOL_TREE') { // Get the name of the function and declare it in the current scope. symbol = token.data; - if (currentScope.getIdentifier(symbol) != false) { + if (currentScope.getIdentifier(symbol,token) != false) { this.warn("The function " + symbol + " has already been declared in the same scope...", true); } currentScope.declareIdentifier(symbol,token); @@ -868,7 +858,7 @@ ScopeParser.prototype = { //assert token.getType() == Token.LP; if (this.mode == 'BUILDING_SYMBOL_TREE') { - fnScope = new Scope(this.braceNesting, currentScope, token.n, ''); + fnScope = new Scope(1, currentScope, token.n, ''); //println("STORING SCOPE" + this.ts.cursor); @@ -879,14 +869,14 @@ ScopeParser.prototype = { 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') { @@ -915,6 +905,7 @@ ScopeParser.prototype = { _this.ts = new TokenStream(tar); _this.parseScope(fnScope); + }); //print(JSON.stringify(this.ts,null,4)); @@ -946,10 +937,10 @@ ScopeParser.prototype = { scope.preventMunging(); }, - getIdentifier: function(symbol, scope) { + getIdentifier: function(symbol, scope, token) { var identifier; while (scope != false) { - identifier = scope.getIdentifier(symbol); + identifier = scope.getIdentifier(symbol, token); //println("ScopeParser.getIdentgetUsedSymbols("+symbol+")=" + scope.getUsedSymbols().join(',')); if (identifier) { return identifier;