Mercurial > hg > xemacs-beta
comparison src/lread.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 04bc9d2f42c7 |
children | 3d8143fc88e1 |
comparison
equal
deleted
inserted
replaced
2366:2a392e0c390a | 2367:ecf1ebac70d8 |
---|---|
562 retval = Qnil; | 562 retval = Qnil; |
563 goto done; | 563 goto done; |
564 } | 564 } |
565 } | 565 } |
566 | 566 |
567 foundstr = (Ibyte *) ALLOCA (XSTRING_LENGTH (found) + 1); | 567 foundstr = alloca_ibytes (XSTRING_LENGTH (found) + 1); |
568 qxestrcpy (foundstr, XSTRING_DATA (found)); | 568 qxestrcpy (foundstr, XSTRING_DATA (found)); |
569 foundlen = qxestrlen (foundstr); | 569 foundlen = qxestrlen (foundstr); |
570 | 570 |
571 /* The omniscient JWZ thinks this is worthless, but I beg to | 571 /* The omniscient JWZ thinks this is worthless, but I beg to |
572 differ. --ben */ | 572 differ. --ben */ |
797 { | 797 { |
798 if (NILP (mode)) | 798 if (NILP (mode)) |
799 return R_OK; | 799 return R_OK; |
800 else if (CONSP (mode)) | 800 else if (CONSP (mode)) |
801 { | 801 { |
802 Lisp_Object tail; | |
803 int mask = 0; | 802 int mask = 0; |
804 EXTERNAL_LIST_LOOP (tail, mode) | 803 EXTERNAL_LIST_LOOP_2 (elt, mode) |
805 mask |= decode_mode_1 (XCAR (tail)); | 804 mask |= decode_mode_1 (elt); |
806 return mask; | 805 return mask; |
807 } | 806 } |
808 else | 807 else |
809 return decode_mode_1 (mode); | 808 return decode_mode_1 (mode); |
810 } | 809 } |
833 | 832 |
834 CHECK_STRING (filename); | 833 CHECK_STRING (filename); |
835 | 834 |
836 if (LISTP (suffixes)) | 835 if (LISTP (suffixes)) |
837 { | 836 { |
838 Lisp_Object tail; | 837 EXTERNAL_LIST_LOOP_2 (elt, suffixes) |
839 EXTERNAL_LIST_LOOP (tail, suffixes) | 838 CHECK_STRING (elt); |
840 CHECK_STRING (XCAR (tail)); | |
841 } | 839 } |
842 else | 840 else |
843 CHECK_STRING (suffixes); | 841 CHECK_STRING (suffixes); |
844 | 842 |
845 locate_file (path_list, filename, suffixes, &tp, decode_mode (mode)); | 843 locate_file (path_list, filename, suffixes, &tp, decode_mode (mode)); |
919 else | 917 else |
920 /* Just take the easy way out */ | 918 /* Just take the easy way out */ |
921 max = XSTRING_LENGTH (suffixes); | 919 max = XSTRING_LENGTH (suffixes); |
922 | 920 |
923 fn_len = XSTRING_LENGTH (filename); | 921 fn_len = XSTRING_LENGTH (filename); |
924 fn = (Ibyte *) ALLOCA (max + fn_len + 1); | 922 fn = alloca_ibytes (max + fn_len + 1); |
925 memcpy (fn, XSTRING_DATA (filename), fn_len); | 923 memcpy (fn, XSTRING_DATA (filename), fn_len); |
926 | 924 |
927 /* Loop over suffixes. */ | 925 /* Loop over suffixes. */ |
928 if (!STRINGP (suffixes)) | 926 if (!STRINGP (suffixes)) |
929 { | 927 { |
1093 int mode) | 1091 int mode) |
1094 { | 1092 { |
1095 /* This function can GC */ | 1093 /* This function can GC */ |
1096 int absolute = !NILP (Ffile_name_absolute_p (str)); | 1094 int absolute = !NILP (Ffile_name_absolute_p (str)); |
1097 | 1095 |
1098 EXTERNAL_LIST_LOOP (path, path) | 1096 EXTERNAL_LIST_LOOP_2 (elt, path) |
1099 { | 1097 { |
1100 int val = locate_file_in_directory (XCAR (path), str, suffixes, storeptr, | 1098 int val = locate_file_in_directory (elt, str, suffixes, storeptr, |
1101 mode); | 1099 mode); |
1102 if (val >= 0) | 1100 if (val >= 0) |
1103 return val; | 1101 return val; |
1104 if (absolute) | 1102 if (absolute) |
1105 break; | 1103 break; |
1158 { | 1156 { |
1159 if (EQ (path, Qt)) | 1157 if (EQ (path, Qt)) |
1160 Fclrhash (Vlocate_file_hash_table); | 1158 Fclrhash (Vlocate_file_hash_table); |
1161 else | 1159 else |
1162 { | 1160 { |
1163 Lisp_Object pathtail; | 1161 EXTERNAL_LIST_LOOP_2 (elt, path) |
1164 EXTERNAL_LIST_LOOP (pathtail, path) | |
1165 { | 1162 { |
1166 Lisp_Object pathel = Fexpand_file_name (XCAR (pathtail), Qnil); | 1163 Lisp_Object pathel = Fexpand_file_name (elt, Qnil); |
1167 Fremhash (pathel, Vlocate_file_hash_table); | 1164 Fremhash (pathel, Vlocate_file_hash_table); |
1168 } | 1165 } |
1169 } | 1166 } |
1170 return Qnil; | 1167 return Qnil; |
1171 } | 1168 } |
1191 locate_file (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, | 1188 locate_file (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, |
1192 Lisp_Object *storeptr, int mode) | 1189 Lisp_Object *storeptr, int mode) |
1193 { | 1190 { |
1194 /* This function can GC */ | 1191 /* This function can GC */ |
1195 Lisp_Object suffixtab = Qnil; | 1192 Lisp_Object suffixtab = Qnil; |
1196 Lisp_Object pathtail, pathel_expanded; | 1193 Lisp_Object pathel_expanded; |
1197 int val; | 1194 int val; |
1198 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | 1195 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
1199 | 1196 |
1200 if (storeptr) | 1197 if (storeptr) |
1201 *storeptr = Qnil; | 1198 *storeptr = Qnil; |
1214 return val; | 1211 return val; |
1215 } | 1212 } |
1216 | 1213 |
1217 suffixtab = locate_file_construct_suffixed_files (str, suffixes); | 1214 suffixtab = locate_file_construct_suffixed_files (str, suffixes); |
1218 | 1215 |
1219 EXTERNAL_LIST_LOOP (pathtail, path) | 1216 { |
1220 { | 1217 EXTERNAL_LIST_LOOP_2 (pathel, path) |
1221 Lisp_Object pathel = XCAR (pathtail); | 1218 { |
1222 Lisp_Object hash_table; | 1219 Lisp_Object hash_table; |
1223 Lisp_Object tail; | 1220 int found = 0; |
1224 int found = 0; | 1221 |
1225 | 1222 /* If this path element is relative, we have to look by hand. */ |
1226 /* If this path element is relative, we have to look by hand. */ | 1223 if (NILP (pathel) || NILP (Ffile_name_absolute_p (pathel))) |
1227 if (NILP (pathel) || NILP (Ffile_name_absolute_p (pathel))) | 1224 { |
1228 { | 1225 val = locate_file_in_directory (pathel, str, suffixes, storeptr, |
1229 val = locate_file_in_directory (pathel, str, suffixes, storeptr, | 1226 mode); |
1230 mode); | 1227 if (val >= 0) |
1231 if (val >= 0) | |
1232 { | |
1233 UNGCPRO; | |
1234 return val; | |
1235 } | |
1236 continue; | |
1237 } | |
1238 | |
1239 pathel_expanded = Fexpand_file_name (pathel, Qnil); | |
1240 hash_table = locate_file_find_directory_hash_table (pathel_expanded); | |
1241 | |
1242 if (!NILP (hash_table)) | |
1243 { | |
1244 /* Loop over suffixes. */ | |
1245 LIST_LOOP (tail, suffixtab) | |
1246 if (!NILP (Fgethash (XCAR (tail), hash_table, Qnil))) | |
1247 { | 1228 { |
1248 found = 1; | 1229 UNGCPRO; |
1249 break; | 1230 return val; |
1250 } | 1231 } |
1251 } | 1232 continue; |
1252 | 1233 } |
1253 if (found) | 1234 |
1254 { | 1235 pathel_expanded = Fexpand_file_name (pathel, Qnil); |
1255 /* This is a likely candidate. Look by hand in this directory | 1236 hash_table = locate_file_find_directory_hash_table (pathel_expanded); |
1256 so we don't get thrown off if someone byte-compiles a file. */ | 1237 |
1257 val = locate_file_in_directory (pathel, str, suffixes, storeptr, | 1238 if (!NILP (hash_table)) |
1258 mode); | 1239 { |
1259 if (val >= 0) | 1240 /* Loop over suffixes. */ |
1260 { | 1241 LIST_LOOP_2 (elt, suffixtab) |
1261 UNGCPRO; | 1242 if (!NILP (Fgethash (elt, hash_table, Qnil))) |
1262 return val; | 1243 { |
1263 } | 1244 found = 1; |
1264 | 1245 break; |
1265 /* Hmm ... the file isn't actually there. (Or possibly it's | 1246 } |
1266 a directory ...) So refresh our hashing. */ | 1247 } |
1267 locate_file_refresh_hashing (pathel_expanded); | 1248 |
1268 } | 1249 if (found) |
1250 { | |
1251 /* This is a likely candidate. Look by hand in this directory | |
1252 so we don't get thrown off if someone byte-compiles a file. */ | |
1253 val = locate_file_in_directory (pathel, str, suffixes, storeptr, | |
1254 mode); | |
1255 if (val >= 0) | |
1256 { | |
1257 UNGCPRO; | |
1258 return val; | |
1259 } | |
1260 | |
1261 /* Hmm ... the file isn't actually there. (Or possibly it's | |
1262 a directory ...) So refresh our hashing. */ | |
1263 locate_file_refresh_hashing (pathel_expanded); | |
1264 } | |
1265 } | |
1269 } | 1266 } |
1270 | 1267 |
1271 /* File is probably not there, but check the hard way just in case. */ | 1268 /* File is probably not there, but check the hard way just in case. */ |
1272 val = locate_file_without_hash (path, str, suffixes, storeptr, mode); | 1269 val = locate_file_without_hash (path, str, suffixes, storeptr, mode); |
1273 if (val >= 0) | 1270 if (val >= 0) |
3109 } | 3106 } |
3110 | 3107 |
3111 void | 3108 void |
3112 vars_of_lread (void) | 3109 vars_of_lread (void) |
3113 { | 3110 { |
3114 reinit_vars_of_lread (); | |
3115 | |
3116 DEFVAR_LISP ("values", &Vvalues /* | 3111 DEFVAR_LISP ("values", &Vvalues /* |
3117 List of values of all expressions which were read, evaluated and printed. | 3112 List of values of all expressions which were read, evaluated and printed. |
3118 Order is reverse chronological. | 3113 Order is reverse chronological. |
3119 */ ); | 3114 */ ); |
3120 | 3115 |