| Index: lib/src/inputstream.dart
|
| diff --git a/lib/inputstream.dart b/lib/src/inputstream.dart
|
| similarity index 98%
|
| rename from lib/inputstream.dart
|
| rename to lib/src/inputstream.dart
|
| index 2cf76175038430fdb234da9cd37c77f75057d23b..cca1329b25e942fab4f7e0d2f9baeb28ade0d1ad 100644
|
| --- a/lib/inputstream.dart
|
| +++ b/lib/src/inputstream.dart
|
| @@ -6,7 +6,7 @@
|
| #import('constants.dart');
|
| #import('utils.dart');
|
| #import('encoding_parser.dart');
|
| -#import('../treebuilders/simpletree.dart', prefix: 'tree'); // for Span
|
| +#import('../dom.dart', prefix: 'dom'); // for Span
|
|
|
| /**
|
| * Provides a unicode stream of characters to the HTMLTokenizer.
|
| @@ -192,7 +192,7 @@ class HTMLInputStream {
|
| return encoding;
|
| }
|
|
|
| - tree.Span _position(int offset) {
|
| + dom.Span _position(int offset) {
|
| var nLines = 1;
|
| var lastLinePos = -1;
|
| for (int i = 0; i < offset; i++) {
|
| @@ -208,11 +208,11 @@ class HTMLInputStream {
|
| } else {
|
| positionColumn = offset - (lastLinePos + 1);
|
| }
|
| - return new tree.Span(positionLine, positionColumn);
|
| + return new dom.Span(positionLine, positionColumn);
|
| }
|
|
|
| /** Returns (line, col) of the current position in the stream. */
|
| - tree.Span position() => _position(chunkOffset);
|
| + dom.Span position() => _position(chunkOffset);
|
|
|
| /**
|
| * Read one character from the stream or queue if available. Return
|
|
|