X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScope.js;h=f66a40701452b0d86eddba1408bb5854cb1c71c9;hp=e91273646a4de7094e91884653b0191e4002a8e5;hb=9f004af67192a92ecb0e84b5b76170a16d10d941;hpb=18a2fc9c73ff01f7f9febbf671344a0a4ca1b68f
diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index e912736..f66a407 100644
--- a/JSDOC/Scope.js
+++ b/JSDOC/Scope.js
@@ -6,11 +6,11 @@
* // FIXME - I need this to do next() without doccomments..
*/
-Identifier = imports['JSDOC/Identifier.js'].Identifier
+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);
@@ -23,9 +23,10 @@ function Scope(braceN, parent, startTokN, lastIdent)
this.subScopes = [];
this.hints = { };
this.ident = lastIdent;
+ this.gid = Scope.gid++;
-
- //println("ADD SCOPE(" + this.id + ") TO "+ (parent ? this.parent.id : '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) {
- //println("ADD IDENT(" + this.id + "):" + symbol+"
");
+ //print("SCOPE : " + this.gid + " : " + token.toString()+"");
if (typeof(this.identifiers[symbol])== 'undefined') {
@@ -72,8 +73,17 @@ Scope.prototype = {
this.addToParentScope(symbol);
return this.identifiers[symbol];
},
- getIdentifier : function(symbol) {
- return (typeof(this.identifiers[symbol])== 'undefined') ? false : this.identifiers[symbol];
+ getIdentifier : function(symbol, token) {
+ if (typeof(this.identifiers[symbol])== 'undefined') {
+ 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];
},
addHint : function(varName, varType) {
@@ -176,10 +186,12 @@ Scope.prototype = {
// Do not munge symbols in the global scope!
if (this.parent) {
- print("MUNGE: SCOPE");
- for (var i in this.identifiers) {
- print("MUNGE VAR:" + i);
+
+ var all = [];
+ for (var ii in this.identifiers) {
+ all.push(ii);
}
+ //print("MUNGE: " + all.join(', '));
//println("MUNGE: Building FreeSyms:" + this.id+"");
@@ -208,18 +220,21 @@ Scope.prototype = {
if (!this.identifiers[i].toMunge) {
+ //print("SKIP toMunge==false : " + i)
continue;
}
if (this.isProtectedVar(i)) {
+ //print("SKIP PROTECTED: " + i)
continue; //
}
- if (this.identifiers[i].constructor != Identifier) {
- continue;
- }
+ //if (this.identifiers[i].constructor != Identifier) {
+ // print("SKIP NOT IDENTIFIER : " + i)
+ // continue;
+ // }
// println("IDENT:" +i+'');
if (!repsym.length) {
@@ -236,7 +251,7 @@ Scope.prototype = {
//println([ repsym,mungedValue ]);
if (this.mungeM && repsym.length < mungedValue.length) {
- println("REPLACE:"+ mungedValue +" with " + repsym + "
");
+ //print("REPLACE:"+ mungedValue +" with " + repsym );
mungedValue = repsym;
repsym = '';
}
@@ -247,8 +262,8 @@ Scope.prototype = {
}
this.munged = true;
//println("Doing sub scopes");
- for (var i = 0; i < this.subScopes.length; i++) {
- var ss = this.subScopes[i];
+ for (var j = 0; j < this.subScopes.length; j++) {
+ var ss = this.subScopes[j];
ss.munge();
}
}
@@ -308,4 +323,4 @@ XObject.extend(Scope, {
})
// init the scope constants..
Scope.init();
-
\ No newline at end of file
+Scope.gid = 0;
\ No newline at end of file