diff --git a/tokenizer/domjs.test b/tokenizer/domjs.test
index 9cd2f0c8..8100cbe5 100644
--- a/tokenizer/domjs.test
+++ b/tokenizer/domjs.test
@@ -154,7 +154,10 @@
             "description":"--!NUL in comment ",
             "doubleEscaped":true,
             "input":"<!----!\\u0000-->",
-            "output":["ParseError", "ParseError", ["Comment", "--!\\uFFFD"]]
+            "output":["ParseError", "ParseError", ["Comment", "--!\\uFFFD"]],
+            "errors":[
+                { "code": "unexpected-null-character", "line": 1, "col": 8 }
+            ]
         },
         {
             "description":"space EOF after doctype ",
diff --git a/tokenizer/escapeFlag.test b/tokenizer/escapeFlag.test
index 18cb4309..47317cee 100644
--- a/tokenizer/escapeFlag.test
+++ b/tokenizer/escapeFlag.test
@@ -16,7 +16,10 @@
 "initialStates":["RCDATA state", "RAWTEXT state"],
 "lastStartTag":"xmp",
 "input":"foo<!--></xmp><!-->baz</xmp>",
-"output":[["Character", "foo<!-->"], ["EndTag", "xmp"], "ParseError", ["Comment", ""], ["Character", "baz"], ["EndTag", "xmp"]]},
+"output":[["Character", "foo<!-->"], ["EndTag", "xmp"], "ParseError", ["Comment", ""], ["Character", "baz"], ["EndTag", "xmp"]],
+"errors":[
+    { "code": "abrupt-comment", "line": 1, "col": 19 }
+]},
 
 {"description":"Commented entities in RCDATA",
 "initialStates":["RCDATA state"],
diff --git a/tokenizer/pendingSpecChanges.test b/tokenizer/pendingSpecChanges.test
index 1b7dc3c7..cbe10668 100644
--- a/tokenizer/pendingSpecChanges.test
+++ b/tokenizer/pendingSpecChanges.test
@@ -2,6 +2,8 @@
 
 {"description":"<!---- >",
 "input":"<!---- >",
-"output":["ParseError", "ParseError", ["Comment","-- >"]]}
-
+"output":["ParseError", "ParseError", ["Comment","-- >"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 9 }
+]}
 ]}
diff --git a/tokenizer/test1.test b/tokenizer/test1.test
index e4ff196c..871b0497 100644
--- a/tokenizer/test1.test
+++ b/tokenizer/test1.test
@@ -94,7 +94,10 @@
 
 {"description":"Unfinished comment",
 "input":"<!--comment",
-"output":["ParseError", ["Comment", "comment"]]},
+"output":["ParseError", ["Comment", "comment"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 12 }
+]},
 
 {"description":"Start of a comment",
 "input":"<!-",
@@ -104,17 +107,30 @@
 ]},
 
 {"description":"Short comment",
- "input":"<!-->",
- "output":["ParseError", ["Comment", ""]]},
+"input":"<!-->",
+"output":["ParseError", ["Comment", ""]],
+"errors":[
+    { "code": "abrupt-comment", "line": 1, "col": 5 }
+]},
+
 
 {"description":"Short comment two",
- "input":"<!--->",
- "output":["ParseError", ["Comment", ""]]},
+"input":"<!--->",
+"output":["ParseError", ["Comment", ""]],
+"errors":[
+    { "code": "abrupt-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"Short comment three",
  "input":"<!---->",
  "output":[["Comment", ""]]},
 
+{"description":"Nested comment",
+"input":"<!-- <!--test-->",
+"output":[["Comment", " <!--test"]],
+"errors":[
+    { "code": "nested-comment", "line": 1, "col": 10 }
+]},
 
 {"description":"Ampersand EOF",
 "input":"&",
diff --git a/tokenizer/test2.test b/tokenizer/test2.test
index 8ce8908f..723f3f7e 100644
--- a/tokenizer/test2.test
+++ b/tokenizer/test2.test
@@ -153,7 +153,10 @@
 
 {"description":"Comment with dash",
 "input":"<!---x",
-"output":["ParseError", ["Comment", "-x"]]},
+"output":["ParseError", ["Comment", "-x"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"Entity + newline",
 "input":"\nx\n&gt;\n",
diff --git a/tokenizer/test3.test b/tokenizer/test3.test
index 27b124e0..bbc6c9a2 100644
--- a/tokenizer/test3.test
+++ b/tokenizer/test3.test
@@ -217,81 +217,133 @@
 
 {"description":"<!--",
 "input":"<!--",
-"output":["ParseError", ["Comment", ""]]},
+"output":["ParseError", ["Comment", ""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 5 }
+]},
 
 {"description":"<!--\\u0000",
 "input":"<!--\u0000",
-"output":["ParseError", "ParseError", ["Comment", "\uFFFD"]]},
+"output":["ParseError", "ParseError", ["Comment", "\uFFFD"]],
+"errors":[
+    { "code": "unexpected-null-character", "line": 1, "col": 5 },
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--\\u0009",
 "input":"<!--\u0009",
-"output":["ParseError", ["Comment", "\u0009"]]},
+"output":["ParseError", ["Comment", "\u0009"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--\\u000A",
 "input":"<!--\u000A",
-"output":["ParseError", ["Comment", "\u000A"]]},
+"output":["ParseError", ["Comment", "\u000A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 2, "col": 1 }
+]},
 
 {"description":"<!--\\u000B",
 "input":"<!--\u000B",
 "output":["ParseError", "ParseError", ["Comment", "\u000B"]],
 "errors":[
-    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 5 }
+    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 5 },
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
 ]},
 
 {"description":"<!--\\u000C",
 "input":"<!--\u000C",
-"output":["ParseError", ["Comment", "\u000C"]]},
+"output":["ParseError", ["Comment", "\u000C"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!-- ",
 "input":"<!-- ",
-"output":["ParseError", ["Comment", " "]]},
+"output":["ParseError", ["Comment", " "]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!-- \\u0000",
 "input":"<!-- \u0000",
-"output":["ParseError", "ParseError", ["Comment", " \uFFFD"]]},
+"output":["ParseError", "ParseError", ["Comment", " \uFFFD"]],
+"errors":[
+    { "code": "unexpected-null-character", "line": 1, "col": 6 },
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- \\u0009",
 "input":"<!-- \u0009",
-"output":["ParseError", ["Comment", " \u0009"]]},
+"output":["ParseError", ["Comment", " \u0009"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- \\u000A",
 "input":"<!-- \u000A",
-"output":["ParseError", ["Comment", " \u000A"]]},
+"output":["ParseError", ["Comment", " \u000A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 2, "col": 1 }
+]},
 
 {"description":"<!-- \\u000B",
 "input":"<!-- \u000B",
 "output":["ParseError", "ParseError", ["Comment", " \u000B"]],
 "errors":[
-    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 6 }
+    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 6 },
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
 ]},
 
 {"description":"<!-- \\u000C",
 "input":"<!-- \u000C",
-"output":["ParseError", ["Comment", " \u000C"]]},
+"output":["ParseError", ["Comment", " \u000C"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!--  ",
 "input":"<!--  ",
-"output":["ParseError", ["Comment", "  "]]},
+"output":["ParseError", ["Comment", "  "]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- !",
 "input":"<!-- !",
-"output":["ParseError", ["Comment", " !"]]},
+"output":["ParseError", ["Comment", " !"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- \"",
 "input":"<!-- \"",
-"output":["ParseError", ["Comment", " \""]]},
+"output":["ParseError", ["Comment", " \""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- &",
 "input":"<!-- &",
-"output":["ParseError", ["Comment", " &"]]},
+"output":["ParseError", ["Comment", " &"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- '",
 "input":"<!-- '",
-"output":["ParseError", ["Comment", " '"]]},
+"output":["ParseError", ["Comment", " '"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- ,",
 "input":"<!-- ,",
-"output":["ParseError", ["Comment", " ,"]]},
+"output":["ParseError", ["Comment", " ,"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- -",
 "input":"<!-- -",
@@ -299,50 +351,82 @@
 
 {"description":"<!-- -\\u0000",
 "input":"<!-- -\u0000",
-"output":["ParseError", "ParseError", ["Comment", " -\uFFFD"]]},
+"output":["ParseError", "ParseError", ["Comment", " -\uFFFD"]],
+"errors":[
+    { "code": "unexpected-null-character", "line": 1, "col": 7 },
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -\\u0009",
 "input":"<!-- -\u0009",
-"output":["ParseError", ["Comment", " -\u0009"]]},
+"output":["ParseError", ["Comment", " -\u0009"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -\\u000A",
 "input":"<!-- -\u000A",
-"output":["ParseError", ["Comment", " -\u000A"]]},
+"output":["ParseError", ["Comment", " -\u000A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 2, "col": 1 }
+]},
 
 {"description":"<!-- -\\u000B",
 "input":"<!-- -\u000B",
 "output":["ParseError", "ParseError", ["Comment", " -\u000B"]],
 "errors":[
-    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 7 }
+    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 7 },
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
 ]},
 
 {"description":"<!-- -\\u000C",
 "input":"<!-- -\u000C",
-"output":["ParseError", ["Comment", " -\u000C"]]},
+"output":["ParseError", ["Comment", " -\u000C"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- - ",
 "input":"<!-- - ",
-"output":["ParseError", ["Comment", " - "]]},
+"output":["ParseError", ["Comment", " - "]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -!",
 "input":"<!-- -!",
-"output":["ParseError", ["Comment", " -!"]]},
+"output":["ParseError", ["Comment", " -!"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -\"",
 "input":"<!-- -\"",
-"output":["ParseError", ["Comment", " -\""]]},
+"output":["ParseError", ["Comment", " -\""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -&",
 "input":"<!-- -&",
-"output":["ParseError", ["Comment", " -&"]]},
+"output":["ParseError", ["Comment", " -&"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -'",
 "input":"<!-- -'",
-"output":["ParseError", ["Comment", " -'"]]},
+"output":["ParseError", ["Comment", " -'"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -,",
 "input":"<!-- -,",
-"output":["ParseError", ["Comment", " -,"]]},
+"output":["ParseError", ["Comment", " -,"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- --",
 "input":"<!-- --",
@@ -350,242 +434,418 @@
 
 {"description":"<!-- -.",
 "input":"<!-- -.",
-"output":["ParseError", ["Comment", " -."]]},
+"output":["ParseError", ["Comment", " -."]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -/",
 "input":"<!-- -/",
-"output":["ParseError", ["Comment", " -/"]]},
+"output":["ParseError", ["Comment", " -/"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -0",
 "input":"<!-- -0",
-"output":["ParseError", ["Comment", " -0"]]},
+"output":["ParseError", ["Comment", " -0"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -1",
 "input":"<!-- -1",
-"output":["ParseError", ["Comment", " -1"]]},
+"output":["ParseError", ["Comment", " -1"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -9",
 "input":"<!-- -9",
-"output":["ParseError", ["Comment", " -9"]]},
+"output":["ParseError", ["Comment", " -9"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -<",
 "input":"<!-- -<",
-"output":["ParseError", ["Comment", " -<"]]},
+"output":["ParseError", ["Comment", " -<"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -=",
 "input":"<!-- -=",
-"output":["ParseError", ["Comment", " -="]]},
+"output":["ParseError", ["Comment", " -="]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- ->",
 "input":"<!-- ->",
-"output":["ParseError", ["Comment", " ->"]]},
+"output":["ParseError", ["Comment", " ->"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -?",
 "input":"<!-- -?",
-"output":["ParseError", ["Comment", " -?"]]},
+"output":["ParseError", ["Comment", " -?"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -@",
 "input":"<!-- -@",
-"output":["ParseError", ["Comment", " -@"]]},
+"output":["ParseError", ["Comment", " -@"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -A",
 "input":"<!-- -A",
-"output":["ParseError", ["Comment", " -A"]]},
+"output":["ParseError", ["Comment", " -A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -B",
 "input":"<!-- -B",
-"output":["ParseError", ["Comment", " -B"]]},
+"output":["ParseError", ["Comment", " -B"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -Y",
 "input":"<!-- -Y",
-"output":["ParseError", ["Comment", " -Y"]]},
+"output":["ParseError", ["Comment", " -Y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -Z",
 "input":"<!-- -Z",
-"output":["ParseError", ["Comment", " -Z"]]},
+"output":["ParseError", ["Comment", " -Z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -`",
 "input":"<!-- -`",
-"output":["ParseError", ["Comment", " -`"]]},
+"output":["ParseError", ["Comment", " -`"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -a",
 "input":"<!-- -a",
-"output":["ParseError", ["Comment", " -a"]]},
+"output":["ParseError", ["Comment", " -a"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -b",
 "input":"<!-- -b",
-"output":["ParseError", ["Comment", " -b"]]},
+"output":["ParseError", ["Comment", " -b"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -y",
 "input":"<!-- -y",
-"output":["ParseError", ["Comment", " -y"]]},
+"output":["ParseError", ["Comment", " -y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -z",
 "input":"<!-- -z",
-"output":["ParseError", ["Comment", " -z"]]},
+"output":["ParseError", ["Comment", " -z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -{",
 "input":"<!-- -{",
-"output":["ParseError", ["Comment", " -{"]]},
+"output":["ParseError", ["Comment", " -{"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-- -\\uDBC0\\uDC00",
 "input":"<!-- -\uDBC0\uDC00",
-"output":["ParseError", ["Comment", " -\uDBC0\uDC00"]]},
+"output":["ParseError", ["Comment", " -\uDBC0\uDC00"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 9 }
+]},
 
 {"description":"<!-- .",
 "input":"<!-- .",
-"output":["ParseError", ["Comment", " ."]]},
+"output":["ParseError", ["Comment", " ."]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- /",
 "input":"<!-- /",
-"output":["ParseError", ["Comment", " /"]]},
+"output":["ParseError", ["Comment", " /"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- 0",
 "input":"<!-- 0",
-"output":["ParseError", ["Comment", " 0"]]},
+"output":["ParseError", ["Comment", " 0"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- 1",
 "input":"<!-- 1",
-"output":["ParseError", ["Comment", " 1"]]},
+"output":["ParseError", ["Comment", " 1"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- 9",
 "input":"<!-- 9",
-"output":["ParseError", ["Comment", " 9"]]},
+"output":["ParseError", ["Comment", " 9"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- <",
 "input":"<!-- <",
-"output":["ParseError", ["Comment", " <"]]},
+"output":["ParseError", ["Comment", " <"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- =",
 "input":"<!-- =",
-"output":["ParseError", ["Comment", " ="]]},
+"output":["ParseError", ["Comment", " ="]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- >",
 "input":"<!-- >",
-"output":["ParseError", ["Comment", " >"]]},
+"output":["ParseError", ["Comment", " >"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- ?",
 "input":"<!-- ?",
-"output":["ParseError", ["Comment", " ?"]]},
+"output":["ParseError", ["Comment", " ?"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- @",
 "input":"<!-- @",
-"output":["ParseError", ["Comment", " @"]]},
+"output":["ParseError", ["Comment", " @"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- A",
 "input":"<!-- A",
-"output":["ParseError", ["Comment", " A"]]},
+"output":["ParseError", ["Comment", " A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- B",
 "input":"<!-- B",
-"output":["ParseError", ["Comment", " B"]]},
+"output":["ParseError", ["Comment", " B"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- Y",
 "input":"<!-- Y",
-"output":["ParseError", ["Comment", " Y"]]},
+"output":["ParseError", ["Comment", " Y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- Z",
 "input":"<!-- Z",
-"output":["ParseError", ["Comment", " Z"]]},
+"output":["ParseError", ["Comment", " Z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- `",
 "input":"<!-- `",
-"output":["ParseError", ["Comment", " `"]]},
+"output":["ParseError", ["Comment", " `"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- a",
 "input":"<!-- a",
-"output":["ParseError", ["Comment", " a"]]},
+"output":["ParseError", ["Comment", " a"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- b",
 "input":"<!-- b",
-"output":["ParseError", ["Comment", " b"]]},
+"output":["ParseError", ["Comment", " b"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- y",
 "input":"<!-- y",
-"output":["ParseError", ["Comment", " y"]]},
+"output":["ParseError", ["Comment", " y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- z",
 "input":"<!-- z",
-"output":["ParseError", ["Comment", " z"]]},
+"output":["ParseError", ["Comment", " z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- {",
 "input":"<!-- {",
-"output":["ParseError", ["Comment", " {"]]},
+"output":["ParseError", ["Comment", " {"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!-- \\uDBC0\\uDC00",
 "input":"<!-- \uDBC0\uDC00",
-"output":["ParseError", ["Comment", " \uDBC0\uDC00"]]},
+"output":["ParseError", ["Comment", " \uDBC0\uDC00"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!--!",
 "input":"<!--!",
-"output":["ParseError", ["Comment", "!"]]},
+"output":["ParseError", ["Comment", "!"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--\"",
 "input":"<!--\"",
-"output":["ParseError", ["Comment", "\""]]},
+"output":["ParseError", ["Comment", "\""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--&",
 "input":"<!--&",
-"output":["ParseError", ["Comment", "&"]]},
+"output":["ParseError", ["Comment", "&"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--'",
 "input":"<!--'",
-"output":["ParseError", ["Comment", "'"]]},
+"output":["ParseError", ["Comment", "'"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--,",
 "input":"<!--,",
-"output":["ParseError", ["Comment", ","]]},
+"output":["ParseError", ["Comment", ","]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!---",
 "input":"<!---",
-"output":["ParseError", ["Comment", ""]]},
+"output":["ParseError", ["Comment", ""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!---\\u0000",
 "input":"<!---\u0000",
-"output":["ParseError", "ParseError", ["Comment", "-\uFFFD"]]},
+"output":["ParseError", "ParseError", ["Comment", "-\uFFFD"]],
+"errors":[
+    { "code": "unexpected-null-character", "line": 1, "col": 6 },
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---\\u0009",
 "input":"<!---\u0009",
-"output":["ParseError", ["Comment", "-\u0009"]]},
+"output":["ParseError", ["Comment", "-\u0009"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---\\u000A",
 "input":"<!---\u000A",
-"output":["ParseError", ["Comment", "-\u000A"]]},
+"output":["ParseError", ["Comment", "-\u000A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 2, "col": 1 }
+]},
 
 {"description":"<!---\\u000B",
 "input":"<!---\u000B",
 "output":["ParseError", "ParseError", ["Comment", "-\u000B"]],
 "errors":[
-    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 6 }
+    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 6 },
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
 ]},
 
 {"description":"<!---\\u000C",
 "input":"<!---\u000C",
-"output":["ParseError", ["Comment", "-\u000C"]]},
+"output":["ParseError", ["Comment", "-\u000C"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!--- ",
 "input":"<!--- ",
-"output":["ParseError", ["Comment", "- "]]},
+"output":["ParseError", ["Comment", "- "]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---!",
 "input":"<!---!",
-"output":["ParseError", ["Comment", "-!"]]},
+"output":["ParseError", ["Comment", "-!"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---\"",
 "input":"<!---\"",
-"output":["ParseError", ["Comment", "-\""]]},
+"output":["ParseError", ["Comment", "-\""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---&",
 "input":"<!---&",
-"output":["ParseError", ["Comment", "-&"]]},
+"output":["ParseError", ["Comment", "-&"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---'",
 "input":"<!---'",
-"output":["ParseError", ["Comment", "-'"]]},
+"output":["ParseError", ["Comment", "-'"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---,",
 "input":"<!---,",
-"output":["ParseError", ["Comment", "-,"]]},
+"output":["ParseError", ["Comment", "-,"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!----",
 "input":"<!----",
@@ -593,35 +853,53 @@
 
 {"description":"<!----\\u0000",
 "input":"<!----\u0000",
-"output":["ParseError", "ParseError", ["Comment", "--\uFFFD"]]},
+"output":["ParseError", "ParseError", ["Comment", "--\uFFFD"]],
+"errors":[
+    { "code": "unexpected-null-character", "line": 1, "col": 7 },
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----\\u0009",
 "input":"<!----\u0009",
-"output":["ParseError", "ParseError", ["Comment", "--\u0009"]]},
+"output":["ParseError", "ParseError", ["Comment", "--\u0009"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----\\u000A",
 "input":"<!----\u000A",
-"output":["ParseError", "ParseError", ["Comment", "--\u000A"]]},
+"output":["ParseError", "ParseError", ["Comment", "--\u000A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 2, "col": 1 }
+]},
 
 {"description":"<!----\\u000B",
 "input":"<!----\u000B",
 "output":["ParseError", "ParseError", "ParseError", ["Comment", "--\u000B"]],
 "errors":[
-    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 7 }
+    { "code": "control-or-undefined-character-in-input-stream", "line": 1, "col": 7 },
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
 ]},
 
 {"description":"<!----\\u000C",
 "input":"<!----\u000C",
-"output":["ParseError", "ParseError", ["Comment", "--\u000C"]]},
+"output":["ParseError", "ParseError", ["Comment", "--\u000C"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!---- ",
 "input":"<!---- ",
-"output":["ParseError", "ParseError", ["Comment", "-- "]]},
+"output":["ParseError", "ParseError", ["Comment", "-- "]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!---- -",
 "input":"<!---- -",
 "output":["ParseError", "ParseError", ["Comment", "-- "]]},
 
+
 {"description":"<!---- --",
 "input":"<!---- --",
 "output":["ParseError", "ParseError", ["Comment", "-- "]]},
@@ -648,7 +926,10 @@
 
 {"description":"<!----!a",
 "input":"<!----!a",
-"output":["ParseError", "ParseError", ["Comment", "--!a"]]},
+"output":["ParseError", "ParseError", ["Comment", "--!a"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 9 }
+]},
 
 {"description":"<!----!a-",
 "input":"<!----!a-",
@@ -676,19 +957,31 @@
 
 {"description":"<!----\"",
 "input":"<!----\"",
-"output":["ParseError", "ParseError", ["Comment", "--\""]]},
+"output":["ParseError", "ParseError", ["Comment", "--\""]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----&",
 "input":"<!----&",
-"output":["ParseError", "ParseError", ["Comment", "--&"]]},
+"output":["ParseError", "ParseError", ["Comment", "--&"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----'",
 "input":"<!----'",
-"output":["ParseError", "ParseError", ["Comment", "--'"]]},
+"output":["ParseError", "ParseError", ["Comment", "--'"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----,",
 "input":"<!----,",
-"output":["ParseError", "ParseError", ["Comment", "--,"]]},
+"output":["ParseError", "ParseError", ["Comment", "--,"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!-----",
 "input":"<!-----",
@@ -696,31 +989,52 @@
 
 {"description":"<!----.",
 "input":"<!----.",
-"output":["ParseError", "ParseError", ["Comment", "--."]]},
+"output":["ParseError", "ParseError", ["Comment", "--."]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----/",
 "input":"<!----/",
-"output":["ParseError", "ParseError", ["Comment", "--/"]]},
+"output":["ParseError", "ParseError", ["Comment", "--/"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----0",
 "input":"<!----0",
-"output":["ParseError", "ParseError", ["Comment", "--0"]]},
+"output":["ParseError", "ParseError", ["Comment", "--0"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----1",
 "input":"<!----1",
-"output":["ParseError", "ParseError", ["Comment", "--1"]]},
+"output":["ParseError", "ParseError", ["Comment", "--1"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----9",
 "input":"<!----9",
-"output":["ParseError", "ParseError", ["Comment", "--9"]]},
+"output":["ParseError", "ParseError", ["Comment", "--9"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----<",
 "input":"<!----<",
-"output":["ParseError", "ParseError", ["Comment", "--<"]]},
+"output":["ParseError", "ParseError", ["Comment", "--<"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----=",
 "input":"<!----=",
-"output":["ParseError", "ParseError", ["Comment", "--="]]},
+"output":["ParseError", "ParseError", ["Comment", "--="]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!---->",
 "input":"<!---->",
@@ -728,223 +1042,374 @@
 
 {"description":"<!----?",
 "input":"<!----?",
-"output":["ParseError", "ParseError", ["Comment", "--?"]]},
+"output":["ParseError", "ParseError", ["Comment", "--?"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----@",
 "input":"<!----@",
-"output":["ParseError", "ParseError", ["Comment", "--@"]]},
+"output":["ParseError", "ParseError", ["Comment", "--@"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----A",
 "input":"<!----A",
-"output":["ParseError", "ParseError", ["Comment", "--A"]]},
+"output":["ParseError", "ParseError", ["Comment", "--A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----B",
 "input":"<!----B",
-"output":["ParseError", "ParseError", ["Comment", "--B"]]},
+"output":["ParseError", "ParseError", ["Comment", "--B"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----Y",
 "input":"<!----Y",
-"output":["ParseError", "ParseError", ["Comment", "--Y"]]},
+"output":["ParseError", "ParseError", ["Comment", "--Y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----Z",
 "input":"<!----Z",
-"output":["ParseError", "ParseError", ["Comment", "--Z"]]},
+"output":["ParseError", "ParseError", ["Comment", "--Z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----`",
 "input":"<!----`",
-"output":["ParseError", "ParseError", ["Comment", "--`"]]},
+"output":["ParseError", "ParseError", ["Comment", "--`"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----a",
 "input":"<!----a",
-"output":["ParseError", "ParseError", ["Comment", "--a"]]},
+"output":["ParseError", "ParseError", ["Comment", "--a"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----b",
 "input":"<!----b",
-"output":["ParseError", "ParseError", ["Comment", "--b"]]},
+"output":["ParseError", "ParseError", ["Comment", "--b"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----y",
 "input":"<!----y",
-"output":["ParseError", "ParseError", ["Comment", "--y"]]},
+"output":["ParseError", "ParseError", ["Comment", "--y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----z",
 "input":"<!----z",
-"output":["ParseError", "ParseError", ["Comment", "--z"]]},
+"output":["ParseError", "ParseError", ["Comment", "--z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----{",
 "input":"<!----{",
-"output":["ParseError", "ParseError", ["Comment", "--{"]]},
+"output":["ParseError", "ParseError", ["Comment", "--{"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!----\\uDBC0\\uDC00",
 "input":"<!----\uDBC0\uDC00",
-"output":["ParseError", "ParseError", ["Comment", "--\uDBC0\uDC00"]]},
+"output":["ParseError", "ParseError", ["Comment", "--\uDBC0\uDC00"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 9 }
+]},
 
 {"description":"<!---.",
 "input":"<!---.",
-"output":["ParseError", ["Comment", "-."]]},
+"output":["ParseError", ["Comment", "-."]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---/",
 "input":"<!---/",
-"output":["ParseError", ["Comment", "-/"]]},
+"output":["ParseError", ["Comment", "-/"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---0",
 "input":"<!---0",
-"output":["ParseError", ["Comment", "-0"]]},
+"output":["ParseError", ["Comment", "-0"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---1",
 "input":"<!---1",
-"output":["ParseError", ["Comment", "-1"]]},
+"output":["ParseError", ["Comment", "-1"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---9",
 "input":"<!---9",
-"output":["ParseError", ["Comment", "-9"]]},
+"output":["ParseError", ["Comment", "-9"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---<",
 "input":"<!---<",
-"output":["ParseError", ["Comment", "-<"]]},
+"output":["ParseError", ["Comment", "-<"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---=",
 "input":"<!---=",
-"output":["ParseError", ["Comment", "-="]]},
-
-{"description":"<!--->",
-"input":"<!--->",
-"output":["ParseError", ["Comment", ""]]},
+"output":["ParseError", ["Comment", "-="]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---?",
 "input":"<!---?",
-"output":["ParseError", ["Comment", "-?"]]},
+"output":["ParseError", ["Comment", "-?"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---@",
 "input":"<!---@",
-"output":["ParseError", ["Comment", "-@"]]},
+"output":["ParseError", ["Comment", "-@"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---A",
 "input":"<!---A",
-"output":["ParseError", ["Comment", "-A"]]},
+"output":["ParseError", ["Comment", "-A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---B",
 "input":"<!---B",
-"output":["ParseError", ["Comment", "-B"]]},
+"output":["ParseError", ["Comment", "-B"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---Y",
 "input":"<!---Y",
-"output":["ParseError", ["Comment", "-Y"]]},
+"output":["ParseError", ["Comment", "-Y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---Z",
 "input":"<!---Z",
-"output":["ParseError", ["Comment", "-Z"]]},
+"output":["ParseError", ["Comment", "-Z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---`",
 "input":"<!---`",
-"output":["ParseError", ["Comment", "-`"]]},
+"output":["ParseError", ["Comment", "-`"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---a",
 "input":"<!---a",
-"output":["ParseError", ["Comment", "-a"]]},
+"output":["ParseError", ["Comment", "-a"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---b",
 "input":"<!---b",
-"output":["ParseError", ["Comment", "-b"]]},
+"output":["ParseError", ["Comment", "-b"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---y",
 "input":"<!---y",
-"output":["ParseError", ["Comment", "-y"]]},
+"output":["ParseError", ["Comment", "-y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---z",
 "input":"<!---z",
-"output":["ParseError", ["Comment", "-z"]]},
+"output":["ParseError", ["Comment", "-z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---{",
 "input":"<!---{",
-"output":["ParseError", ["Comment", "-{"]]},
+"output":["ParseError", ["Comment", "-{"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!---\\uDBC0\\uDC00",
 "input":"<!---\uDBC0\uDC00",
-"output":["ParseError", ["Comment", "-\uDBC0\uDC00"]]},
+"output":["ParseError", ["Comment", "-\uDBC0\uDC00"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 8 }
+]},
 
 {"description":"<!--.",
 "input":"<!--.",
-"output":["ParseError", ["Comment", "."]]},
+"output":["ParseError", ["Comment", "."]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--/",
 "input":"<!--/",
-"output":["ParseError", ["Comment", "/"]]},
+"output":["ParseError", ["Comment", "/"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--0",
 "input":"<!--0",
-"output":["ParseError", ["Comment", "0"]]},
+"output":["ParseError", ["Comment", "0"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--1",
 "input":"<!--1",
-"output":["ParseError", ["Comment", "1"]]},
+"output":["ParseError", ["Comment", "1"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--9",
 "input":"<!--9",
-"output":["ParseError", ["Comment", "9"]]},
+"output":["ParseError", ["Comment", "9"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--<",
 "input":"<!--<",
-"output":["ParseError", ["Comment", "<"]]},
+"output":["ParseError", ["Comment", "<"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--=",
 "input":"<!--=",
-"output":["ParseError", ["Comment", "="]]},
-
-{"description":"<!-->",
-"input":"<!-->",
-"output":["ParseError", ["Comment", ""]]},
+"output":["ParseError", ["Comment", "="]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--?",
 "input":"<!--?",
-"output":["ParseError", ["Comment", "?"]]},
+"output":["ParseError", ["Comment", "?"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--@",
 "input":"<!--@",
-"output":["ParseError", ["Comment", "@"]]},
+"output":["ParseError", ["Comment", "@"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--A",
 "input":"<!--A",
-"output":["ParseError", ["Comment", "A"]]},
+"output":["ParseError", ["Comment", "A"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--B",
 "input":"<!--B",
-"output":["ParseError", ["Comment", "B"]]},
+"output":["ParseError", ["Comment", "B"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--Y",
 "input":"<!--Y",
-"output":["ParseError", ["Comment", "Y"]]},
+"output":["ParseError", ["Comment", "Y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--Z",
 "input":"<!--Z",
-"output":["ParseError", ["Comment", "Z"]]},
+"output":["ParseError", ["Comment", "Z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--`",
 "input":"<!--`",
-"output":["ParseError", ["Comment", "`"]]},
+"output":["ParseError", ["Comment", "`"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--a",
 "input":"<!--a",
-"output":["ParseError", ["Comment", "a"]]},
+"output":["ParseError", ["Comment", "a"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--b",
 "input":"<!--b",
-"output":["ParseError", ["Comment", "b"]]},
+"output":["ParseError", ["Comment", "b"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--y",
 "input":"<!--y",
-"output":["ParseError", ["Comment", "y"]]},
+"output":["ParseError", ["Comment", "y"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--z",
 "input":"<!--z",
-"output":["ParseError", ["Comment", "z"]]},
+"output":["ParseError", ["Comment", "z"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--{",
 "input":"<!--{",
-"output":["ParseError", ["Comment", "{"]]},
+"output":["ParseError", ["Comment", "{"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 6 }
+]},
 
 {"description":"<!--\\uDBC0\\uDC00",
 "input":"<!--\uDBC0\uDC00",
-"output":["ParseError", ["Comment", "\uDBC0\uDC00"]]},
+"output":["ParseError", ["Comment", "\uDBC0\uDC00"]],
+"errors":[
+    { "code": "eof-in-comment", "line": 1, "col": 7 }
+]},
 
 {"description":"<!/",
 "input":"<!/",
diff --git a/tree-construction/comments01.dat b/tree-construction/comments01.dat
index 8d708dff..185ee886 100644
--- a/tree-construction/comments01.dat
+++ b/tree-construction/comments01.dat
@@ -29,6 +29,8 @@ FOO<!-- BAR --   >BAZ
 (1,3): expected-doctype-but-got-chars
 (1,15): unexpected-char-in-comment
 (1,21): eof-in-comment
+#new-errors
+(1:22) eof-in-comment
 #document
 | <html>
 |   <head>
@@ -73,6 +75,8 @@ FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
 (1,24): unexpected-char-in-comment
 (1,31): unexpected-char-in-comment
 (1,35): eof-in-comment
+#new-errors
+(1:36) eof-in-comment
 #document
 | <html>
 |   <head>
@@ -97,6 +101,8 @@ FOO<!--->BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
 (1,9): incorrect-comment
+#new-errors
+(1:9) abrupt-comment
 #document
 | <html>
 |   <head>
@@ -110,6 +116,8 @@ FOO<!-->BAZ
 #errors
 (1,3): expected-doctype-but-got-chars
 (1,8): incorrect-comment
+#new-errors
+(1:8) abrupt-comment
 #document
 | <html>
 |   <head>
diff --git a/tree-construction/tests1.dat b/tree-construction/tests1.dat
index 16eb0d44..6d4ee9d8 100644
--- a/tree-construction/tests1.dat
+++ b/tree-construction/tests1.dat
@@ -327,6 +327,9 @@ Line1<br>Line2<br>Line3<br>Line4
 (1,10): expected-doctype-but-got-start-tag
 (1,17): incorrect-comment
 (1,17): expected-closing-tag-but-got-eof
+#new-errors
+(1:5) abrupt-comment
+(1:17) abrupt-comment
 #document
 | <!--  -->
 | <html>
diff --git a/tree-construction/tests2.dat b/tree-construction/tests2.dat
index 880c377b..daf6c0ff 100644
--- a/tree-construction/tests2.dat
+++ b/tree-construction/tests2.dat
@@ -431,6 +431,8 @@
 <!DOCTYPE html><!-- X
 #errors
 (1,21): eof-in-comment
+#new-errors
+(1:22) eof-in-comment
 #document
 | <!DOCTYPE html>
 | <!--  X -->
@@ -537,6 +539,8 @@
 <!DOCTYPE html><!-- XXX - XXX
 #errors
 (1,29): eof-in-comment
+#new-errors
+(1:30) eof-in-comment
 #document
 | <!DOCTYPE html>
 | <!--  XXX - XXX -->
@@ -760,6 +764,8 @@ x { content:"</style" } "
 (1,20): expected-space-or-right-bracket-in-doctype
 (1,25): unknown-doctype
 (1,35): unexpected-char-in-comment
+#new-errors
+(1:35) nested-comment
 #document
 | <!DOCTYPE <!doctype>
 | <html>
diff --git a/tree-construction/tests6.dat b/tree-construction/tests6.dat
index d774fc23..3ad5bfed 100644
--- a/tree-construction/tests6.dat
+++ b/tree-construction/tests6.dat
@@ -62,6 +62,8 @@
 #errors
 (1,6): eof-in-comment
 (1,6): expected-doctype-but-got-eof
+#new-errors
+(1:7) eof-in-comment
 #document
 | <!-- -x -->
 | <html>