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.

diff --git a/src/lib/charsio.pl b/src/lib/charsio.pl
index 8585681033fecdf12617b85adb49eef026dc84bf..3a9443010ec064eba6f41277639ba5a31f03953f 100644 (file)
--- a/src/lib/charsio.pl
+++ b/src/lib/charsio.pl
@@ -3,7 +3,7 @@
                     get_single_char/1,
                     read_n_chars/3,
                     read_line_to_chars/3,
-                    read_term_from_chars/2,
+                    read_from_chars/2,
                     write_term_to_chars/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) ->
-       instantiation_error(read_term_from_chars/2)
+       instantiation_error(read_from_chars/2)
     ;  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),
        Chars0 == [],
        partial_string(Chars) ->
        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).
 

diff --git a/src/lib/files.pl b/src/lib/files.pl
index 6989cb4697c7d1da7a14ec508c535f07e6080c86..9ee1c2b988e3ace92212b13752a68956b3446cf5 100644 (file)
--- a/src/lib/files.pl
+++ b/src/lib/files.pl
@@ -174,7 +174,7 @@ file_creation_time(File, T) :-
 file_time_(File, Which, T) :-
         file_must_exist(File, file_time_/3),
         '$file_time'(File, Which, T0),
-        read_term_from_chars(T0, T).
+        read_from_chars(T0, T).
 
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/src/lib/time.pl b/src/lib/time.pl
index 56e31fae32634a73007755d2afa7d6508fc71801..5da5bb594508c49f58858d11995bcdabb84679f1 100644 (file)
--- a/src/lib/time.pl
+++ b/src/lib/time.pl
@@ -49,11 +49,11 @@
 :- use_module(library(error)).
 :- use_module(library(dcgs)).
 :- 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'(T0),
-        read_term_from_chars(T0, T).
+        read_from_chars(T0, T).
 
 format_time([], _) --> [].
 format_time(['%','%'|Fs], T) --> !, "%", format_time(Fs, T).