rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use '$skip_max_list'/4 in string_get_n_chars/4

Browse Source
This commit is contained in:
bakaq
2023-09-23 01:43:45 -03:00
parent 35d0042be1
commit b4fab5a806
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/pio.pl
View File

@@ -68,6 +68,9 @@ phrase_from_file(NT, File, Options) :-
close(Stream)) close(Stream))
). ).
% How many chars to read from stream and buffer in each step
chars_to_read(4096).
stream_to_lazy_list(Stream, Xs) :- stream_to_lazy_list(Stream, Xs) :-
stream_property(Stream, reposition(Rep)), stream_property(Stream, reposition(Rep)),
( Rep = true -> ( Rep = true ->
@@ -83,7 +86,8 @@ reader_step_repositionable(Stream, Pos, Xs0) :-
set_stream_position(Stream, Pos), set_stream_position(Stream, Pos),
( at_end_of_stream(Stream) ( at_end_of_stream(Stream)
-> Xs0 = [] -> Xs0 = []
; get_n_chars(Stream, 4096, Cs), ; chars_to_read(CharsToRead),
get_n_chars(Stream, CharsToRead, Cs),
partial_string(Cs, Xs0, Xs), partial_string(Cs, Xs0, Xs),
stream_to_lazy_list_repositionable(Stream, Xs) stream_to_lazy_list_repositionable(Stream, Xs)
). ).
@@ -96,7 +100,8 @@ render_step_buffer(Stream, Pos, Ls) :-
set_stream_buffer_position(Stream, Pos), set_stream_buffer_position(Stream, Pos),
( buffer_at_end_of_stream(Stream) -> ( buffer_at_end_of_stream(Stream) ->
Ls = [] Ls = []
; buffer_get_n_chars(Stream, 4096, Chars), ; chars_to_read(CharsToRead),
buffer_get_n_chars(Stream, CharsToRead, Chars),
partial_string(Chars, Ls, Ls0), partial_string(Chars, Ls, Ls0),
stream_to_lazy_list_buffer(Stream, Ls0) stream_to_lazy_list_buffer(Stream, Ls0)
). ).
@@ -143,7 +148,8 @@ buffer_prepare_for_n(Stream, BufferId, BufferPosId, BufferLenId, N) :-
( at_end_of_stream(Stream) -> ( at_end_of_stream(Stream) ->
BufferTail = [], BufferTail = [],
bb_put(BufferId, Buffer) bb_put(BufferId, Buffer)
; get_n_chars(Stream, 4096, Chars), ; chars_to_read(CharsToRead),
get_n_chars(Stream, CharsToRead, Chars),
length(Chars, NChars), length(Chars, NChars),
partial_string(Chars, BufferTail, _), partial_string(Chars, BufferTail, _),
bb_put(BufferId, Buffer), bb_put(BufferId, Buffer),
@@ -163,13 +169,16 @@ partial_string_last_tail(PartialString, PartialStringTail) :-
; partial_string_last_tail(PartialStringTail0, PartialStringTail) ; partial_string_last_tail(PartialStringTail0, PartialStringTail)
). ).
string_get_n_chars([], _, _, []). string_get_n_chars(String, Pos, N, Chars) :-
string_get_n_chars([S|Ss], BufferPos, N, Chars) :- chars_to_read(CharsToRead),
( BufferPos = 0 -> ( CharsToRead < Pos ->
string_get_n_chars_([S|Ss], N, Chars) % I have absolutely no idea why this is needed (maybe it's a bug?),
; BufferPos1 is BufferPos - 1, % but hey, it works.
string_get_n_chars(Ss, BufferPos1, N, Chars) '$skip_max_list'(_, Pos, String, String0),
). '$skip_max_list'(_, CharsToRead, String0, String1)
; '$skip_max_list'(_, Pos, String, String1)
),
string_get_n_chars_(String1, N, Chars).
string_get_n_chars_([], _, []). string_get_n_chars_([], _, []).
string_get_n_chars_([S|Ss], N, Chars) :- string_get_n_chars_([S|Ss], N, Chars) :-