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

lib/src/tokenizer.dart

 library tokenizer;
 
 import 'dart:math';
 import 'package:html5lib/dom_parsing.dart' show SourceSpan;
 import 'package:html5lib/parser.dart' show HtmlParser;
 import 'constants.dart';
 import 'inputstream.dart';
 import 'token.dart';
 import 'utils.dart';
 
 // Group entities by their first character, for faster lookups
 
 // TODO(jmesserly): we could use a better data structure here like a trie, if
 // 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;
 })();
 
 // TODO(jmesserly): lots of ways to make this faster:
 // - use char codes everywhere instead of 1-char strings
 // - use switch instead of contains, indexOf
 // - use switch instead of the sequential if tests
 // - avoid string concat
@@ skipping 36 matching lines @@
   HtmlTokenizer(doc,
       [String encoding, bool parseMeta = true,
       this.lowercaseElementName = true, this.lowercaseAttrName = true,
       bool generateSpans = false])
       : stream = new HtmlInputStream(doc, encoding, parseMeta, generateSpans),
         tokenQueue = new Queue(),
         generateSpans = generateSpans {
     reset();
   }
 
-  get lastData => currentToken.data.last();
+  get lastData => currentToken.data.last;
 
   TagToken get currentTagToken => currentToken;
   DoctypeToken get currentDoctypeToken => currentToken;
 
   bool get hasNext {
     if (stream.errors.length > 0) return true;
     if (tokenQueue.length > 0) return true;
     // Start processing. When EOF is reached state will return false;
     // instead of true and the loop will terminate.
     do {
@@ skipping 119 matching lines @@
     var output = "&";
 
     var charStack = [stream.char()];
     if (isWhitespace(charStack[0]) || charStack[0] == '<' || charStack[0] == '&'
         || charStack[0] == EOF || allowedChar == charStack[0]) {
       stream.unget(charStack[0]);
     } else if (charStack[0] == "#") {
       // 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
         _addToken(new ParseErrorToken("expected-numeric-entity"));
         stream.unget(charStack.removeLast());
         output = "&${joinStr(charStack)}";
       }
     } else {
       // At this point in the process might have named entity. Entities
       // are stored in the global variable "entities".
       //
       // Consume characters and compare to these to a substring of the
       // entity names in the list until the substring no longer matches.
       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));
 
         if (filteredEntityList.length == 0) {
           break;
         }
         charStack.add(stream.char());
       }
 
@@ skipping 953 matching lines @@
 
     // Eat the character directly after the bogus comment which is either a
     // ">" or an EOF.
     stream.char();
     state = dataState;
     return true;
   }
 
   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();
         charStack.add(char);
         if (char == EOF || !expected.contains(char)) {
           matched = false;
           break;
         }
       }
       if (matched) {
         currentToken = new DoctypeToken(correct: true);
         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;
         }
       }
       if (matched) {
         state = cdataSectionState;
         return true;
       }
     }
 
@@ skipping 572 matching lines @@
     }
 
     if (data.length > 0) {
       _addToken(new CharactersToken(joinStr(data)));
     }
     state = dataState;
     return true;
   }
 }