X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScope.js;h=dbb3e0976c9f269c0a127ae5fb16d1041e39532f;hb=cc935efc3f7afc2b006802fc8e53ce6f2f49996c;hp=6bf1f16c616e725b9f4981d09c1fc67359b6ff27;hpb=209cbf916efff44454e07faa8c842a1eea75fea1;p=gnome.introspection-doc-generator
diff --git a/JSDOC/Scope.js b/JSDOC/Scope.js
index 6bf1f16..dbb3e09 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
-XObject = imports.XObject.XObject;
+const Identifier = imports.Identifier.Identifier
+const 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;
-
-
- //println("ADD SCOPE(" + this.id + ") TO "+ (parent ? this.parent.id : 'TOP') + "
");
+ this.gid = Scope.gid++;
+ this.token = token;
+ //print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + ' : ' +
+ // (token ? token.toString() : ''));
if (parent) {
this.parent.subScopes.push(this);
@@ -52,9 +53,31 @@ Scope.prototype = {
munged : false,
protectedVars : {}, // only used by to parent..
- declareIdentifier : function(symbol, token) {
+
+ /**
+ * dump the scope to StdOut...
+ *
+ */
+ dump : function(indent)
+ {
+ indent = indent || '';
+ print(
+ indent + "Scope: " + this.id + "\n" +
+ indent + "Started: " + ( this.token ? this.token.line : 'TOP' ) + "\n" +
+ indent + "- " + XObject.keys(this.identifiers).join(", ") + "\n"
+ );
+ this.subScopes.forEach(function(s) {
+ s.dump(indent + ' ');
+ });
+
+
+ },
+
+
+ declareIdentifier : function(symbol, token)
+ {
- //println("ADD IDENT(" + this.id + "):" + symbol+"
");
+ //print("SCOPE : " + this.gid + " :SYM: " + symbol + " " + token.toString()+"");
if (typeof(this.identifiers[symbol])== 'undefined') {
@@ -69,11 +92,22 @@ Scope.prototype = {
// then it's global...
this.identifiers[symbol].toMunge = false;
}
+
+
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) {
@@ -178,10 +212,10 @@ Scope.prototype = {
if (this.parent) {
var all = [];
- for (var i in this.identifiers) {
- all.push(i);
+ for (var ii in this.identifiers) {
+ all.push(ii);
}
- print("MUNGE: " + all.join(', '));
+ //print("MUNGE: " + all.join(', '));
//println("MUNGE: Building FreeSyms:" + this.id+"");
@@ -210,26 +244,26 @@ Scope.prototype = {
if (!this.identifiers[i].toMunge) {
- print("SKIP toMunge==false : " + i)
+ //print("SKIP toMunge==false : " + i)
continue;
}
if (this.isProtectedVar(i)) {
- print("SKIP PROTECTED: " + i)
+ //print("SKIP PROTECTED: " + i)
continue; //
}
- if (this.identifiers[i].constructor != Identifier) {
- print("SKIP NOT IDENTIFIER : " + i)
- continue;
- }
+ //if (this.identifiers[i].constructor != Identifier) {
+ // print("SKIP NOT IDENTIFIER : " + i)
+ // continue;
+ // }
// println("IDENT:" +i+'');
if (!repsym.length) {
if (!freeSymbols.length) {
- addSyms(JSDOC.Scope.twos);
+ addSyms(Scope.twos);
}
repsym = freeSymbols.shift(); // pop off beginngin???
}
@@ -241,7 +275,7 @@ Scope.prototype = {
//println([ repsym,mungedValue ]);
if (this.mungeM && repsym.length < mungedValue.length) {
- print("REPLACE:"+ mungedValue +" with " + repsym );
+ //print("REPLACE:"+ mungedValue +" with " + repsym );
mungedValue = repsym;
repsym = '';
}
@@ -252,8 +286,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();
}
}
@@ -313,4 +347,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