hare

commit bcb025aee2b0a2957f715b3727a8ad86fbaf0b7a
parent 68d7b73519898600f13be2692fe6917ecb0779c0
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 10 Apr 2021 09:51:26 -0400

format::xml: add test for comments

Diffstat:
M
format/xml/+test.ha
 | 
33
++++++++++++++++++++++++++++-----

1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/format/xml/+test.ha b/format/xml/+test.ha
@@ -3,11 +3,10 @@ use bufio;
 use strings;
 
 @test fn basic() void = {
-	const input = "<?xml version='1.0' encoding='utf-8' ?>
+	xmltest("<?xml version='1.0' encoding='utf-8' ?>
 <root>
 	<hello name='foobar'>world</hello>
-</root>";
-	const expected: []token = [
+</root>", [
 		"root": elementstart,
 		"\n\t": text,
 		"hello": elementstart,
@@ -16,12 +15,36 @@ use strings;
 		elementend,
 		"\n": text,
 		elementend,
-	];
+	]);
+};
+
+@test fn comments() void = {
+	xmltest("<?xml version='1.0' encoding='utf-8' ?>
+<!-- hello -- world -->
+<root>
+	<hello name='foobar'>world<!----></hello>
+</root>", [
+		"root": elementstart,
+		"\n\t": text,
+		"hello": elementstart,
+		("name", "foobar"): attribute,
+		"world": text,
+		elementend,
+		"\n": text,
+		elementend,
+	]);
+};
+
+fn xmltest(input: str, expected: []token) void = {
 	let in = bufio::fixed(strings::toutf8(input), io::mode::READ);
 	defer io::close(in);
 	let parser = parse(in) as *parser;
 	for (let i = 0z; i < len(expected); i += 1) {
-		let tok = scan(parser) as token;
+		let tok = match (scan(parser)) {
+			tok: token => tok,
+			void => abort("Expected token, got void"),
+			syntaxerr => abort("Expected token, got syntax error"),
+		};
 		match (tok) {
 			el: elementstart => {
 				let ex = expected[i] as elementstart;