//print("TOK"+ token.toString());
// this.timerPrint("parseScope AFTER lookT: " + token.toString());
- if (token.tokN == Script.TOKwhitespace) {
+ if (token.is('WHIT')) {
if (!token._isDoc) {
// things that stop comments carrying on...??
if (this.currentDoc && (
- token.tokN == Script.TOKsemicolon ||
- token.tokN == Script.TOKrbrace)) {
+ token.tokN.data == ';' ||
+ token.tokN.data == '}')) {
this.addSymbol('', true);
//throw "Unconsumed Doc ("+ token.toString() +"): " + this.currentDoc.toSource();
}
// var a = b;
- if (token.tokN == Script.TOKvar &&
+ if (token.name == 'VAR' &&
- this.ts.lookT(1).tokN == Script.TOKidentifier &&
- this.ts.lookT(2).tokN == Script.TOKassign &&
- this.ts.lookT(3).tokN == Script.TOKidentifier &&
- this.ts.lookT(4).tokN == Script.TOKsemicolon
+ this.ts.lookT(1).type == 'NAME' &&
+ this.ts.lookT(2).data == '-' &&
+ this.ts.lookT(3).type == 'NAME' &&
+ this.ts.lookT(4).data == ';'
) {
// a << scope
// xxx.applyIf(a, {
// a << scope
- if (token.tokN == Script.TOKidentifier) {
+ if (token.type = 'NAME') {
//print("TOK(ident)"+ token.toString());
if (/\.extend$/.test(token.data) &&
- this.ts.lookT(1).tokN == Script.TOKlparen &&
- this.ts.lookT(2).tokN == Script.TOKidentifier &&
- this.ts.lookT(3).tokN == Script.TOKcomma &&
- this.ts.lookT(4).tokN == Script.TOKidentifier &&
- this.ts.lookT(5).tokN == Script.TOKcomma &&
- this.ts.lookT(6).tokN == Script.TOKlbrace
+ this.ts.lookT(1).data == '(' &&
+ this.ts.lookT(2).type == 'NAME' &&
+ this.ts.lookT(3).data == ',' &&
+ this.ts.lookT(4).type == 'NAME' &&
+ this.ts.lookT(5).data == ',' &&
+ this.ts.lookT(6).data == '{'
+ }
) {
// ignore test for ( a and ,
this.ts.nextT(); /// (
// a = Roo.extend(parentname, {
if (/\.extend$/.test(token.data) &&
- this.ts.lookT(-2).tokN == Script.TOKidentifier &&
- this.ts.lookT(-1).tokN == Script.TOKassign &&
- this.ts.lookT(1).tokN == Script.TOKlparen &&
- this.ts.lookT(2).tokN == Script.TOKidentifier &&
- this.ts.lookT(3).tokN == Script.TOKcomma &&
- this.ts.lookT(4).tokN == Script.TOKlbrace
+ this.ts.lookT(-2).type == 'NAME' &&
+ this.ts.lookT(-1).data == '=' &&
+ this.ts.lookT(1).data == '(' &&
+ this.ts.lookT(2).type == 'NAME' &&
+ this.ts.lookT(3).data == ',' &&
+ this.ts.lookT(4).data == '{'
) {
// ignore test for ( a and ,
token = this.ts.lookT(-2);
}
-
+ // apply ( XXXX, {
+
if (/\.(applyIf|apply)$/.test(token.data) &&
- this.ts.lookT(1).tokN == Script.TOKlparen &&
- this.ts.lookT(2).tokN == Script.TOKidentifier &&
- this.ts.lookT(3).tokN == Script.TOKcomma &&
- this.ts.lookT(4).tokN == Script.TOKlbrace
+ this.ts.lookT(1).data == '(' &&
+ this.ts.lookT(2).type == 'NAME' &&
+ this.ts.lookT(3).data == ',' &&
+ this.ts.lookT(4).data == '{'
) {
this.ts.nextT(); /// (
// change scope to xxxx
- if ( this.ts.lookT(1).tokN == Script.TOKassign &&
- this.ts.lookT(2).tokN == Script.TOKnew &&
- this.ts.lookT(3).tokN == Script.TOKidentifier &&
- this.ts.lookT(4).tokN == Script.TOKlparen &&
- this.ts.lookT(5).tokN == Script.TOKlbrace
+ if ( this.ts.lookT(1).data == '=' &&
+ this.ts.lookT(2).name == 'NEW' &&
+ this.ts.lookT(3).type == 'NAME' &&
+ this.ts.lookT(4).data == '(' &&
+ this.ts.lookT(5)..data == '{'
) {
scopeName = token.data;
if (this.currentDoc) {
// ident = function ()
var atype = 'OBJECT';
- if (((this.ts.lookT(1).tokN == Script.TOKcolon )|| (this.ts.lookT(1).tokN == Script.TOKassign)) &&
- (this.ts.lookT(2).tokN == Script.TOKfunction)
+ if (((this.ts.lookT(1).data == ':' )|| (this.ts.lookT(1).data == '=')) &&
+ (this.ts.lookT(2).name == "FUNCTION")
) {
atype = 'FUNCTION';
}
continue; // dont care about other idents..
}
- if (token.tokN == Script.TOKstring) {
+ if (token.type == "STRN") {
if (this.currentDoc) {
this.addSymbol(token.data.substring(1,token.data.length-1),false,'OBJECT');
// really we only have to deal with object constructs and function calls that change the scope...
- if (token.tokN == Script.TOKfunction) {
+ if (token.name == 'FUNCTION') {
// see if we have an unconsumed doc...
//$this$=foo.prototype|$private$|foo.prototype
if (
- (this.ts.lookT(-1).tokN == Script.TOKassign) &&
- (this.ts.lookT(-2).tokN == Script.TOKidentifier)
+ (this.ts.lookT(-1).data == '=') &&
+ (this.ts.lookT(-2).type == 'NAME')
) {
scopeName = this.ts.lookT(-2).data;
- this.ts.balanceN(Script.TOKlparen);
+ this.ts.balanceN('(');
token = this.ts.nextT(); // should be {
//print("FOO=FUNCITON() {}" + this.ts.context() + "\n" + token.toString());
//$private$
if (
- (this.ts.lookT(-1).tokN == Script.TOKnew) &&
- (this.ts.lookT(-2).tokN == Script.TOKassign)
- (this.ts.lookT(-3).tokN == Script.TOKidentifier)
+ (this.ts.lookT(-1).name == 'NEW') &&
+ (this.ts.lookT(-2).data == '=') &&
+ (this.ts.lookT(-3).type = 'FUNCTION')
) {
//scopeName = this.ts.look(-3).data;
this.ts.balanceN(Script.TOKlparen);