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

Unified Diff: packages/petitparser/lib/src/dart/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/smalltalk.dart ('k') | packages/petitparser/lib/src/debug/continuation.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/petitparser/lib/src/dart/grammar.dart
diff --git a/petitparser/lib/src/dart/grammar.dart b/packages/petitparser/lib/src/dart/grammar.dart
similarity index 95%
rename from petitparser/lib/src/dart/grammar.dart
rename to packages/petitparser/lib/src/dart/grammar.dart
index 187ecfa3c8759837acf01841ee7579d885d9f398..e7bfa4198ddbd78f3e4680f1f25452127a808b27 100644
--- a/petitparser/lib/src/dart/grammar.dart
+++ b/packages/petitparser/lib/src/dart/grammar.dart
@@ -1,17 +1,11 @@
-part of dart;
+part of petitparser.dart;
-/**
- * Dart grammar.
- */
+/// Dart grammar.
class DartGrammar extends GrammarParser {
DartGrammar() : super(new DartGrammarDefinition());
}
-/**
- * Dart grammar definition.
- *
- * Adapted from [https://code.google.com/p/dart/source/browse/branches/bleeding_edge/dart/language/grammar/Dart.g].
- */
+/// Dart grammar definition.
class DartGrammarDefinition extends GrammarDefinition {
Parser token(input) {
@@ -23,7 +17,7 @@ class DartGrammarDefinition extends GrammarDefinition {
if (input is! Parser && input is TrimmingParser) {
throw new StateError('Invalid token parser: $input');
}
- return input.token().trim(ref(HIDDEN));
+ return input.token().trim(ref(HIDDEN_STUFF));
}
@@ -146,8 +140,8 @@ class DartGrammarDefinition extends GrammarDefinition {
| ref(functionDeclaration) & ref(initializers).optional()
| ref(namedConstructorDeclaration) & ref(initializers).optional();
-// An abstract method/operator, a field, or const constructor (which
-// all should be followed by a semicolon).
+ // An abstract method/operator, a field, or const constructor (which
+ // all should be followed by a semicolon).
declaration() =>
ref(constantConstructorDeclaration) & (ref(redirection) | ref(initializers)).optional()
| ref(functionDeclaration) & ref(redirection)
@@ -245,8 +239,8 @@ class DartGrammarDefinition extends GrammarDefinition {
| ref(token, '+=')
| ref(token, '-=')
| ref(token, '<<=')
- | ref(token, '>') & ref(token, '>') & ref(token, '>') & ref(token, '=')
- | ref(token, '>') & ref(token, '>') & ref(token, '=')
+ | ref(token, '>>>=')
+ | ref(token, '>>=')
| ref(token, '&=')
| ref(token, '^=')
| ref(token, '|=');
@@ -261,20 +255,20 @@ class DartGrammarDefinition extends GrammarDefinition {
shiftOperator() =>
ref(token, '<<')
- | ref(token, '>') & ref(token, '>') & ref(token, '>')
- | ref(token, '>') & ref(token, '>');
+ | ref(token, '>>>')
+ | ref(token, '>>');
relationalOperator() =>
- ref(token, '>') & ref(token, '=')
+ ref(token, '>=')
| ref(token, '>')
| ref(token, '<=')
| ref(token, '<');
equalityOperator() =>
- ref(token, '==')
- | ref(token, '!=')
- | ref(token, '===')
- | ref(token, '!==');
+ ref(token, '===')
+ | ref(token, '!==')
+ | ref(token, '==')
+ | ref(token, '!=');
bitwiseOperator() =>
ref(token, '&')
@@ -327,26 +321,7 @@ class DartGrammarDefinition extends GrammarDefinition {
| ref(type) & ref(identifier)
;
- identifier() => ref(token, ref(IDENTIFIER)
- | ref(ABSTRACT)
- | ref(ASSERT)
- | ref(CLASS)
- | ref(EXTENDS)
- | ref(FACTORY)
- | ref(GET)
- | ref(IMPLEMENTS)
- | ref(IMPORT)
- | ref(INTERFACE)
- | ref(IS)
- | ref(LIBRARY)
- | ref(NATIVE)
- | ref(NEGATE)
- | ref(OPERATOR)
- | ref(SET)
- | ref(SOURCE)
- | ref(STATIC)
- | ref(TYPEDEF)
- );
+ identifier() => ref(token, ref(IDENTIFIER));
qualified() =>
ref(identifier) & (ref(token, '.') & ref(identifier)).optional()
« no previous file with comments | « packages/petitparser/lib/smalltalk.dart ('k') | packages/petitparser/lib/src/debug/continuation.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698