Mercurial > hg > xemacs-beta
view lisp/syntax.el @ 1314:15a91d7ae2d1
[xemacs-hg @ 2003-02-20 08:16:21 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:16:21 +0000 |
parents | 7039e6323819 |
children | 2f31c7aa4e96 |
line wrap: on
line source
;; syntax.el --- Syntax-table hacking stuff, moved from syntax.c ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.28. ;;; Commentary: ;; This file is dumped with XEmacs. ;; Note: FSF does not have a file syntax.el. This stuff is ;; in syntax.c. See comments there about not merging past 19.28. ;; Significantly hacked upon by Ben Wing. ;;; Code: (defun make-syntax-table (&optional oldtable) "Return a new syntax table. It inherits all characters from the standard syntax table." (make-char-table 'syntax)) (defun simple-set-syntax-entry (char spec table) (put-char-table char spec table)) (defun char-syntax-from-code (code) "Extract the syntax designator from the internal syntax code CODE. CODE is the value actually contained in the syntax table." (if (consp code) (setq code (car code))) (aref (syntax-designator-chars) (logand code 127))) (defun set-char-syntax-in-code (code desig) "Return a new internal syntax code whose syntax designator is DESIG. Other characteristics are the same as in CODE." (let ((newcode (if (consp code) (car code) code))) (setq newcode (logior (string-match (regexp-quote (char-to-string desig)) (syntax-designator-chars)) (logand newcode (lognot 127)))) (if (consp code) (cons newcode (cdr code)) newcode))) (defun syntax-code-to-string (code) "Return a string equivalent to internal syntax code CODE. The string can be passed to `modify-syntax-entry'. If CODE is invalid, return nil." (let ((match (and (consp code) (cdr code))) (codes (syntax-designator-chars))) (if (consp code) (setq code (car code))) (if (or (not (integerp code)) (> (logand code 127) (length codes))) nil (with-output-to-string (let* ((spec (elt codes (logand code 127))) (b3 (lsh code -16)) (start1 (/= 0 (logand b3 128))) ;logtest! (start1b (/= 0 (logand b3 64))) (start2 (/= 0 (logand b3 32))) (start2b (/= 0 (logand b3 16))) (end1 (/= 0 (logand b3 8))) (end1b (/= 0 (logand b3 4))) (end2 (/= 0 (logand b3 2))) (end2b (/= 0 (logand b3 1))) (prefix (/= 0 (logand code 128))) (single-char-p (or (= spec ?<) (= spec ?>))) ) (write-char spec) (write-char (if match match 32)) ;;; (if start1 (if single-char-p (write-char ?a) (write-char ?1))) (if start1 (if single-char-p (write-char ? ) (write-char ?1))) (if start2 (write-char ?2)) ;;; (if end1 (if single-char-p (write-char ?a) (write-char ?3))) (if end1 (if single-char-p (write-char ? ) (write-char ?3))) (if end2 (write-char ?4)) (if start1b (if single-char-p (write-char ?b) (write-char ?5))) (if start2b (write-char ?6)) (if end1b (if single-char-p (write-char ?b) (write-char ?7))) (if end2b (write-char ?8)) (if prefix (write-char ?p))))))) (defun syntax-string-to-code (string) "Return the internal syntax code equivalent to STRING. STRING should be something acceptable as the second argument to `modify-syntax-entry'. If STRING is invalid, signal an error." (let* ((bflag nil) (b3 0) (ch0 (aref string 0)) (len (length string)) (code (string-match (regexp-quote (char-to-string ch0)) (syntax-designator-chars))) (i 2) ch) (or code (error "Invalid syntax designator: %S" string)) (while (< i len) (setq ch (aref string i)) (incf i) (case ch (?1 (setq b3 (logior b3 128))) (?2 (setq b3 (logior b3 32))) (?3 (setq b3 (logior b3 8))) (?4 (setq b3 (logior b3 2))) (?5 (setq b3 (logior b3 64))) (?6 (setq b3 (logior b3 16))) (?7 (setq b3 (logior b3 4))) (?8 (setq b3 (logior b3 1))) (?a (case ch0 (?< (setq b3 (logior b3 128))) (?> (setq b3 (logior b3 8))))) (?b (case ch0 (?< (setq b3 (logior b3 64) bflag t)) (?> (setq b3 (logior b3 4) bflag t)))) (?p (setq code (logior code (lsh 1 7)))) (?\ nil) ;; ignore for compatibility (otherwise (error "Invalid syntax description flag: %S" string)))) ;; default single char style if `b' has not been seen (if (not bflag) (case ch0 (?< (setq b3 (logior b3 128))) (?> (setq b3 (logior b3 8))))) (setq code (logior code (lsh b3 16))) (if (and (> len 1) ;; tough luck if you want to make space a paren! (/= (aref string 1) ?\ )) (setq code (cons code (aref string 1)))) code)) (defun modify-syntax-entry (char-range spec &optional syntax-table) "Set syntax for the characters CHAR-RANGE according to string SPEC. CHAR-RANGE is a single character or a range of characters, as per `put-char-table'. The syntax is changed only for SYNTAX-TABLE, which defaults to the current buffer's syntax table. The first character of SPEC should be one of the following: Space whitespace syntax. w word constituent. _ symbol constituent. . punctuation. \( open-parenthesis. \) close-parenthesis. \" string quote. \\ character-quote. $ paired delimiter. ' expression quote or prefix operator. < comment starter. > comment ender. / character-quote. @ inherit from `standard-syntax-table'. Only single-character comment start and end sequences are represented thus. Two-character sequences are represented as described below. The second character of SPEC is the matching parenthesis, used only if the first character is `(' or `)'. Any additional characters are flags. Defined flags are the characters 1, 2, 3, 4, 5, 6, 7, 8, p, a, and b. 1 means C is the first of a two-char comment start sequence of style a. 2 means C is the second character of such a sequence. 3 means C is the first of a two-char comment end sequence of style a. 4 means C is the second character of such a sequence. 5 means C is the first of a two-char comment start sequence of style b. 6 means C is the second character of such a sequence. 7 means C is the first of a two-char comment end sequence of style b. 8 means C is the second character of such a sequence. p means C is a prefix character for `backward-prefix-chars'; such characters are treated as whitespace when they occur between expressions. a means C is comment starter or comment ender for comment style a (default) b means C is comment starter or comment ender for comment style b." (interactive ;; I really don't know why this is interactive ;; help-form should at least be made useful while reading the second arg "cSet syntax for character: \nsSet syntax for %c to: ") (simple-set-syntax-entry char-range (syntax-string-to-code spec) (cond ((syntax-table-p syntax-table) syntax-table) ((null syntax-table) (syntax-table)) (t (wrong-type-argument 'syntax-table-p syntax-table)))) nil) (defun map-syntax-table (__function __syntax_table &optional __range) "Map FUNCTION over entries in SYNTAX-TABLE, collapsing inheritance. This is similar to `map-char-table', but works only on syntax tables, and collapses any entries that call for inheritance by invisibly substituting the inherited values from the standard syntax table." (check-argument-type 'syntax-table-p __syntax_table) (map-char-table #'(lambda (__key __value) (if (eq ?@ (char-syntax-from-code __value)) (map-char-table #'(lambda (__key __value) (funcall __function __key __value)) (standard-syntax-table) __key) (funcall __function __key __value))) __syntax_table __range)) ;(defun test-xm () ; (let ((o (copy-syntax-table)) ; (n (copy-syntax-table)) ; (codes (syntax-designator-chars)) ; (flags "12345678abp")) ; (while t ; (let ((spec (concat (char-to-string (elt codes ; (random (length codes)))))) ; (if (= (random 4) 0) ; "b" ; " ") ; (let* ((n (random 4)) ; (s (make-string n 0))) ; (while (> n 0) ; (setq n (1- n)) ; (aset s n (aref flags (random (length flags))))) ; s)))) ; (message "%S..." spec) ; (modify-syntax-entry ?a spec o) ; (xmodify-syntax-entry ?a spec n) ; (or (= (aref o ?a) (aref n ?a)) ; (error "%s" ; (format "fucked with %S: %x %x" ; spec (aref o ?a) (aref n ?a)))))))) (defun describe-syntax-table (table stream) (let (first-char last-char prev-val (describe-one (if (featurep 'mule) #'(lambda (first last value stream) (if (equal first last) (cond ((vectorp first) (princ (format "%s, row %d\t" (declare-fboundp (charset-name (aref first 0))) (aref first 1)) stream)) ((symbolp first) (princ first stream) (princ "\t" stream)) (t (princ (text-char-description first) stream) (princ "\t" stream))) (cond ((vectorp first) (princ (format "%s, rows %d .. %d\t" (declare-fboundp (charset-name (aref first 0))) (aref first 1) (aref last 1)) stream)) ((symbolp first) (princ (format "%s .. %s\t" first last) stream)) (t (princ (format "%s .. %s\t" (text-char-description first) (text-char-description last)) stream)))) (describe-syntax-code value stream)) #'(lambda (first last value stream) (let* ((tem (text-char-description first)) (pos (length tem)) ;;(limit (cond ((numberp ctl-arrow) ctl-arrow) ;; ((memq ctl-arrow '(t nil)) 256) ;; (t 160))) ) (princ tem stream) (if (> last first) (progn (princ " .. " stream) (setq tem (text-char-description last)) (princ tem stream) (setq pos (+ pos (length tem) 4)))) (while (progn (write-char ?\ stream) (setq pos (1+ pos)) (< pos 16)))) (describe-syntax-code value stream))))) (map-syntax-table #'(lambda (range value) (cond ((not first-char) (setq first-char range last-char range prev-val value)) ((and (equal value prev-val) (or (and (characterp range) (characterp first-char) (or (not (featurep 'mule)) (eq (declare-fboundp (char-charset range)) (declare-fboundp (char-charset first-char)))) (= (char-int last-char) (1- (char-int range)))) (and (vectorp range) (vectorp first-char) (eq (aref range 0) (aref first-char 0)) (= (aref last-char 1) (1- (aref range 1)))))) (setq last-char range)) (t (funcall describe-one first-char last-char prev-val stream) (setq first-char range last-char range prev-val value))) nil) table) (if first-char (funcall describe-one first-char last-char prev-val stream)))) (defun describe-syntax-code (code stream) (let ((match (and (consp code) (cdr code))) (invalid (gettext "**invalid**")) ;(empty "") ;constants (standard-output (or stream standard-output)) ;; #### I18N3 should temporarily set buffer to output-translatable (in #'(lambda (string) (princ ",\n\t\t\t\t ") (princ string))) (syntax-string (syntax-code-to-string code))) (if (consp code) (setq code (car code))) (if (null syntax-string) (princ invalid) (princ syntax-string) (princ "\tmeaning: ") (princ (aref ["whitespace" "punctuation" "word-constituent" "symbol-constituent" "open-paren" "close-paren" "expression-prefix" "string-quote" "paired-delimiter" "escape" "character-quote" "comment-begin" "comment-end" "inherit" "extended-word-constituent"] (logand code 127))) (if match (progn (princ ", matches ") (princ (text-char-description match)))) (let* ((spec (elt syntax-string 0)) (b3 (lsh code -16)) (start1 (/= 0 (logand b3 128))) ;logtest! (start1b (/= 0 (logand b3 64))) (start2 (/= 0 (logand b3 32))) (start2b (/= 0 (logand b3 16))) (end1 (/= 0 (logand b3 8))) (end1b (/= 0 (logand b3 4))) (end2 (/= 0 (logand b3 2))) (end2b (/= 0 (logand b3 1))) (prefix (/= 0 (logand code 128))) (single-char-p (or (= spec ?<) (= spec ?>)))) (if start1 (if single-char-p (princ ", style A") (funcall in (gettext "first character of comment-start sequence A")))) (if start2 (funcall in (gettext "second character of comment-start sequence A"))) (if end1 (if single-char-p (princ ", style A") (funcall in (gettext "first character of comment-end sequence A")))) (if end2 (funcall in (gettext "second character of comment-end sequence A"))) (if start1b (if single-char-p (princ ", style B") (funcall in (gettext "first character of comment-start sequence B")))) (if start2b (funcall in (gettext "second character of comment-start sequence B"))) (if end1b (if single-char-p (princ ", style B") (funcall in (gettext "first character of comment-end sequence B")))) (if end2b (funcall in (gettext "second character of comment-end sequence B"))) (if prefix (funcall in (gettext "prefix character for `backward-prefix-chars'")))) (terpri stream)))) (defun symbol-near-point () "Return the first textual item to the nearest point." (interactive) ;alg stolen from etag.el (save-excursion (if (or (bobp) (not (memq (char-syntax (char-before)) '(?w ?_)))) (while (not (looking-at "\\sw\\|\\s_\\|\\'")) (forward-char 1))) (while (looking-at "\\sw\\|\\s_") (forward-char 1)) (if (re-search-backward "\\sw\\|\\s_" nil t) (regexp-quote (progn (forward-char 1) (buffer-substring (point) (progn (forward-sexp -1) (while (looking-at "\\s'") (forward-char 1)) (point))))) nil))) ;;; syntax.el ends here