| Index: packages/yaml/lib/src/parser.dart
|
| diff --git a/yaml/lib/src/parser.dart b/packages/yaml/lib/src/parser.dart
|
| similarity index 98%
|
| rename from yaml/lib/src/parser.dart
|
| rename to packages/yaml/lib/src/parser.dart
|
| index 8bb131f8346bb1e6d2df1d498c537131b5bc9f36..b44043a1e62f3adf2afd46d9e6c1dc11c8504672 100644
|
| --- a/yaml/lib/src/parser.dart
|
| +++ b/packages/yaml/lib/src/parser.dart
|
| @@ -115,7 +115,7 @@ class Parser {
|
| ///
|
| /// stream ::=
|
| /// STREAM-START implicit_document? explicit_document* STREAM-END
|
| - /// ************
|
| + /// ************
|
| Event _parseStreamStart() {
|
| var token = _scanner.scan();
|
| assert(token.type == TokenType.STREAM_START);
|
| @@ -183,7 +183,7 @@ class Parser {
|
| ///
|
| /// explicit_document ::=
|
| /// DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
|
| - /// ***********
|
| + /// ***********
|
| Event _parseDocumentContent() {
|
| var token = _scanner.peek();
|
|
|
| @@ -260,24 +260,24 @@ class Parser {
|
| var anchor;
|
| var tagToken;
|
| var span = token.span.start.pointSpan();
|
| - parseAnchor() {
|
| + parseAnchor(token) {
|
| anchor = token.name;
|
| span = span.expand(token.span);
|
| - token = _scanner.advance();
|
| + return _scanner.advance();
|
| }
|
|
|
| - parseTag() {
|
| + parseTag(token) {
|
| tagToken = token;
|
| span = span.expand(token.span);
|
| - token = _scanner.advance();
|
| + return _scanner.advance();
|
| }
|
|
|
| if (token is AnchorToken) {
|
| - parseAnchor();
|
| - if (token is TagToken) parseTag();
|
| + token = parseAnchor(token);
|
| + if (token is TagToken) token = parseTag(token);
|
| } else if (token is TagToken) {
|
| - parseTag();
|
| - if (token is AnchorToken) parseAnchor();
|
| + token = parseTag(token);
|
| + if (token is AnchorToken) token = parseAnchor(token);
|
| }
|
|
|
| var tag;
|
| @@ -462,7 +462,7 @@ class Parser {
|
| ///
|
| /// (VALUE block_node_or_indentless_sequence?)?)*
|
| /// ***** *
|
| - /// BLOCK-END
|
| + /// BLOCK-END
|
| ///
|
| Event _parseBlockMappingValue() {
|
| var token = _scanner.peek();
|
| @@ -527,7 +527,7 @@ class Parser {
|
| _scanner.scan();
|
| _state = _states.removeLast();
|
| return new Event(EventType.SEQUENCE_END, token.span);
|
| - }
|
| + }
|
|
|
| /// Parses the productions:
|
| ///
|
| @@ -670,7 +670,7 @@ class Parser {
|
| var token = _scanner.peek();
|
|
|
| var versionDirective;
|
| - var tagDirectives = [];
|
| + var tagDirectives = <TagDirective>[];
|
| while (token.type == TokenType.VERSION_DIRECTIVE ||
|
| token.type == TokenType.TAG_DIRECTIVE) {
|
| if (token is VersionDirectiveToken) {
|
| @@ -699,7 +699,7 @@ class Parser {
|
|
|
| token = _scanner.advance();
|
| }
|
| -
|
| +
|
| _appendTagDirective(
|
| new TagDirective("!", "!"),
|
| token.span.start.pointSpan(),
|
|
|