/* XEmacs routines to deal with syntax tables; also word and list parsing.
Copyright (C) 1985-1994 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
+ Copyright (C) 2001 MORIOKA Tomohiko
This file is part of XEmacs.
#include "buffer.h"
#include "syntax.h"
-#include "extents.h"
/* Here is a comment from Ken'ichi HANDA <handa@etl.go.jp>
explaining the purpose of the Sextword syntax category:
/* Mule 2.4 doesn't seem to have Sextword - I'm removing it -- mrb */
/* Recovered by tomo */
-#define ST_COMMENT_STYLE 0x101
-#define ST_STRING_STYLE 0x102
-
-Lisp_Object Qsyntax_table;
-int lookup_syntax_properties;
-
Lisp_Object Qsyntax_table_p;
int words_include_escapes;
and the like. */
struct buffer *regex_emacs_buffer;
-/* In Emacs, this is the string or buffer in which we
- are matching. It is used for looking up syntax properties. */
-Lisp_Object regex_match_object;
+/* Tell the regex routines whether buffer is used or not. */
+int regex_emacs_buffer_p;
Lisp_Object Vstandard_syntax_table;
int depth; /* Depth at end of parsing */
Emchar instring; /* -1 if not within string, else desired terminator */
int incomment; /* Nonzero if within a comment at end of parsing */
- int comstyle; /* comment style a=0, or b=1, or ST_COMMENT_STYLE */
+ int comstyle; /* comment style a=0, or b=1 */
int quoted; /* Nonzero if just after an escape char at end of
parsing */
Bufpos thislevelstart;/* Char number of most recent start-of-expression
Bufpos prevlevelstart;/* Char number of start of containing expression */
Bufpos location; /* Char number at which parsing stopped */
int mindepth; /* Minimum depth seen while scanning */
- Bufpos comstr_start; /* Position just after last comment/string starter */
- Lisp_Object levelstarts; /* Char numbers of starts-of-expression
- of levels (starting from outermost). */
+ Bufpos comstart; /* Position just after last comment starter */
};
\f
/* These variables are a cache for finding the start of a defun.
find_defun_start (struct buffer *buf, Bufpos pos)
{
Bufpos tem;
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
/* Use previous finding, if it's valid and applies to this inquiry. */
if (buf == find_start_buffer
/* Back up to start of line. */
tem = find_next_newline (buf, pos, -1);
- SETUP_SYNTAX_CACHE (tem, 1);
while (tem > BUF_BEGV (buf))
{
- UPDATE_SYNTAX_CACHE_BACKWARD(tem);
-
/* Open-paren at start of line means we found our defun-start. */
- if (SYNTAX_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, tem)) == Sopen)
+ if (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, tem)) == Sopen)
break;
/* Move to beg of previous line. */
tem = find_next_newline (buf, tem, -2);
struct buffer *buf = decode_buffer (buffer, 0);
syntax_table = check_syntax_table (syntax_table, Qnil);
buf->syntax_table = syntax_table;
+#ifndef UTF2000
buf->mirror_syntax_table = XCHAR_TABLE (syntax_table)->mirror_table;
+#endif
/* Indicate that this buffer now has a specified syntax table. */
buf->local_var_flags |= XINT (buffer_local_flags.syntax_table);
return syntax_table;
}
\f
-/* The current syntax state */
-struct syntax_cache syntax_cache;
-
-
-/*
- Update syntax_cache to an appropriate setting for position POS
-
- The sign of COUNT gives the relative position of POS wrt the
- previously valid interval. (not currently used)
-
- `syntax_cache.*_change' are the next and previous positions at
- which syntax_code and c_s_t will need to be recalculated.
-
- #### Currently this code uses 'get-char-property', which will
- return the "last smallest" extent at a given position. In cases
- where overlapping extents are defined, this code will simply use
- whatever is returned by get-char-property.
-
- It might be worth it at some point to merge provided syntax tables
- outward to the current buffer. */
-
-void
-update_syntax_cache (int pos, int count, int init)
-{
- Lisp_Object tmp_table;
-
- if (init)
- {
- syntax_cache.prev_change = -1;
- syntax_cache.next_change = -1;
- }
-
- if (pos > syntax_cache.prev_change &&
- pos < syntax_cache.next_change)
- {
- /* do nothing */
- }
- else
- {
- if (NILP (syntax_cache.object) || EQ (syntax_cache.object, Qt))
- {
- int get_change_before = pos + 1;
-
- tmp_table = Fget_char_property (make_int(pos), Qsyntax_table,
- make_buffer (syntax_cache.buffer), Qnil);
- syntax_cache.next_change =
- XINT (Fnext_extent_change (make_int (pos > 0 ? pos : 1),
- make_buffer (syntax_cache.buffer)));
-
- if (get_change_before < 1)
- get_change_before = 1;
- else if (get_change_before > BUF_ZV (syntax_cache.buffer))
- get_change_before = BUF_ZV (syntax_cache.buffer);
-
- syntax_cache.prev_change =
- XINT (Fprevious_extent_change (make_int (get_change_before),
- make_buffer (syntax_cache.buffer)));
- }
- else
- {
- int get_change_before = pos + 1;
-
- tmp_table = Fget_char_property (make_int(pos), Qsyntax_table,
- syntax_cache.object, Qnil);
- syntax_cache.next_change =
- XINT (Fnext_extent_change (make_int (pos >= 0 ? pos : 0),
- syntax_cache.object));
-
- if (get_change_before < 0)
- get_change_before = 0;
- else if (get_change_before > XSTRING_LENGTH(syntax_cache.object))
- get_change_before = XSTRING_LENGTH(syntax_cache.object);
-
- syntax_cache.prev_change =
- XINT (Fprevious_extent_change (make_int (pos >= 0 ? pos : 0),
- syntax_cache.object));
- }
-
- if (EQ (Fsyntax_table_p (tmp_table), Qt))
- {
- syntax_cache.use_code = 0;
- syntax_cache.current_syntax_table =
- XCHAR_TABLE (tmp_table)->mirror_table;
- }
- else if (CONSP (tmp_table) && INTP (XCAR (tmp_table)))
- {
- syntax_cache.use_code = 1;
- syntax_cache.syntax_code = XINT (XCAR(tmp_table));
- }
- else
- {
- syntax_cache.use_code = 0;
- syntax_cache.current_syntax_table =
- syntax_cache.buffer->mirror_syntax_table;
- }
- }
-}
-\f
/* Convert a letter which signifies a syntax code
into the code it signifies.
This is used by modify-syntax-entry, and other things. */
0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* `, a, ... */
0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword,
- 0377, 0377, 0377, 0377, (char) Sstring_fence, 0377, 0377, 0377
+ 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377
};
-const unsigned char syntax_code_spec[] = " .w_()'\"$\\/<>@!|";
+const unsigned char syntax_code_spec[] = " .w_()'\"$\\/<>@";
DEFUN ("syntax-designator-chars", Fsyntax_designator_chars, 0, 0, 0, /*
Return a string of the recognized syntax designator chars.
*/
(character, syntax_table))
{
+#ifndef UTF2000
Lisp_Char_Table *mirrortab;
+#endif
if (NILP (character))
{
}
CHECK_CHAR_COERCE_INT (character);
syntax_table = check_syntax_table (syntax_table, current_buffer->syntax_table);
+#ifdef UTF2000
+ return make_char (syntax_code_spec[(int) SYNTAX (XCHAR_TABLE(syntax_table),
+ XCHAR (character))]);
+#else
mirrortab = XCHAR_TABLE (XCHAR_TABLE (syntax_table)->mirror_table);
return make_char (syntax_code_spec[(int) SYNTAX (mirrortab, XCHAR (character))]);
+#endif
}
#ifdef MULE
*/
(character, syntax_table))
{
+#ifndef UTF2000
Lisp_Char_Table *mirrortab;
+#endif
int code;
CHECK_CHAR_COERCE_INT (character);
syntax_table = check_syntax_table (syntax_table, current_buffer->syntax_table);
+#ifdef UTF2000
+ code = SYNTAX (XCHAR_TABLE (syntax_table), XCHAR (character));
+#else
mirrortab = XCHAR_TABLE (XCHAR_TABLE (syntax_table)->mirror_table);
code = SYNTAX (mirrortab, XCHAR (character));
+#endif
if (code == Sopen || code == Sclose || code == Sstring)
return syntax_match (syntax_table, XCHAR (character));
return Qnil;
scan_words (struct buffer *buf, Bufpos from, int count)
{
Bufpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
Emchar ch0, ch1;
enum syntaxcode code;
- SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, from, count);
-
/* #### is it really worth it to hand expand both cases? JV */
while (count > 0)
{
if (from == limit)
return 0;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
ch0 = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, ch0);
+ code = SYNTAX_UNSAFE (mirrortab, ch0);
from++;
if (words_include_escapes
while (from != limit)
{
- UPDATE_SYNTAX_CACHE_FORWARD (from);
ch1 = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, ch1);
+ code = SYNTAX_UNSAFE (mirrortab, ch1);
if (!(words_include_escapes
&& (code == Sescape || code == Scharquote)))
if (code != Sword
if (from == limit)
return 0;
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
ch1 = BUF_FETCH_CHAR (buf, from - 1);
- code = SYNTAX_FROM_CACHE (mirrortab, ch1);
- from--;
+ code = SYNTAX_UNSAFE (mirrortab, ch1);
+ from--;
if (words_include_escapes
&& (code == Sescape || code == Scharquote))
break;
while (from != limit)
{
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
ch0 = BUF_FETCH_CHAR (buf, from - 1);
- code = SYNTAX_FROM_CACHE (mirrortab, ch0);
-
+ code = SYNTAX_UNSAFE (mirrortab, ch0);
if (!(words_include_escapes
&& (code == Sescape || code == Scharquote)))
if (code != Sword
Normally t is returned, but if an edge of the buffer is reached,
point is left there and nil is returned.
-The characters that are moved over may be added to the current selection
-\(i.e. active region) if the Shift key is held down, a motion key is used
-to invoke this command, and `shifted-motion-keys-select-region' is t; see
-the documentation for this variable for more details.
-
COUNT defaults to 1, and BUFFER defaults to the current buffer.
*/
(count, buffer))
int commentstop);
static int
-find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop,
- int comstyle)
+find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
{
Emchar c;
enum syntaxcode code;
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
/* Look back, counting the parity of string-quotes,
and recording the comment-starters seen.
Bufpos comstart_pos = 0;
int comstart_parity = 0;
int styles_match_p = 0;
- /* mask to match comment styles against; for ST_COMMENT_STYLE, this
- will get set to SYNTAX_COMMENT_STYLE_B, but never get checked */
- int mask = comstyle ? SYNTAX_COMMENT_STYLE_B : SYNTAX_COMMENT_STYLE_A;
/* At beginning of range to scan, we're outside of strings;
that determines quote parity to the comment-end. */
while (from != stop)
{
- int syncode;
-
/* Move back and examine a character. */
from--;
- UPDATE_SYNTAX_CACHE_BACKWARD (from);
c = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, c);
- syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+ code = SYNTAX_UNSAFE (mirrortab, c);
/* is this a 1-char comment end sequence? if so, try
to see if style matches previously extracted mask */
if (code == Sendcomment)
{
+ styles_match_p = SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask);
+ }
+
+ /* otherwise, is this a 2-char comment end sequence? */
+ else if (from >= stop
+ && SYNTAX_END_P (mirrortab, c, BUF_FETCH_CHAR (buf, from+1)))
+ {
+ code = Sendcomment;
styles_match_p =
- SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode) & mask;
+ SYNTAX_STYLES_MATCH_END_P (mirrortab, c,
+ BUF_FETCH_CHAR (buf, from+1),
+ mask);
}
/* or are we looking at a 1-char comment start sequence
of the style matching mask? */
- else if (code == Scomment)
+ else if (code == Scomment
+ && SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask))
{
- styles_match_p =
- SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode) & mask;
+ styles_match_p = 1;
}
- /* otherwise, is this a 2-char comment end or start sequence? */
- else if (from > stop)
- do
- {
- /* 2-char comment end sequence? */
- if (SYNTAX_CODE_END_SECOND_P (syncode))
- {
- int prev_syncode;
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
- prev_syncode =
- SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from - 1));
-
- if (SYNTAX_CODES_END_P (prev_syncode, syncode))
- {
- code = Sendcomment;
- styles_match_p =
- SYNTAX_CODES_COMMENT_MASK_END (prev_syncode, syncode);
- from--;
- UPDATE_SYNTAX_CACHE_BACKWARD (from);
- c = BUF_FETCH_CHAR (buf, from);
-
- /* Found a comment-end sequence, so skip past the
- check for a comment-start */
- break;
- }
- }
-
- /* 2-char comment start sequence? */
- if (SYNTAX_CODE_START_SECOND_P (syncode))
- {
- int prev_syncode;
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
- prev_syncode =
- SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from - 1));
-
- if (SYNTAX_CODES_START_P (prev_syncode, syncode))
- {
- code = Scomment;
- styles_match_p =
- SYNTAX_CODES_COMMENT_MASK_START (prev_syncode, syncode);
- from--;
- UPDATE_SYNTAX_CACHE_BACKWARD (from);
- c = BUF_FETCH_CHAR (buf, from);
- }
- }
- } while (0);
+ /* or possibly, a 2-char comment start sequence */
+ else if (from >= stop
+ && SYNTAX_STYLES_MATCH_START_P (mirrortab, c,
+ BUF_FETCH_CHAR (buf, from+1),
+ mask))
+ {
+ code = Scomment;
+ styles_match_p = 1;
+ }
/* Ignore escaped characters. */
if (char_quoted (buf, from))
string_lossage = 1;
}
- if (code == Sstring_fence || code == Scomment_fence)
- {
- parity ^= 1;
- if (my_stringend == 0)
- my_stringend =
- code == Sstring_fence ? ST_STRING_STYLE : ST_COMMENT_STYLE;
- /* If we have two kinds of string delimiters.
- There's no way to grok this scanning backwards. */
- else if (my_stringend != (code == Sstring_fence
- ? ST_STRING_STYLE : ST_COMMENT_STYLE))
- string_lossage = 1;
- }
-
/* Record comment-starters according to that
quote-parity to the comment-end. */
if (code == Scomment && styles_match_p)
scan_sexps_forward (buf, &state, find_defun_start (buf, comment_end),
comment_end - 1, -10000, 0, Qnil, 0);
if (state.incomment)
- from = state.comstr_start;
+ from = state.comstart;
else
/* We can't grok this as a comment; scan it normally. */
from = comment_end;
- UPDATE_SYNTAX_CACHE_FORWARD (from - 1);
}
return from;
}
static Bufpos
-find_end_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int comstyle)
+find_end_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
{
int c;
- int prev_code;
- /* mask to match comment styles against; for ST_COMMENT_STYLE, this
- will get set to SYNTAX_COMMENT_STYLE_B, but never get checked */
- int mask = comstyle ? SYNTAX_COMMENT_STYLE_B : SYNTAX_COMMENT_STYLE_A;
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
- /* This is only called by functions which have already set up the
- syntax_cache and are keeping it up-to-date */
while (1)
{
if (from == stop)
{
return -1;
}
-
- UPDATE_SYNTAX_CACHE_FORWARD (from);
c = BUF_FETCH_CHAR (buf, from);
-
- /* Test for generic comments */
- if (comstyle == ST_COMMENT_STYLE)
- {
- if (SYNTAX_FROM_CACHE (mirrortab, c) == Scomment_fence)
- {
- from++;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- break;
- }
- from++;
- continue; /* No need to test other comment styles in a
- generic comment */
- }
- else
-
- if (SYNTAX_FROM_CACHE (mirrortab, c) == Sendcomment
- && SYNTAX_CODE_MATCHES_1CHAR_P
- (SYNTAX_CODE_FROM_CACHE (mirrortab, c), mask))
+ if (SYNTAX_UNSAFE (mirrortab, c) == Sendcomment
+ && SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask))
/* we have encountered a comment end of the same style
as the comment sequence which began this comment
section */
- {
- from++;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- break;
- }
+ break;
- prev_code = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
from++;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
if (from < stop
- && SYNTAX_CODES_MATCH_END_P
- (prev_code,
- SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from)),
- mask)
-
- )
+ && SYNTAX_STYLES_MATCH_END_P (mirrortab, c,
+ BUF_FETCH_CHAR (buf, from), mask))
/* we have encountered a comment end of the same style
as the comment sequence which began this comment
section */
- {
- from++;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- break;
- }
+ { from++; break; }
}
return from;
}
Bufpos stop;
Emchar c;
enum syntaxcode code;
- int syncode;
EMACS_INT n;
struct buffer *buf = decode_buffer (buffer, 0);
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
if (NILP (count))
n = 1;
from = BUF_PT (buf);
- SETUP_SYNTAX_CACHE (from, n);
while (n > 0)
{
QUIT;
stop = BUF_ZV (buf);
while (from < stop)
{
- int comstyle = 0; /* mask for finding matching comment style */
+ int mask = 0; /* mask for finding matching comment style */
if (char_quoted (buf, from))
{
continue;
}
- UPDATE_SYNTAX_CACHE_FORWARD (from);
c = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, c);
- syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+ code = SYNTAX (mirrortab, c);
if (code == Scomment)
{
we must record the comment style this character begins
so that later, only a comment end of the same style actually
ends the comment section */
- comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
- == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+ mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
}
- else if (code == Scomment_fence)
- {
- from++;
- code = Scomment;
- comstyle = ST_COMMENT_STYLE;
- }
-
else if (from < stop
- && SYNTAX_CODE_START_FIRST_P (syncode))
+ && SYNTAX_START_P (mirrortab, c, BUF_FETCH_CHAR (buf, from+1)))
{
- int next_syncode;
- UPDATE_SYNTAX_CACHE_FORWARD (from + 1);
- next_syncode =
- SYNTAX_CODE_FROM_CACHE (mirrortab,
- BUF_FETCH_CHAR (buf, from + 1));
-
- if (SYNTAX_CODES_START_P (syncode, next_syncode))
- {
- /* we have encountered a 2char comment start sequence and we
- are ignoring all text inside comments. we must record
- the comment style this sequence begins so that later,
- only a comment end of the same style actually ends
- the comment section */
- code = Scomment;
- comstyle =
- SYNTAX_CODES_COMMENT_MASK_START (syncode, next_syncode)
- == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
- from++;
- }
+ /* we have encountered a 2char comment start sequence and we
+ are ignoring all text inside comments. we must record
+ the comment style this sequence begins so that later,
+ only a comment end of the same style actually ends
+ the comment section */
+ code = Scomment;
+ mask = SYNTAX_COMMENT_MASK_START (mirrortab, c,
+ BUF_FETCH_CHAR (buf, from+1));
+ from++;
}
if (code == Scomment)
{
- Bufpos newfrom = find_end_of_comment (buf, from, stop, comstyle);
+ Bufpos newfrom;
+
+ newfrom = find_end_of_comment (buf, from, stop, mask);
if (newfrom < 0)
{
/* we stopped because from==stop */
stop = BUF_BEGV (buf);
while (from > stop)
{
- int comstyle = 0; /* mask for finding matching comment style */
+ int mask = 0; /* mask for finding matching comment style */
from--;
if (char_quoted (buf, from))
}
c = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, c);
- syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+ code = SYNTAX (mirrortab, c);
if (code == Sendcomment)
{
/* we have found a single char end comment. we must record
the comment style encountered so that later, we can match
only the proper comment begin sequence of the same style */
- comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
- == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
- }
-
- else if (code == Scomment_fence)
- {
- code = Sendcomment;
- comstyle = ST_COMMENT_STYLE;
+ mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
}
else if (from > stop
- && SYNTAX_CODE_END_SECOND_P (syncode))
+ && SYNTAX_END_P (mirrortab, BUF_FETCH_CHAR (buf, from - 1), c)
+ && !char_quoted (buf, from - 1))
{
- int prev_syncode;
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
- prev_syncode =
- SYNTAX_CODE_FROM_CACHE (mirrortab,
- BUF_FETCH_CHAR (buf, from - 1));
- if (SYNTAX_CODES_END_P (prev_syncode, syncode))
- {
- /* We must record the comment style encountered so that
- later, we can match only the proper comment begin
- sequence of the same style. */
- code = Sendcomment;
- comstyle = SYNTAX_CODES_COMMENT_MASK_END
- (prev_syncode, syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
- from--;
- }
+ /* We must record the comment style encountered so that
+ later, we can match only the proper comment begin
+ sequence of the same style. */
+ code = Sendcomment;
+ mask = SYNTAX_COMMENT_MASK_END (mirrortab,
+ BUF_FETCH_CHAR (buf, from - 1),
+ c);
+ from--;
}
if (code == Sendcomment)
{
- from = find_start_of_comment (buf, from, stop, comstyle);
+ from = find_start_of_comment (buf, from, stop, mask);
break;
}
else if (code != Swhitespace
- && code != Scomment
- && code != Sendcomment)
+ && SYNTAX (mirrortab, c) != Scomment
+ && SYNTAX (mirrortab, c) != Sendcomment)
{
BUF_SET_PT (buf, from + 1);
return Qnil;
int quoted;
int mathexit = 0;
enum syntaxcode code;
- int syncode;
int min_depth = depth; /* Err out if depth gets less than this. */
+ Lisp_Object syntaxtab = buf->syntax_table;
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
if (depth > 0) min_depth = 0;
- SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, from, count);
while (count > 0)
{
QUIT;
stop = BUF_ZV (buf);
while (from < stop)
{
- int comstyle = 0; /* mask for finding matching comment style */
+ int mask = 0; /* mask for finding matching comment style */
- UPDATE_SYNTAX_CACHE_FORWARD (from);
c = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, c);
- syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+ code = SYNTAX_UNSAFE (mirrortab, c);
from++;
/* a 1-char comment start sequence */
if (code == Scomment && parse_sexp_ignore_comments)
{
- comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode) ==
- SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+ mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
}
/* else, a 2-char comment start sequence? */
else if (from < stop
- && SYNTAX_CODE_START_FIRST_P (syncode)
+ && SYNTAX_START_P (mirrortab, c, BUF_FETCH_CHAR (buf, from))
&& parse_sexp_ignore_comments)
{
- int next_syncode;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- next_syncode =
- SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from));
-
- if (SYNTAX_CODES_START_P (syncode, next_syncode))
- {
/* we have encountered a comment start sequence and we
are ignoring all text inside comments. we must record
the comment style this sequence begins so that later,
only a comment end of the same style actually ends
the comment section */
code = Scomment;
- comstyle = SYNTAX_CODES_COMMENT_MASK_START
- (syncode, next_syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+ mask = SYNTAX_COMMENT_MASK_START (mirrortab, c,
+ BUF_FETCH_CHAR (buf, from));
from++;
}
- }
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- if (SYNTAX_CODE_PREFIX (syncode))
+ if (SYNTAX_PREFIX_UNSAFE (mirrortab, c))
continue;
switch (code)
/* This word counts as a sexp; return at end of it. */
while (from < stop)
{
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- switch (SYNTAX_FROM_CACHE (mirrortab,
- BUF_FETCH_CHAR (buf, from)))
+ switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
{
case Scharquote:
case Sescape:
}
goto done;
- case Scomment_fence:
- comstyle = ST_COMMENT_STYLE;
case Scomment:
if (!parse_sexp_ignore_comments)
break;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
{
- Bufpos newfrom =
- find_end_of_comment (buf, from, stop, comstyle);
+ Bufpos newfrom = find_end_of_comment (buf, from, stop, mask);
if (newfrom < 0)
{
/* we stopped because from == stop in search forward */
}
break;
- case Sstring_fence:
case Sstring:
{
- Emchar stringterm;
-
- if (code != Sstring_fence)
- {
/* XEmacs change: call syntax_match on character */
Emchar ch = BUF_FETCH_CHAR (buf, from - 1);
- Lisp_Object stermobj =
- syntax_match (syntax_cache.current_syntax_table, ch);
+ Lisp_Object stermobj = syntax_match (syntaxtab, ch);
+ Emchar stringterm;
if (CHARP (stermobj))
stringterm = XCHAR (stermobj);
else
stringterm = ch;
- }
- else
- stringterm = '\0'; /* avoid compiler warnings */
while (1)
{
if (from >= stop)
goto lose;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- c = BUF_FETCH_CHAR (buf, from);
- if (code == Sstring
- ? c == stringterm
- : SYNTAX_FROM_CACHE (mirrortab, c) == Sstring_fence)
+ if (BUF_FETCH_CHAR (buf, from) == stringterm)
break;
-
- switch (SYNTAX_FROM_CACHE (mirrortab, c))
+ switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
{
case Scharquote:
case Sescape:
stop = BUF_BEGV (buf);
while (from > stop)
{
- int comstyle = 0; /* mask for finding matching comment style */
+ int mask = 0; /* mask for finding matching comment style */
from--;
- UPDATE_SYNTAX_CACHE_BACKWARD (from);
quoted = char_quoted (buf, from);
if (quoted)
- {
from--;
- UPDATE_SYNTAX_CACHE_BACKWARD (from);
- }
c = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, c);
- syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+ code = SYNTAX_UNSAFE (mirrortab, c);
if (code == Sendcomment && parse_sexp_ignore_comments)
{
/* we have found a single char end comment. we must record
the comment style encountered so that later, we can match
only the proper comment begin sequence of the same style */
- comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
- == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+ mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
}
else if (from > stop
- && SYNTAX_CODE_END_SECOND_P (syncode)
+ && SYNTAX_END_P (mirrortab, BUF_FETCH_CHAR (buf, from-1), c)
&& !char_quoted (buf, from - 1)
&& parse_sexp_ignore_comments)
{
- int prev_syncode;
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
- prev_syncode = SYNTAX_CODE_FROM_CACHE
- (mirrortab, BUF_FETCH_CHAR (buf, from - 1));
-
- if (SYNTAX_CODES_END_P (prev_syncode, syncode))
- {
/* we must record the comment style encountered so that
later, we can match only the proper comment begin
sequence of the same style */
code = Sendcomment;
- comstyle = SYNTAX_CODES_COMMENT_MASK_END
- (prev_syncode, syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+ mask = SYNTAX_COMMENT_MASK_END (mirrortab,
+ BUF_FETCH_CHAR (buf, from - 1),
+ c);
from--;
}
- }
- if (SYNTAX_CODE_PREFIX (syncode))
+ if (SYNTAX_PREFIX_UNSAFE (mirrortab, c))
continue;
switch (quoted ? Sword : code)
passing it. */
while (from > stop)
{
- UPDATE_SYNTAX_CACHE_BACKWARD (from);
+ enum syntaxcode syncode;
quoted = char_quoted (buf, from - 1);
if (quoted)
from--;
if (! (quoted
|| (syncode =
- SYNTAX_FROM_CACHE (mirrortab,
- BUF_FETCH_CHAR (buf, from - 1)))
+ SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from - 1)))
== Sword
|| syncode == Ssymbol
|| syncode == Squote))
}
break;
- case Scomment_fence:
- comstyle = ST_COMMENT_STYLE;
case Sendcomment:
if (parse_sexp_ignore_comments)
- from = find_start_of_comment (buf, from, stop, comstyle);
+ from = find_start_of_comment (buf, from, stop, mask);
break;
- case Sstring_fence:
case Sstring:
{
- Emchar stringterm;
-
- if (code != Sstring_fence)
- {
/* XEmacs change: call syntax_match() on character */
Emchar ch = BUF_FETCH_CHAR (buf, from);
- Lisp_Object stermobj =
- syntax_match (syntax_cache.current_syntax_table, ch);
+ Lisp_Object stermobj = syntax_match (syntaxtab, ch);
+ Emchar stringterm;
if (CHARP (stermobj))
stringterm = XCHAR (stermobj);
else
stringterm = ch;
- }
- else
- stringterm = '\0'; /* avoid compiler warnings */
while (1)
{
if (from == stop) goto lose;
-
- UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
- c = BUF_FETCH_CHAR (buf, from - 1);
-
- if ((code == Sstring
- ? c == stringterm
- : SYNTAX_FROM_CACHE (mirrortab, c) == Sstring_fence)
- && !char_quoted (buf, from - 1))
- {
+ if (!char_quoted (buf, from - 1)
+ && stringterm == BUF_FETCH_CHAR (buf, from - 1))
break;
- }
-
from--;
}
from--;
enum syntaxcode code;
Bufpos beg = BUF_BEGV (buf);
int quoted = 0;
- Bufpos startpos = pos;
-
- while (pos > beg)
- {
- UPDATE_SYNTAX_CACHE_BACKWARD (pos - 1);
- code = SYNTAX_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, pos - 1));
-
- if (code != Scharquote && code != Sescape)
- break;
- pos--;
- quoted = !quoted;
- }
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
- UPDATE_SYNTAX_CACHE (startpos);
+ while (pos > beg
+ && ((code = SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1)))
+ == Scharquote
+ || code == Sescape))
+ pos--, quoted = !quoted;
return quoted;
}
struct buffer *buf = decode_buffer (buffer, 0);
Bufpos beg = BUF_BEGV (buf);
Bufpos pos = BUF_PT (buf);
-#ifndef emacs
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
#endif
- Emchar c = '\0'; /* initialize to avoid compiler warnings */
-
-
- SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, pos, -1);
while (pos > beg && !char_quoted (buf, pos - 1)
- /* Previous statement updates syntax table. */
- && (SYNTAX_FROM_CACHE (mirrortab, c = BUF_FETCH_CHAR (buf, pos - 1)) == Squote
- || SYNTAX_CODE_PREFIX (SYNTAX_CODE_FROM_CACHE (mirrortab, c))))
+ && (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1)) == Squote
+ || SYNTAX_PREFIX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1))))
pos--;
BUF_SET_PT (buf, pos);
when the depth becomes negative. */
int mindepth; /* Lowest DEPTH value seen. */
int start_quoted = 0; /* Nonzero means starting after a char quote */
- int boundary_stop = commentstop == -1;
Lisp_Object tem;
+ int mask; /* comment mask */
+ Lisp_Object syntaxtab = buf->syntax_table;
+#ifdef UTF2000
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
+ Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
- SETUP_SYNTAX_CACHE (from, 1);
if (NILP (oldstate))
{
depth = 0;
state.instring = -1;
state.incomment = 0;
state.comstyle = 0; /* comment style a by default */
- state.comstr_start = -1; /* no comment/string seen. */
+ mask = SYNTAX_COMMENT_STYLE_A;
}
else
{
oldstate = Fcdr (oldstate);
oldstate = Fcdr (oldstate);
tem = Fcar (oldstate); /* elt 3, instring */
- state.instring = ( !NILP (tem)
- ? ( INTP (tem) ? XINT (tem) : ST_STRING_STYLE)
- : -1);
+ state.instring = !NILP (tem) ? XINT (tem) : -1;
- oldstate = Fcdr (oldstate);
- tem = Fcar (oldstate); /* elt 4, incomment */
+ oldstate = Fcdr (oldstate); /* elt 4, incomment */
+ tem = Fcar (oldstate);
state.incomment = !NILP (tem);
oldstate = Fcdr (oldstate);
start_quoted = !NILP (tem);
/* if the eighth element of the list is nil, we are in comment style
- a; if it is t, we are in comment style b; if it is 'syntax-table,
- we are in a generic comment */
+ a. if it is non-nil, we are in comment style b */
oldstate = Fcdr (oldstate);
oldstate = Fcdr (oldstate);
- tem = Fcar (oldstate); /* elt 7, comment style a/b/fence */
- state.comstyle = NILP (tem) ? 0 : ( EQ (tem, Qsyntax_table)
- ? ST_COMMENT_STYLE : 1 );
-
- oldstate = Fcdr (oldstate); /* elt 8, start of last comment/string */
- tem = Fcar (oldstate);
- state.comstr_start = NILP (tem) ? -1 : XINT (tem);
-
- /* elt 9, char numbers of starts-of-expression of levels
- (starting from outermost). */
oldstate = Fcdr (oldstate);
- tem = Fcar (oldstate); /* elt 9, intermediate data for
- continuation of parsing (subject
- to change). */
- while (!NILP (tem)) /* >= second enclosing sexps. */
- {
- curlevel->last = XINT (Fcar (tem));
- if (++curlevel == endlevel)
- error ("Nesting too deep for parser");
- curlevel->prev = -1;
- curlevel->last = -1;
- tem = Fcdr (tem);
- }
+ tem = Fcar (oldstate); /* elt 8, comment style a */
+ state.comstyle = !NILP (tem);
+ mask = state.comstyle ? SYNTAX_COMMENT_STYLE_B : SYNTAX_COMMENT_STYLE_A;
}
state.quoted = 0;
mindepth = depth;
while (from < end)
{
- Emchar c;
- int syncode;
-
QUIT;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- c = BUF_FETCH_CHAR (buf, from);
- code = SYNTAX_FROM_CACHE (mirrortab, c);
- syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+ code = SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from));
from++;
+ if (code == Scomment)
+ {
/* record the comment style we have entered so that only the
comment-ender sequence (or single char) of the same style
actually terminates the comment section. */
- if (code == Scomment)
- {
- state.comstyle =
- SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
- == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
- state.comstr_start = from - 1;
- }
-
- /* a generic comment delimiter? */
- else if (code == Scomment_fence)
- {
- state.comstyle = ST_COMMENT_STYLE;
- state.comstr_start = from - 1;
- code = Scomment;
+ mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab,
+ BUF_FETCH_CHAR (buf, from-1));
+ state.comstyle = (mask == SYNTAX_COMMENT_STYLE_B);
+ state.comstart = from - 1;
}
else if (from < end &&
- SYNTAX_CODE_START_FIRST_P (syncode))
- {
- int next_syncode;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- next_syncode =
- SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from));
-
- if (SYNTAX_CODES_START_P (syncode, next_syncode))
+ SYNTAX_START_P (mirrortab, BUF_FETCH_CHAR (buf, from-1),
+ BUF_FETCH_CHAR (buf, from)))
{
+ /* Record the comment style we have entered so that only
+ the comment-end sequence of the same style actually
+ terminates the comment section. */
code = Scomment;
- state.comstyle = SYNTAX_CODES_COMMENT_MASK_START
- (syncode, next_syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
- state.comstr_start = from - 1;
+ mask = SYNTAX_COMMENT_MASK_START (mirrortab,
+ BUF_FETCH_CHAR (buf, from-1),
+ BUF_FETCH_CHAR (buf, from));
+ state.comstyle = (mask == SYNTAX_COMMENT_STYLE_B);
+ state.comstart = from-1;
from++;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- }
}
- if (SYNTAX_CODE_PREFIX (syncode))
+ if (SYNTAX_PREFIX (mirrortab, BUF_FETCH_CHAR (buf, from - 1)))
continue;
switch (code)
{
symstarted:
while (from < end)
{
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- switch (SYNTAX_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from)))
+ switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
{
case Scharquote:
case Sescape:
case Scomment:
state.incomment = 1;
- if (commentstop || boundary_stop) goto done;
startincomment:
- if (commentstop == 1)
+ if (commentstop)
goto done;
- UPDATE_SYNTAX_CACHE_FORWARD (from);
{
- Bufpos newfrom = find_end_of_comment (buf, from, end, state.comstyle);
+ Bufpos newfrom = find_end_of_comment (buf, from, end, mask);
if (newfrom < 0)
{
/* we terminated search because from == end */
}
state.incomment = 0;
state.comstyle = 0; /* reset the comment style */
- if (boundary_stop) goto done;
+ mask = 0;
break;
case Sopen:
break;
case Sstring:
- case Sstring_fence:
- state.comstr_start = from - 1;
+ {
+ Emchar ch;
if (stopbefore) goto stop; /* this arg means stop at sexp start */
curlevel->last = from - 1;
- if (code == Sstring_fence)
+ /* XEmacs change: call syntax_match() on character */
+ ch = BUF_FETCH_CHAR (buf, from - 1);
{
- state.instring = ST_STRING_STYLE;
- }
- else
- {
- /* XEmacs change: call syntax_match() on character */
- Emchar ch = BUF_FETCH_CHAR (buf, from - 1);
- Lisp_Object stermobj =
- syntax_match (syntax_cache.current_syntax_table, ch);
+ Lisp_Object stermobj = syntax_match (syntaxtab, ch);
if (CHARP (stermobj))
state.instring = XCHAR (stermobj);
else
state.instring = ch;
+ }
}
- if (boundary_stop) goto done;
startinstring:
while (1)
{
- enum syntaxcode temp_code;
-
if (from >= end) goto done;
-
- UPDATE_SYNTAX_CACHE_FORWARD (from);
- c = BUF_FETCH_CHAR (buf, from);
- temp_code = SYNTAX_FROM_CACHE (mirrortab, c);
-
- if (
- state.instring != ST_STRING_STYLE &&
- temp_code == Sstring &&
- c == state.instring) break;
-
- switch (temp_code)
+ if (BUF_FETCH_CHAR (buf, from) == state.instring) break;
+ switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
{
- case Sstring_fence:
- if (state.instring == ST_STRING_STYLE)
- goto string_end;
- break;
case Scharquote:
case Sescape:
{
}
from++;
}
- string_end:
state.instring = -1;
curlevel->prev = curlevel->last;
from++;
- if (boundary_stop) goto done;
break;
case Smath:
case Spunct:
case Squote:
case Sendcomment:
- case Scomment_fence:
case Sinherit:
case Smax:
break;
state.prevlevelstart
= (curlevel == levelstart) ? -1 : (curlevel - 1)->last;
state.location = from;
- state.levelstarts = Qnil;
- while (--curlevel >= levelstart)
- state.levelstarts = Fcons (make_int (curlevel->last),
- state.levelstarts);
*stateptr = state;
}
point is set to where parsing stops.
If fifth arg OLDSTATE is omitted or nil,
parsing assumes that FROM is the beginning of a function.
-Value is a list of nine elements describing final state of parsing:
+Value is a list of eight elements describing final state of parsing:
0. depth in parens.
1. character address of start of innermost containing list; nil if none.
2. character address of start of last complete sexp terminated.
3. non-nil if inside a string.
- (It is the character that will terminate the string,
- or t if the string should be terminated by an explicit
- `syntax-table' property.)
+ (It is the character that will terminate the string.)
4. t if inside a comment.
5. t if following a quote character.
6. the minimum paren-depth encountered during this scan.
- 7. nil if in comment style a, or not in a comment; t if in comment style b;
- `syntax-table' if given by an explicit `syntax-table' property.
- 8. character address of start of last comment or string; nil if none.
- 9. Intermediate data for continuation of parsing (subject to change).
+ 7. nil if in comment style a, or not in a comment; t if in comment style b
If third arg TARGETDEPTH is non-nil, parsing stops if the depth
in parentheses becomes equal to TARGETDEPTH.
Fourth arg STOPBEFORE non-nil means stop when come to
any character that starts a sexp.
-Fifth arg OLDSTATE is a nine-element list like what this function returns.
+Fifth arg OLDSTATE is an eight-element list like what this function returns.
It is used to initialize the state of the parse. Its second and third
elements are ignored.
-Sixth arg COMMENTSTOP non-nil means stop at the start of a comment. If it
-is `syntax-table', stop after the start of a comment or a string, or after
-the end of a comment or string.
+Sixth arg COMMENTSTOP non-nil means stop at the start of a comment.
*/
(from, to, targetdepth, stopbefore, oldstate, commentstop, buffer))
{
get_buffer_range_char (buf, from, to, &start, &end, 0);
scan_sexps_forward (buf, &state, start, end,
target, !NILP (stopbefore), oldstate,
- (NILP (commentstop)
- ? 0 : (EQ (commentstop, Qsyntax_table) ? -1 : 1)));
+ !NILP (commentstop));
+
BUF_SET_PT (buf, state.location);
/* reverse order */
val = Qnil;
- val = Fcons (state.levelstarts, val);
- val = Fcons ((state.incomment || (state.instring >= 0))
- ? make_int (state.comstr_start) : Qnil, val);
- val = Fcons (state.comstyle ? (state.comstyle == ST_COMMENT_STYLE
- ? Qsyntax_table : Qt) : Qnil, val);
+ val = Fcons (state.comstyle ? Qt : Qnil, val);
val = Fcons (make_int (state.mindepth), val);
val = Fcons (state.quoted ? Qt : Qnil, val);
val = Fcons (state.incomment ? Qt : Qnil, val);
- val = Fcons (state.instring < 0
- ? Qnil
- : (state.instring == ST_STRING_STYLE
- ? Qt : make_int (state.instring)), val);
+ val = Fcons (state.instring < 0 ? Qnil : make_int (state.instring), val);
val = Fcons (state.thislevelstart < 0 ? Qnil : make_int (state.thislevelstart), val);
val = Fcons (state.prevlevelstart < 0 ? Qnil : make_int (state.prevlevelstart), val);
val = Fcons (make_int (state.depth), val);
return 0;
}
+#ifndef UTF2000
static void
update_just_this_syntax_table (Lisp_Char_Table *ct)
{
else
update_just_this_syntax_table (ct);
}
+#endif
\f
/************************************************************************/
syms_of_syntax (void)
{
defsymbol (&Qsyntax_table_p, "syntax-table-p");
- defsymbol (&Qsyntax_table, "syntax-table");
DEFSUBR (Fsyntax_table_p);
DEFSUBR (Fsyntax_table);
*/ );
parse_sexp_ignore_comments = 0;
- DEFVAR_BOOL ("lookup-syntax-properties", &lookup_syntax_properties /*
-Non-nil means `forward-sexp', etc., grant `syntax-table' property.
-The value of this property should be either a syntax table, or a cons
-of the form (SYNTAXCODE . MATCHCHAR), SYNTAXCODE being the numeric
-syntax code, MATCHCHAR being nil or the character to match (which is
-relevant only for open/close type.
-*/ );
- lookup_syntax_properties = 1;
-
DEFVAR_BOOL ("words-include-escapes", &words_include_escapes /*
Non-nil means `forward-word', etc., should treat escape chars part of words.
*/ );
projects / chise / xemacs-chise.git / blobdiff