[KSS-checkins] r46072 - in kukit/kukit.js/branch/commas-in-selectors: kukit tests
gotcha at codespeak.net
gotcha at codespeak.net
Tue Aug 28 10:43:16 CEST 2007
Author: gotcha
Date: Tue Aug 28 10:43:15 2007
New Revision: 46072
Modified:
kukit/kukit.js/branch/commas-in-selectors/kukit/kssparser.js
kukit/kukit.js/branch/commas-in-selectors/tests/test_kssparser.js
Log:
openparent and closeparent rename
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:43:15 2007
@@ -29,8 +29,8 @@
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', "(");
-kukit.kssp.closeparent = kukit.tk.mkToken('closeparent', ")");
+kukit.kssp.openParent = kukit.tk.mkToken('openParent', "(");
+kukit.kssp.closeParent = kukit.tk.mkToken('closeParent', ")");
kukit.kssp.semicolon = kukit.tk.mkToken('semicolon', ";");
kukit.kssp.colon = kukit.tk.mkToken('colon', ":");
kukit.kssp.quote = kukit.tk.mkToken('quote', "'");
@@ -350,7 +350,7 @@
"'": 'new kukit.kssp.String(this.cursor, kukit.kssp.quote)',
'"': 'new kukit.kssp.String2(this.cursor, kukit.kssp.dquote)',
"\/\*": 'new kukit.kssp.Comment(this.cursor, kukit.kssp.openComment)',
- "(": 'new kukit.kssp.MethodArgs(this.cursor, kukit.kssp.openparent)'
+ "(": 'new kukit.kssp.MethodArgs(this.cursor, kukit.kssp.openParent)'
});
kukit.kssp.PropValue.prototype.process = function() {
var context = {'nextTokenIndex': 0};
@@ -441,7 +441,7 @@
"\/\*": 'this.emitAndReturn()',
":": 'this.emitAndReturn()',
"(": 'this.emitAndReturn(new kukit.kssp.MethodArgs(this.cursor,' +
- 'kukit.kssp.openparent))'
+ 'kukit.kssp.openParent))'
});
kukit.kssp.EventValue.prototype.multiword_allowed = false;
kukit.kssp.EventValue.prototype.process =
@@ -507,7 +507,7 @@
"'": 'new kukit.kssp.String(this.cursor, kukit.kssp.quote)',
'"': 'new kukit.kssp.String2(this.cursor, kukit.kssp.dquote)',
",": 'new kukit.kssp.comma(this.cursor)',
- ")": 'this.emitAndReturn(new kukit.kssp.closeparent(this.cursor))',
+ ")": 'this.emitAndReturn(new kukit.kssp.closeParent(this.cursor))',
"\/\*": 'new kukit.kssp.Comment(this.cursor, kukit.kssp.openComment)'
});
kukit.kssp.MethodArgs.prototype.process = function() {
Modified: kukit/kukit.js/branch/commas-in-selectors/tests/test_kssparser.js
==============================================================================
--- kukit/kukit.js/branch/commas-in-selectors/tests/test_kssparser.js (original)
+++ kukit/kukit.js/branch/commas-in-selectors/tests/test_kssparser.js Tue Aug 28 10:43:15 2007
@@ -280,42 +280,42 @@
// Parsing method args
var txt= "(a, b)";
var src = new kukit.tk.Cursor(txt);
- var parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openparent, true);
+ var parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openParent, true);
this.assertEquals(parser.finished, true);
this.assertListEquals(parser.args, ['a', 'b']);
txt= "('a', /* to annoy you */ \"b\")";
src = new kukit.tk.Cursor(txt);
- parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openparent, true);
+ parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openParent, true);
this.assertEquals(parser.finished, true);
this.assertListEquals(parser.args, ['a', 'b']);
txt= "(' a multi', /* to annoy you */ \"b multi \")";
src = new kukit.tk.Cursor(txt);
- parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openparent, true);
+ parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openParent, true);
this.assertEquals(parser.finished, true);
this.assertListEquals(parser.args, [' a multi','b multi ']);
txt= "('a', /*comment*/ /* to annoy you */ \"b\")";
src = new kukit.tk.Cursor(txt);
- parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openparent, true);
+ parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openParent, true);
this.assertEquals(parser.finished, true);
this.assertListEquals(parser.args, ['a', 'b']);
txt= "(a, b, )";
src = new kukit.tk.Cursor(txt);
- parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openparent, true);
+ parser = new kukit.kssp.MethodArgs(src, kukit.kssp.openParent, true);
this.assertEquals(parser.finished, true);
this.assertListEquals(parser.args, ['a', 'b']);
txt= "(a, b c )";
src = new kukit.tk.Cursor(txt);
- this.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openparent, true,
+ this.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openParent, true,
'Wrong method argument [b c] : value cannot have spaces', 9);
txt= "(a, b 'x' )";
src = new kukit.tk.Cursor(txt);
- this.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openparent, true,
+ this.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openParent, true,
'Unexpected token : [string] found, [comma] was expected.', 11);
};
More information about the Kukit-checkins
mailing list