pkg/third_party/html5lib: lots of cleanup

pkg/third_party/html5lib/lib/parser.dart

Index: pkg/third_party/html5lib/lib/parser.dart
diff --git a/pkg/third_party/html5lib/lib/parser.dart b/pkg/third_party/html5lib/lib/parser.dart
index 268053a78a1b208052a6ac57e0d0c7781bbac043..a12a1e0e8a163961bf522bd8d81eaa448371ec5c 100644
--- a/pkg/third_party/html5lib/lib/parser.dart
+++ b/pkg/third_party/html5lib/lib/parser.dart
@@ -26,7 +26,6 @@ import 'src/token.dart';
 import 'src/tokenizer.dart';
 import 'src/utils.dart';
 import 'dom.dart';
-import 'dom_parsing.dart';
 
 /**
  * Parse the [input] html5 document into a tree. The [input] can be
@@ -242,9 +241,9 @@ class HtmlParser {
     compatMode = "no quirks";
 
     if (innerHTMLMode) {
-      if (cdataElements.contains(innerHTML)) {
+      if (CDATA_ELEMENTS.contains(innerHTML)) {
         tokenizer.state = tokenizer.rcdataState;
-      } else if (rcdataElements.contains(innerHTML)) {
+      } else if (RCDATA_ELEMENTS.contains(innerHTML)) {
         tokenizer.state = tokenizer.rawtextState;
       } else if (innerHTML == 'plaintext') {
         tokenizer.state = tokenizer.plaintextState;
@@ -271,13 +270,13 @@ class HtmlParser {
       if (enc != null) enc = asciiUpper2Lower(enc);
       return enc == "text/html" || enc == "application/xhtml+xml";
     } else {
-      return htmlIntegrationPointElements.contains(
+      return HTML_INTEGRATION_POINT_ELEMENTS.contains(
           new Pair(element.namespace, element.tagName));
     }
   }
 
   bool isMathMLTextIntegrationPoint(Node element) {
-    return mathmlTextIntegrationPointElements.contains(
+    return MATHML_TEXT_INTEGRATION_POINT_ELEMENTS.contains(
         new Pair(element.namespace, element.tagName));
   }
 
@@ -1226,7 +1225,7 @@ class InBodyPhase extends Phase {
 
     var matchingElements = [];
     for (Node node in tree.activeFormattingElements.reversed) {
-      if (node == Marker) {
+      if (node == MARKER) {
         break;
       } else if (isMatchingFormattingElement(node, element)) {
         matchingElements.add(node);
@@ -1371,7 +1370,7 @@ class InBodyPhase extends Phase {
         parser.phase.processEndTag(new EndTagToken(node.tagName));
         break;
       }
-      if (specialElements.contains(node.nameTuple) &&
+      if (SPECIAL_ELEMENTS.contains(node.nameTuple) &&
           !const ["address", "div", "p"].contains(node.tagName)) {
         break;
       }
@@ -1396,7 +1395,7 @@ class InBodyPhase extends Phase {
     if (tree.elementInScope("p", variant: "button")) {
       endTagP(new EndTagToken("p"));
     }
-    if (headingElements.contains(tree.openElements.last.tagName)) {
+    if (HEADING_ELEMENTS.contains(tree.openElements.last.tagName)) {
       parser.parseError(token.span, "unexpected-start-tag",
           {"name": token.name});
       tree.openElements.removeLast();
@@ -1450,7 +1449,7 @@ class InBodyPhase extends Phase {
   void startTagAppletMarqueeObject(StartTagToken token) {
     tree.reconstructActiveFormattingElements();
     tree.insertElement(token);
-    tree.activeFormattingElements.add(Marker);
+    tree.activeFormattingElements.add(MARKER);
     parser.framesetOK = false;
   }
 
@@ -1736,7 +1735,7 @@ class InBodyPhase extends Phase {
   }
 
   void endTagHeading(EndTagToken token) {
-    for (var item in headingElements) {
+    for (var item in HEADING_ELEMENTS) {
       if (tree.elementInScope(item)) {
         tree.generateImpliedEndTags();
         break;
@@ -1746,10 +1745,10 @@ class InBodyPhase extends Phase {
       parser.parseError(token.span, "end-tag-too-early", {"name": token.name});
     }
 
-    for (var item in headingElements) {
+    for (var item in HEADING_ELEMENTS) {
       if (tree.elementInScope(item)) {
         item = tree.openElements.removeLast();
-        while (!headingElements.contains(item.tagName)) {
+        while (!HEADING_ELEMENTS.contains(item.tagName)) {
           item = tree.openElements.removeLast();
         }
         break;
@@ -1796,7 +1795,7 @@ class InBodyPhase extends Phase {
       var afeIndex = tree.openElements.indexOf(formattingElement);
       Node furthestBlock = null;
       for (Node element in slice(tree.openElements, afeIndex)) {
-        if (specialElements.contains(element.nameTuple)) {
+        if (SPECIAL_ELEMENTS.contains(element.nameTuple)) {
           furthestBlock = element;
           break;
         }
@@ -1933,7 +1932,7 @@ class InBodyPhase extends Phase {
         while (tree.openElements.removeLast() != node);
         break;
       } else {
-        if (specialElements.contains(node.nameTuple)) {
+        if (SPECIAL_ELEMENTS.contains(node.nameTuple)) {
           parser.parseError(token.span, "unexpected-end-tag",
               {"name": token.name});
           break;
@@ -2060,7 +2059,7 @@ class InTablePhase extends Phase {
 
   void startTagCaption(StartTagToken token) {
     clearStackToTableContext();
-    tree.activeFormattingElements.add(Marker);
+    tree.activeFormattingElements.add(MARKER);
     tree.insertElement(token);
     parser.phase = parser._inCaptionPhase;
   }
@@ -2576,7 +2575,7 @@ class InRowPhase extends Phase {
     clearStackToTableRowContext();
     tree.insertElement(token);
     parser.phase = parser._inCellPhase;
-    tree.activeFormattingElements.add(Marker);
+    tree.activeFormattingElements.add(MARKER);
   }
 
   Token startTagTableOther(StartTagToken token) {
@@ -3336,7 +3335,7 @@ class ParseError implements Exception {
    * [span.getLocationMessage] will not show any source url information, but
    * [toString] will include 'ParserError:' as a prefix.
    */
-  String get message => formatStr(errorMessages[errorCode], data);
+  String get message => formatStr(ERROR_MESSAGES[errorCode], data);
 
   String toString() {
     var res = span.getLocationMessage(message);