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

Unified Diff: packages/csslib/lib/src/tokenizer.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/lib/src/css_printer.dart ('k') | packages/csslib/lib/src/tree.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/csslib/lib/src/tokenizer.dart
diff --git a/packages/csslib/lib/src/tokenizer.dart b/packages/csslib/lib/src/tokenizer.dart
index d7677f9f211501f1c1564d1de483debc016f9ef7..0b0661a860f3b70fddcbb604c728ceec0d5c025b 100644
--- a/packages/csslib/lib/src/tokenizer.dart
+++ b/packages/csslib/lib/src/tokenizer.dart
@@ -149,7 +149,7 @@ class Tokenizer extends TokenizerBase {
if (_maybeEatChar(TokenChar.BANG)) {
if (_maybeEatChar(TokenChar.MINUS) &&
_maybeEatChar(TokenChar.MINUS)) {
- return finishMultiLineComment();
+ return finishHtmlComment();
} else if (_maybeEatChar(TokenChar.LBRACK) &&
_maybeEatChar(CDATA_NAME[0]) &&
_maybeEatChar(CDATA_NAME[1]) &&
@@ -393,19 +393,11 @@ class Tokenizer extends TokenizerBase {
return _finishToken(TokenKind.HEX_RANGE);
}
- Token finishMultiLineComment() {
+ Token finishHtmlComment() {
while (true) {
int ch = _nextChar();
if (ch == 0) {
return _finishToken(TokenKind.INCOMPLETE_COMMENT);
- } else if (ch == 42 /*'*'*/) {
- if (_maybeEatChar(47 /*'/'*/)) {
- if (_inString) {
- return next();
- } else {
- return _finishToken(TokenKind.COMMENT);
- }
- }
} else if (ch == TokenChar.MINUS) {
/* Check if close part of Comment Definition --> (CDC). */
if (_maybeEatChar(TokenChar.MINUS)) {
@@ -420,6 +412,23 @@ class Tokenizer extends TokenizerBase {
}
}
}
+
+ Token finishMultiLineComment() {
+ while (true) {
+ int ch = _nextChar();
+ if (ch == 0) {
+ return _finishToken(TokenKind.INCOMPLETE_COMMENT);
+ } else if (ch == 42 /*'*'*/) {
+ if (_maybeEatChar(47 /*'/'*/)) {
+ if (_inString) {
+ return next();
+ } else {
+ return _finishToken(TokenKind.COMMENT);
+ }
+ }
+ }
+ }
+ }
}
/** Static helper methods. */
« no previous file with comments | « packages/csslib/lib/src/css_printer.dart ('k') | packages/csslib/lib/src/tree.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698