From 46a4927acad674b3265969bd5bde591b480d0c73 Mon Sep 17 00:00:00 2001
From: Jeroen van Rijn <Kelimion@users.noreply.github.com>
Date: Wed, 1 Dec 2021 00:32:35 +0100
Subject: [PATCH] [xml] Use `io.Writer` for `xml.print(doc)`.

---
 core/encoding/xml/debug_print.odin         | 51 ++++++++++++----------
 core/encoding/xml/example/xml_example.odin |  8 +++-
 core/encoding/xml/xml_reader.odin          |  2 +-
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin
index 0b7ffa822..be1175cbc 100644
--- a/core/encoding/xml/debug_print.odin
+++ b/core/encoding/xml/debug_print.odin
@@ -10,64 +10,69 @@ package xml
 	List of contributors:
 		Jeroen van Rijn: Initial implementation.
 */
+import "core:io"
 import "core:fmt"
 
 /*
 	Just for debug purposes.
 */
-print :: proc(doc: ^Document) {
-	assert(doc != nil)
-
+print :: proc(writer: io.Writer, doc: ^Document) -> (written: int, err: io.Error) {
+	if doc == nil { return }
 	using fmt
-	println("[XML Prolog]")
+
+	written += wprintf(writer, "[XML Prolog]\n")
 
 	for attr in doc.prolog {
-		printf("\t%v: %v\n", attr.key, attr.val)
+		written += wprintf(writer, "\t%v: %v\n", attr.key, attr.val)
 	}
 
-	printf("[Encoding] %v\n",  doc.encoding)
-	printf("[DOCTYPE]  %v\n",  doc.doctype.ident)
+	written += wprintf(writer, "[Encoding] %v\n", doc.encoding)
+	written += wprintf(writer, "[DOCTYPE]  %v\n", doc.doctype.ident)
 
 	if len(doc.doctype.rest) > 0 {
-		printf("\t%v\n", doc.doctype.rest)
+	 	wprintf(writer, "\t%v\n", doc.doctype.rest)
 	}
 
 	if doc.root != nil {
-		println(" --- ")
-		print_element(0, doc.root)
-		println(" --- ")		
-	}
+	 	wprintln(writer, " --- ")
+	 	print_element(writer, doc.root)
+	 	wprintln(writer, " --- ")		
+	 }
+
+	return written, .None
 }
 
-print_element :: proc(indent: int, element: ^Element) {
+print_element :: proc(writer: io.Writer, element: ^Element, indent := 0) -> (written: int, err: io.Error) {
 	if element == nil { return }
 	using fmt
 
-	tab :: proc(indent: int) {
+	tab :: proc(writer: io.Writer, indent: int) {
 		tabs := "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
 
 		i := max(0, min(indent, len(tabs)))
-		printf("%v", tabs[:i])
+		wprintf(writer, "%v", tabs[:i])
 	}
 
-	tab(indent)
+	tab(writer, indent)
 
 	if element.kind == .Element {
-		printf("<%v>\n", element.ident)
+		wprintf(writer, "<%v>\n", element.ident)
 		if len(element.value) > 0 {
-			tab(indent + 1)
-			printf("[Value] %v\n", element.value)
+			tab(writer, indent + 1)
+			wprintf(writer, "[Value] %v\n", element.value)
 		}
 
 		for attr in element.attribs {
-			tab(indent + 1)
-			printf("[Attr] %v: %v\n", attr.key, attr.val)
+			tab(writer, indent + 1)
+			wprintf(writer, "[Attr] %v: %v\n", attr.key, attr.val)
 		}
 
 		for child in element.children {
-			print_element(indent + 1, child)
+			print_element(writer, child, indent + 1)
 		}
 	} else if element.kind == .Comment {
-		printf("[COMMENT] %v\n", element.value)
+		wprintf(writer, "[COMMENT] %v\n", element.value)
 	}
+
+	return written, .None
 }
\ No newline at end of file
diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin
index 24a277de6..82938c223 100644
--- a/core/encoding/xml/example/xml_example.odin
+++ b/core/encoding/xml/example/xml_example.odin
@@ -2,6 +2,7 @@ package xml_example
 
 import "core:encoding/xml"
 import "core:mem"
+import "core:strings"
 import "core:fmt"
 
 Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) {
@@ -28,7 +29,12 @@ _main :: proc() {
 	doc, err := xml.parse(DOC, OPTIONS, FILENAME, Error_Handler)
 	defer xml.destroy(doc)
 
-	xml.print(doc)
+	buf: strings.Builder
+	defer strings.destroy_builder(&buf)
+	w := strings.to_writer(&buf)
+
+	xml.print(w, doc)
+	println(strings.to_string(buf))
 
 	if err != .None {
 		printf("Parse error: %v\n", err)
diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin
index 526be5856..34f6e65d0 100644
--- a/core/encoding/xml/xml_reader.odin
+++ b/core/encoding/xml/xml_reader.odin
@@ -75,6 +75,7 @@ Option_Flag :: enum {
 	*/
 	Decode_SGML_Entities,
 }
+Option_Flags :: bit_set[Option_Flag; u8]
 
 Document :: struct {
 	root:     ^Element,
@@ -122,7 +123,6 @@ Options :: struct {
 	flags:            Option_Flags,
 	expected_doctype: string,
 }
-Option_Flags :: bit_set[Option_Flag]
 
 Encoding :: enum {
 	Unknown,