* // FIXME - I need this to do next() without doccomments..
*/
-Identifier = imports.Identifier.Identifier
-XObject = imports.XObject.XObject;
+const Identifier = imports.Identifier.Identifier
+const XObject = imports.XObject.XObject;
+Scope.id = 1;
-function Scope(braceN, parent, startTokN, lastIdent)
+function Scope(braceN, parent, startTokN, lastIdent, token)
{
if (lastIdent.length) {
// println("NEW SCOPE: " + lastIdent);
this.braceN = braceN
this.parent = parent;
- this.id = startTokN;
+ this.id = Scope.id++;
this.identifiers = { };
this.subScopes = [];
this.hints = { };
this.ident = lastIdent;
this.gid = Scope.gid++;
-
- print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP'));
+ this.token = token;
+ //print("ADD SCOPE(" + this.gid + ") TO "+ (parent ? this.parent.gid : 'TOP') + ' : ' +
+ // (token ? token.toString() : ''));
if (parent) {
this.parent.subScopes.push(this);
munged : false,
protectedVars : {}, // only used by to parent..
- declareIdentifier : function(symbol, token) {
+
+ /**
+ * dump the scope to StdOut...
+ *
+ */
+ dump : function(indent)
+ {
+ indent = indent || '';
+ var str = '';
+ for (var k in this.identifiers) {
+ str += str.length ? ", " : "";
+ str += k + '=>' + this.identifiers[k].mungedValue;
+ }
- print("SCOPE : " + this.gid + " ADD IDENT(" + this.id + "):" + token.toString()+"");
+ print(
+ indent + "Scope: " + this.id + "\n" +
+
+ indent + "Started: " + ( this.token ? this.token.toString(): 'TOP' ) + "\n" +
+ indent + "- " + str + "\n"
+ );
+ this.subScopes.forEach(function(s) {
+ s.dump(indent + ' ');
+ });
+
+
+ },
+
+
+ declareIdentifier : function(symbol, token)
+ {
+
+ //print("SCOPE : " + this.gid + " :SYM: " + symbol + " " + token.toString()+"");
if (typeof(this.identifiers[symbol])== 'undefined') {
// 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];
},
if (!repsym.length) {
if (!freeSymbols.length) {
- addSyms(JSDOC.Scope.twos);
+ addSyms(Scope.twos);
}
repsym = freeSymbols.shift(); // pop off beginngin???
}