/* Lisp parsing and input streams.
- Copyright (C) 1985, 1986, 1987, 1988, 1989,
- 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 1998
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
#include <config.h>
#ifndef standalone
#include "buffer.h"
+#include "charset.h"
#include <paths.h>
#include "commands.h"
#include "keyboard.h"
#include <sys/inode.h>
#endif /* lint */
+#ifdef MSDOS
+#if __DJGPP__ < 2
+#include <unistd.h> /* to get X_OK */
+#endif
+#include "msdos.h"
+#endif
+
#ifndef X_OK
#define X_OK 01
#endif
#include <stdlib.h>
#endif
-#ifdef MSDOS
-#include "msdos.h"
-/* These are redefined (correctly, but differently) in values.h. */
-#undef INTBITS
-#undef LONGBITS
-#undef SHORTBITS
-#endif
-
#include <math.h>
#endif /* LISP_FLOAT_TYPE */
+#ifdef HAVE_SETLOCALE
+#include <locale.h>
+#endif /* HAVE_SETLOCALE */
+
#ifndef O_RDONLY
#define O_RDONLY 0
#endif
Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list;
Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist;
Lisp_Object Qascii_character, Qload, Qload_file_name;
+Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction;
+Lisp_Object Qinhibit_file_name_operation;
extern Lisp_Object Qevent_symbol_element_mask;
+extern Lisp_Object Qfile_exists_p;
/* non-zero if inside `load' */
int load_in_progress;
+/* Directory in which the sources were found. */
+Lisp_Object Vsource_directory;
+
/* Search path for files to be loaded. */
Lisp_Object Vload_path;
/* This is used to build the load history. */
Lisp_Object Vcurrent_load_list;
+/* List of files that were preloaded. */
+Lisp_Object Vpreloaded_file_list;
+
/* Name of file actually being read by `load'. */
Lisp_Object Vload_file_name;
+/* Function to use for reading, in `load' and friends. */
+Lisp_Object Vload_read_function;
+
+/* The association list of objects read with the #n=object form.
+ Each member of the list has the form (n . object), and is used to
+ look up the object for the corresponding #n# construct.
+ It must be set to nil before all top-level calls to read0. */
+Lisp_Object read_objects;
+
+/* Nonzero means load should forcibly load all dynamic doc strings. */
+static int load_force_doc_strings;
+
+/* Function to use for loading an Emacs lisp source file (not
+ compiled) instead of readevalloop. */
+Lisp_Object Vload_source_file_function;
+
/* List of descriptors now open for Fload. */
static Lisp_Object load_descriptor_list;
-/* File for get_file_char to read from. Use by load */
+/* File for get_file_char to read from. Use by load. */
static FILE *instream;
/* When nonzero, read conses in pure space */
static int read_pure;
-/* For use within read-from-string (this reader is non-reentrant!!) */
+/* For use within read-from-string (this reader is non-reentrant!!) */
static int read_from_string_index;
static int read_from_string_limit;
+
+/* Number of bytes left to read in the buffer character
+ that `readchar' has already advanced over. */
+static int readchar_backlog;
+
+/* This contains the last string skipped with #@, but only on some systems.
+ On other systems we can't put the string here. */
+static char *saved_doc_string;
+/* Length of buffer allocated in saved_doc_string. */
+static int saved_doc_string_size;
+/* Length of actual data in saved_doc_string. */
+static int saved_doc_string_length;
+/* This is the file position that string came from. */
+static int saved_doc_string_position;
+
+/* Nonzero means inside a new-style backquote
+ with no surrounding parentheses.
+ Fread initializes this to zero, so we need not specbind it
+ or worry about what happens to it when there is an error. */
+static int new_backquote_flag;
\f
/* Handle unreading and rereading of characters.
Write READCHAR to read a character,
- UNREAD(c) to unread c to be read again. */
+ UNREAD(c) to unread c to be read again.
+
+ These macros actually read/unread a byte code, multibyte characters
+ are not handled here. The caller should manage them if necessary.
+ */
#define READCHAR readchar (readcharfun)
#define UNREAD(c) unreadchar (readcharfun, c)
{
inbuffer = XBUFFER (readcharfun);
- if (BUF_PT (inbuffer) >= BUF_ZV (inbuffer))
- return -1;
- c = *(unsigned char *) BUF_CHAR_ADDRESS (inbuffer, BUF_PT (inbuffer));
- SET_BUF_PT (inbuffer, BUF_PT (inbuffer) + 1);
+ if (readchar_backlog == 0)
+ {
+ int pt_byte = BUF_PT_BYTE (inbuffer);
+ int orig_pt_byte = pt_byte;
- return c;
+ if (pt_byte >= BUF_ZV_BYTE (inbuffer))
+ return -1;
+
+ if (! NILP (inbuffer->enable_multibyte_characters))
+ BUF_INC_POS (inbuffer, pt_byte);
+ else
+ pt_byte++;
+ SET_BUF_PT_BOTH (inbuffer, BUF_PT (inbuffer) + 1, pt_byte);
+ readchar_backlog = pt_byte - orig_pt_byte;
+ }
+
+ /* We get the address of the byte just passed,
+ which is the last byte of the character.
+ The other bytes in this character are consecutive with it,
+ because the gap can't be in the middle of a character. */
+ return *(BUF_BYTE_ADDRESS (inbuffer, BUF_PT_BYTE (inbuffer) - 1)
+ - --readchar_backlog);
}
if (MARKERP (readcharfun))
{
inbuffer = XMARKER (readcharfun)->buffer;
- mpos = marker_position (readcharfun);
+ if (readchar_backlog == 0)
+ {
+ int bytepos = marker_byte_position (readcharfun);
+ int orig_bytepos = bytepos;
- if (mpos > BUF_ZV (inbuffer) - 1)
- return -1;
- c = *(unsigned char *) BUF_CHAR_ADDRESS (inbuffer, mpos);
- if (mpos != BUF_GPT (inbuffer))
- XMARKER (readcharfun)->bufpos++;
- else
- Fset_marker (readcharfun, make_number (mpos + 1),
- Fmarker_buffer (readcharfun));
- return c;
+ if (bytepos >= BUF_ZV_BYTE (inbuffer))
+ return -1;
+
+ if (! NILP (inbuffer->enable_multibyte_characters))
+ INC_POS (bytepos);
+ else
+ bytepos++;
+ XMARKER (readcharfun)->bytepos = bytepos;
+ XMARKER (readcharfun)->charpos++;
+
+ readchar_backlog = bytepos - orig_bytepos;
+ }
+
+ return *(BUF_BEG_ADDR (inbuffer) + XMARKER (readcharfun)->bytepos
+ - readchar_backlog--);
}
if (EQ (readcharfun, Qget_file_char))
{
c = XSTRING (readcharfun)->data[read_from_string_index++];
else
c = -1;
+
return c;
}
;
else if (BUFFERP (readcharfun))
{
- if (XBUFFER (readcharfun) == current_buffer)
- SET_PT (point - 1);
+ if (!SINGLE_BYTE_CHAR_P (c))
+ readchar_backlog++;
else
- SET_BUF_PT (XBUFFER (readcharfun), BUF_PT (XBUFFER (readcharfun)) - 1);
+ {
+ struct buffer *b = XBUFFER (readcharfun);
+ int bytepos = BUF_PT_BYTE (b);
+
+ BUF_PT (b)--;
+ if (! NILP (b->enable_multibyte_characters))
+ BUF_DEC_POS (b, bytepos);
+ else
+ bytepos--;
+
+ BUF_PT_BYTE (b) = bytepos;
+ }
}
else if (MARKERP (readcharfun))
- XMARKER (readcharfun)->bufpos--;
+ {
+ if (!SINGLE_BYTE_CHAR_P (c))
+ readchar_backlog++;
+ else
+ {
+ struct buffer *b = XMARKER (readcharfun)->buffer;
+ int bytepos = XMARKER (readcharfun)->bytepos;
+
+ XMARKER (readcharfun)->charpos--;
+ if (! NILP (b->enable_multibyte_characters))
+ BUF_DEC_POS (b, bytepos);
+ else
+ bytepos--;
+
+ XMARKER (readcharfun)->bytepos = bytepos;
+ }
+ }
else if (STRINGP (readcharfun))
read_from_string_index--;
else if (EQ (readcharfun, Qget_file_char))
}
static Lisp_Object read0 (), read1 (), read_list (), read_vector ();
+static int read_multibyte ();
\f
/* get a character from the tty */
get isn't an ASCII character with modifiers. If it's zero but
ASCII_REQUIRED is non-zero, we just re-read until we get an ASCII
character. */
+
Lisp_Object
read_filtered_event (no_switch_frame, ascii_required, error_nonascii)
int no_switch_frame, ascii_required, error_nonascii;
goto retry;
/* switch-frame events are put off until after the next ASCII
- character. This is better than signalling an error just because
+ character. This is better than signaling an error just because
the last characters were typed to a separate minibuffer frame,
for example. Eventually, some code which can deal with
switch-frame events will read it and process it. */
DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 0, 0,
"Read a character from the command input (keyboard or macro).\n\
-It is returned as a number. Non character events are ignored.")
+It is returned as a number. Non-character events are ignored.")
()
{
return read_filtered_event (1, 1, 0);
static Lisp_Object load_unwind ();
static Lisp_Object load_descriptor_unwind ();
-DEFUN ("load", Fload, Sload, 1, 4, 0,
+DEFUN ("load", Fload, Sload, 1, 5, 0,
"Execute a file of Lisp code named FILE.\n\
First try FILE with `.elc' appended, then try with `.el',\n\
then try FILE unmodified.\n\
optional third arg NOMESSAGE is non-nil.\n\
If optional fourth arg NOSUFFIX is non-nil, don't try adding\n\
suffixes `.elc' or `.el' to the specified name FILE.\n\
+If optional fifth arg MUST-SUFFIX is non-nil, insist on\n\
+ the suffix `.elc' or `.el'; don't accept just FILE unless\n\
+ it ends in one of those suffixes or includes a directory name.\n\
Return t if file exists.")
- (str, noerror, nomessage, nosuffix)
- Lisp_Object str, noerror, nomessage, nosuffix;
+ (file, noerror, nomessage, nosuffix, must_suffix)
+ Lisp_Object file, noerror, nomessage, nosuffix, must_suffix;
{
register FILE *stream;
register int fd = -1;
Lisp_Object temp;
struct gcpro gcpro1;
Lisp_Object found;
- /* 1 means inhibit the message at the beginning. */
- int nomessage1 = 0;
+ /* 1 means we printed the ".el is newer" message. */
+ int newer = 0;
+ /* 1 means we are loading a compiled file. */
+ int compiled = 0;
Lisp_Object handler;
#ifdef DOS_NT
char *dosmode = "rt";
#endif /* DOS_NT */
- CHECK_STRING (str, 0);
+ CHECK_STRING (file, 0);
/* If file name is magic, call the handler. */
- handler = Ffind_file_name_handler (str, Qload);
+ handler = Ffind_file_name_handler (file, Qload);
if (!NILP (handler))
- return call5 (handler, Qload, str, noerror, nomessage, nosuffix);
+ return call5 (handler, Qload, file, noerror, nomessage, nosuffix);
/* Do this after the handler to avoid
the need to gcpro noerror, nomessage and nosuffix.
(Below here, we care only whether they are nil or not.) */
- str = Fsubstitute_in_file_name (str);
+ file = Fsubstitute_in_file_name (file);
/* Avoid weird lossage with null string as arg,
since it would try to load a directory as a Lisp file */
- if (XSTRING (str)->size > 0)
+ if (XSTRING (file)->size > 0)
{
- GCPRO1 (str);
- fd = openp (Vload_path, str, !NILP (nosuffix) ? "" : ".elc:.el:",
+ int size = XSTRING (file)->size;
+
+ GCPRO1 (file);
+
+ if (! NILP (must_suffix))
+ {
+ /* Don't insist on adding a suffix if FILE already ends with one. */
+ if (size > 3
+ && !strcmp (XSTRING (file)->data + size - 3, ".el"))
+ must_suffix = Qnil;
+ else if (size > 4
+ && !strcmp (XSTRING (file)->data + size - 4, ".elc"))
+ must_suffix = Qnil;
+ /* Don't insist on adding a suffix
+ if the argument includes a directory name. */
+ else if (! NILP (Ffile_name_directory (file)))
+ must_suffix = Qnil;
+ }
+
+ fd = openp (Vload_path, file,
+ (!NILP (nosuffix) ? ""
+ : ! NILP (must_suffix) ? ".elc:.el"
+ : ".elc:.el:"),
&found, 0);
UNGCPRO;
}
if (NILP (noerror))
while (1)
Fsignal (Qfile_error, Fcons (build_string ("Cannot open load file"),
- Fcons (str, Qnil)));
+ Fcons (file, Qnil)));
else
return Qnil;
}
+ /* If FD is 0, that means openp found a remote file. */
+ if (fd == 0)
+ {
+ handler = Ffind_file_name_handler (found, Qload);
+ return call5 (handler, Qload, found, noerror, nomessage, Qt);
+ }
+
if (!bcmp (&(XSTRING (found)->data[XSTRING (found)->size - 4]),
".elc", 4))
{
struct stat s1, s2;
int result;
+ compiled = 1;
+
#ifdef DOS_NT
dosmode = "rb";
#endif /* DOS_NT */
result = stat ((char *)XSTRING (found)->data, &s2);
if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime)
{
- message ("Source file `%s' newer than byte-compiled file",
- XSTRING (found)->data);
- /* Don't immediately overwrite this message. */
- if (!noninteractive)
- nomessage1 = 1;
+ /* Make the progress messages mention that source is newer. */
+ newer = 1;
+
+ /* If we won't print another message, mention this anyway. */
+ if (! NILP (nomessage))
+ message_with_string ("Source file `%s' newer than byte-compiled file",
+ found, 1);
}
XSTRING (found)->data[XSTRING (found)->size - 1] = 'c';
}
+ else
+ {
+ /* We are loading a source file (*.el). */
+ if (!NILP (Vload_source_file_function))
+ {
+ close (fd);
+ return call4 (Vload_source_file_function, found, file,
+ NILP (noerror) ? Qnil : Qt,
+ NILP (nomessage) ? Qnil : Qt);
+ }
+ }
#ifdef DOS_NT
close (fd);
if (stream == 0)
{
close (fd);
- error ("Failure to create stdio stream for %s", XSTRING (str)->data);
+ error ("Failure to create stdio stream for %s", XSTRING (file)->data);
}
- if (NILP (nomessage) && !nomessage1)
- message ("Loading %s...", XSTRING (str)->data);
+ if (! NILP (Vpurify_flag))
+ Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list);
- GCPRO1 (str);
+ if (NILP (nomessage))
+ {
+ if (!compiled)
+ message_with_string ("Loading %s (source)...", file, 1);
+ else if (newer)
+ message_with_string ("Loading %s (compiled; note, source file is newer)...",
+ file, 1);
+ else /* The typical case; compiled file newer than source file. */
+ message_with_string ("Loading %s...", file, 1);
+ }
+
+ GCPRO1 (file);
lispstream = Fcons (Qnil, Qnil);
XSETFASTINT (XCONS (lispstream)->car, (EMACS_UINT)stream >> 16);
XSETFASTINT (XCONS (lispstream)->cdr, (EMACS_UINT)stream & 0xffff);
record_unwind_protect (load_unwind, lispstream);
record_unwind_protect (load_descriptor_unwind, load_descriptor_list);
specbind (Qload_file_name, found);
+ specbind (Qinhibit_file_name_operation, Qnil);
load_descriptor_list
= Fcons (make_number (fileno (stream)), load_descriptor_list);
load_in_progress++;
- readevalloop (Qget_file_char, stream, str, Feval, 0);
+ readevalloop (Qget_file_char, stream, file, Feval, 0);
unbind_to (count, Qnil);
/* Run any load-hooks for this file. */
- temp = Fassoc (str, Vafter_load_alist);
+ temp = Fassoc (file, Vafter_load_alist);
if (!NILP (temp))
Fprogn (Fcdr (temp));
UNGCPRO;
+ if (saved_doc_string)
+ free (saved_doc_string);
+ saved_doc_string = 0;
+ saved_doc_string_size = 0;
+
if (!noninteractive && NILP (nomessage))
- message ("Loading %s...done", XSTRING (str)->data);
+ {
+ if (!compiled)
+ message_with_string ("Loading %s (source)...done", file, 1);
+ else if (newer)
+ message_with_string ("Loading %s (compiled; note, source file is newer)...done",
+ file, 1);
+ else /* The typical case; compiled file newer than source file. */
+ message_with_string ("Loading %s...done", file, 1);
+ }
return Qt;
}
void
close_load_descs ()
{
+#ifndef WINDOWSNT
Lisp_Object tail;
for (tail = load_descriptor_list; !NILP (tail); tail = XCONS (tail)->cdr)
close (XFASTINT (XCONS (tail)->car));
+#endif
}
\f
static int
If STOREPTR is nonzero, it points to a slot where the name of
the file actually found should be stored as a Lisp string.
- Nil is stored there on failure. */
+ nil is stored there on failure.
+
+ If the file we find is remote, return 0
+ but store the found remote file name in *STOREPTR.
+ We do not check for remote files if EXEC_ONLY is nonzero. */
int
openp (path, str, suffix, storeptr, exec_only)
register char *fn = buf;
int absolute = 0;
int want_size;
- register Lisp_Object filename;
+ Lisp_Object filename;
struct stat st;
struct gcpro gcpro1;
{
char *esuffix = (char *) index (nsuffix, ':');
int lsuffix = esuffix ? esuffix - nsuffix : strlen (nsuffix);
+ Lisp_Object handler;
+
+ /* Concatenate path element/specified name with the suffix.
+ If the directory starts with /:, remove that. */
+ if (XSTRING (filename)->size > 2
+ && XSTRING (filename)->data[0] == '/'
+ && XSTRING (filename)->data[1] == ':')
+ {
+ strncpy (fn, XSTRING (filename)->data + 2,
+ XSTRING (filename)->size - 2);
+ fn[XSTRING (filename)->size - 2] = 0;
+ }
+ else
+ {
+ strncpy (fn, XSTRING (filename)->data, XSTRING (filename)->size);
+ fn[XSTRING (filename)->size] = 0;
+ }
- /* Concatenate path element/specified name with the suffix. */
- strncpy (fn, XSTRING (filename)->data, XSTRING (filename)->size);
- fn[XSTRING (filename)->size] = 0;
if (lsuffix != 0) /* Bug happens on CCI if lsuffix is 0. */
strncat (fn, nsuffix, lsuffix);
- /* Ignore file if it's a directory. */
- if (stat (fn, &st) >= 0
- && (st.st_mode & S_IFMT) != S_IFDIR)
+ /* Check that the file exists and is not a directory. */
+ if (absolute)
+ handler = Qnil;
+ else
+ handler = Ffind_file_name_handler (filename, Qfile_exists_p);
+ if (! NILP (handler) && ! exec_only)
{
- /* Check that we can access or open it. */
- if (exec_only)
- fd = (access (fn, X_OK) == 0) ? 1 : -1;
- else
- fd = open (fn, O_RDONLY, 0);
+ Lisp_Object string;
+ int exists;
+
+ string = build_string (fn);
+ exists = ! NILP (exec_only ? Ffile_executable_p (string)
+ : Ffile_readable_p (string));
+ if (exists
+ && ! NILP (Ffile_directory_p (build_string (fn))))
+ exists = 0;
- if (fd >= 0)
+ if (exists)
{
/* We succeeded; return this descriptor and filename. */
if (storeptr)
*storeptr = build_string (fn);
UNGCPRO;
- return fd;
+ return 0;
+ }
+ }
+ else
+ {
+ int exists = (stat (fn, &st) >= 0
+ && (st.st_mode & S_IFMT) != S_IFDIR);
+ if (exists)
+ {
+ /* Check that we can access or open it. */
+ if (exec_only)
+ fd = (access (fn, X_OK) == 0) ? 1 : -1;
+ else
+ fd = open (fn, O_RDONLY, 0);
+
+ if (fd >= 0)
+ {
+ /* We succeeded; return this descriptor and filename. */
+ if (storeptr)
+ *storeptr = build_string (fn);
+ UNGCPRO;
+ return fd;
+ }
}
}
specbind (Qstandard_input, readcharfun);
specbind (Qcurrent_load_list, Qnil);
+ readchar_backlog = 0;
+
GCPRO1 (sourcename);
LOADHIST_ATTACH (sourcename);
else
{
UNREAD (c);
- val = read0 (readcharfun);
+ read_objects = Qnil;
+ if (NILP (Vload_read_function))
+ val = read0 (readcharfun);
+ else
+ val = call1 (Vload_read_function, readcharfun);
}
val = (*evalfun) (val);
#ifndef standalone
-DEFUN ("eval-buffer", Feval_buffer, Seval_buffer, 0, 2, "",
+DEFUN ("eval-buffer", Feval_buffer, Seval_buffer, 0, 3, "",
"Execute the current buffer as Lisp code.\n\
Programs can pass two arguments, BUFFER and PRINTFLAG.\n\
BUFFER is the buffer to evaluate (nil means use current buffer).\n\
PRINTFLAG controls printing of output:\n\
nil means discard it; anything else is stream for print.\n\
\n\
-If there is no error, point does not move. If there is an error,\n\
-point remains at the end of the last character read from the buffer.")
- (bufname, printflag)
- Lisp_Object bufname, printflag;
+If the optional third argument FILENAME is non-nil,\n\
+it specifies the file name to use for `load-history'.\n\
+\n\
+This function preserves the position of point.")
+ (buffer, printflag, filename)
+ Lisp_Object buffer, printflag, filename;
{
int count = specpdl_ptr - specpdl;
Lisp_Object tem, buf;
- if (NILP (bufname))
+ if (NILP (buffer))
buf = Fcurrent_buffer ();
else
- buf = Fget_buffer (bufname);
+ buf = Fget_buffer (buffer);
if (NILP (buf))
- error ("No such buffer.");
+ error ("No such buffer");
if (NILP (printflag))
tem = Qsymbolp;
else
tem = printflag;
+
+ if (NILP (filename))
+ filename = XBUFFER (buf)->filename;
+
specbind (Qstandard_output, tem);
record_unwind_protect (save_excursion_restore, save_excursion_save ());
BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
- readevalloop (buf, 0, XBUFFER (buf)->filename, Feval, !NILP (printflag));
+ readevalloop (buf, 0, filename, Feval, !NILP (printflag));
unbind_to (count, Qnil);
return Qnil;
}
#if 0
-DEFUN ("eval-current-buffer", Feval_current_buffer, Seval_current_buffer, 0, 1, "",
+XDEFUN ("eval-current-buffer", Feval_current_buffer, Seval_current_buffer, 0, 1, "",
"Execute the current buffer as Lisp code.\n\
Programs can pass argument PRINTFLAG which controls printing of output:\n\
nil means discard it; anything else is stream for print.\n\
Programs can pass third argument PRINTFLAG which controls output:\n\
nil means discard it; anything else is stream for printing it.\n\
\n\
-If there is no error, point does not move. If there is an error,\n\
-point remains at the end of the last character read from the buffer.")
- (b, e, printflag)
- Lisp_Object b, e, printflag;
+This function does not move point.")
+ (start, end, printflag)
+ Lisp_Object start, end, printflag;
{
int count = specpdl_ptr - specpdl;
Lisp_Object tem, cbuf;
record_unwind_protect (save_excursion_restore, save_excursion_save ());
record_unwind_protect (save_restriction_restore, save_restriction_save ());
- /* This both uses b and checks its type. */
- Fgoto_char (b);
- Fnarrow_to_region (make_number (BEGV), e);
+ /* This both uses start and checks its type. */
+ Fgoto_char (start);
+ Fnarrow_to_region (make_number (BEGV), end);
readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval, !NILP (printflag));
return unbind_to (count, Qnil);
call it with a char as argument to push a char back)\n\
a string (takes text from string, starting at the beginning)\n\
t (read text line using minibuffer and use it).")
- (readcharfun)
- Lisp_Object readcharfun;
+ (stream)
+ Lisp_Object stream;
{
extern Lisp_Object Fread_minibuffer ();
- if (NILP (readcharfun))
- readcharfun = Vstandard_input;
- if (EQ (readcharfun, Qt))
- readcharfun = Qread_char;
+ if (NILP (stream))
+ stream = Vstandard_input;
+ if (EQ (stream, Qt))
+ stream = Qread_char;
+
+ readchar_backlog = 0;
+ new_backquote_flag = 0;
+ read_objects = Qnil;
#ifndef standalone
- if (EQ (readcharfun, Qread_char))
+ if (EQ (stream, Qread_char))
return Fread_minibuffer (build_string ("Lisp expression: "), Qnil);
#endif
- if (STRINGP (readcharfun))
- return Fcar (Fread_from_string (readcharfun, Qnil, Qnil));
+ if (STRINGP (stream))
+ return Fcar (Fread_from_string (stream, Qnil, Qnil));
- return read0 (readcharfun);
+ return read0 (stream);
}
DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
CHECK_STRING (string,0);
if (NILP (end))
- endval = XSTRING (string)->size;
+ endval = STRING_BYTES (XSTRING (string));
else
- { CHECK_NUMBER (end,2);
- endval = XINT (end);
- if (endval < 0 || endval > XSTRING (string)->size)
+ {
+ CHECK_NUMBER (end, 2);
+ endval = string_char_to_byte (string, XINT (end));
+ if (endval < 0 || endval > STRING_BYTES (XSTRING (string)))
args_out_of_range (string, end);
}
if (NILP (start))
startval = 0;
else
- { CHECK_NUMBER (start,1);
- startval = XINT (start);
+ {
+ CHECK_NUMBER (start, 1);
+ startval = string_char_to_byte (string, XINT (start));
if (startval < 0 || startval > endval)
args_out_of_range (string, start);
}
read_from_string_index = startval;
read_from_string_limit = endval;
+ new_backquote_flag = 0;
+ read_objects = Qnil;
+
tem = read0 (string);
- return Fcons (tem, make_number (read_from_string_index));
+ endval = string_byte_to_char (string,
+ read_from_string_index);
+ return Fcons (tem, make_number (endval));
}
\f
/* Use this for recursive reads, in contexts where internal tokens
are not allowed. */
+
static Lisp_Object
read0 (readcharfun)
Lisp_Object readcharfun;
{
register Lisp_Object val;
- char c;
+ int c;
- val = read1 (readcharfun, &c);
+ val = read1 (readcharfun, &c, 0);
if (c)
- Fsignal (Qinvalid_read_syntax, Fcons (make_string (&c, 1), Qnil));
+ Fsignal (Qinvalid_read_syntax, Fcons (Fmake_string (make_number (1),
+ make_number (c)),
+ Qnil));
return val;
}
static int read_buffer_size;
static char *read_buffer;
+/* Read multibyte form and return it as a character. C is a first
+ byte of multibyte form, and rest of them are read from
+ READCHARFUN. */
+
static int
-read_escape (readcharfun)
+read_multibyte (c, readcharfun)
+ register int c;
Lisp_Object readcharfun;
+{
+ /* We need the actual character code of this multibyte
+ characters. */
+ unsigned char str[MAX_LENGTH_OF_MULTI_BYTE_FORM];
+ int len = 0;
+
+ str[len++] = c;
+ while ((c = READCHAR) >= 0xA0
+ && len < MAX_LENGTH_OF_MULTI_BYTE_FORM)
+ str[len++] = c;
+ UNREAD (c);
+ return STRING_CHAR (str, len);
+}
+
+/* Read a \-escape sequence, assuming we already read the `\'. */
+
+static int
+read_escape (readcharfun, stringp)
+ Lisp_Object readcharfun;
+ int stringp;
{
register int c = READCHAR;
switch (c)
{
+ case -1:
+ error ("End of file");
+
case 'a':
return '\007';
case 'b':
return '\v';
case '\n':
return -1;
+ case ' ':
+ if (stringp)
+ return -1;
+ return ' ';
case 'M':
c = READCHAR;
error ("Invalid escape character syntax");
c = READCHAR;
if (c == '\\')
- c = read_escape (readcharfun);
+ c = read_escape (readcharfun, 0);
return c | meta_modifier;
case 'S':
error ("Invalid escape character syntax");
c = READCHAR;
if (c == '\\')
- c = read_escape (readcharfun);
- if ((c & 0xff) >= 'a' && (c & 0xff) <= 'z')
- return c - ('a' - 'A');
+ c = read_escape (readcharfun, 0);
return c | shift_modifier;
case 'H':
error ("Invalid escape character syntax");
c = READCHAR;
if (c == '\\')
- c = read_escape (readcharfun);
+ c = read_escape (readcharfun, 0);
return c | hyper_modifier;
case 'A':
error ("Invalid escape character syntax");
c = READCHAR;
if (c == '\\')
- c = read_escape (readcharfun);
+ c = read_escape (readcharfun, 0);
return c | alt_modifier;
case 's':
error ("Invalid escape character syntax");
c = READCHAR;
if (c == '\\')
- c = read_escape (readcharfun);
+ c = read_escape (readcharfun, 0);
return c | super_modifier;
case 'C':
case '^':
c = READCHAR;
if (c == '\\')
- c = read_escape (readcharfun);
+ c = read_escape (readcharfun, 0);
if ((c & 0177) == '?')
return 0177 | c;
/* ASCII control chars are made from letters (both cases),
}
default:
+ if (BASE_LEADING_CODE_P (c))
+ c = read_multibyte (c, readcharfun);
return c;
}
}
/* If the next token is ')' or ']' or '.', we store that character
in *PCH and the return value is not interesting. Else, we store
- zero in *PCH and we read and return one lisp object. */
+ zero in *PCH and we read and return one lisp object.
+
+ FIRST_IN_LIST is nonzero if this is the first element of a list. */
+
static Lisp_Object
-read1 (readcharfun, pch)
+read1 (readcharfun, pch, first_in_list)
register Lisp_Object readcharfun;
- char *pch;
+ int *pch;
+ int first_in_list;
{
register int c;
+ int uninterned_symbol = 0;
+
*pch = 0;
retry:
case '#':
c = READCHAR;
+ if (c == '^')
+ {
+ c = READCHAR;
+ if (c == '[')
+ {
+ Lisp_Object tmp;
+ tmp = read_vector (readcharfun);
+ if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS
+ || XVECTOR (tmp)->size > CHAR_TABLE_STANDARD_SLOTS + 10)
+ error ("Invalid size char-table");
+ XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp));
+ XCHAR_TABLE (tmp)->top = Qt;
+ return tmp;
+ }
+ else if (c == '^')
+ {
+ c = READCHAR;
+ if (c == '[')
+ {
+ Lisp_Object tmp;
+ tmp = read_vector (readcharfun);
+ if (XVECTOR (tmp)->size != SUB_CHAR_TABLE_STANDARD_SLOTS)
+ error ("Invalid size char-table");
+ XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp));
+ XCHAR_TABLE (tmp)->top = Qnil;
+ return tmp;
+ }
+ Fsignal (Qinvalid_read_syntax,
+ Fcons (make_string ("#^^", 3), Qnil));
+ }
+ Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#^", 2), Qnil));
+ }
+ if (c == '&')
+ {
+ Lisp_Object length;
+ length = read1 (readcharfun, pch, first_in_list);
+ c = READCHAR;
+ if (c == '"')
+ {
+ Lisp_Object tmp, val;
+ int size_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1)
+ / BITS_PER_CHAR);
+
+ UNREAD (c);
+ tmp = read1 (readcharfun, pch, first_in_list);
+ if (size_in_chars != XSTRING (tmp)->size
+ /* We used to print 1 char too many
+ when the number of bits was a multiple of 8.
+ Accept such input in case it came from an old version. */
+ && ! (XFASTINT (length)
+ == (XSTRING (tmp)->size - 1) * BITS_PER_CHAR))
+ Fsignal (Qinvalid_read_syntax,
+ Fcons (make_string ("#&...", 5), Qnil));
+
+ val = Fmake_bool_vector (length, Qnil);
+ bcopy (XSTRING (tmp)->data, XBOOL_VECTOR (val)->data,
+ size_in_chars);
+ return val;
+ }
+ Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5),
+ Qnil));
+ }
if (c == '[')
{
/* Accept compiled functions at read-time so that we don't have to
{
Lisp_Object tmp;
struct gcpro gcpro1;
- char ch;
+ int ch;
/* Read the string itself. */
- tmp = read1 (readcharfun, &ch);
+ tmp = read1 (readcharfun, &ch, 0);
if (ch != 0 || !STRINGP (tmp))
Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil));
GCPRO1 (tmp);
{
Lisp_Object beg, end, plist;
- beg = read1 (readcharfun, &ch);
+ beg = read1 (readcharfun, &ch, 0);
if (ch == ')')
break;
if (ch == 0)
- end = read1 (readcharfun, &ch);
+ end = read1 (readcharfun, &ch, 0);
if (ch == 0)
- plist = read1 (readcharfun, &ch);
+ plist = read1 (readcharfun, &ch, 0);
if (ch)
Fsignal (Qinvalid_read_syntax,
Fcons (build_string ("invalid string property list"),
if (c >= 0)
UNREAD (c);
- /* Skip that many characters. */
- for (i = 0; i < nskip && c >= 0; i++)
- c = READCHAR;
+#ifndef DOS_NT /* I don't know if filepos works right on MSDOS and Windoze. */
+ if (load_force_doc_strings && EQ (readcharfun, Qget_file_char))
+ {
+ /* If we are supposed to force doc strings into core right now,
+ record the last string that we skipped,
+ and record where in the file it comes from. */
+ if (saved_doc_string_size == 0)
+ {
+ saved_doc_string_size = nskip + 100;
+ saved_doc_string = (char *) xmalloc (saved_doc_string_size);
+ }
+ if (nskip > saved_doc_string_size)
+ {
+ saved_doc_string_size = nskip + 100;
+ saved_doc_string = (char *) xrealloc (saved_doc_string,
+ saved_doc_string_size);
+ }
+
+ saved_doc_string_position = ftell (instream);
+
+ /* Copy that many characters into saved_doc_string. */
+ for (i = 0; i < nskip && c >= 0; i++)
+ saved_doc_string[i] = c = READCHAR;
+
+ saved_doc_string_length = i;
+ }
+ else
+#endif /* not DOS_NT */
+ {
+ /* Skip that many characters. */
+ for (i = 0; i < nskip && c >= 0; i++)
+ c = READCHAR;
+ }
+
goto retry;
}
if (c == '$')
return Vload_file_name;
+ if (c == '\'')
+ return Fcons (Qfunction, Fcons (read0 (readcharfun), Qnil));
+ /* #:foo is the uninterned symbol named foo. */
+ if (c == ':')
+ {
+ uninterned_symbol = 1;
+ c = READCHAR;
+ goto default_label;
+ }
+ /* Reader forms that can reuse previously read objects. */
+ if (c >= '0' && c <= '9')
+ {
+ int n = 0;
+ Lisp_Object tem;
+
+ /* Read a non-negative integer. */
+ while (c >= '0' && c <= '9')
+ {
+ n *= 10;
+ n += c - '0';
+ c = READCHAR;
+ }
+ /* #n=object returns object, but associates it with n for #n#. */
+ if (c == '=')
+ {
+ tem = read0 (readcharfun);
+ read_objects = Fcons (Fcons (make_number (n), tem), read_objects);
+ return tem;
+ }
+ /* #n# returns a previously read object. */
+ if (c == '#')
+ {
+ tem = Fassq (make_number (n), read_objects);
+ if (CONSP (tem))
+ return XCDR (tem);
+ /* Fall through to error message. */
+ }
+ /* Fall through to error message. */
+ }
UNREAD (c);
Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil));
return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil));
}
+ case '`':
+ if (first_in_list)
+ goto default_label;
+ else
+ {
+ Lisp_Object value;
+
+ new_backquote_flag = 1;
+ value = read0 (readcharfun);
+ new_backquote_flag = 0;
+
+ return Fcons (Qbackquote, Fcons (value, Qnil));
+ }
+
+ case ',':
+ if (new_backquote_flag)
+ {
+ Lisp_Object comma_type = Qnil;
+ Lisp_Object value;
+ int ch = READCHAR;
+
+ if (ch == '@')
+ comma_type = Qcomma_at;
+ else if (ch == '.')
+ comma_type = Qcomma_dot;
+ else
+ {
+ if (ch >= 0) UNREAD (ch);
+ comma_type = Qcomma;
+ }
+
+ new_backquote_flag = 0;
+ value = read0 (readcharfun);
+ new_backquote_flag = 1;
+ return Fcons (comma_type, Fcons (value, Qnil));
+ }
+ else
+ goto default_label;
+
case '?':
{
register Lisp_Object val;
if (c < 0) return Fsignal (Qend_of_file, Qnil);
if (c == '\\')
- XSETINT (val, read_escape (readcharfun));
- else
- XSETINT (val, c);
+ c = read_escape (readcharfun, 0);
+ else if (BASE_LEADING_CODE_P (c))
+ c = read_multibyte (c, readcharfun);
- return val;
+ return make_number (c);
}
case '\"':
register char *p = read_buffer;
register char *end = read_buffer + read_buffer_size;
register int c;
+ /* Nonzero if we saw an escape sequence specifying
+ a multibyte character. */
+ int force_multibyte = 0;
+ /* Nonzero if we saw an escape sequence specifying
+ a single-byte character. */
+ int force_singlebyte = 0;
int cancel = 0;
+ int nchars;
while ((c = READCHAR) >= 0
&& c != '\"')
end = read_buffer + read_buffer_size;
}
if (c == '\\')
- c = read_escape (readcharfun);
+ {
+ c = read_escape (readcharfun, 1);
+ if (! SINGLE_BYTE_CHAR_P ((c & ~CHAR_META)))
+ {
+ unsigned char workbuf[4];
+ unsigned char *str = workbuf;
+ int length;
+
+ length = non_ascii_char_to_string (c, workbuf, &str);
+ if (length > 1)
+ force_multibyte = 1;
+
+ if (p + length > end)
+ {
+ char *new = (char *) xrealloc (read_buffer, read_buffer_size *= 2);
+ p += new - read_buffer;
+ read_buffer += new - read_buffer;
+ end = read_buffer + read_buffer_size;
+ }
+
+ bcopy (str, p, length);
+ p += length;
+ continue;
+ }
+ else if (! ASCII_BYTE_P (c))
+ force_singlebyte = 1;
+ }
+
/* c is -1 if \ newline has just been seen */
if (c == -1)
{
*p++ = c;
}
}
- if (c < 0) return Fsignal (Qend_of_file, Qnil);
+ if (c < 0)
+ return Fsignal (Qend_of_file, Qnil);
/* If purifying, and string starts with \ newline,
return zero instead. This is for doc strings
if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
return make_number (0);
- if (read_pure)
- return make_pure_string (read_buffer, p - read_buffer);
+ if (force_singlebyte && force_multibyte)
+ error ("Multibyte and single-byte escapes in one string constant");
+
+ if (force_singlebyte)
+ nchars = p - read_buffer;
+ else if (! NILP (buffer_defaults.enable_multibyte_characters)
+ || force_multibyte)
+ nchars = multibyte_chars_in_text (read_buffer, p - read_buffer);
else
- return make_string (read_buffer, p - read_buffer);
+ nchars = p - read_buffer;
+
+ if (read_pure)
+ return make_pure_string (read_buffer, nchars, p - read_buffer,
+ (force_multibyte
+ || (p - read_buffer != nchars)));
+ return make_specified_string (read_buffer, nchars, p - read_buffer,
+ (force_multibyte
+ || (p - read_buffer != nchars)));
}
case '.':
try to UNREAD two characters in a row. */
}
default:
+ default_label:
if (c <= 040) goto retry;
{
register char *p = read_buffer;
{
register char *end = read_buffer + read_buffer_size;
- while (c > 040 &&
- !(c == '\"' || c == '\'' || c == ';' || c == '?'
- || c == '(' || c == ')'
+ while (c > 040
+ && !(c == '\"' || c == '\'' || c == ';' || c == '?'
+ || c == '(' || c == ')'
#ifndef LISP_FLOAT_TYPE
- /* If we have floating-point support, then we need
- to allow <digits><dot><digits>. */
- || c =='.'
+ /* If we have floating-point support, then we need
+ to allow <digits><dot><digits>. */
+ || c =='.'
#endif /* not LISP_FLOAT_TYPE */
- || c == '[' || c == ']' || c == '#'
- ))
+ || c == '[' || c == ']' || c == '#'
+ ))
{
if (p == end)
{
c = READCHAR;
quoted = 1;
}
+
*p++ = c;
+
c = READCHAR;
}
UNREAD (c);
}
- if (!quoted)
+ if (!quoted && !uninterned_symbol)
{
register char *p1;
register Lisp_Object val;
if (p1[-1] == '.')
p1[-1] = '\0';
#endif
- XSETINT (val, atoi (read_buffer));
+ if (sizeof (int) == sizeof (EMACS_INT))
+ XSETINT (val, atoi (read_buffer));
+ else if (sizeof (long) == sizeof (EMACS_INT))
+ XSETINT (val, atol (read_buffer));
+ else
+ abort ();
return val;
}
}
#ifdef LISP_FLOAT_TYPE
if (isfloat_string (read_buffer))
- return make_float (atof (read_buffer));
+ {
+ double value = atof (read_buffer);
+ if (read_buffer[0] == '-' && value == 0.0)
+ value *= -1.0;
+ /* The only way this can be true, after isfloat_string
+ returns 1, is if the input ends in e+INF or e+NaN. */
+ if (p[-1] == 'F' || p[-1] == 'N')
+ {
+ if (p[-1] == 'N')
+ value = 0.0 / 0.0;
+ else if (read_buffer[0] == '-')
+ value = -1.0e999;
+ else
+ value = 1.0e999;
+ }
+ return make_float (value);
+ }
#endif
}
- return intern (read_buffer);
+ if (uninterned_symbol)
+ return make_symbol (read_buffer);
+ else
+ return intern (read_buffer);
}
}
}
while (*cp >= '0' && *cp <= '9')
cp++;
}
- if (*cp == 'e')
+ if (*cp == 'e' || *cp == 'E')
{
state |= E_CHAR;
cp++;
+ if (*cp == '+' || *cp == '-')
+ cp++;
}
- if ((*cp == '+') || (*cp == '-'))
- cp++;
if (*cp >= '0' && *cp <= '9')
{
while (*cp >= '0' && *cp <= '9')
cp++;
}
- return (*cp == 0
+ else if (cp[-1] == '+' && cp[0] == 'I' && cp[1] == 'N' && cp[2] == 'F')
+ {
+ state |= EXP_INT;
+ cp += 3;
+ }
+ else if (cp[-1] == '+' && cp[0] == 'N' && cp[1] == 'a' && cp[2] == 'N')
+ {
+ state |= EXP_INT;
+ cp += 3;
+ }
+
+ return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f'))
&& (state == (LEAD_INT|DOT_CHAR|TRAIL_INT)
|| state == (DOT_CHAR|TRAIL_INT)
|| state == (LEAD_INT|E_CHAR|EXP_INT)
return vector;
}
-/* flag = 1 means check for ] to terminate rather than ) and .
- flag = -1 means check for starting with defun
+/* FLAG = 1 means check for ] to terminate rather than ) and .
+ FLAG = -1 means check for starting with defun
and make structure pure. */
static Lisp_Object
Lisp_Object val, tail;
register Lisp_Object elt, tem;
struct gcpro gcpro1, gcpro2;
- int cancel = 0;
+ /* 0 is the normal case.
+ 1 means this list is a doc reference; replace it with the number 0.
+ 2 means this list is a doc reference; replace it with the doc string. */
+ int doc_reference = 0;
+
+ /* Initialize this to 1 if we are reading a list. */
+ int first_in_list = flag <= 0;
val = Qnil;
tail = Qnil;
while (1)
{
- char ch;
+ int ch;
GCPRO2 (val, tail);
- elt = read1 (readcharfun, &ch);
+ elt = read1 (readcharfun, &ch, first_in_list);
UNGCPRO;
- /* If purifying, and the list starts with #$,
- return 0 instead. This is a doc string reference
- and it will be replaced anyway by Snarf-documentation,
- so don't waste pure space with it. */
+ first_in_list = 0;
+
+ /* While building, if the list starts with #$, treat it specially. */
if (EQ (elt, Vload_file_name)
- && !NILP (Vpurify_flag) && NILP (Vdoc_file_name))
- cancel = 1;
+ && ! NILP (elt)
+ && !NILP (Vpurify_flag))
+ {
+ if (NILP (Vdoc_file_name))
+ /* We have not yet called Snarf-documentation, so assume
+ this file is described in the DOC-MM.NN file
+ and Snarf-documentation will fill in the right value later.
+ For now, replace the whole list with 0. */
+ doc_reference = 1;
+ else
+ /* We have already called Snarf-documentation, so make a relative
+ file name for this file, so it can be found properly
+ in the installed Lisp directory.
+ We don't use Fexpand_file_name because that would make
+ the directory absolute now. */
+ elt = concat2 (build_string ("../lisp/"),
+ Ffile_name_nondirectory (elt));
+ }
+ else if (EQ (elt, Vload_file_name)
+ && ! NILP (elt)
+ && load_force_doc_strings)
+ doc_reference = 2;
if (ch)
{
{
if (ch == ']')
return val;
- Fsignal (Qinvalid_read_syntax, Fcons (make_string (") or . in a vector", 18), Qnil));
+ Fsignal (Qinvalid_read_syntax,
+ Fcons (make_string (") or . in a vector", 18), Qnil));
}
if (ch == ')')
return val;
XCONS (tail)->cdr = read0 (readcharfun);
else
val = read0 (readcharfun);
- read1 (readcharfun, &ch);
+ read1 (readcharfun, &ch, 0);
UNGCPRO;
if (ch == ')')
- return (cancel ? make_number (0) : val);
+ {
+ if (doc_reference == 1)
+ return make_number (0);
+ if (doc_reference == 2)
+ {
+ /* Get a doc string from the file we are loading.
+ If it's in saved_doc_string, get it from there. */
+ int pos = XINT (XCONS (val)->cdr);
+ if (pos >= saved_doc_string_position
+ && pos < (saved_doc_string_position
+ + saved_doc_string_length))
+ {
+ int start = pos - saved_doc_string_position;
+ int from, to;
+
+ /* Process quoting with ^A,
+ and find the end of the string,
+ which is marked with ^_ (037). */
+ for (from = start, to = start;
+ saved_doc_string[from] != 037;)
+ {
+ int c = saved_doc_string[from++];
+ if (c == 1)
+ {
+ c = saved_doc_string[from++];
+ if (c == 1)
+ saved_doc_string[to++] = c;
+ else if (c == '0')
+ saved_doc_string[to++] = 0;
+ else if (c == '_')
+ saved_doc_string[to++] = 037;
+ }
+ else
+ saved_doc_string[to++] = c;
+ }
+
+ return make_string (saved_doc_string + start,
+ to - start);
+ }
+ else
+ return read_doc_string (val);
+ }
+
+ return val;
+ }
return Fsignal (Qinvalid_read_syntax, Fcons (make_string (". in wrong context", 18), Qnil));
}
return Fsignal (Qinvalid_read_syntax, Fcons (make_string ("] in a list", 11), Qnil));
Lisp_Object Vobarray;
Lisp_Object initial_obarray;
+/* oblookup stores the bucket number here, for the sake of Funintern. */
+
+int oblookup_last_bucket_number;
+
+static int hash_string ();
+Lisp_Object oblookup ();
+
+/* Get an error if OBARRAY is not an obarray.
+ If it is one, return it. */
+
Lisp_Object
check_obarray (obarray)
Lisp_Object obarray;
return obarray;
}
-static int hash_string ();
-Lisp_Object oblookup ();
+/* Intern the C string STR: return a symbol with that name,
+ interned in the current obarray. */
Lisp_Object
intern (str)
obarray = Vobarray;
if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0)
obarray = check_obarray (obarray);
- tem = oblookup (obarray, str, len);
+ tem = oblookup (obarray, str, len, len);
if (SYMBOLP (tem))
return tem;
- return Fintern ((!NILP (Vpurify_flag)
- ? make_pure_string (str, len)
- : make_string (str, len)),
- obarray);
+ return Fintern (make_string (str, len), obarray);
}
+/* Create an uninterned symbol with name STR. */
+
+Lisp_Object
+make_symbol (str)
+ char *str;
+{
+ int len = strlen (str);
+
+ return Fmake_symbol ((!NILP (Vpurify_flag)
+ ? make_pure_string (str, len, len, 0)
+ : make_string (str, len)));
+}
+\f
DEFUN ("intern", Fintern, Sintern, 1, 2, 0,
"Return the canonical symbol whose name is STRING.\n\
If there is none, one is created by this function and returned.\n\
A second optional argument specifies the obarray to use;\n\
it defaults to the value of `obarray'.")
- (str, obarray)
- Lisp_Object str, obarray;
+ (string, obarray)
+ Lisp_Object string, obarray;
{
register Lisp_Object tem, sym, *ptr;
if (NILP (obarray)) obarray = Vobarray;
obarray = check_obarray (obarray);
- CHECK_STRING (str, 0);
+ CHECK_STRING (string, 0);
- tem = oblookup (obarray, XSTRING (str)->data, XSTRING (str)->size);
+ tem = oblookup (obarray, XSTRING (string)->data,
+ XSTRING (string)->size,
+ STRING_BYTES (XSTRING (string)));
if (!INTEGERP (tem))
return tem;
if (!NILP (Vpurify_flag))
- str = Fpurecopy (str);
- sym = Fmake_symbol (str);
+ string = Fpurecopy (string);
+ sym = Fmake_symbol (string);
+ XSYMBOL (sym)->obarray = obarray;
+
+ if (XSTRING (string)->data[0] == ':')
+ XSYMBOL (sym)->value = sym;
ptr = &XVECTOR (obarray)->contents[XINT (tem)];
if (SYMBOLP (*ptr))
"Return the canonical symbol whose name is STRING, or nil if none exists.\n\
A second optional argument specifies the obarray to use;\n\
it defaults to the value of `obarray'.")
- (str, obarray)
- Lisp_Object str, obarray;
+ (string, obarray)
+ Lisp_Object string, obarray;
{
register Lisp_Object tem;
if (NILP (obarray)) obarray = Vobarray;
obarray = check_obarray (obarray);
- CHECK_STRING (str, 0);
+ CHECK_STRING (string, 0);
- tem = oblookup (obarray, XSTRING (str)->data, XSTRING (str)->size);
+ tem = oblookup (obarray, XSTRING (string)->data,
+ XSTRING (string)->size,
+ STRING_BYTES (XSTRING (string)));
if (!INTEGERP (tem))
return tem;
return Qnil;
}
+\f
+DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0,
+ "Delete the symbol named NAME, if any, from OBARRAY.\n\
+The value is t if a symbol was found and deleted, nil otherwise.\n\
+NAME may be a string or a symbol. If it is a symbol, that symbol\n\
+is deleted, if it belongs to OBARRAY--no other symbol is deleted.\n\
+OBARRAY defaults to the value of the variable `obarray'.")
+ (name, obarray)
+ Lisp_Object name, obarray;
+{
+ register Lisp_Object string, tem;
+ int hash;
+
+ if (NILP (obarray)) obarray = Vobarray;
+ obarray = check_obarray (obarray);
+
+ if (SYMBOLP (name))
+ XSETSTRING (string, XSYMBOL (name)->name);
+ else
+ {
+ CHECK_STRING (name, 0);
+ string = name;
+ }
+
+ tem = oblookup (obarray, XSTRING (string)->data,
+ XSTRING (string)->size,
+ STRING_BYTES (XSTRING (string)));
+ if (INTEGERP (tem))
+ return Qnil;
+ /* If arg was a symbol, don't delete anything but that symbol itself. */
+ if (SYMBOLP (name) && !EQ (name, tem))
+ return Qnil;
+
+ XSYMBOL (tem)->obarray = Qnil;
+
+ hash = oblookup_last_bucket_number;
+
+ if (EQ (XVECTOR (obarray)->contents[hash], tem))
+ {
+ if (XSYMBOL (tem)->next)
+ XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next);
+ else
+ XSETINT (XVECTOR (obarray)->contents[hash], 0);
+ }
+ else
+ {
+ Lisp_Object tail, following;
+
+ for (tail = XVECTOR (obarray)->contents[hash];
+ XSYMBOL (tail)->next;
+ tail = following)
+ {
+ XSETSYMBOL (following, XSYMBOL (tail)->next);
+ if (EQ (following, tem))
+ {
+ XSYMBOL (tail)->next = XSYMBOL (following)->next;
+ break;
+ }
+ }
+ }
+
+ return Qt;
+}
+\f
+/* Return the symbol in OBARRAY whose names matches the string
+ of SIZE characters (SIZE_BYTE bytes) at PTR.
+ If there is no such symbol in OBARRAY, return nil.
+
+ Also store the bucket number in oblookup_last_bucket_number. */
Lisp_Object
-oblookup (obarray, ptr, size)
+oblookup (obarray, ptr, size, size_byte)
Lisp_Object obarray;
register char *ptr;
- register int size;
+ int size, size_byte;
{
int hash;
int obsize;
obarray = check_obarray (obarray);
obsize = XVECTOR (obarray)->size;
}
+ /* This is sometimes needed in the middle of GC. */
+ obsize &= ~ARRAY_MARK_FLAG;
/* Combining next two lines breaks VMS C 2.3. */
- hash = hash_string (ptr, size);
+ hash = hash_string (ptr, size_byte);
hash %= obsize;
bucket = XVECTOR (obarray)->contents[hash];
+ oblookup_last_bucket_number = hash;
if (XFASTINT (bucket) == 0)
;
else if (!SYMBOLP (bucket))
error ("Bad data in guts of obarray"); /* Like CADR error message */
- else for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next))
+ else
+ for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next))
{
- if (XSYMBOL (tail)->name->size == size &&
- !bcmp (XSYMBOL (tail)->name->data, ptr, size))
+ if (STRING_BYTES (XSYMBOL (tail)->name) == size_byte
+ && XSYMBOL (tail)->name->size == size
+ && !bcmp (XSYMBOL (tail)->name->data, ptr, size_byte))
return tail;
else if (XSYMBOL (tail)->next == 0)
break;
}
return hash & 07777777777;
}
-
+\f
void
map_obarray (obarray, fn, arg)
Lisp_Object obarray;
- int (*fn) ();
+ void (*fn) P_ ((Lisp_Object, Lisp_Object));
Lisp_Object arg;
{
register int i;
for (i = XVECTOR (obarray)->size - 1; i >= 0; i--)
{
tail = XVECTOR (obarray)->contents[i];
- if (XFASTINT (tail) != 0)
+ if (SYMBOLP (tail))
while (1)
{
(*fn) (tail, arg);
}
}
+void
mapatoms_1 (sym, function)
Lisp_Object sym, function;
{
XSETFASTINT (oblength, OBARRAY_SIZE);
- Qnil = Fmake_symbol (make_pure_string ("nil", 3));
+ Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0));
Vobarray = Fmake_vector (oblength, make_number (0));
initial_obarray = Vobarray;
staticpro (&initial_obarray);
/* Intern nil in the obarray */
+ XSYMBOL (Qnil)->obarray = Vobarray;
/* These locals are to kludge around a pyramid compiler bug. */
hash = hash_string ("nil", 3);
/* Separate statement here to avoid VAXC bug. */
tem = &XVECTOR (Vobarray)->contents[hash];
*tem = Qnil;
- Qunbound = Fmake_symbol (make_pure_string ("unbound", 7));
+ Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0));
XSYMBOL (Qnil)->function = Qunbound;
XSYMBOL (Qunbound)->value = Qunbound;
XSYMBOL (Qunbound)->function = Qunbound;
Vpurify_flag = Qt;
Qvariable_documentation = intern ("variable-documentation");
+ staticpro (&Qvariable_documentation);
read_buffer_size = 100;
read_buffer = (char *) malloc (read_buffer_size);
Lisp_Object sym, val;
sym = intern (namestring);
val = allocate_misc ();
- XMISC (val)->type = Lisp_Misc_Intfwd;
+ XMISCTYPE (val) = Lisp_Misc_Intfwd;
XINTFWD (val)->intvar = address;
XSYMBOL (sym)->value = val;
}
Lisp_Object sym, val;
sym = intern (namestring);
val = allocate_misc ();
- XMISC (val)->type = Lisp_Misc_Boolfwd;
+ XMISCTYPE (val) = Lisp_Misc_Boolfwd;
XBOOLFWD (val)->boolvar = address;
XSYMBOL (sym)->value = val;
}
Lisp_Object sym, val;
sym = intern (namestring);
val = allocate_misc ();
- XMISC (val)->type = Lisp_Misc_Objfwd;
+ XMISCTYPE (val) = Lisp_Misc_Objfwd;
XOBJFWD (val)->objvar = address;
XSYMBOL (sym)->value = val;
}
val = allocate_misc ();
offset = (char *)address - (char *)current_buffer;
- XMISC (val)->type = Lisp_Misc_Buffer_Objfwd;
+ XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd;
XBUFFER_OBJFWD (val)->offset = offset;
XSYMBOL (sym)->value = val;
*(Lisp_Object *)(offset + (char *)&buffer_local_symbols) = sym;
#endif /* standalone */
/* Similar but define a variable whose value is the Lisp Object stored
- at a particular offset in the current perdisplay object. */
+ at a particular offset in the current kboard object. */
void
-defvar_display (namestring, offset)
+defvar_kboard (namestring, offset)
char *namestring;
int offset;
{
Lisp_Object sym, val;
sym = intern (namestring);
val = allocate_misc ();
- XMISC (val)->type = Lisp_Misc_Display_Objfwd;
- XDISPLAY_OBJFWD (val)->offset = offset;
+ XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd;
+ XKBOARD_OBJFWD (val)->offset = offset;
XSYMBOL (sym)->value = val;
-#ifndef MULTI_PERDISPLAY
- staticpro ((Lisp_Object *)((char *)&the_only_perdisplay + offset));
-#endif
}
\f
+/* Record the value of load-path used at the start of dumping
+ so we can see if the site changed it later during dumping. */
+static Lisp_Object dump_path;
+
+void
init_lread ()
{
char *normal;
+ int turn_off_warning = 0;
+
+#ifdef HAVE_SETLOCALE
+ /* Make sure numbers are parsed as we expect. */
+ setlocale (LC_NUMERIC, "C");
+#endif /* HAVE_SETLOCALE */
/* Compute the default load-path. */
#ifdef CANNOT_DUMP
from the default before dumping, don't override that value. */
if (initialized)
{
- Lisp_Object dump_path;
-
- dump_path = decode_env_path (0, PATH_DUMPLOADSEARCH);
if (! NILP (Fequal (dump_path, Vload_path)))
{
Vload_path = decode_env_path (0, normal);
if (!NILP (tem1))
{
if (NILP (Fmember (tem, Vload_path)))
- Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ {
+ turn_off_warning = 1;
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ }
}
else
/* That dir doesn't exist, so add the build-time
Lisp dirs instead. */
Vload_path = nconc2 (Vload_path, dump_path);
+
+ /* Add leim under the installation dir, if it exists. */
+ tem = Fexpand_file_name (build_string ("leim"),
+ Vinstallation_directory);
+ tem1 = Ffile_exists_p (tem);
+ if (!NILP (tem1))
+ {
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ }
+
+ /* Add site-list under the installation dir, if it exists. */
+ tem = Fexpand_file_name (build_string ("site-lisp"),
+ Vinstallation_directory);
+ tem1 = Ffile_exists_p (tem);
+ if (!NILP (tem1))
+ {
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ }
+
+ /* If Emacs was not built in the source directory,
+ and it is run from where it was built, add to load-path
+ the lisp, leim and site-lisp dirs under that directory. */
+
+ if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
+ {
+ Lisp_Object tem2;
+
+ tem = Fexpand_file_name (build_string ("src/Makefile"),
+ Vinstallation_directory);
+ tem1 = Ffile_exists_p (tem);
+
+ /* Don't be fooled if they moved the entire source tree
+ AFTER dumping Emacs. If the build directory is indeed
+ different from the source dir, src/Makefile.in and
+ src/Makefile will not be found together. */
+ tem = Fexpand_file_name (build_string ("src/Makefile.in"),
+ Vinstallation_directory);
+ tem2 = Ffile_exists_p (tem);
+ if (!NILP (tem1) && NILP (tem2))
+ {
+ tem = Fexpand_file_name (build_string ("lisp"),
+ Vsource_directory);
+
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+
+ tem = Fexpand_file_name (build_string ("leim"),
+ Vsource_directory);
+
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+
+ tem = Fexpand_file_name (build_string ("site-lisp"),
+ Vsource_directory);
+
+ if (NILP (Fmember (tem, Vload_path)))
+ Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
+ }
+ }
}
}
}
else
- Vload_path = decode_env_path (0, normal);
+ {
+ /* NORMAL refers to the lisp dir in the source directory. */
+ /* We used to add ../lisp at the front here, but
+ that caused trouble because it was copied from dump_path
+ into Vload_path, aboe, when Vinstallation_directory was non-nil.
+ It should be unnecessary. */
+ Vload_path = decode_env_path (0, normal);
+ dump_path = Vload_path;
+ }
#endif
#ifndef WINDOWSNT
/* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
almost never correct, thereby causing a warning to be printed out that
- confuses users. Since PATH_LOADSEARCH is always overriden by the
+ confuses users. Since PATH_LOADSEARCH is always overridden by the
EMACSLOADPATH environment variable below, disable the warning on NT. */
/* Warn if dirs in the *standard* path don't exist. */
- {
- Lisp_Object path_tail;
+ if (!turn_off_warning)
+ {
+ Lisp_Object path_tail;
- for (path_tail = Vload_path;
- !NILP (path_tail);
- path_tail = XCONS (path_tail)->cdr)
- {
- Lisp_Object dirfile;
- dirfile = Fcar (path_tail);
- if (STRINGP (dirfile))
- {
- dirfile = Fdirectory_file_name (dirfile);
- if (access (XSTRING (dirfile)->data, 0) < 0)
- fprintf (stderr,
- "Warning: Lisp directory `%s' does not exist.\n",
- XSTRING (Fcar (path_tail))->data);
- }
- }
- }
+ for (path_tail = Vload_path;
+ !NILP (path_tail);
+ path_tail = XCONS (path_tail)->cdr)
+ {
+ Lisp_Object dirfile;
+ dirfile = Fcar (path_tail);
+ if (STRINGP (dirfile))
+ {
+ dirfile = Fdirectory_file_name (dirfile);
+ if (access (XSTRING (dirfile)->data, 0) < 0)
+ dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
+ XCONS (path_tail)->car);
+ }
+ }
+ }
#endif /* WINDOWSNT */
/* If the EMACSLOADPATH environment variable is set, use its value.
This doesn't apply if we're dumping. */
+#ifndef CANNOT_DUMP
if (NILP (Vpurify_flag)
&& egetenv ("EMACSLOADPATH"))
+#endif
Vload_path = decode_env_path ("EMACSLOADPATH", normal);
Vvalues = Qnil;
load_in_progress = 0;
+ Vload_file_name = Qnil;
load_descriptor_list = Qnil;
}
+/* Print a warning, using format string FORMAT, that directory DIRNAME
+ does not exist. Print it on stderr and put it in *Message*. */
+
+void
+dir_warning (format, dirname)
+ char *format;
+ Lisp_Object dirname;
+{
+ char *buffer
+ = (char *) alloca (XSTRING (dirname)->size + strlen (format) + 5);
+
+ fprintf (stderr, format, XSTRING (dirname)->data);
+ sprintf (buffer, format, XSTRING (dirname)->data);
+ message_dolog (buffer, strlen (buffer), 0, STRING_MULTIBYTE (dirname));
+}
+
void
syms_of_lread ()
{
defsubr (&Sread_from_string);
defsubr (&Sintern);
defsubr (&Sintern_soft);
+ defsubr (&Sunintern);
defsubr (&Sload);
defsubr (&Seval_buffer);
defsubr (&Seval_region);
"Used for internal purposes by `load'.");
Vcurrent_load_list = Qnil;
+ DEFVAR_LISP ("load-read-function", &Vload_read_function,
+ "Function used by `load' and `eval-region' for reading expressions.\n\
+The default is nil, which means use the function `read'.");
+ Vload_read_function = Qnil;
+
+ DEFVAR_LISP ("load-source-file-function", &Vload_source_file_function,
+ "Function called in `load' for loading an Emacs lisp source file.\n\
+This function is for doing code conversion before reading the source file.\n\
+If nil, loading is done without any code conversion.\n\
+Arguments are FULLNAME, FILE, NOERROR, NOMESSAGE, where\n\
+ FULLNAME is the full name of FILE.\n\
+See `load' for the meaning of the remaining arguments.");
+ Vload_source_file_function = Qnil;
+
+ DEFVAR_BOOL ("load-force-doc-strings", &load_force_doc_strings,
+ "Non-nil means `load' should force-load all dynamic doc strings.\n\
+This is useful when the file being loaded is a temporary copy.");
+ load_force_doc_strings = 0;
+
+ DEFVAR_LISP ("source-directory", &Vsource_directory,
+ "Directory in which Emacs sources were found when Emacs was built.\n\
+You cannot count on them to still be there!");
+ Vsource_directory
+ = Fexpand_file_name (build_string ("../"),
+ Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH)));
+
+ DEFVAR_LISP ("preloaded-file-list", &Vpreloaded_file_list,
+ "List of files that were preloaded (when dumping Emacs).");
+ Vpreloaded_file_list = Qnil;
+
+ /* Vsource_directory was initialized in init_lread. */
+
load_descriptor_list = Qnil;
staticpro (&load_descriptor_list);
Qget_file_char = intern ("get-file-char");
staticpro (&Qget_file_char);
+ Qbackquote = intern ("`");
+ staticpro (&Qbackquote);
+ Qcomma = intern (",");
+ staticpro (&Qcomma);
+ Qcomma_at = intern (",@");
+ staticpro (&Qcomma_at);
+ Qcomma_dot = intern (",.");
+ staticpro (&Qcomma_dot);
+
+ Qinhibit_file_name_operation = intern ("inhibit-file-name-operation");
+ staticpro (&Qinhibit_file_name_operation);
+
Qascii_character = intern ("ascii-character");
staticpro (&Qascii_character);
+ Qfunction = intern ("function");
+ staticpro (&Qfunction);
+
Qload = intern ("load");
staticpro (&Qload);
Qload_file_name = intern ("load-file-name");
staticpro (&Qload_file_name);
+
+ staticpro (&dump_path);
+
+ staticpro (&read_objects);
+ read_objects = Qnil;
}
HCoop / bpt / emacs.git / blobdiff