X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScope.js;h=aa145c3dbcb84a895c539fff8dcdb1cef79325ab;hp=5179205696ef0ccba3015a86cc517383e5cc215b;hb=309249e9eba5141a1ebb6276c7ceba0ff787fc74;hpb=461bd02a4597736f5bec62f7615076258143d964 diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js index 5179205..aa145c3 100644 --- a/JSDOC/Scope.js +++ b/JSDOC/Scope.js @@ -10,7 +10,7 @@ Identifier = imports.Identifier.Identifier XObject = imports.XObject.XObject; -function Scope(braceN, parent, startTokN, lastIdent) +function Scope(braceN, parent, startTokN, lastIdent, token) { if (lastIdent.length) { // println("NEW SCOPE: " + lastIdent); @@ -25,7 +25,8 @@ function Scope(braceN, parent, startTokN, lastIdent) this.ident = lastIdent; this.gid = Scope.gid++; - println("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + "
"); + //print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + ' : ' + + // (token ? token.toString() : '')); if (parent) { this.parent.subScopes.push(this); @@ -54,7 +55,7 @@ Scope.prototype = { protectedVars : {}, // only used by to parent.. declareIdentifier : function(symbol, token) { - print("SCOPE : " + this.gid + " ADD IDENT(" + this.id + "):" + token.toString()+""); + //print("SCOPE : " + this.gid + " :SYM: " + symbol + " " + token.toString()+""); if (typeof(this.identifiers[symbol])== 'undefined') { @@ -69,15 +70,21 @@ Scope.prototype = { // then it's global... this.identifiers[symbol].toMunge = false; } + + this.addToParentScope(symbol); return this.identifiers[symbol]; }, - getIdentifier : function(symbol) { + getIdentifier : function(symbol, token) { if (typeof(this.identifiers[symbol])== 'undefined') { - print("SYMBOL NOT FOUND?" + symbol); + if (['String', 'Date'].indexOf(symbol)> -1) { + return false; + } + + //print("SCOPE : " + this.gid +" = SYMBOL NOT FOUND?" + token.toString()); return false; } - + //print("SCOPE : " + this.gid +" = FOUND:" + token.toString()); return this.identifiers[symbol]; }, @@ -234,7 +241,7 @@ Scope.prototype = { if (!repsym.length) { if (!freeSymbols.length) { - addSyms(JSDOC.Scope.twos); + addSyms(Scope.twos); } repsym = freeSymbols.shift(); // pop off beginngin??? }