MODIFIED: library(charsio): read_term_from_chars/2 is now called read_from_chars/2

This is for compatibility with SICStus Prolog and GNU Prolog.
This commit is contained in:
Markus Triska
2022-01-17 20:09:50 +01:00
parent c6400550e1
commit 20b6816562
3 changed files with 8 additions and 8 deletions

View File

@@ -3,7 +3,7 @@
get_single_char/1, get_single_char/1,
read_n_chars/3, read_n_chars/3,
read_line_to_chars/3, read_line_to_chars/3,
read_term_from_chars/2, read_from_chars/2,
write_term_to_chars/3, write_term_to_chars/3,
chars_base64/3]). chars_base64/3]).
@@ -113,17 +113,17 @@ get_single_char(C) :-
). ).
read_term_from_chars(Chars, Term) :- read_from_chars(Chars, Term) :-
( var(Chars) -> ( var(Chars) ->
instantiation_error(read_term_from_chars/2) instantiation_error(read_from_chars/2)
; nonvar(Term) -> ; nonvar(Term) ->
throw(error(uninstantiation_error(Term), read_term_from_chars/2)) throw(error(uninstantiation_error(Term), read_from_chars/2))
; '$skip_max_list'(_, -1, Chars, Chars0), ; '$skip_max_list'(_, -1, Chars, Chars0),
Chars0 == [], Chars0 == [],
partial_string(Chars) -> partial_string(Chars) ->
true true
; ;
type_error(complete_string, Chars, read_term_from_chars/2) type_error(complete_string, Chars, read_from_chars/2)
), ),
'$read_term_from_chars'(Chars, Term). '$read_term_from_chars'(Chars, Term).

View File

@@ -174,7 +174,7 @@ file_creation_time(File, T) :-
file_time_(File, Which, T) :- file_time_(File, Which, T) :-
file_must_exist(File, file_time_/3), file_must_exist(File, file_time_/3),
'$file_time'(File, Which, T0), '$file_time'(File, Which, T0),
read_term_from_chars(T0, T). read_from_chars(T0, T).
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View File

@@ -49,11 +49,11 @@
:- use_module(library(error)). :- use_module(library(error)).
:- use_module(library(dcgs)). :- use_module(library(dcgs)).
:- use_module(library(lists)). :- use_module(library(lists)).
:- use_module(library(charsio), [read_term_from_chars/2]). :- use_module(library(charsio), [read_from_chars/2]).
current_time(T) :- current_time(T) :-
'$current_time'(T0), '$current_time'(T0),
read_term_from_chars(T0, T). read_from_chars(T0, T).
format_time([], _) --> []. format_time([], _) --> [].
format_time(['%','%'|Fs], T) --> !, "%", format_time(Fs, T). format_time(['%','%'|Fs], T) --> !, "%", format_time(Fs, T).