summaryrefslogtreecommitdiff
path: root/libguile/load.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-06-03 09:48:16 +0200
committerAndy Wingo <wingo@pobox.com>2009-06-03 22:20:55 +0200
commit0fb81f95b0222c5ba49efd3e36cf797df54c0863 (patch)
tree4fa082789891713ede9e62ef209ff13cccf30231 /libguile/load.h
parent1d022387c8f2615cc94a27109db9b9e02d7d7831 (diff)
downloadguile-0fb81f95b0222c5ba49efd3e36cf797df54c0863.tar.gz
add exception_on_error optional arg to primitive-load-path
* libguile/init.c (scm_load_startup_files): Use scm_c_primitive_load_path. * libguile/load.c (scm_primitive_load_path): Add an optional arg, exception_on_error, which if #f will cause primitive-load-path to just return #f if no file is found. This is to help out the semantics of try-module-autoload. We can't just catch misc-error, because loading the file could raise any exception. (scm_c_primitive_load_path): Add the extra arg to scm_primitive_load_path. * libguile/load.h: Adapt scm_primitive_load_path prototype. * module/ice-9/boot-9.scm (try-module-autoload): Refactor slightly to be clearer.
Diffstat (limited to 'libguile/load.h')
-rw-r--r--libguile/load.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/load.h b/libguile/load.h
index 87f336e1e..021987329 100644
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -33,7 +33,7 @@ SCM_API SCM scm_sys_library_dir (void);
SCM_API SCM scm_sys_site_dir (void);
SCM_API SCM scm_search_path (SCM path, SCM filename, SCM exts, SCM require_exts);
SCM_API SCM scm_sys_search_load_path (SCM filename);
-SCM_API SCM scm_primitive_load_path (SCM filename);
+SCM_API SCM scm_primitive_load_path (SCM filename, SCM exception_on_not_found);
SCM_API SCM scm_c_primitive_load_path (const char *filename);
SCM_INTERNAL void scm_init_load_path (void);
SCM_INTERNAL void scm_init_load (void);