From d1372d9b3bfdb8835d7cdcc383a4e7ee6f42d97a Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Tue, 22 Feb 2022 23:49:01 +0100
Subject: [PATCH 1/2] FIXED: library(sgml): load_html/3 and load_xml/3 now both
 work again.

This addresses #1249.
---
 src/machine/system_calls.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 314a35d4..becc644e 100644
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -6003,7 +6003,7 @@ impl Machine {
 
             let tag = self.machine_st.atom_tbl.build_with(node.tag_name().name());
 
-            let result = heap_loc_as_cell!(self.machine_st.heap.len());
+            let result = str_loc_as_cell!(self.machine_st.heap.len());
 
             self.machine_st.heap.push(atom_as_cell!(atom!("element"), 3));
             self.machine_st.heap.push(atom_as_cell!(tag));
@@ -6056,7 +6056,7 @@ impl Machine {
                 );
 
                 let tag = self.machine_st.atom_tbl.build_with(name);
-                let result = heap_loc_as_cell!(self.machine_st.heap.len());
+                let result = str_loc_as_cell!(self.machine_st.heap.len());
 
                 self.machine_st.heap.push(atom_as_cell!(atom!("element"), 3));
                 self.machine_st.heap.push(atom_as_cell!(tag));

From 8fb673e93e59b9876ce72c61dac66766fd88ea59 Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Tue, 22 Feb 2022 23:51:01 +0100
Subject: [PATCH 2/2] use newly available get_n_chars/3 from library(charsio)

---
 src/lib/sgml.pl | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lib/sgml.pl b/src/lib/sgml.pl
index 507da1c6..0289278e 100644
--- a/src/lib/sgml.pl
+++ b/src/lib/sgml.pl
@@ -58,6 +58,7 @@
 :- use_module(library(error)).
 :- use_module(library(dcgs)).
 :- use_module(library(pio)).
+:- use_module(library(charsio)).
 
 load_html(Source, Es, Options) :-
         load_structure_(Source, Es, Options, html).
@@ -75,15 +76,8 @@ load_structure_(file(Fs), [E], Options, What) :-
         load_(What, Cs, E, Options).
 load_structure_(stream(Stream), [E], Options, What) :-
         must_be(list, Options),
-        read_to_end(Stream, Cs),
+        get_n_chars(Stream, _, Cs),
         load_(What, Cs, E, Options).
 
 load_(html, Cs, E, Options) :- '$load_html'(Cs, E, Options).
 load_(xml, Cs, E, Options) :- '$load_xml'(Cs, E, Options).
-
-read_to_end(Stream, Cs) :-
-        '$get_n_chars'(Stream, 4096, Cs0),
-        (   Cs0 = [] -> Cs = []
-        ;   partial_string(Cs0, Cs, Rest),
-            read_to_end(Stream, Rest)
-        ).