mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

scm_primitive_load: Simplify code using 'scm_open_file_with_encoding'.

Browse source 
* libguile/load.c (scm_primitive_load): Use
  'scm_open_file_with_encoding'.
This commit is contained in:
Mark H Weaver 2013-12-24 06:48:44 -05:00
parent 6146984cc5
commit 4101d14f2e
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libguile/load.c
View file

@ -89,7 +89,6 @@ SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
{ {
SCM hook = *scm_loc_load_hook; SCM hook = *scm_loc_load_hook;
SCM ret = SCM_UNSPECIFIED; SCM ret = SCM_UNSPECIFIED;
char *encoding;
SCM_VALIDATE_STRING (1, filename); SCM_VALIDATE_STRING (1, filename);
if (scm_is_true (hook) && scm_is_false (scm_procedure_p (hook))) if (scm_is_true (hook) && scm_is_false (scm_procedure_p (hook)))
@ -102,18 +101,14 @@ SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
{ {
SCM port; SCM port;
port = scm_open_file (filename, scm_from_locale_string ("r")); port = scm_open_file_with_encoding (filename,
scm_from_latin1_string ("r"),
SCM_BOOL_T, /* guess_encoding */
scm_from_latin1_string ("UTF-8"));
scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE); scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE);
scm_i_dynwind_current_load_port (port); scm_i_dynwind_current_load_port (port);
encoding = scm_i_scan_for_encoding (port);
if (encoding)
scm_i_set_port_encoding_x (port, encoding);
else
/* The file has no encoding declared. We'll presume UTF-8, like
compile-file does. */
scm_i_set_port_encoding_x (port, "UTF-8");
while (1) while (1)
{ {
SCM reader, form; SCM reader, form;