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

Unified Diff: packages/csslib/lib/parser.dart

Issue 2990843002: Removed fixed dependencies (Closed)
Patch Set: Created 3 years, 5 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/csslib/CHANGELOG.md ('k') | packages/csslib/lib/src/analyzer.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/csslib/lib/parser.dart
diff --git a/packages/csslib/lib/parser.dart b/packages/csslib/lib/parser.dart
index cd4f6c00b56e40627ef40ab84b7e42900643ba89..6688507d5078a81b0644708dd25ca977af0129cd 100644
--- a/packages/csslib/lib/parser.dart
+++ b/packages/csslib/lib/parser.dart
@@ -211,17 +211,11 @@ class _Parser {
var start = _peekToken.span;
while (!_maybeEat(TokenKind.END_OF_FILE) && !_peekKind(TokenKind.RBRACE)) {
// TODO(terry): Need to handle charset.
- var directive = processDirective();
- if (directive != null) {
- productions.add(directive);
- _maybeEat(TokenKind.SEMICOLON);
+ final rule = processRule();
+ if (rule != null) {
+ productions.add(rule);
} else {
- RuleSet ruleset = processRuleSet();
- if (ruleset != null) {
- productions.add(ruleset);
- } else {
- break;
- }
+ break;
}
}
@@ -523,12 +517,12 @@ class _Parser {
// Any medias?
var media = processMediaQueryList();
- List<TreeNode> rulesets = [];
+ List<TreeNode> rules = [];
if (_maybeEat(TokenKind.LBRACE)) {
while (!_maybeEat(TokenKind.END_OF_FILE)) {
- RuleSet ruleset = processRuleSet();
- if (ruleset == null) break;
- rulesets.add(ruleset);
+ final rule = processRule();
+ if (rule == null) break;
+ rules.add(rule);
}
if (!_maybeEat(TokenKind.RBRACE)) {
@@ -537,17 +531,17 @@ class _Parser {
} else {
_error('expected { after media before ruleset', _peekToken.span);
}
- return new MediaDirective(media, rulesets, _makeSpan(start));
+ return new MediaDirective(media, rules, _makeSpan(start));
case TokenKind.DIRECTIVE_HOST:
_next();
- List<TreeNode> rulesets = [];
+ List<TreeNode> rules = [];
if (_maybeEat(TokenKind.LBRACE)) {
while (!_maybeEat(TokenKind.END_OF_FILE)) {
- RuleSet ruleset = processRuleSet();
- if (ruleset == null) break;
- rulesets.add(ruleset);
+ final rule = processRule();
+ if (rule == null) break;
+ rules.add(rule);
}
if (!_maybeEat(TokenKind.RBRACE)) {
@@ -556,7 +550,7 @@ class _Parser {
} else {
_error('expected { after host before ruleset', _peekToken.span);
}
- return new HostDirective(rulesets, _makeSpan(start));
+ return new HostDirective(rules, _makeSpan(start));
case TokenKind.DIRECTIVE_PAGE:
/*
@@ -708,11 +702,11 @@ class _Parser {
start = _peekToken.span;
while (!_maybeEat(TokenKind.END_OF_FILE)) {
- RuleSet ruleset = processRuleSet();
- if (ruleset == null) {
+ final rule = processRule();
+ if (rule == null) {
break;
}
- productions.add(ruleset);
+ productions.add(rule);
}
_eat(TokenKind.RBRACE);
@@ -1121,8 +1115,13 @@ class _Parser {
return new ViewportDirective(name, declarations, _makeSpan(start));
}
- RuleSet processRuleSet([SelectorGroup selectorGroup]) {
+ TreeNode processRule([SelectorGroup selectorGroup]) {
if (selectorGroup == null) {
+ final directive = processDirective();
+ if (directive != null) {
+ _maybeEat(TokenKind.SEMICOLON);
+ return directive;
+ }
selectorGroup = processSelectorGroup();
}
if (selectorGroup != null) {
@@ -1135,14 +1134,9 @@ class _Parser {
List<TreeNode> processGroupRuleBody() {
var nodes = <TreeNode>[];
while (!(_peekKind(TokenKind.RBRACE) || _peekKind(TokenKind.END_OF_FILE))) {
- var directive = processDirective();
- if (directive != null) {
- nodes.add(directive);
- continue;
- }
- var ruleSet = processRuleSet();
- if (ruleSet != null) {
- nodes.add(ruleSet);
+ var rule = processRule();
+ if (rule != null) {
+ nodes.add(rule);
continue;
}
break;
@@ -1211,7 +1205,7 @@ class _Parser {
var selectorGroup = _nestedSelector();
while (selectorGroup != null) {
// Nested selector so process as a ruleset.
- var ruleset = processRuleSet(selectorGroup);
+ var ruleset = processRule(selectorGroup);
decls.add(ruleset);
selectorGroup = _nestedSelector();
}
« no previous file with comments | « packages/csslib/CHANGELOG.md ('k') | packages/csslib/lib/src/analyzer.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698