[KSS-checkins] r46070 - in kukit/kukit.js/branch/commas-in-selectors: kukit tests
gotcha at codespeak.net
gotcha at codespeak.net
Tue Aug 28 10:25:38 CEST 2007
Author: gotcha
Date: Tue Aug 28 10:25:35 2007
New Revision: 46070
Modified:
kukit/kukit.js/branch/commas-in-selectors/kukit/kssparser.js
kukit/kukit.js/branch/commas-in-selectors/tests/test_tokenizer.js
Log:
rename openbrace and closebrace
Modified: kukit/kukit.js/branch/commas-in-selectors/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/branch/commas-in-selectors/kukit/kssparser.js (original)
+++ kukit/kukit.js/branch/commas-in-selectors/kukit/kssparser.js Tue Aug 28 10:25:35 2007
@@ -25,8 +25,8 @@
kukit.kssp.commentbegin = kukit.tk.mkToken('commentbegin', "\/\*");
kukit.kssp.commentend = kukit.tk.mkToken('commentend', "\*\/");
-kukit.kssp.openbrace = kukit.tk.mkToken('openbrace', "{");
-kukit.kssp.closebrace = kukit.tk.mkToken('closebrace', "}");
+kukit.kssp.openBrace = kukit.tk.mkToken('openBrace', "{");
+kukit.kssp.closeBrace = kukit.tk.mkToken('closeBrace', "}");
kukit.kssp.openbracket = kukit.tk.mkToken('openbracket', "[");
kukit.kssp.closebracket = kukit.tk.mkToken('closebracket', "]");
kukit.kssp.openparent = kukit.tk.mkToken('openparent', "(");
@@ -46,7 +46,7 @@
*/
kukit.kssp.Document = kukit.tk.mkParser('document', {
"\/\*": 'new kukit.kssp.Comment(this.cursor, kukit.kssp.commentbegin)',
- "{": 'new kukit.kssp.Block(this.cursor, kukit.kssp.openbrace)'
+ "{": 'new kukit.kssp.Block(this.cursor, kukit.kssp.openBrace)'
});
kukit.kssp.Document.prototype.process = function() {
this.eventRules = [];
@@ -115,7 +115,7 @@
kukit.kssp.Block = kukit.tk.mkParser('block', {
";": 'new kukit.kssp.semicolon(this.cursor)',
":": '[new kukit.kssp.colon(this.cursor), new kukit.kssp.PropValue(this.cursor)]',
- "}": 'this.emitAndReturn(new kukit.kssp.closebrace(this.cursor))'
+ "}": 'this.emitAndReturn(new kukit.kssp.closeBrace(this.cursor))'
});
kukit.kssp.Block.prototype.process = function() {
//this.parms = {};
Modified: kukit/kukit.js/branch/commas-in-selectors/tests/test_tokenizer.js
==============================================================================
--- kukit/kukit.js/branch/commas-in-selectors/tests/test_tokenizer.js (original)
+++ kukit/kukit.js/branch/commas-in-selectors/tests/test_tokenizer.js Tue Aug 28 10:25:35 2007
@@ -124,12 +124,12 @@
var txt="abc def";
var cursor = new kukit.tk.Cursor(txt);
- kukit.tk.openbrace = kukit.tk.mkToken('openbrace', '{');
+ kukit.tk.openBrace = kukit.tk.mkToken('openBrace', '{');
kukit.tk.openbracket = kukit.tk.mkToken('openbracket', '[');
var pf = kukit.tk.mkParser('block', {
'[': 'this.emitAndReturn(new kukit.tk.openbracket(this.cursor))',
- '{': 'new kukit.tk.openbrace(this.cursor)'
+ '{': 'new kukit.tk.openBrace(this.cursor)'
});
var parser = new pf(cursor, null, true);
@@ -159,19 +159,19 @@
var txt="a[bc{de[f}ghi";
var cursor = new kukit.tk.Cursor(txt);
- kukit.tk.openbrace = kukit.tk.mkToken('openbrace', '{');
+ kukit.tk.openBrace = kukit.tk.mkToken('openBrace', '{');
kukit.tk.openbracket = kukit.tk.mkToken('openbracket', '[');
- kukit.tk.closebrace = kukit.tk.mkToken('closebrace', '}');
+ kukit.tk.closeBrace = kukit.tk.mkToken('closeBrace', '}');
kukit.tk.wrappedbracket = kukit.tk.mkToken('wrappedbracket', '[');
kukit.tk.global = kukit.tk.mkParser('global', {
'[': 'new kukit.tk.openbracket(this.cursor)',
- '{': 'new kukit.tk.inside(this.cursor, kukit.tk.openbrace)'
+ '{': 'new kukit.tk.inside(this.cursor, kukit.tk.openBrace)'
});
kukit.tk.inside = kukit.tk.mkParser('inside', {
'[': 'new kukit.tk.wrappedbracket(this.cursor)',
- '}': 'this.emitAndReturn(new kukit.tk.closebrace(this.cursor))'
+ '}': 'this.emitAndReturn(new kukit.tk.closeBrace(this.cursor))'
});
var parser = new kukit.tk.global(cursor, null, true);
@@ -188,7 +188,7 @@
var itoken = parser.result[3]
this.assertEquals(itoken.result.length, 5);
- this.assertEquals(itoken.result[0].symbol, 'openbrace');
+ this.assertEquals(itoken.result[0].symbol, 'openBrace');
this.assertEquals(itoken.result[0].txt, '{');
this.assertEquals(itoken.result[1].symbol, 'fraction');
this.assertEquals(itoken.result[1].txt, 'de');
@@ -196,7 +196,7 @@
this.assertEquals(itoken.result[2].txt, '[');
this.assertEquals(itoken.result[3].symbol, 'fraction');
this.assertEquals(itoken.result[3].txt, 'f');
- this.assertEquals(itoken.result[4].symbol, 'closebrace');
+ this.assertEquals(itoken.result[4].symbol, 'closeBrace');
this.assertEquals(itoken.result[4].txt, '}');
this.assertEquals(parser.result[4].symbol, 'fraction');
@@ -304,18 +304,18 @@
var txt="a[bc{de fg[h] ij[kl]mn}opq";
var cursor = new kukit.tk.Cursor(txt);
- kukit.tk.openbrace = kukit.tk.mkToken('openbrace', '{');
+ kukit.tk.openBrace = kukit.tk.mkToken('openBrace', '{');
kukit.tk.openbracket = kukit.tk.mkToken('openbracket', '[');
- kukit.tk.closebrace = kukit.tk.mkToken('closebrace', '}');
+ kukit.tk.closeBrace = kukit.tk.mkToken('closeBrace', '}');
kukit.tk.closebracket = kukit.tk.mkToken('closebracket', ']');
kukit.tk.global = kukit.tk.mkParser('global', {
'[': 'new kukit.tk.openbracket(this.cursor)',
- '{': 'new kukit.tk.inside(this.cursor, kukit.tk.openbrace)'
+ '{': 'new kukit.tk.inside(this.cursor, kukit.tk.openBrace)'
});
kukit.tk.inside = kukit.tk.mkParser('inside', {
- '}': 'this.emitAndReturn(new kukit.tk.closebrace(this.cursor))'
+ '}': 'this.emitAndReturn(new kukit.tk.closeBrace(this.cursor))'
});
kukit.tk.inside.prototype.process = function() {
// collect up the value of the string, omitting the quotes
@@ -374,15 +374,15 @@
var txt="a[bc{de[f}ghi";
var cursor = new kukit.tk.Cursor(txt);
- kukit.tk.openbrace = kukit.tk.mkToken('openbrace', '{');
+ kukit.tk.openBrace = kukit.tk.mkToken('openBrace', '{');
kukit.tk.openbracket = kukit.tk.mkToken('openbracket', '[');
- kukit.tk.closebrace = kukit.tk.mkToken('closebrace', '}');
+ kukit.tk.closeBrace = kukit.tk.mkToken('closeBrace', '}');
kukit.tk.wrappedbracket = kukit.tk.mkToken('wrappedbracket', '[');
kukit.tk.global = kukit.tk.mkParser('global', {
'[': 'new kukit.tk.openbracket(this.cursor)',
- '{': '[new kukit.tk.openbrace(this.cursor), new kukit.tk.inside(this.cursor)]',
- '}': 'new kukit.tk.closebrace(this.cursor)'
+ '{': '[new kukit.tk.openBrace(this.cursor), new kukit.tk.inside(this.cursor)]',
+ '}': 'new kukit.tk.closeBrace(this.cursor)'
});
kukit.tk.inside = kukit.tk.mkParser('inside', {
@@ -400,7 +400,7 @@
this.assertEquals(parser.result[1].txt, '[');
this.assertEquals(parser.result[2].symbol, 'fraction');
this.assertEquals(parser.result[2].txt, 'bc');
- this.assertEquals(parser.result[3].symbol, 'openbrace');
+ this.assertEquals(parser.result[3].symbol, 'openBrace');
this.assertEquals(parser.result[3].txt, '{');
this.assertEquals(parser.result[4].symbol, 'inside');
@@ -413,7 +413,7 @@
this.assertEquals(itoken.result[2].symbol, 'fraction');
this.assertEquals(itoken.result[2].txt, 'f');
- this.assertEquals(parser.result[5].symbol, 'closebrace');
+ this.assertEquals(parser.result[5].symbol, 'closeBrace');
this.assertEquals(parser.result[5].txt, '}');
this.assertEquals(parser.result[6].symbol, 'fraction');
this.assertEquals(parser.result[6].txt, 'ghi');
More information about the Kukit-checkins
mailing list