X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FScope.js;h=11bf09eaf6bdaddc0e1048b8f9ea417c5feaeb3b;hp=d88510b177b80de631d7f995c2ef955286f6201d;hb=091d871eb0c2a8bbdfbba3aefe404bfc09356f89;hpb=f4b67e6269843a03383111ced9800ea385c7d55d
diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index d88510b..11bf09e 100644
--- a/JSDOC/Scope.js
+++ b/JSDOC/Scope.js
@@ -6,7 +6,7 @@
* // FIXME - I need this to do next() without doccomments..
*/
-Identifier = imports['JSDOC/Identifier.js'].Identifier
+Identifier = imports.Identifier.Identifier
XObject = imports.XObject.XObject;
@@ -23,9 +23,9 @@ 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'));
if (parent) {
this.parent.subScopes.push(this);
@@ -54,7 +54,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') {
@@ -73,7 +73,16 @@ Scope.prototype = {
return this.identifiers[symbol];
},
getIdentifier : function(symbol) {
- return (typeof(this.identifiers[symbol])== 'undefined') ? false : this.identifiers[symbol];
+ if (typeof(this.identifiers[symbol])== 'undefined') {
+ if (['String', 'Date'].indexOf(symbol)> -1) {
+ return false;
+ }
+
+ print("SCOPE : " + this.gid +" = SYMBOL NOT FOUND?" + symbol);
+ return false;
+ }
+ print("SCOPE : " + this.gid +" = FOUND?" + symbol);
+ return this.identifiers[symbol];
},
addHint : function(varName, varType) {
@@ -170,13 +179,18 @@ Scope.prototype = {
}
- //println("MUNGE: Scope:" + this.id+"");
+
var pickFromSet = 1;
// Do not munge symbols in the global scope!
if (this.parent) {
-
+
+ var all = [];
+ for (var ii in this.identifiers) {
+ all.push(ii);
+ }
+ //print("MUNGE: " + all.join(', '));
//println("MUNGE: Building FreeSyms:" + this.id+"");
@@ -205,18 +219,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) {
@@ -233,18 +250,19 @@ 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 = '';
}
+
identifier.mungedValue = mungedValue;
}
//println("MUNGE: Done " + this.id+"");
}
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();
}
}
@@ -304,4 +322,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