Advance html5lib to newest breaking changes in core: getKeys -> keys, etc

Review URL: https://chromiumcodereview.appspot.com//11260039

Author: sigmundch

lib/dom.dart

@@ -88,7 +88,7 @@ abstract class Node {
    * Note that attribute order needs to be stable for serialization, so we use a
    * LinkedHashMap. Each key is a [String] or [AttributeName].
    */
-  LinkedHashMap<Dynamic, String> attributes = new LinkedHashMap();
+  LinkedHashMap<dynamic, String> attributes = new LinkedHashMap();
 
   /**
    * A list of child nodes of the current node. This must

lib/parser.dart

@@ -93,7 +93,7 @@ class HtmlInputStream {
 
     if (source is String) {
       // TODO(jmesserly): if the data is already a string, we should just use
-      // the source.charCodes() instead of wasting time encoding/decoding.
+      // the source.charCodes instead of wasting time encoding/decoding.
       rawBytes = encodeUtf8(source);
       charEncodingName = 'utf-8';
       charEncodingCertain = true;
@@ -306,7 +306,7 @@ class HtmlInputStream {
         hex = (hex.length == 1) ? "0$hex" : hex;
         return "\\u00$hex";
       }
-      var regex = joinStr(characters.charCodes().map(escapeChar));
+      var regex = joinStr(characters.charCodes.map(escapeChar));
       if (!opposite) {
         regex = "^${regex}";
       }
@@ -326,8 +326,8 @@ class HtmlInputStream {
           break;
         }
       } else {
-        assert(m.start() == 0);
-        var end = m.end();
+        assert(m.start == 0);
+        var end = m.end;
         // If not the whole chunk matched, return everything
         // up to the part that didn't match
         if (end != chunk.length - chunkOffset) {

lib/src/inputstream.dart

@@ -51,7 +51,7 @@ class ListProxy<E> implements List<E> {
   bool every(bool f(E element)) => _list.every(f);
   bool some(bool f(E element)) => _list.some(f);
   bool get isEmpty => _list.isEmpty;
-  E last() => _list.last();
+  E get last => _list.last;
 
   set length(int value) { _list.length = value; }
   operator []=(int index, E value) { _list[index] = value; }

lib/src/list_proxy.dart

@@ -14,7 +14,7 @@ import 'utils.dart';
 // we had it implemented in Dart.
 Map<String, List<String>> entitiesByFirstChar = (() {
   var result = {};
-  for (var k in entities.getKeys()) {
+  for (var k in entities.keys) {
     result.putIfAbsent(k[0], () => []).add(k);
   }
   return result;
@@ -71,7 +71,7 @@ class HtmlTokenizer implements Iterator<Token> {
     reset();
   }
 
-  get lastData => currentToken.data.last();
+  get lastData => currentToken.data.last;
 
   TagToken get currentTagToken => currentToken;
   DoctypeToken get currentDoctypeToken => currentToken;
@@ -211,16 +211,16 @@ class HtmlTokenizer implements Iterator<Token> {
       // Read the next character to see if it's hex or decimal
       bool hex = false;
       charStack.add(stream.char());
-      if (charStack.last() == 'x' || charStack.last() == 'X') {
+      if (charStack.last == 'x' || charStack.last == 'X') {
         hex = true;
         charStack.add(stream.char());
       }
 
-      // charStack.last() should be the first digit
-      if (hex && isHexDigit(charStack.last()) ||
-          (!hex && isDigit(charStack.last()))) {
+      // charStack.last should be the first digit
+      if (hex && isHexDigit(charStack.last) ||
+          (!hex && isDigit(charStack.last))) {
         // At least one digit found, so consume the whole number
-        stream.unget(charStack.last());
+        stream.unget(charStack.last);
         output = consumeNumberEntity(hex);
       } else {
         // No digits found
@@ -237,7 +237,7 @@ class HtmlTokenizer implements Iterator<Token> {
       var filteredEntityList = entitiesByFirstChar[charStack[0]];
       if (filteredEntityList == null) filteredEntityList = const [];
 
-      while (charStack.last() !== EOF) {
+      while (charStack.last !== EOF) {
         var name = joinStr(charStack);
         filteredEntityList = filteredEntityList.filter(
             (e) => e.startsWith(name));
@@ -1211,14 +1211,14 @@ class HtmlTokenizer implements Iterator<Token> {
 
   bool markupDeclarationOpenState() {
     var charStack = [stream.char()];
-    if (charStack.last() == "-") {
+    if (charStack.last == "-") {
       charStack.add(stream.char());
-      if (charStack.last() == "-") {
+      if (charStack.last == "-") {
         currentToken = new CommentToken("");
         state = commentStartState;
         return true;
       }
-    } else if (charStack.last() == 'd' || charStack.last() == 'D') {
+    } else if (charStack.last == 'd' || charStack.last == 'D') {
       var matched = true;
       for (var expected in const ['oO', 'cC', 'tT', 'yY', 'pP', 'eE']) {
         var char = stream.char();
@@ -1233,14 +1233,14 @@ class HtmlTokenizer implements Iterator<Token> {
         state = doctypeState;
         return true;
       }
-    } else if (charStack.last() == "[" &&
+    } else if (charStack.last == "[" &&
         parser !== null && parser.tree.openElements.length > 0 &&
-        parser.tree.openElements.last().namespace
+        parser.tree.openElements.last.namespace
             != parser.tree.defaultNamespace) {
       var matched = true;
       for (var expected in const ["C", "D", "A", "T", "A", "["]) {
         charStack.add(stream.char());
-        if (charStack.last() != expected) {
+        if (charStack.last != expected) {
           matched = false;
           break;
         }

lib/src/tokenizer.dart

@@ -42,7 +42,7 @@ bool _mapEquals(Map a, Map b) {
   if (a.length != b.length) return false;
   if (a.length == 0) return true;
 
-  for (var keyA in a.getKeys()) {
+  for (var keyA in a.keys) {
     var valB = b[keyA];
     if (valB == null && !b.containsKey(keyA)) {
       return false;
@@ -194,7 +194,7 @@ class TreeBuilder {
       activeFormattingElements[i] = element;
 
       // Step 11
-      if (element == activeFormattingElements.last()) {
+      if (element == activeFormattingElements.last) {
         break;
       }
     }
@@ -239,7 +239,7 @@ class TreeBuilder {
 
   void insertComment(Token token, [Node parent]) {
     if (parent == null) {
-      parent = openElements.last();
+      parent = openElements.last;
     }
     parent.nodes.add(new Comment(token.data)..span = token.span);
   }
@@ -267,15 +267,15 @@ class TreeBuilder {
     var element = new Element(name, namespace)
         ..attributes = token.data
         ..span = token.span;
-    openElements.last().nodes.add(element);
+    openElements.last.nodes.add(element);
     openElements.add(element);
     return element;
   }
 
   Element insertElementTable(token) {
     /** Create an element and insert it into the tree */
     var element = createElement(token);
-    if (!tableInsertModeElements.contains(openElements.last().tagName)) {
+    if (!tableInsertModeElements.contains(openElements.last.tagName)) {
       return insertElementNormal(token);
     } else {
       // We should be in the InTable mode. This means we want to do
@@ -296,10 +296,10 @@ class TreeBuilder {
 
   /** Insert text data. */
   void insertText(String data, SourceSpan span) {
-    var parent = openElements.last();
+    var parent = openElements.last;
 
     if (!insertFromTable || insertFromTable &&
-        !tableInsertModeElements.contains(openElements.last().tagName)) {
+        !tableInsertModeElements.contains(openElements.last.tagName)) {
       _insertText(parent, data, span);
     } else {
       // We should be in the InTable mode. This means we want to do
@@ -317,8 +317,8 @@ class TreeBuilder {
       [Element refNode]) {
     var nodes = parent.nodes;
     if (refNode == null) {
-      if (nodes.length > 0 && nodes.last() is Text) {
-        Text last = nodes.last();
+      if (nodes.length > 0 && nodes.last is Text) {
+        Text last = nodes.last;
         last.value = '${last.value}$data';
       } else {
         nodes.add(new Text(data)..span = span);
@@ -367,7 +367,7 @@ class TreeBuilder {
   }
 
   void generateImpliedEndTags([String exclude]) {
-    var name = openElements.last().tagName;
+    var name = openElements.last.tagName;
     // XXX td, th and tr are not actually needed
     if (name != exclude && const ["dd", "dt", "li", "option", "optgroup", "p",
         "rp", "rt"].contains(name)) {

lib/src/treebuilder.dart

@@ -2,7 +2,7 @@ name: html5lib
 author: "Dart Team <misc@dartlang.org>"
 homepage: https://github.com/dart-lang/html5lib
 description: A library for working with HTML documents.
-version: 0.0.16
+version: 0.0.17
 dependencies:
   unittest: { sdk: unittest }
   args: { sdk: args }

pubspec.yaml

@@ -165,7 +165,7 @@ ParseError:4:3: Unexpected DOCTYPE. Ignored.
               xlink:show="new"></desc>
       ''');
       var n = doc.query('desc');
-      var keys = n.attributes.getKeys();
+      var keys = n.attributes.keys;
       expect(keys[0] is AttributeName);
       expect(keys[0].prefix, equals('xlink'));
       expect(keys[0].namespace, equals('http://www.w3.org/1999/xlink'));

test/parser_feature_test.dart

@@ -83,7 +83,7 @@ void main() {
             errors = errors.split("\n");
           }
 
-          for (var treeCtor in treeTypes.getValues()) {
+          for (var treeCtor in treeTypes.values) {
             for (var namespaceHTMLElements in const [false, true]) {
               test(input, () {
                 runParserTest(testName, innerHTML, input, expected, errors,

test/parser_test.dart

@@ -60,7 +60,7 @@ class TestData implements Iterable<Map> {
     var lines = _text.split('\n');
     int numLines = lines.length;
     // Remove trailing newline to match Python
-    if (lines.last() == '') {
+    if (lines.last == '') {
       lines.removeLast();
     }
     for (var line in lines) {
@@ -162,7 +162,7 @@ class TestSerializer extends TreeVisitor {
     _str.add(node);
     if (node.attributes.length > 0) {
       indent += 2;
-      var keys = new List.from(node.attributes.getKeys());
+      var keys = new List.from(node.attributes.keys);
       keys.sort((x, y) => x.compareTo(y));
       for (var key in keys) {
         var v = node.attributes[key];