-/* Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
\f
-#include <stdio.h>
-#include "_scm.h"
-#include "libpath.h"
-#include "fports.h"
-#include "read.h"
-#include "eval.h"
-#include "throw.h"
-#include "alist.h"
-#include "dynwind.h"
+#include <string.h>
-#include "load.h"
+#include "libguile/_scm.h"
+#include "libguile/libpath.h"
+#include "libguile/fports.h"
+#include "libguile/read.h"
+#include "libguile/eval.h"
+#include "libguile/throw.h"
+#include "libguile/alist.h"
+#include "libguile/dynwind.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/modules.h"
+
+#include "libguile/validate.h"
+#include "libguile/load.h"
#include <sys/types.h>
#include <sys/stat.h>
static SCM
load (void *data)
{
- SCM port = (SCM) data, form;
+ SCM port = SCM_PACK (data);
while (1)
{
- form = scm_read (port);
+ SCM form = scm_read (port);
if (SCM_EOF_OBJECT_P (form))
break;
- scm_eval_x (form);
+ scm_primitive_eval_x (form);
}
return SCM_UNSPECIFIED;
}
-SCM_PROC(s_primitive_load, "primitive-load", 1, 0, 0, scm_primitive_load);
-SCM
-scm_primitive_load (filename)
- SCM filename;
+SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
+ (SCM filename),
+ "Load the file named @var{filename} and evaluate its contents in\n"
+ "the top-level environment. The load paths are not searched;\n"
+ "@var{filename} must either be a full pathname or be a pathname\n"
+ "relative to the current directory. If the variable\n"
+ "@code{%load-hook} is defined, it should be bound to a procedure\n"
+ "that will be called before any code is loaded. See the\n"
+ "documentation for @code{%load-hook} later in this section.")
+#define FUNC_NAME s_scm_primitive_load
{
SCM hook = *scm_loc_load_hook;
- SCM_ASSERT (SCM_NIMP (filename) && SCM_ROSTRINGP (filename), filename,
- SCM_ARG1, s_primitive_load);
- SCM_ASSERT (hook == SCM_BOOL_F
- || (scm_procedure_p (hook) == SCM_BOOL_T),
- hook, "value of %load-hook is neither a procedure nor #f",
- s_primitive_load);
+ SCM_VALIDATE_STRING (1, filename);
+ if (!SCM_FALSEP (hook) && !SCM_EQ_P (scm_procedure_p (hook), SCM_BOOL_T))
+ SCM_MISC_ERROR ("value of %load-hook is neither a procedure nor #f",
+ SCM_EOL);
- if (hook != SCM_BOOL_F)
- scm_apply (hook, scm_listify (filename, SCM_UNDEFINED), SCM_EOL);
+ if (! SCM_FALSEP (hook))
+ scm_call_1 (hook, filename);
- {
+ { /* scope */
SCM port, save_port;
- port = scm_open_file (filename,
- scm_makfromstr ("r", (scm_sizet) sizeof (char), 0));
+ port = scm_open_file (filename, scm_mem2string ("r", sizeof (char)));
save_port = port;
scm_internal_dynamic_wind (swap_port,
load,
swap_port,
- (void *) port,
+ (void *) SCM_UNPACK (port),
&save_port);
scm_close_port (port);
}
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
+
+SCM
+scm_c_primitive_load (const char *filename)
+{
+ return scm_primitive_load (scm_makfrom0str (filename));
+}
\f
/* Builtin path to scheme library files. */
#ifdef SCM_PKGDATA_DIR
-SCM_PROC (s_sys_package_data_dir, "%package-data-dir", 0, 0, 0, scm_sys_package_data_dir);
-SCM
-scm_sys_package_data_dir ()
+SCM_DEFINE (scm_sys_package_data_dir, "%package-data-dir", 0, 0, 0,
+ (),
+ "Return the name of the directory where Scheme packages, modules and\n"
+ "libraries are kept. On most Unix systems, this will be\n"
+ "@samp{/usr/local/share/guile}.")
+#define FUNC_NAME s_scm_sys_package_data_dir
{
return scm_makfrom0str (SCM_PKGDATA_DIR);
}
+#undef FUNC_NAME
#endif /* SCM_PKGDATA_DIR */
+#ifdef SCM_LIBRARY_DIR
+SCM_DEFINE (scm_sys_library_dir, "%library-dir", 0,0,0,
+ (),
+ "Return the directory where the Guile Scheme library files are installed.\n"
+ "E.g., may return \"/usr/share/guile/1.3.5\".")
+#define FUNC_NAME s_scm_sys_library_dir
+{
+ return scm_makfrom0str(SCM_LIBRARY_DIR);
+}
+#undef FUNC_NAME
+#endif /* SCM_LIBRARY_DIR */
+
+#ifdef SCM_SITE_DIR
+SCM_DEFINE (scm_sys_site_dir, "%site-dir", 0,0,0,
+ (),
+ "Return the directory where the Guile site files are installed.\n"
+ "E.g., may return \"/usr/share/guile/site\".")
+#define FUNC_NAME s_scm_sys_site_dir
+{
+ return scm_makfrom0str(SCM_SITE_DIR);
+}
+#undef FUNC_NAME
+#endif /* SCM_SITE_DIR */
+
+
+
\f
/* Initializing the load path, and searching it. */
/* Scan back to the beginning of the current element. */
do scan--;
while (scan >= path && *scan != ':');
- tail = scm_cons (scm_makfromstr (scan + 1, elt_end - (scan + 1), 0),
+ tail = scm_cons (scm_mem2string (scan + 1, elt_end - (scan + 1)),
tail);
elt_end = scan;
} while (scan >= path);
}
-SCM_PROC (s_parse_path, "parse-path", 1, 1, 0, scm_parse_path);
-
-SCM
-scm_parse_path (SCM path, SCM tail)
+SCM_DEFINE (scm_parse_path, "parse-path", 1, 1, 0,
+ (SCM path, SCM tail),
+ "Parse @var{path}, which is expected to be a colon-separated\n"
+ "string, into a list and return the resulting list with\n"
+ "@var{tail} appended. If @var{path} is @code{#f}, @var{tail}\n"
+ "is returned.")
+#define FUNC_NAME s_scm_parse_path
{
- SCM_ASSERT (SCM_FALSEP (path) || (SCM_NIMP (path) && SCM_ROSTRINGP (path)),
+ SCM_ASSERT (SCM_FALSEP (path) || (SCM_STRINGP (path)),
path,
- SCM_ARG1,
- s_parse_path);
+ SCM_ARG1, FUNC_NAME);
if (SCM_UNBNDP (tail))
tail = SCM_EOL;
return (SCM_FALSEP (path)
? tail
- : scm_internal_parse_path (SCM_ROCHARS (path), tail));
+ : scm_internal_parse_path (SCM_STRING_CHARS (path), tail));
}
+#undef FUNC_NAME
/* Initialize the global variable %load-path, given the value of the
SCM path = SCM_EOL;
#ifdef SCM_LIBRARY_DIR
- path = scm_listify (scm_makfrom0str (SCM_SITE_DIR),
- scm_makfrom0str (SCM_LIBRARY_DIR),
- scm_makfrom0str (SCM_PKGDATA_DIR),
- SCM_UNDEFINED);
+ path = scm_list_3 (scm_makfrom0str (SCM_SITE_DIR),
+ scm_makfrom0str (SCM_LIBRARY_DIR),
+ scm_makfrom0str (SCM_PKGDATA_DIR));
#endif /* SCM_LIBRARY_DIR */
- /* For compatibility, we still check this, but give a warning. */
- {
- char *p = getenv ("SCHEME_LOAD_PATH");
- if (p && p[0] != '\0')
- {
- fprintf (stderr, "guile: warning: SCHEME_LOAD_PATH variable will be"
- " removed by Guile 1.4;\n"
- " use GUILE_LOAD_PATH instead\n");
- path = scm_internal_parse_path (p, path);
- }
- }
-
path = scm_internal_parse_path (getenv ("GUILE_LOAD_PATH"), path);
*scm_loc_load_path = path;
/* Search PATH for a directory containing a file named FILENAME.
The file must be readable, and not a directory.
If we find one, return its full filename; otherwise, return #f.
- If FILENAME is absolute, return it unchanged. */
-SCM_PROC(s_search_path, "search-path", 2, 1, 0, scm_search_path);
-SCM
-scm_search_path (path, filename, extensions)
- SCM path;
- SCM filename;
- SCM extensions;
+ If FILENAME is absolute, return it unchanged.
+ If given, EXTENSIONS is a list of strings; for each directory
+ in PATH, we search for FILENAME concatenated with each EXTENSION. */
+SCM_DEFINE (scm_search_path, "search-path", 2, 1, 0,
+ (SCM path, SCM filename, SCM extensions),
+ "Search @var{path} for a directory containing a file named\n"
+ "@var{filename}. The file must be readable, and not a directory.\n"
+ "If we find one, return its full filename; otherwise, return\n"
+ "@code{#f}. If @var{filename} is absolute, return it unchanged.\n"
+ "If given, @var{extensions} is a list of strings; for each\n"
+ "directory in @var{path}, we search for @var{filename}\n"
+ "concatenated with each @var{extension}.")
+#define FUNC_NAME s_scm_search_path
{
- char *buf;
+ char *filename_chars;
int filename_len;
- size_t max_path_len;
- size_t max_ext_len;
+ size_t max_path_len; /* maximum length of any PATH element */
+ size_t max_ext_len; /* maximum length of any EXTENSIONS element */
- SCM_ASSERT (scm_ilength (path) >= 0, path, SCM_ARG1, s_search_path);
- SCM_ASSERT (SCM_NIMP (filename) && SCM_ROSTRINGP (filename), filename,
- SCM_ARG2, s_search_path);
+ SCM_VALIDATE_LIST (1,path);
+ SCM_VALIDATE_STRING (2, filename);
if (SCM_UNBNDP (extensions))
- extensions = scm_listofnullstr;
+ extensions = SCM_EOL;
else
- SCM_ASSERT (scm_ilength (extensions) >= 0, extensions,
- SCM_ARG3, s_search_path);
- filename_len = SCM_ROLENGTH (filename);
+ SCM_VALIDATE_LIST (3,extensions);
+
+ filename_chars = SCM_STRING_CHARS (filename);
+ filename_len = SCM_STRING_LENGTH (filename);
/* If FILENAME is absolute, return it unchanged. */
- if (filename_len >= 1
- && SCM_ROCHARS (filename)[0] == '/')
+ if (filename_len >= 1 && filename_chars[0] == '/')
return filename;
/* Find the length of the longest element of path. */
SCM walk;
max_path_len = 0;
- for (walk = path; SCM_NIMP (walk); walk = SCM_CDR (walk))
+ for (walk = path; !SCM_NULLP (walk); walk = SCM_CDR (walk))
{
SCM elt = SCM_CAR (walk);
- SCM_ASSERT (SCM_NIMP (elt) && SCM_ROSTRINGP (elt), elt,
- "path is not a list of strings",
- s_search_path);
- if (SCM_LENGTH (elt) > max_path_len)
- max_path_len = SCM_LENGTH (elt);
+ SCM_ASSERT_TYPE (SCM_STRINGP (elt), path, 1, FUNC_NAME,
+ "list of strings");
+ if (SCM_STRING_LENGTH (elt) > max_path_len)
+ max_path_len = SCM_STRING_LENGTH (elt);
+ }
+ }
+
+ /* If FILENAME has an extension, don't try to add EXTENSIONS to it. */
+ {
+ char *endp;
+
+ for (endp = filename_chars + filename_len - 1;
+ endp >= filename_chars;
+ endp--)
+ {
+ if (*endp == '.')
+ {
+ /* This filename already has an extension, so cancel the
+ list of extensions. */
+ extensions = SCM_EOL;
+ break;
+ }
+ else if (*endp == '/')
+ /* This filename has no extension, so keep the current list
+ of extensions. */
+ break;
}
}
/* Find the length of the longest element of the load extensions
list. */
- {
+ { /* scope */
SCM walk;
max_ext_len = 0;
- for (walk = extensions; SCM_NIMP (walk); walk = SCM_CDR (walk))
+ for (walk = extensions; !SCM_NULLP (walk); walk = SCM_CDR (walk))
{
SCM elt = SCM_CAR (walk);
- SCM_ASSERT (SCM_NIMP (elt) && SCM_ROSTRINGP (elt), elt,
- "extension list is not a list of strings",
- s_search_path);
- if (SCM_LENGTH (elt) > max_ext_len)
- max_ext_len = SCM_LENGTH (elt);
+ SCM_ASSERT_TYPE (SCM_STRINGP (elt), elt, 3, FUNC_NAME,
+ "list of strings");
+ if (SCM_STRING_LENGTH (elt) > max_ext_len)
+ max_ext_len = SCM_STRING_LENGTH (elt);
}
}
SCM_DEFER_INTS;
- buf = scm_must_malloc (max_path_len + 1 + filename_len + max_ext_len + 1,
- s_search_path);
+ { /* scope */
+ SCM result = SCM_BOOL_F;
+ size_t buf_size = max_path_len + 1 + filename_len + max_ext_len + 1;
+ char *buf = SCM_MUST_MALLOC (buf_size);
- /* Try every path element. At this point, we know it's a proper
- list of strings. */
- for (; SCM_NIMP (path); path = SCM_CDR (path))
- {
- SCM path_elt = SCM_CAR (path), exts;
-
- /* Try every extension. At this point, we know it's a proper
- list of strings. */
- for (exts = extensions; SCM_NIMP (exts); exts = SCM_CDR (exts))
- {
- SCM ext_elt = SCM_CAR (exts);
- int i;
-
- /* Concatenate the path name, the filename, and the extension. */
- i = SCM_ROLENGTH (path_elt);
- memcpy (buf, SCM_ROCHARS (path_elt), i);
- if (i >= 1 && buf[i - 1] != '/')
- buf[i++] = '/';
- memcpy (buf + i, SCM_ROCHARS (filename), filename_len);
- i += filename_len;
- memcpy (buf + i, SCM_ROCHARS (ext_elt), SCM_LENGTH (ext_elt));
- i += SCM_LENGTH (ext_elt);
- buf[i] = '\0';
+ /* This simplifies the loop below a bit. */
+ if (SCM_NULLP (extensions))
+ extensions = scm_listofnullstr;
+ /* Try every path element. At this point, we know the path is a
+ proper list of strings. */
+ for (; !SCM_NULLP (path); path = SCM_CDR (path))
+ {
+ size_t len;
+ SCM dir = SCM_CAR (path);
+ SCM exts;
+
+ /* Concatenate the path name and the filename. */
+ len = SCM_STRING_LENGTH (dir);
+ memcpy (buf, SCM_STRING_CHARS (dir), len);
+ if (len >= 1 && buf[len - 1] != '/')
+ buf[len++] = '/';
+ memcpy (buf + len, filename_chars, filename_len);
+ len += filename_len;
+
+ /* Try every extension. At this point, we know the extension
+ list is a proper, nonempty list of strings. */
+ for (exts = extensions; !SCM_NULLP (exts); exts = SCM_CDR (exts))
{
+ SCM ext = SCM_CAR (exts);
+ size_t ext_len = SCM_STRING_LENGTH (ext);
struct stat mode;
- if (stat (buf, &mode) >= 0
- && ! (mode.st_mode & S_IFDIR)
- && access (buf, R_OK) == 0)
+ /* Concatenate the extension. */
+ memcpy (buf + len, SCM_STRING_CHARS (ext), ext_len);
+ buf[len + ext_len] = '\0';
+
+ /* If the file exists at all, we should return it. If the
+ file is inaccessible, then that's an error. */
+ if (stat (buf, &mode) == 0
+ && ! (mode.st_mode & S_IFDIR))
{
- SCM result = scm_makfromstr (buf, i, 0);
- scm_must_free (buf);
- SCM_ALLOW_INTS;
- return result;
+ result = scm_mem2string (buf, len + ext_len);
+ goto end;
}
}
- }
- }
-
- scm_must_free (buf);
- SCM_ALLOW_INTS;
- return SCM_BOOL_F;
+ }
+
+ end:
+ scm_must_free (buf);
+ scm_done_free (buf_size);
+ SCM_ALLOW_INTS;
+ return result;
+ }
}
+#undef FUNC_NAME
/* Search %load-path for a directory containing a file named FILENAME.
The file must be readable, and not a directory.
If we find one, return its full filename; otherwise, return #f.
If FILENAME is absolute, return it unchanged. */
-SCM_PROC(s_sys_search_load_path, "%search-load-path", 1, 0, 0, scm_sys_search_load_path);
-SCM
-scm_sys_search_load_path (filename)
- SCM filename;
+SCM_DEFINE (scm_sys_search_load_path, "%search-load-path", 1, 0, 0,
+ (SCM filename),
+ "Search @var{%load-path} for the file named @var{filename},\n"
+ "which must be readable by the current user. If @var{filename}\n"
+ "is found in the list of paths to search or is an absolute\n"
+ "pathname, return its full pathname. Otherwise, return\n"
+ "@code{#f}. Filenames may have any of the optional extensions\n"
+ "in the @code{%load-extensions} list; @code{%search-load-path}\n"
+ "will try each extension automatically.")
+#define FUNC_NAME s_scm_sys_search_load_path
{
SCM path = *scm_loc_load_path;
SCM exts = *scm_loc_load_extensions;
- SCM_ASSERT (SCM_NIMP (filename) && SCM_ROSTRINGP (filename), filename,
- SCM_ARG1, s_sys_search_load_path);
- SCM_ASSERT (scm_ilength (path) >= 0, path, "load path is not a proper list",
- s_sys_search_load_path);
- SCM_ASSERT (scm_ilength (exts) >= 0, exts,
- "load extension list is not a proper list",
- s_sys_search_load_path);
- return scm_search_path (path,
- filename,
- exts);
+ SCM_VALIDATE_STRING (1, filename);
+
+ if (scm_ilength (path) < 0)
+ SCM_MISC_ERROR ("%load-path is not a proper list", SCM_EOL);
+ if (scm_ilength (exts) < 0)
+ SCM_MISC_ERROR ("%load-extension list is not a proper list", SCM_EOL);
+ return scm_search_path (path, filename, exts);
}
+#undef FUNC_NAME
-SCM_PROC(s_primitive_load_path, "primitive-load-path", 1, 0, 0, scm_primitive_load_path);
-SCM
-scm_primitive_load_path (filename)
- SCM filename;
+SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 1, 0, 0,
+ (SCM filename),
+ "Search @var{%load-path} for the file named @var{filename} and\n"
+ "load it into the top-level environment. If @var{filename} is a\n"
+ "relative pathname and is not found in the list of search paths,\n"
+ "an error is signalled.")
+#define FUNC_NAME s_scm_primitive_load_path
{
SCM full_filename;
- SCM_ASSERT (SCM_NIMP (filename) && SCM_ROSTRINGP (filename), filename,
- SCM_ARG1, s_primitive_load_path);
+ SCM_VALIDATE_STRING (1, filename);
full_filename = scm_sys_search_load_path (filename);
if (SCM_FALSEP (full_filename))
{
- int absolute = (SCM_LENGTH (filename) >= 1
- && SCM_ROCHARS (filename)[0] == '/');
- scm_misc_error (s_primitive_load_path,
- (absolute
- ? "Unable to load file %S"
- : "Unable to find file %S in load path"),
- scm_listify (filename, SCM_UNDEFINED));
+ int absolute = (SCM_STRING_LENGTH (filename) >= 1
+ && SCM_STRING_CHARS (filename)[0] == '/');
+ SCM_MISC_ERROR ((absolute
+ ? "Unable to load file ~S"
+ : "Unable to find file ~S in load path"),
+ scm_list_1 (filename));
}
return scm_primitive_load (full_filename);
}
+#undef FUNC_NAME
+
+SCM
+scm_c_primitive_load_path (const char *filename)
+{
+ return scm_primitive_load_path (scm_makfrom0str (filename));
+}
+
+#if SCM_DEBUG_DEPRECATED == 0
-/* The following function seems trivial - and indeed it is. Its
- * existence is motivated by its ability to evaluate expressions
- * without copying them first (as is done in "eval").
+/* Eval now copies source properties, so this function is no longer required.
*/
SCM_SYMBOL (scm_end_of_file_key, "end-of-file");
-SCM_PROC (s_read_and_eval_x, "read-and-eval!", 0, 1, 0, scm_read_and_eval_x);
-
-SCM
-scm_read_and_eval_x (port)
- SCM port;
+SCM_DEFINE (scm_read_and_eval_x, "read-and-eval!", 0, 1, 0,
+ (SCM port),
+ "Read a form from @var{port} (standard input by default), and evaluate it\n"
+ "(memoizing it in the process) in the top-level environment. If no data\n"
+ "is left to be read from @var{port}, an @code{end-of-file} error is\n"
+ "signalled.")
+#define FUNC_NAME s_scm_read_and_eval_x
{
SCM form = scm_read (port);
if (SCM_EOF_OBJECT_P (form))
scm_ithrow (scm_end_of_file_key, SCM_EOL, 1);
- return scm_eval_x (form);
+ return scm_eval_x (form, scm_current_module ());
}
+#undef FUNC_NAME
+
+#endif
\f
/* Information about the build environment. */
init_build_info ()
{
static struct { char *name; char *value; } info[] = SCM_BUILD_INFO;
- SCM *loc = SCM_CDRLOC (scm_sysintern ("%guile-build-info", SCM_EOL));
- unsigned int i;
+ SCM *loc = SCM_VARIABLE_LOC (scm_c_define ("%guile-build-info", SCM_EOL));
+ unsigned long i;
for (i = 0; i < (sizeof (info) / sizeof (info[0])); i++)
- *loc = scm_acons (SCM_CAR (scm_intern0 (info[i].name)),
+ *loc = scm_acons (scm_str2symbol (info[i].name),
scm_makfrom0str (info[i].value),
*loc);
}
void
scm_init_load ()
{
- scm_listofnullstr = scm_permanent_object (SCM_LIST1 (scm_nullstr));
- scm_loc_load_path = SCM_CDRLOC (scm_sysintern ("%load-path", SCM_EOL));
+ scm_listofnullstr = scm_permanent_object (scm_list_1 (scm_nullstr));
+ scm_loc_load_path = SCM_VARIABLE_LOC (scm_c_define ("%load-path", SCM_EOL));
scm_loc_load_extensions
- = SCM_CDRLOC (scm_sysintern ("%load-extensions",
- scm_listify (scm_makfrom0str (""),
- scm_makfrom0str (".scm"),
- SCM_UNDEFINED)));
- scm_loc_load_hook = SCM_CDRLOC (scm_sysintern ("%load-hook", SCM_BOOL_F));
+ = SCM_VARIABLE_LOC (scm_c_define ("%load-extensions",
+ scm_list_2 (scm_makfrom0str (".scm"),
+ scm_nullstr)));
+ scm_loc_load_hook = SCM_VARIABLE_LOC (scm_c_define ("%load-hook", SCM_BOOL_F));
init_build_info ();
-#include "load.x"
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/load.x"
+#endif
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/