if (token.name == 'VAR' &&
this.ts.lookTok(1).type == 'NAME' &&
- this.ts.lookTok(2).data == '-' &&
+ this.ts.lookTok(2).data == '=' &&
this.ts.lookTok(3).type == 'NAME' &&
this.ts.lookTok(4).data == ';'
) {
- //print("SET ALIAS:" + this.ts.lookTok(1).data +'=' + this.ts.lookTok(3).data);
+ print("SET ALIAS:" + this.ts.lookTok(1).data +'=' + this.ts.lookTok(3).data);
aliases[this.ts.lookTok(1).data] = this.ts.lookTok(3).data;
}
-
+ if ((token.data == 'eval') || /\.eval$/.test(token.data)) {
+ this.currentDoc = false;
+ continue;
+ }
// extends scoping *** not sure if the can be x = Roo.apply(....)
// xxx.extends(a,b, {
// eval can be prefixed with a hint hider for the compresser..
- if ((token.data == 'eval') || /\.eval$/.test(token.data)) {
- this.currentDoc = false;
- continue;
- }
- /*
+
+
if (this.currentDoc) {
//print(token.toString());
if (((this.ts.lookTok(1).data == ':' )|| (this.ts.lookTok(1).data == '=')) &&
(this.ts.lookTok(2).name == "FUNCTION")
) {
- this.ts.nextTok();
- this.ts.nextTok();
+ // this.ts.nextTok();
+ // this.ts.nextTok();
atype = 'FUNCTION';
}
false,
atype);
-
+ this.currentDoc = false;
}
- */
+
continue; // dont care about other idents..
//print("GOT FUNCTION");
// see if we have an unconsumed doc...
- //if (this.currentDoc) {
- // throw {
- // name: "ArgumentError",
- // message: "Unhandled doc (TOKfunction)" + token.toString()
- // };
- //
+ if (this.currentDoc) {
+ throw {
+ name: "ArgumentError",
+ message: "Unhandled doc (TOKfunction)" + token.toString()
+ };
+
//this.addSymbol(this.currentDoc.getTag('class')[0].name, true);
//throw "Unconsumed Doc: (TOKrbrace)" + this.currentDoc.toSource();
- //}
+ }
(this.ts.lookTok(-3).type = 'FUNCTION')
) {
//scopeName = this.ts.look(-3).data;
- this.ts.balanceN(Script.TOKlparen);
+ this.ts.balance("(");
token = this.ts.nextTok(); // should be {
scopeName = fixAlias(scopeName);
var fnScope = new Scope(this.braceNesting, scope, token.n, '$private$');
if (
(this.ts.lookTok(-1).data == '=') &&
(this.ts.lookTok(-2).type == 'NAME') &&
- (this.ts.lookTok(-3).nane != 'VAR')
+ (this.ts.lookTok(-3).name != 'VAR')
) {
scopeName = this.ts.look(-2).data;
+ print(scopeName);
scopeName = fixAlias(scopeName);
- var fnScope = new Scope(this.braceNesting, scope, token.n,
- '$this$='+scopeName + '|'+scopeName
- );
- this.indexedScopes[this.ts.cursor] = fnScope;
- scope = fnScope;
- this.scopesIn(fnScope);
+
+ print(this.scopes.length);
+ //var fnScope = new Scope(this.braceNesting, scope, token.n,
+ // '$this$='+scopeName + '|'+scopeName
+ //);
+
+ //this.indexedScopes[this.ts.cursor] = fnScope;
+ //scope = fnScope;
+ // push the same scope onto the stack..
+ this.scopesIn(this.scopes[this.scopes.length-1]);
locBraceNest++;
continue;
}
- if (token.data == '{') {
+ if (token.data == '}') {
if (this.currentDoc) {
addSymbol: function(lastIdent, appendIt, atype )
{
- print("Walker.addSymbol : " + lastIdent);
- print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
+ //print("Walker.addSymbol : " + lastIdent);
+ // print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
/*if (!this.currentDoc.tags.length) {
var s = s.join('|').split('|');
- //print("FULLSCOPE: " + s);
- //print("Walker:ADDSymbol: " + s.join('|') );
+ print("FULLSCOPE: " + s);
+ // print("Walker:ADDSymbol: " + s.join('|') );
var _t = '';
_s = '';
//print("Symbol:" + _s);
//print(this.currentDoc.src);
- throw {
- name: "ArgumentError",
- message: "Trying to append symbol '" + _s + "', but no doc available\n" +
- this.ts.lookTok(0).toString()
- };
-
+ //throw {
+ // name: "ArgumentError",
+ // message: "Trying to append symbol '" + _s + "', but no doc available\n" +
+ // this.ts.lookTok(0).toString()
+ //};
+ this.currentDoc = false;
+ return;
}