Mercurial > hg > xemacs-beta
comparison src/syntax.h @ 1315:70921960b980
[xemacs-hg @ 2003-02-20 08:19:28 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
author | ben |
---|---|
date | Thu, 20 Feb 2003 08:19:44 +0000 |
parents | 87084e8445a7 |
children | 141c2920ea48 |
comparison
equal
deleted
inserted
replaced
1314:15a91d7ae2d1 | 1315:70921960b980 |
---|---|
84 } | 84 } |
85 | 85 |
86 /* Return the syntax code for a particular character and mirror table. */ | 86 /* Return the syntax code for a particular character and mirror table. */ |
87 | 87 |
88 DECLARE_INLINE_HEADER ( | 88 DECLARE_INLINE_HEADER ( |
89 enum syntaxcode | 89 int |
90 SYNTAX_CODE (Lisp_Object table, Ichar c) | 90 SYNTAX_CODE (Lisp_Object table, Ichar c) |
91 ) | 91 ) |
92 { | 92 { |
93 type_checking_assert (XCHAR_TABLE (table)->mirror_table_p); | 93 type_checking_assert (XCHAR_TABLE (table)->mirror_table_p); |
94 update_mirror_syntax_if_dirty (table); | 94 update_mirror_syntax_if_dirty (table); |
95 return (enum syntaxcode) XINT (get_char_table_1 (c, table)); | 95 return XINT (get_char_table_1 (c, table)); |
96 } | 96 } |
97 | 97 |
98 #ifdef NOT_WORTH_THE_EFFORT | 98 #ifdef NOT_WORTH_THE_EFFORT |
99 | 99 |
100 /* Same but skip the dirty check. */ | 100 /* Same but skip the dirty check. */ |
101 | 101 |
102 DECLARE_INLINE_HEADER ( | 102 DECLARE_INLINE_HEADER ( |
103 enum syntaxcode | 103 int |
104 SYNTAX_CODE_1 (Lisp_Object table, Ichar c) | 104 SYNTAX_CODE_1 (Lisp_Object table, Ichar c) |
105 ) | 105 ) |
106 { | 106 { |
107 type_checking_assert (XCHAR_TABLE (table)->mirror_table_p); | 107 type_checking_assert (XCHAR_TABLE (table)->mirror_table_p); |
108 return (enum syntaxcode) XINT (get_char_table_1 (c, table)); | 108 return (enum syntaxcode) XINT (get_char_table_1 (c, table)); |
351 DECLARE_INLINE_HEADER ( | 351 DECLARE_INLINE_HEADER ( |
352 void | 352 void |
353 UPDATE_SYNTAX_CACHE_FORWARD (struct syntax_cache *cache, Charxpos pos) | 353 UPDATE_SYNTAX_CACHE_FORWARD (struct syntax_cache *cache, Charxpos pos) |
354 ) | 354 ) |
355 { | 355 { |
356 if (!(pos >= cache->prev_change && pos < cache->next_change)) | 356 /* #### Formerly this function, and the next one, had |
357 | |
358 if (pos < cache->prev_change || pos >= cache->next_change) | |
359 | |
360 just like for plain UPDATE_SYNTAX_CACHE. However, sometimes the | |
361 value of POS may be invalid (particularly, it may be 0 for a buffer). | |
362 FSF has the check at only one end, so let's try the same. */ | |
363 if (pos >= cache->next_change) | |
357 update_syntax_cache (cache, pos, 1); | 364 update_syntax_cache (cache, pos, 1); |
358 } | 365 } |
359 | 366 |
360 /* Make syntax cache state good for CHARPOS, assuming it is | 367 /* Make syntax cache state good for CHARPOS, assuming it is |
361 currently good for a position after CHARPOS. */ | 368 currently good for a position after CHARPOS. */ |
362 DECLARE_INLINE_HEADER ( | 369 DECLARE_INLINE_HEADER ( |
363 void | 370 void |
364 UPDATE_SYNTAX_CACHE_BACKWARD (struct syntax_cache *cache, Charxpos pos) | 371 UPDATE_SYNTAX_CACHE_BACKWARD (struct syntax_cache *cache, Charxpos pos) |
365 ) | 372 ) |
366 { | 373 { |
367 if (!(pos >= cache->prev_change && pos < cache->next_change)) | 374 if (pos < cache->prev_change) |
368 update_syntax_cache (cache, pos, -1); | 375 update_syntax_cache (cache, pos, -1); |
369 } | 376 } |
370 | 377 |
371 /* Make syntax cache state good for CHARPOS */ | 378 /* Make syntax cache state good for CHARPOS */ |
372 DECLARE_INLINE_HEADER ( | 379 DECLARE_INLINE_HEADER ( |
373 void | 380 void |
374 UPDATE_SYNTAX_CACHE (struct syntax_cache *cache, Charxpos pos) | 381 UPDATE_SYNTAX_CACHE (struct syntax_cache *cache, Charxpos pos) |
375 ) | 382 ) |
376 { | 383 { |
377 if (!(pos >= cache->prev_change && pos < cache->next_change)) | 384 if (pos < cache->prev_change || pos >= cache->next_change) |
378 update_syntax_cache (cache, pos, 0); | 385 update_syntax_cache (cache, pos, 0); |
379 } | 386 } |
380 | 387 |
381 #define SYNTAX_FROM_CACHE(cache, c) \ | 388 #define SYNTAX_FROM_CACHE(cache, c) \ |
382 SYNTAX_FROM_CODE (SYNTAX_CODE_FROM_CACHE (cache, c)) | 389 SYNTAX_FROM_CODE (SYNTAX_CODE_FROM_CACHE (cache, c)) |