Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: packages/petitparser/lib/src/json/grammar.dart

Issue 1400473008: Roll Observatory packages and add a roll script (Closed) Base URL: git@github.com:dart-lang/observatory_pub_packages.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « packages/petitparser/lib/src/debug/trace.dart ('k') | packages/petitparser/lib/src/json/parser.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/petitparser/lib/src/json/grammar.dart
diff --git a/petitparser/lib/src/json/grammar.dart b/packages/petitparser/lib/src/json/grammar.dart
similarity index 85%
rename from petitparser/lib/src/json/grammar.dart
rename to packages/petitparser/lib/src/json/grammar.dart
index 60b4de24e4c5ba747bbb6630ee324e00ebd593c5..ba76150d20295a76720ae8ebb4804fd30b593c2f 100644
--- a/petitparser/lib/src/json/grammar.dart
+++ b/packages/petitparser/lib/src/json/grammar.dart
@@ -1,15 +1,11 @@
-part of json;
+part of petitparser.json;
-/**
- * JSON grammar.
- */
+/// JSON grammar.
class JsonGrammar extends GrammarParser {
JsonGrammar() : super(const JsonGrammarDefinition());
}
-/**
- * JSON grammar definition.
- */
+/// JSON grammar definition.
class JsonGrammarDefinition extends GrammarDefinition {
const JsonGrammarDefinition();
@@ -43,11 +39,12 @@ class JsonGrammarDefinition extends GrammarDefinition {
characterPrimitive() => ref(characterNormal)
| ref(characterEscape)
- | ref(characterOctal);
+ | ref(characterUnicode);
characterNormal() => pattern('^"\\');
characterEscape() => char('\\')
- & pattern(new List.from(JSON_ESCAPE_CHARS.keys).join());
- characterOctal() => string('\\u').seq(pattern("0-9A-Fa-f").times(4).flatten());
+ & pattern(new List.from(jsonEscapeChars.keys).join());
+ characterUnicode() => string('\\u')
+ & pattern("0-9A-Fa-f").times(4);
numberPrimitive() => char('-').optional()
& char('0').or(digit().plus())
& char('.').seq(digit().plus()).optional()
@@ -58,7 +55,7 @@ class JsonGrammarDefinition extends GrammarDefinition {
}
-const JSON_ESCAPE_CHARS = const {
+const jsonEscapeChars = const {
'\\': '\\',
'/': '/',
'"': '"',
« no previous file with comments | « packages/petitparser/lib/src/debug/trace.dart ('k') | packages/petitparser/lib/src/json/parser.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698