Mercurial > hg > xemacs-beta
view lisp/syntax.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +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