From: Markus Triska Date: Mon, 17 Jan 2022 19:36:51 +0000 (+0100) Subject: MODIFIED: library(charsio): read_n_chars/3 is now called get_n_chars/3 X-Git-Tag: v0.9.0^2~59^2 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=23adfef281c1158b6ebd84ef95c01a4b0f681190;p=scryer-prolog.git MODIFIED: library(charsio): read_n_chars/3 is now called get_n_chars/3 This is because "read" is associated with general Prolog terms. --- diff --git a/src/lib/charsio.pl b/src/lib/charsio.pl index 3a944301..3ef732db 100644 --- a/src/lib/charsio.pl +++ b/src/lib/charsio.pl @@ -1,7 +1,7 @@ :- module(charsio, [char_type/2, chars_utf8bytes/2, get_single_char/1, - read_n_chars/3, + get_n_chars/3, read_line_to_chars/3, read_from_chars/2, write_term_to_chars/3, @@ -205,7 +205,7 @@ read_line_to_chars(Stream, Cs0, Cs) :- characters read. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -read_n_chars(Stream, N, Cs) :- +get_n_chars(Stream, N, Cs) :- can_be(integer, N), ( var(N) -> read_to_eof(Stream, Cs), diff --git a/src/lib/pio.pl b/src/lib/pio.pl index 38849a4b..db609aa6 100644 --- a/src/lib/pio.pl +++ b/src/lib/pio.pl @@ -21,7 +21,7 @@ :- use_module(library(freeze)). :- use_module(library(iso_ext), [setup_call_cleanup/3, partial_string/3]). :- use_module(library(lists), [member/2, maplist/2]). -:- use_module(library(charsio), [read_n_chars/3]). +:- use_module(library(charsio), [get_n_chars/3]). :- meta_predicate(phrase_from_file(2, ?)). :- meta_predicate(phrase_from_file(2, ?, ?)). @@ -62,7 +62,7 @@ reader_step(Stream, Pos, Xs0) :- set_stream_position(Stream, Pos), ( at_end_of_stream(Stream) -> Xs0 = [] - ; read_n_chars(Stream, 4096, Cs), + ; get_n_chars(Stream, 4096, Cs), partial_string(Cs, Xs0, Xs), stream_to_lazy_list(Stream, Xs) ).