X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4a2f9c6aefdb14ce8c34ace4d7573b89d1cc13b7..a12aece30906d6a8b03611262169ba181b37b93b:/src/syntax.h diff --git a/src/syntax.h b/src/syntax.h index e70fd71e05..92d55967b3 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -1,5 +1,6 @@ /* Declarations having to do with GNU Emacs syntax tables. - Copyright (C) 1985, 93, 94, 97, 1998 Free Software Foundation, Inc. + Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ extern Lisp_Object Qsyntax_table_p; @@ -58,7 +59,7 @@ enum syntaxcode /* Set the syntax entry VAL for char C in table TABLE. */ #define SET_RAW_SYNTAX_ENTRY(table, c, val) \ - ((c) < CHAR_TABLE_SINGLE_BYTE_SLOTS \ + ((((c) & 0xFF) == (c)) \ ? (XCHAR_TABLE (table)->contents[(unsigned char) (c)] = (val)) \ : Faset ((table), make_number (c), (val))) @@ -68,16 +69,16 @@ enum syntaxcode #ifdef __GNUC__ #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c) \ - ({ Lisp_Object tbl = table; \ - Lisp_Object temp = XCHAR_TABLE (tbl)->contents[(c)]; \ - while (NILP (temp)) \ + ({ Lisp_Object _syntax_tbl = (table); \ + Lisp_Object _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \ + while (NILP (_syntax_temp)) \ { \ - tbl = XCHAR_TABLE (tbl)->parent; \ - if (NILP (tbl)) \ + _syntax_tbl = XCHAR_TABLE (_syntax_tbl)->parent; \ + if (NILP (_syntax_tbl)) \ break; \ - temp = XCHAR_TABLE (tbl)->contents[(c)]; \ + _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \ } \ - temp; }) + _syntax_temp; }) #else extern Lisp_Object syntax_temp; extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int)); @@ -90,7 +91,7 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int)); #endif /* SYNTAX_ENTRY fetches the information from the entry for character C - in syntax table TABLE, or from globally kept data (gl_state). + in syntax table TABLE, or from globally kept data (gl_state). Does inheritance. */ /* CURRENT_SYNTAX_TABLE gives the syntax table valid for current position, it is either the buffer's syntax table, or syntax table @@ -105,62 +106,65 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int)); # define CURRENT_SYNTAX_TABLE current_buffer->syntax_table #endif -#define SYNTAX_ENTRY_INT(c) \ - ((c) < CHAR_TABLE_SINGLE_BYTE_SLOTS \ +#define SYNTAX_ENTRY_INT(c) \ + ((((c) & 0xFF) == (c)) \ ? SYNTAX_ENTRY_FOLLOW_PARENT (CURRENT_SYNTAX_TABLE, \ - (unsigned char) (c)) \ - : Faref (CURRENT_SYNTAX_TABLE, make_number ((c)))) + (unsigned char) (c)) \ + : Faref (CURRENT_SYNTAX_TABLE, \ + make_number (c))) /* Extract the information from the entry for character C in the current syntax table. */ #ifdef __GNUC__ #define SYNTAX(c) \ - ({ Lisp_Object temp; \ - temp = SYNTAX_ENTRY (c); \ - (CONSP (temp) \ - ? (enum syntaxcode) (XINT (XCONS (temp)->car) & 0xff) \ + ({ Lisp_Object _syntax_temp; \ + _syntax_temp = SYNTAX_ENTRY (c); \ + (CONSP (_syntax_temp) \ + ? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff) \ : Swhitespace); }) #define SYNTAX_WITH_FLAGS(c) \ - ({ Lisp_Object temp; \ - temp = SYNTAX_ENTRY (c); \ - (CONSP (temp) \ - ? XINT (XCONS (temp)->car) \ + ({ Lisp_Object _syntax_temp; \ + _syntax_temp = SYNTAX_ENTRY (c); \ + (CONSP (_syntax_temp) \ + ? XINT (XCAR (_syntax_temp)) \ : (int) Swhitespace); }) #define SYNTAX_MATCH(c) \ - ({ Lisp_Object temp; \ - temp = SYNTAX_ENTRY (c); \ - (CONSP (temp) \ - ? XCONS (temp)->cdr \ + ({ Lisp_Object _syntax_temp; \ + _syntax_temp = SYNTAX_ENTRY (c); \ + (CONSP (_syntax_temp) \ + ? XCDR (_syntax_temp) \ : Qnil); }) #else #define SYNTAX(c) \ (syntax_temp = SYNTAX_ENTRY ((c)), \ (CONSP (syntax_temp) \ - ? (enum syntaxcode) (XINT (XCONS (syntax_temp)->car) & 0xff) \ + ? (enum syntaxcode) (XINT (XCAR (syntax_temp)) & 0xff) \ : Swhitespace)) #define SYNTAX_WITH_FLAGS(c) \ (syntax_temp = SYNTAX_ENTRY ((c)), \ (CONSP (syntax_temp) \ - ? XINT (XCONS (syntax_temp)->car) \ + ? XINT (XCAR (syntax_temp)) \ : (int) Swhitespace)) #define SYNTAX_MATCH(c) \ (syntax_temp = SYNTAX_ENTRY ((c)), \ (CONSP (syntax_temp) \ - ? XCONS (syntax_temp)->cdr \ + ? XCDR (syntax_temp) \ : Qnil)) #endif -/* Then there are six single-bit flags that have the following meanings: +/* Then there are seven single-bit flags that have the following meanings: 1. This character is the first of a two-character comment-start sequence. 2. This character is the second of a two-character comment-start sequence. 3. This character is the first of a two-character comment-end sequence. 4. This character is the second of a two-character comment-end sequence. 5. This character is a prefix, for backward-prefix-chars. + 6. see below + 7. This character is part of a nestable comment sequence. Note that any two-character sequence whose first character has flag 1 and whose second character has flag 2 will be interpreted as a comment start. @@ -171,6 +175,8 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int)); Style a is always the default. */ +/* These macros extract a particular flag for a given character. */ + #define SYNTAX_COMSTART_FIRST(c) ((SYNTAX_WITH_FLAGS (c) >> 16) & 1) #define SYNTAX_COMSTART_SECOND(c) ((SYNTAX_WITH_FLAGS (c) >> 17) & 1) @@ -181,9 +187,27 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int)); #define SYNTAX_PREFIX(c) ((SYNTAX_WITH_FLAGS (c) >> 20) & 1) -/* extract the comment style bit from the syntax table entry */ #define SYNTAX_COMMENT_STYLE(c) ((SYNTAX_WITH_FLAGS (c) >> 21) & 1) +#define SYNTAX_COMMENT_NESTED(c) ((SYNTAX_WITH_FLAGS (c) >> 22) & 1) + +/* These macros extract specific flags from an integer + that holds the syntax code and the flags. */ + +#define SYNTAX_FLAGS_COMSTART_FIRST(flags) (((flags) >> 16) & 1) + +#define SYNTAX_FLAGS_COMSTART_SECOND(flags) (((flags) >> 17) & 1) + +#define SYNTAX_FLAGS_COMEND_FIRST(flags) (((flags) >> 18) & 1) + +#define SYNTAX_FLAGS_COMEND_SECOND(flags) (((flags) >> 19) & 1) + +#define SYNTAX_FLAGS_PREFIX(flags) (((flags) >> 20) & 1) + +#define SYNTAX_FLAGS_COMMENT_STYLE(flags) (((flags) >> 21) & 1) + +#define SYNTAX_FLAGS_COMMENT_NESTED(flags) (((flags) >> 22) & 1) + /* This array, indexed by a character, contains the syntax code which that character signifies (as a char). For example, (enum syntaxcode) syntax_spec_code['w'] is Sword. */ @@ -195,46 +219,57 @@ extern unsigned char syntax_spec_code[0400]; extern char syntax_code_spec[16]; /* Convert the byte offset BYTEPOS into a character position, - for the object recorded in gl_state with SETUP_SYNTAX_TABLE_FOR_OBJECT. */ + for the object recorded in gl_state with SETUP_SYNTAX_TABLE_FOR_OBJECT. + + The value is meant for use in the UPDATE_SYNTAX_TABLE... macros. + These macros do nothing when parse_sexp_lookup_properties is 0, + so we return 0 in that case, for speed. */ #define SYNTAX_TABLE_BYTE_TO_CHAR(bytepos) \ - (STRINGP (gl_state.object) \ + (! parse_sexp_lookup_properties \ + ? 0 \ + : STRINGP (gl_state.object) \ ? string_byte_to_char (gl_state.object, (bytepos)) \ : BUFFERP (gl_state.object) \ - ? buf_bytepos_to_charpos (XBUFFER (gl_state.object), (bytepos)) \ + ? buf_bytepos_to_charpos (XBUFFER (gl_state.object), \ + (bytepos) + BUF_BEGV_BYTE (XBUFFER (gl_state.object)) - 1) - BUF_BEGV (XBUFFER (gl_state.object)) + 1 \ : NILP (gl_state.object) \ - ? BYTE_TO_CHAR ((bytepos)) \ + ? BYTE_TO_CHAR ((bytepos) + BEGV_BYTE - 1) - BEGV + 1 \ : (bytepos)) -/* Make syntax table state (gl_state) good for POS, assuming it is - currently good for a position before POS. */ +/* Make syntax table state (gl_state) good for CHARPOS, assuming it is + currently good for a position before CHARPOS. */ -#define UPDATE_SYNTAX_TABLE_FORWARD(pos) \ - ((pos) >= gl_state.e_property - gl_state.offset \ - ? (update_syntax_table ((pos) + gl_state.offset, 1, 0, \ +#define UPDATE_SYNTAX_TABLE_FORWARD(charpos) \ + (parse_sexp_lookup_properties \ + && (charpos) >= gl_state.e_property \ + ? (update_syntax_table ((charpos) + gl_state.offset, 1, 0, \ gl_state.object), \ 1) \ : 0) -/* Make syntax table state (gl_state) good for POS, assuming it is - currently good for a position after POS. */ +/* Make syntax table state (gl_state) good for CHARPOS, assuming it is + currently good for a position after CHARPOS. */ -#define UPDATE_SYNTAX_TABLE_BACKWARD(pos) \ - ((pos) <= gl_state.b_property - gl_state.offset \ - ? (update_syntax_table ((pos) + gl_state.offset, -1, 0, \ +#define UPDATE_SYNTAX_TABLE_BACKWARD(charpos) \ + (parse_sexp_lookup_properties \ + && (charpos) < gl_state.b_property \ + ? (update_syntax_table ((charpos) + gl_state.offset, -1, 0, \ gl_state.object), \ 1) \ : 0) -/* Make syntax table good for POS. */ +/* Make syntax table good for CHARPOS. */ -#define UPDATE_SYNTAX_TABLE(pos) \ - ((pos) <= gl_state.b_property - gl_state.offset \ - ? (update_syntax_table ((pos) + gl_state.offset, -1, 0, \ +#define UPDATE_SYNTAX_TABLE(charpos) \ + (parse_sexp_lookup_properties \ + && (charpos) < gl_state.b_property \ + ? (update_syntax_table ((charpos) + gl_state.offset, -1, 0, \ gl_state.object), \ 1) \ - : ((pos) >= gl_state.e_property - gl_state.offset \ - ? (update_syntax_table ((pos) + gl_state.offset, 1, 0, \ + : (parse_sexp_lookup_properties \ + && (charpos) >= gl_state.e_property \ + ? (update_syntax_table ((charpos) + gl_state.offset, 1, 0,\ gl_state.object), \ 1) \ : 0)) @@ -243,20 +278,25 @@ extern char syntax_code_spec[16]; search, or after the last position of the backward search. It makes sure that the first char is picked up with correct table, so one does not need to call UPDATE_SYNTAX_TABLE immediately after the - call. + call. Sign of COUNT gives the direction of the search. */ #define SETUP_SYNTAX_TABLE(FROM, COUNT) \ - gl_state.b_property = BEGV - 1; \ - gl_state.e_property = ZV + 1; \ - gl_state.object = Qnil; \ - gl_state.use_global = 0; \ - gl_state.offset = 0; \ - gl_state.current_syntax_table = current_buffer->syntax_table; \ - if (parse_sexp_lookup_properties) \ - update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT), \ - 1, Qnil); +if (1) \ + { \ + gl_state.b_property = BEGV; \ + gl_state.e_property = ZV + 1; \ + gl_state.object = Qnil; \ + gl_state.use_global = 0; \ + gl_state.offset = 0; \ + gl_state.current_syntax_table = current_buffer->syntax_table; \ + if (parse_sexp_lookup_properties) \ + if ((COUNT) > 0 || (FROM) > BEGV) \ + update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),\ + 1, Qnil); \ + } \ +else /* Same as above, but in OBJECT. If OBJECT is nil, use current buffer. If it is t, ignore properties altogether. @@ -272,32 +312,32 @@ if (1) \ if (BUFFERP (gl_state.object)) \ { \ struct buffer *buf = XBUFFER (gl_state.object); \ - gl_state.b_property = BUF_BEGV (buf) - 1; \ - gl_state.e_property = BUF_ZV (buf); \ + gl_state.b_property = 1; \ + gl_state.e_property = BUF_ZV (buf) - BUF_BEGV (buf) + 1; \ gl_state.offset = BUF_BEGV (buf) - 1; \ } \ else if (NILP (gl_state.object)) \ { \ - gl_state.b_property = BEGV - 1; \ - gl_state.e_property = ZV; \ + gl_state.b_property = 1; \ + gl_state.e_property = ZV - BEGV + 1; \ gl_state.offset = BEGV - 1; \ } \ else if (EQ (gl_state.object, Qt)) \ { \ - gl_state.b_property = - 1; \ + gl_state.b_property = 0; \ gl_state.e_property = 1500000000; \ gl_state.offset = 0; \ } \ else \ { \ - gl_state.b_property = -1; \ - gl_state.e_property = 1 + XSTRING (gl_state.object)->size; \ + gl_state.b_property = 0; \ + gl_state.e_property = 1 + SCHARS (gl_state.object); \ gl_state.offset = 0; \ } \ gl_state.use_global = 0; \ gl_state.current_syntax_table = current_buffer->syntax_table; \ if (parse_sexp_lookup_properties) \ - update_syntax_table ((BYTE_TO_CHAR ((FROM) + gl_state.offset) \ + update_syntax_table (((FROM) + gl_state.offset \ + (COUNT > 0 ? 0 : -1)), \ COUNT, 1, gl_state.object); \ } \ @@ -313,8 +353,7 @@ struct gl_state_s Lisp_Object global_code; /* Syntax code of current char. */ Lisp_Object current_syntax_table; /* Syntax table for current pos. */ Lisp_Object old_prop; /* Syntax-table prop at prev pos. */ - int b_property; /* Last index where c_s_t is - not valid. */ + int b_property; /* First index where c_s_t is valid. */ int e_property; /* First index where c_s_t is not valid. */ INTERVAL forward_i; /* Where to start lookup on forward */ @@ -326,8 +365,6 @@ struct gl_state_s on: */ /* Offset for positions specified to UPDATE_SYNTAX_TABLE. */ int offset; - char left_ok; - char right_ok; }; extern struct gl_state_s gl_state; @@ -335,3 +372,6 @@ extern int parse_sexp_lookup_properties; extern INTERVAL interval_of P_ ((int, Lisp_Object)); extern int scan_words P_ ((int, int)); + +/* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0 + (do not change this comment) */