/* Lisp parsing and input streams.
Copyright (C) 1985, 1986, 1987, 1988, 1989,
- 1993, 1994 Free Software Foundation, Inc.
+ 1993, 1994, 1995 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
-#include <ctype.h>
#include <errno.h>
#include "lisp.h"
#ifdef MSDOS
#include "msdos.h"
-/* These are redefined (correctly, but differently) in values.h. */
-#undef INTBITS
-#undef LONGBITS
-#undef SHORTBITS
#endif
#include <math.h>
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;
+Lisp_Object Qascii_character, Qload, Qload_file_name;
+Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction;
extern Lisp_Object Qevent_symbol_element_mask;
/* 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;
lists of defs in their load files. */
Lisp_Object Vload_history;
-/* This is useud to build the load history. */
+/* This is used to build the load history. */
Lisp_Object Vcurrent_load_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;
+
+/* Nonzero means load should forcibly load all dynamic doc strings. */
+static int load_force_doc_strings;
+
/* 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;
+
+/* This contains the last string skipped with #@. */
+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,
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. */
If optional fourth arg NOSUFFIX is non-nil, don't try adding\n\
suffixes `.elc' or `.el' to the specified name FILE.\n\
Return t if file exists.")
- (str, noerror, nomessage, nosuffix)
- Lisp_Object str, noerror, nomessage, nosuffix;
+ (file, noerror, nomessage, nosuffix)
+ Lisp_Object file, noerror, nomessage, nosuffix;
{
register FILE *stream;
register int fd = -1;
/* 1 means inhibit the message at the beginning. */
int nomessage1 = 0;
Lisp_Object handler;
-#ifdef MSDOS
+#ifdef DOS_NT
char *dosmode = "rt";
-#endif
+#endif /* DOS_NT */
- CHECK_STRING (str, 0);
- str = Fsubstitute_in_file_name (str);
+ 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.) */
+ 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:",
+ GCPRO1 (file);
+ fd = openp (Vload_path, file, !NILP (nosuffix) ? "" : ".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;
}
struct stat s1, s2;
int result;
-#ifdef MSDOS
+#ifdef DOS_NT
dosmode = "rb";
-#endif
+#endif /* DOS_NT */
stat ((char *)XSTRING (found)->data, &s1);
XSTRING (found)->data[XSTRING (found)->size - 1] = 0;
result = stat ((char *)XSTRING (found)->data, &s2);
XSTRING (found)->data[XSTRING (found)->size - 1] = 'c';
}
-#ifdef MSDOS
+#ifdef DOS_NT
close (fd);
stream = fopen ((char *) XSTRING (found)->data, dosmode);
-#else
+#else /* not DOS_NT */
stream = fdopen (fd, "r");
-#endif
+#endif /* not DOS_NT */
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);
+ message ("Loading %s...", XSTRING (file)->data);
- GCPRO1 (str);
+ 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);
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);
+ message ("Loading %s...done", XSTRING (file)->data);
return Qt;
}
Lisp_Object pathname;
{
register unsigned char *s = XSTRING (pathname)->data;
- return (*s == '/'
+ return (IS_DIRECTORY_SEP (s[0])
+ || (XSTRING (pathname)->size > 2
+ && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))
#ifdef ALTOS
|| *s == '@'
#endif
#ifdef VMS
|| index (s, ':')
#endif /* VMS */
-#ifdef MSDOS /* MW, May 1993 */
- || (s[0] != '\0' && s[1] == ':' && s[2] == '/')
-#endif
);
}
continue;
}
if (c < 0) break;
- if (c == ' ' || c == '\t' || c == '\n' || c == '\f') continue;
+
+ /* Ignore whitespace here, so we can detect eof. */
+ if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r')
+ continue;
if (!NILP (Vpurify_flag) && c == '(')
{
else
{
UNREAD (c);
- val = read0 (readcharfun);
+ if (NILP (Vload_read_function))
+ val = read0 (readcharfun);
+ else
+ val = call1 (Vload_read_function, readcharfun);
}
val = (*evalfun) (val);
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;
+
+ new_backquote_flag = 0;
#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,
read_from_string_index = startval;
read_from_string_limit = endval;
+ new_backquote_flag = 0;
+
tem = read0 (string);
return Fcons (tem, make_number (read_from_string_index));
}
register Lisp_Object val;
char c;
- val = read1 (readcharfun, &c);
+ val = read1 (readcharfun, &c, 0);
if (c)
Fsignal (Qinvalid_read_syntax, Fcons (make_string (&c, 1), Qnil));
/* 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 first_in_list;
{
register int c;
*pch = 0;
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));
+ return tmp;
+ }
+ 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)
+ / BITS_PER_CHAR);
+
+ UNREAD (c);
+ tmp = read1 (readcharfun, pch, first_in_list);
+ if (size_in_chars != XSTRING (tmp)->size)
+ Fsignal (Qinvalid_read_syntax,
+ Fcons (make_string ("#&", 2), 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 ("#&", 2), Qnil));
+ }
if (c == '[')
{
/* Accept compiled functions at read-time so that we don't have to
char 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"),
return tmp;
}
#endif
+ /* #@NUMBER is used to skip NUMBER following characters.
+ That's used in .elc files to skip over doc strings
+ and function definitions. */
+ if (c == '@')
+ {
+ int i, nskip = 0;
+
+ /* Read a decimal integer. */
+ while ((c = READCHAR) >= 0
+ && c >= '0' && c <= '9')
+ {
+ nskip *= 10;
+ nskip += c - '0';
+ }
+ if (c >= 0)
+ UNREAD (c);
+
+#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 *) malloc (saved_doc_string_size);
+ }
+ if (nskip > saved_doc_string_size)
+ {
+ saved_doc_string_size = nskip + 100;
+ saved_doc_string = (char *) realloc (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));
+
+
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;
int next_char = READCHAR;
UNREAD (next_char);
- if (! isdigit (next_char))
+ if (! (next_char >= '0' && next_char <= '9'))
#endif
{
*pch = c;
try to UNREAD two characters in a row. */
}
default:
+ default_label:
if (c <= 040) goto retry;
{
register char *p = read_buffer;
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;
}
}
if (*cp == '+' || *cp == '-')
cp++;
- if (isdigit(*cp))
+ if (*cp >= '0' && *cp <= '9')
{
state |= LEAD_INT;
- while (isdigit (*cp))
- cp ++;
+ while (*cp >= '0' && *cp <= '9')
+ cp++;
}
if (*cp == '.')
{
state |= DOT_CHAR;
cp++;
}
- if (isdigit(*cp))
+ if (*cp >= '0' && *cp <= '9')
{
state |= TRAIL_INT;
- while (isdigit (*cp))
+ while (*cp >= '0' && *cp <= '9')
cp++;
}
if (*cp == 'e')
{
state |= E_CHAR;
cp++;
+ if (*cp == '+' || *cp == '-')
+ cp++;
}
- if ((*cp == '+') || (*cp == '-'))
- cp++;
- if (isdigit (*cp))
+ if (*cp >= '0' && *cp <= '9')
{
state |= EXP_INT;
- while (isdigit (*cp))
+ while (*cp >= '0' && *cp <= '9')
cp++;
}
- return (*cp == 0
+ 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)
Lisp_Object val, tail;
register Lisp_Object elt, tem;
struct gcpro gcpro1, gcpro2;
+ /* 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;
{
char ch;
GCPRO2 (val, tail);
- elt = read1 (readcharfun, &ch);
+ elt = read1 (readcharfun, &ch, first_in_list);
UNGCPRO;
+
+ first_in_list = 0;
+
+ /* While building, if the list starts with #$, treat it specially. */
+ if (EQ (elt, Vload_file_name)
+ && !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)
+ && load_force_doc_strings)
+ doc_reference = 2;
+
if (ch)
{
if (flag > 0)
{
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 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)
: make_string (str, len)),
obarray);
}
-
+\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\
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);
+ 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;
+
+ 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 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)
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 %= 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 (XSYMBOL (tail)->name->size == size
+ && !bcmp (XSYMBOL (tail)->name->data, ptr, size))
return tail;
else if (XSYMBOL (tail)->next == 0)
break;
}
return hash & 07777777777;
}
-
+\f
void
map_obarray (obarray, fn, arg)
Lisp_Object obarray;
/* Define an "integer variable"; a symbol whose value is forwarded
to a C variable of type int. Sample call: */
- /* DEFVARINT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */
+ /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */
void
defvar_int (namestring, address)
char *namestring;
Lisp_Object sym, val;
sym = intern (namestring);
val = allocate_misc ();
- XMISC (val)->type = Lisp_Misc_Intfwd;
- XMISC (val)->u_intfwd.intvar = address;
+ 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;
- XMISC (val)->u_boolfwd.boolvar = address;
+ 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;
- XMISC (val)->u_objfwd.objvar = address;
+ 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;
- XMISC (val)->u_buffer_objfwd.offset = offset;
+ XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd;
+ XBUFFER_OBJFWD (val)->offset = offset;
XSYMBOL (sym)->value = val;
*(Lisp_Object *)(offset + (char *)&buffer_local_symbols) = sym;
*(Lisp_Object *)(offset + (char *)&buffer_local_types) = type;
}
#endif /* standalone */
+
+/* Similar but define a variable whose value is the Lisp Object stored
+ at a particular offset in the current kboard object. */
+
+void
+defvar_kboard (namestring, offset)
+ char *namestring;
+ int offset;
+{
+ Lisp_Object sym, val;
+ sym = intern (namestring);
+ val = allocate_misc ();
+ XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd;
+ XKBOARD_OBJFWD (val)->offset = offset;
+ XSYMBOL (sym)->value = val;
+}
\f
init_lread ()
{
char *normal;
+ int turn_off_warning = 0;
/* Compute the default load-path. */
#ifdef CANNOT_DUMP
Lisp_Object dump_path;
dump_path = decode_env_path (0, PATH_DUMPLOADSEARCH);
+
+ Vsource_directory = Fexpand_file_name (build_string ("../"),
+ Fcar (dump_path));
+
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 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));
+ }
}
}
}
else
- Vload_path = decode_env_path (0, normal);
+ /* ../lisp refers to the build directory.
+ NORMAL refers to the lisp dir in the source directory. */
+ Vload_path = Fcons (build_string ("../lisp"),
+ decode_env_path (0, normal));
#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 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)
+ fprintf (stderr,
+ "Warning: Lisp directory `%s' does not exist.\n",
+ XSTRING (Fcar (path_tail))->data);
+ }
+ }
+ }
+#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;
defsubr (&Sread_from_string);
defsubr (&Sintern);
defsubr (&Sintern_soft);
+ defsubr (&Sunintern);
defsubr (&Sload);
defsubr (&Seval_buffer);
defsubr (&Seval_region);
or variables, and cons cells `(provide . FEATURE)' and `(require . FEATURE)'.");
Vload_history = Qnil;
+ DEFVAR_LISP ("load-file-name", &Vload_file_name,
+ "Full name of file being loaded by `load'.");
+ Vload_file_name = Qnil;
+
DEFVAR_LISP ("current-load-list", &Vcurrent_load_list,
"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_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 = Qnil;
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);
+
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);
}
HCoop / bpt / emacs.git / blobdiff