Fix a couple of Dart style naming violations in Intl
BUG=
R=rnystrom@google.com
Review URL: https://codereview.chromium.org//670933004
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart/pkg/intl@41401 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c08f649..b1ba358 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.11.10
+ * Fix some style glitches with naming. The only publicly visible one
+ is DateFormat.parseUtc, but the parseUTC variant is still retained
+ for backward-compatibility.
+
## 0.11.9
* Fix bug with per-mille parsing (only divided by 100, not 1000)
diff --git a/bin/generate_from_arb.dart b/bin/generate_from_arb.dart
index 1d576bc..7156e23 100644
--- a/bin/generate_from_arb.dart
+++ b/bin/generate_from_arb.dart
@@ -137,5 +137,5 @@
List<MainMessage> _findOriginals() => originalMessages = messages[id];
}
-final pluralAndGenderParser = new ICUParser().message;
-final plainParser = new ICUParser().nonIcuMessage;
+final pluralAndGenderParser = new IcuParser().message;
+final plainParser = new IcuParser().nonIcuMessage;
diff --git a/lib/date_symbol_data_http_request.dart b/lib/date_symbol_data_http_request.dart
index 4c54147..4f724f8 100644
--- a/lib/date_symbol_data_http_request.dart
+++ b/lib/date_symbol_data_http_request.dart
@@ -26,10 +26,10 @@
* "http://localhost:8000/dates/"
*/
Future initializeDateFormatting(String locale, String url) {
- var reader = new HTTPRequestDataReader('${url}symbols/');
+ var reader = new HttpRequestDataReader('${url}symbols/');
initializeDateSymbols(() => new LazyLocaleData(
reader, _createDateSymbol, availableLocalesForDateFormatting));
- var reader2 = new HTTPRequestDataReader('${url}patterns/');
+ var reader2 = new HttpRequestDataReader('${url}patterns/');
initializeDatePatterns(() => new LazyLocaleData(
reader2, (x) => x, availableLocalesForDateFormatting));
var actualLocale = Intl.verifiedLocale(locale,
diff --git a/lib/src/http_request_data_reader.dart b/lib/src/http_request_data_reader.dart
index a79d16f..ce63870 100644
--- a/lib/src/http_request_data_reader.dart
+++ b/lib/src/http_request_data_reader.dart
@@ -13,11 +13,11 @@
import 'dart:html';
import 'intl_helpers.dart';
-class HTTPRequestDataReader implements LocaleDataReader {
+class HttpRequestDataReader implements LocaleDataReader {
/** The base url from which we read the data. */
String url;
- HTTPRequestDataReader(this.url);
+ HttpRequestDataReader(this.url);
Future read(String locale) {
// TODO(alanknight): Remove this once it's not necessary for Chrome.
diff --git a/lib/src/icu_parser.dart b/lib/src/icu_parser.dart
index d83c089..0565ce0 100644
--- a/lib/src/icu_parser.dart
+++ b/lib/src/icu_parser.dart
@@ -13,11 +13,11 @@
/**
* This defines a grammar for ICU MessageFormat syntax. Usage is
- * new ICUParser.message.parse(<string>).value;
+ * new IcuParser.message.parse(<string>).value;
* The "parse" method will return a Success or Failure object which responds
* to "value".
*/
-class ICUParser {
+class IcuParser {
get openCurly => char("{");
get closeCurly => char("}");
@@ -69,7 +69,7 @@
gender.map((values) => new Gender.from(values.first, values[3], null));
get selectClause => (id & openCurly & interiorText & closeCurly).map(
(x) => [x.first, x[2]]);
- get generalSelect => preface & selectLiteral & comma &
+ get generalSelect => preface & selectLiteral & comma &
selectClause.plus() & closeCurly;
get intlSelect => generalSelect.map(
(values) => new Select.from(values.first, values[3], null));
@@ -79,7 +79,7 @@
get contents => pluralOrGenderOrSelect | parameter | messageText;
get simpleText => (nonIcuMessageText | parameter | openCurly).plus();
get empty => epsilon().map((_) => '');
-
+
get parameter => (openCurly & id & closeCurly).map(
(param) => new VariableSubstitution.named(param[1], null));
@@ -91,17 +91,16 @@
Message.from(chunk, null));
/**
- * Represents an ordinary message, i.e. not a plural/gender/select, although
+ * Represents an ordinary message, i.e. not a plural/gender/select, although
* it may have parameters.
*/
get nonIcuMessage => (simpleText | empty).map((chunk) =>
- Message.from(chunk, null));
-
+ Message.from(chunk, null));
+
get stuff => (pluralOrGenderOrSelect | empty).map(
(chunk) => Message.from(chunk, null));
-
- ICUParser() {
+ IcuParser() {
// There is a cycle here, so we need the explicit set to avoid
// infinite recursion.
interiorText.set(contents.plus() | empty);
diff --git a/lib/src/intl/date_format.dart b/lib/src/intl/date_format.dart
index 54fb3f0..3aede36 100644
--- a/lib/src/intl/date_format.dart
+++ b/lib/src/intl/date_format.dart
@@ -291,10 +291,24 @@
/**
* Given user input, attempt to parse the [inputString] into the anticipated
* format, treating it as being in UTC.
+ *
+ * The canonical Dart style name
+ * is [parseUtc], but [parseUTC] is retained
+ * for backward-compatibility.
*/
DateTime parseUTC(String inputString) => parse(inputString, true);
/**
+ * Given user input, attempt to parse the [inputString] into the anticipated
+ * format, treating it as being in UTC.
+ *
+ * The canonical Dart style name
+ * is [parseUtc], but [parseUTC] is retained
+ * for backward-compatibility.
+ */
+ DateTime parseUtc(String inputString) => parse(inputString, true);
+
+ /**
* Return the locale code in which we operate, e.g. 'en_US' or 'pt'.
*/
String get locale => _locale;
