Author: reebalazs
Date: Sun Dec 30 14:01:14 2007
New Revision: 50199
Modified:
kukit/kukit.js/branch/finish-closures/kukit/kssparser.js
kukit/kukit.js/branch/finish-closures/kukit/tokenizer.js
Log:
Attempt to improve the new token table by use of 'this'.
Modified: kukit/kukit.js/branch/finish-closures/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/branch/finish-closures/kukit/kssparser.js (original)
+++ kukit/kukit.js/branch/finish-closures/kukit/kssparser.js Sun Dec 30
14:01:14 2007
@@ -45,41 +45,41 @@
/* Helpers */
-var _emitAndReturn = function(parser) {
- return parser.emitAndReturn();
+var _emitAndReturn = function() {
+ return this.emitAndReturn();
};
var _mkEmitAndReturnToken = function(klass) {
- return function(parser) {
- var token = new klass(parser.cursor);
- return parser.emitAndReturn(token);
+ return function() {
+ var token = new klass(this.cursor);
+ return this.emitAndReturn(token);
};
};
var _mkReturnToken = function(klass) {
- return function(parser) {
- return new klass(parser.cursor);
+ return function() {
+ return new klass(this.cursor);
};
};
-var _returnComment = function(parser) {
- return new kssp.Comment(parser.cursor, kssp.openComment)
+var _returnComment = function() {
+ return new kssp.Comment(this.cursor, kssp.openComment)
};
-var _returnString = function(parser) {
- return new kssp.String(parser.cursor, kssp.quote)
+var _returnString = function() {
+ return new kssp.String(this.cursor, kssp.quote)
};
-var _returnString2 = function(parser) {
- return new kssp.String2(parser.cursor, kssp.dquote)
+var _returnString2 = function() {
+ return new kssp.String2(this.cursor, kssp.dquote)
};
-var _returnMethodArgs = function(parser) {
- return new kssp.MethodArgs(parser.cursor, kssp.openParent)
+var _returnMethodArgs = function() {
+ return new kssp.MethodArgs(this.cursor, kssp.openParent)
};
-var _returnBackslashed = function(parser) {
- return new kssp.Backslashed(parser.cursor, kssp.backslash)
+var _returnBackslashed = function() {
+ return new kssp.Backslashed(this.cursor, kssp.backslash)
};
/*
@@ -116,8 +116,8 @@
};
kssp.Document = kukit.tk.mkParser('document', {
"\/\*": _returnComment,
- "{": function(parser) {
- return new kssp.Block(parser.cursor, kssp.openBrace)
+ "{": function() {
+ return new kssp.Block(this.cursor, kssp.openBrace)
}
},
_Document
@@ -420,9 +420,9 @@
};
kssp.Block = kukit.tk.mkParser('block', {
";": _mkReturnToken(kssp.semicolon),
- ":": function(parser) {
- return [new kssp.colon(parser.cursor),
- new kssp.PropValue(parser.cursor)]
+ ":": function() {
+ return [new kssp.colon(this.cursor),
+ new kssp.PropValue(this.cursor)]
},
"}": _mkEmitAndReturnToken(kssp.closeBrace)
},
@@ -612,9 +612,9 @@
"\r": _emitAndReturn,
"\/\*": _emitAndReturn,
":": _emitAndReturn,
- "(": function(parser) {
- return [new kssp.openParent(parser.cursor),
- new kssp.PropValue(parser.cursor)]
+ "(": function() {
+ return [new kssp.openParent(this.cursor),
+ new kssp.PropValue(this.cursor)]
},
")": _mkEmitAndReturnToken(kssp.closeParent)
},
@@ -809,11 +809,11 @@
};
kssp.KssSelectors = kukit.tk.mkParser('kssselectors', {
- "'": function(parser) {
- return new kssp.StringInSelector(parser.cursor, kssp.quote)
+ "'": function() {
+ return new kssp.StringInSelector(this.cursor, kssp.quote)
},
- '"': function(parser) {
- return new kssp.String2InSelector(parser.cursor, kssp.dquote)
+ '"': function() {
+ return new kssp.String2InSelector(this.cursor, kssp.dquote)
},
",": _mkReturnToken(kssp.comma),
"{": _emitAndReturn,
@@ -949,9 +949,9 @@
};
kssp.KssSelector = kukit.tk.mkParser('kssselector', {
- ":": function(parser) {
- return [new kssp.colon(parser.cursor),
- new kssp.EventValue(parser.cursor)]
+ ":": function() {
+ return [new kssp.colon(this.cursor),
+ new kssp.EventValue(this.cursor)]
},
"{": _emitAndReturn,
"\/\*": _returnComment
Modified: kukit/kukit.js/branch/finish-closures/kukit/tokenizer.js
==============================================================================
--- kukit/kukit.js/branch/finish-closures/kukit/tokenizer.js (original)
+++ kukit/kukit.js/branch/finish-closures/kukit/tokenizer.js Sun Dec 30
14:01:14 2007
@@ -82,7 +82,7 @@
if (best_symbol) {
// found a symbol, handle that
// make the token and push it
- var tokens = table[best_symbol](this);
+ var tokens = table[best_symbol].call(this);
if (typeof(tokens) != 'undefined') {
if (typeof(tokens.length) == 'undefined') {
tokens = [tokens];
_______________________________________________
Kukit-checkins mailing list
[email protected]
http://codespeak.net/mailman/listinfo/kukit-checkins
