Mercurial > emacs
annotate src/syntax.c @ 108164:745e12b5af4a
Don't burp if process sentinel/filter kills the current buffer.
* process.c (read_process_output, exec_sentinel): Don't burp if the
sentinel/filter kills the current buffer.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 29 Apr 2010 10:29:09 -0400 |
parents | 14ff9accfbd3 |
children | ea6ba19c6edd |
rev | line source |
---|---|
163 | 1 /* GNU Emacs routines to deal with syntax tables; also word and list parsing. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74563
diff
changeset
|
2 Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, |
106815 | 3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74563
diff
changeset
|
4 Free Software Foundation, Inc. |
163 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
163 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
11 (at your option) any later version. |
163 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
163 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4458
diff
changeset
|
22 #include <config.h> |
163 | 23 #include <ctype.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105661
diff
changeset
|
24 #include <setjmp.h> |
163 | 25 #include "lisp.h" |
26 #include "commands.h" | |
27 #include "buffer.h" | |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
28 #include "character.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39195
diff
changeset
|
29 #include "keymap.h" |
56088 | 30 #include "regex.h" |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
31 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
32 /* Make syntax table lookup grant data in gl_state. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
33 #define SYNTAX_ENTRY_VIA_PROPERTY |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
34 |
163 | 35 #include "syntax.h" |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
36 #include "intervals.h" |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
37 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
38 /* We use these constants in place for comment-style and |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
39 string-ender-char to distinguish comments/strings started by |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
40 comment_fence and string_fence codes. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
41 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
42 #define ST_COMMENT_STYLE (256 + 1) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
43 #define ST_STRING_STYLE (256 + 2) |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
44 #include "category.h" |
163 | 45 |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
46 Lisp_Object Qsyntax_table_p, Qsyntax_table, Qscan_error; |
163 | 47 |
48 int words_include_escapes; | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
49 int parse_sexp_lookup_properties; |
163 | 50 |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
51 /* Nonzero means `scan-sexps' treat all multibyte characters as symbol. */ |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
52 int multibyte_syntax_as_symbol; |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
53 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
54 /* Used as a temporary in SYNTAX_ENTRY and other macros in syntax.h, |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
55 if not compiled with GCC. No need to mark it, since it is used |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
56 only very temporarily. */ |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
57 Lisp_Object syntax_temp; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
58 |
28302
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
59 /* Non-zero means an open parenthesis in column 0 is always considered |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
60 to be the start of a defun. Zero means an open parenthesis in |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
61 column 0 has no special meaning. */ |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
62 |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
63 int open_paren_in_column_0_is_defun_start; |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
64 |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
65 /* This is the internal form of the parse state used in parse-partial-sexp. */ |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
66 |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
67 struct lisp_parse_state |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
68 { |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
69 int depth; /* Depth at end of parsing. */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
70 int instring; /* -1 if not within string, else desired terminator. */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
71 int incomment; /* -1 if in unnestable comment else comment nesting */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
72 int comstyle; /* comment style a=0, or b=1, or ST_COMMENT_STYLE. */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
73 int quoted; /* Nonzero if just after an escape char at end of parsing */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
74 int mindepth; /* Minimum depth seen while scanning. */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
75 /* Char number of most recent start-of-expression at current level */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
76 EMACS_INT thislevelstart; |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
77 /* Char number of start of containing expression */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
78 EMACS_INT prevlevelstart; |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
79 EMACS_INT location; /* Char number at which parsing stopped. */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
80 EMACS_INT comstr_start; /* Position of last comment/string starter. */ |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
81 Lisp_Object levelstarts; /* Char numbers of starts-of-expression |
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
82 of levels (starting from outermost). */ |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
83 }; |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
84 |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
85 /* These variables are a cache for finding the start of a defun. |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
86 find_start_pos is the place for which the defun start was found. |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
87 find_start_value is the defun start position found for it. |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
88 find_start_value_byte is the corresponding byte position. |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
89 find_start_buffer is the buffer it was found in. |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
90 find_start_begv is the BEGV value when it was found. |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
91 find_start_modiff is the value of MODIFF when it was found. */ |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
92 |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
93 static EMACS_INT find_start_pos; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
94 static EMACS_INT find_start_value; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
95 static EMACS_INT find_start_value_byte; |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
96 static struct buffer *find_start_buffer; |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
97 static EMACS_INT find_start_begv; |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
98 static int find_start_modiff; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
99 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
100 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
101 static Lisp_Object skip_chars P_ ((int, Lisp_Object, Lisp_Object, int)); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
102 static Lisp_Object skip_syntaxes P_ ((int, Lisp_Object, Lisp_Object)); |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
103 static Lisp_Object scan_lists P_ ((EMACS_INT, EMACS_INT, EMACS_INT, int)); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
104 static void scan_sexps_forward P_ ((struct lisp_parse_state *, |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
105 EMACS_INT, EMACS_INT, EMACS_INT, int, |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
106 int, Lisp_Object, int)); |
56088 | 107 static int in_classes P_ ((int, Lisp_Object)); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
108 |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
109 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
110 struct gl_state_s gl_state; /* Global state of syntax parser. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
111 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
112 INTERVAL interval_of (); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
113 #define INTERVALS_AT_ONCE 10 /* 1 + max-number of intervals |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
114 to scan to property-change. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
115 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
116 /* Update gl_state to an appropriate interval which contains CHARPOS. The |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
117 sign of COUNT give the relative position of CHARPOS wrt the previously |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
118 valid interval. If INIT, only [be]_property fields of gl_state are |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
119 valid at start, the rest is filled basing on OBJECT. |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
120 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
121 `gl_state.*_i' are the intervals, and CHARPOS is further in the search |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
122 direction than the intervals - or in an interval. We update the |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
123 current syntax-table basing on the property of this interval, and |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
124 update the interval to start further than CHARPOS - or be |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
125 NULL_INTERVAL. We also update lim_property to be the next value of |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
126 charpos to call this subroutine again - or be before/after the |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
127 start/end of OBJECT. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
128 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
129 void |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
130 update_syntax_table (charpos, count, init, object) |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
131 int charpos, count, init; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
132 Lisp_Object object; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
133 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
134 Lisp_Object tmp_table; |
25771
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
135 int cnt = 0, invalidate = 1; |
65215
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
136 INTERVAL i; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
137 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
138 if (init) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
139 { |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
140 gl_state.old_prop = Qnil; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
141 gl_state.start = gl_state.b_property; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
142 gl_state.stop = gl_state.e_property; |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
143 i = interval_of (charpos, object); |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
144 gl_state.backward_i = gl_state.forward_i = i; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
145 invalidate = 0; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
146 if (NULL_INTERVAL_P (i)) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
147 return; |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
148 /* interval_of updates only ->position of the return value, so |
21011
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
149 update the parents manually to speed up update_interval. */ |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
150 while (!NULL_PARENT (i)) |
21011
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
151 { |
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
152 if (AM_RIGHT_CHILD (i)) |
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents:
27812
diff
changeset
|
153 INTERVAL_PARENT (i)->position = i->position |
21011
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
154 - LEFT_TOTAL_LENGTH (i) + TOTAL_LENGTH (i) /* right end */ |
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents:
27812
diff
changeset
|
155 - TOTAL_LENGTH (INTERVAL_PARENT (i)) |
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents:
27812
diff
changeset
|
156 + LEFT_TOTAL_LENGTH (INTERVAL_PARENT (i)); |
21011
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
157 else |
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents:
27812
diff
changeset
|
158 INTERVAL_PARENT (i)->position = i->position - LEFT_TOTAL_LENGTH (i) |
21011
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
159 + TOTAL_LENGTH (i); |
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents:
27812
diff
changeset
|
160 i = INTERVAL_PARENT (i); |
21011
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
161 } |
ceb05db73a63
(update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents:
20956
diff
changeset
|
162 i = gl_state.forward_i; |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
163 gl_state.b_property = i->position - gl_state.offset; |
20956
15d1b7bf1cd7
(update_syntax_table): Fix calculations using offset.
Karl Heuer <kwzh@gnu.org>
parents:
20905
diff
changeset
|
164 gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
165 goto update; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
166 } |
65215
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
167 i = count > 0 ? gl_state.forward_i : gl_state.backward_i; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
168 |
37532
f14973be41f5
(update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34398
diff
changeset
|
169 /* We are guaranteed to be called with CHARPOS either in i, |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
170 or further off. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
171 if (NULL_INTERVAL_P (i)) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
172 error ("Error in syntax_table logic for to-the-end intervals"); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
173 else if (charpos < i->position) /* Move left. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
174 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
175 if (count > 0) |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
176 error ("Error in syntax_table logic for intervals <-"); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
177 /* Update the interval. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
178 i = update_interval (i, charpos); |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
179 if (INTERVAL_LAST_POS (i) != gl_state.b_property) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
180 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
181 invalidate = 0; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
182 gl_state.forward_i = i; |
20956
15d1b7bf1cd7
(update_syntax_table): Fix calculations using offset.
Karl Heuer <kwzh@gnu.org>
parents:
20905
diff
changeset
|
183 gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
184 } |
37532
f14973be41f5
(update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34398
diff
changeset
|
185 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
186 else if (charpos >= INTERVAL_LAST_POS (i)) /* Move right. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
187 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
188 if (count < 0) |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
189 error ("Error in syntax_table logic for intervals ->"); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
190 /* Update the interval. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
191 i = update_interval (i, charpos); |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
192 if (i->position != gl_state.e_property) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
193 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
194 invalidate = 0; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
195 gl_state.backward_i = i; |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
196 gl_state.b_property = i->position - gl_state.offset; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
197 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
198 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
199 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
200 update: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
201 tmp_table = textget (i->plist, Qsyntax_table); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
202 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
203 if (invalidate) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
204 invalidate = !EQ (tmp_table, gl_state.old_prop); /* Need to invalidate? */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
205 |
37532
f14973be41f5
(update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34398
diff
changeset
|
206 if (invalidate) /* Did not get to adjacent interval. */ |
f14973be41f5
(update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34398
diff
changeset
|
207 { /* with the same table => */ |
f14973be41f5
(update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34398
diff
changeset
|
208 /* invalidate the old range. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
209 if (count > 0) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
210 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
211 gl_state.backward_i = i; |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
212 gl_state.b_property = i->position - gl_state.offset; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
213 } |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
214 else |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
215 { |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
216 gl_state.forward_i = i; |
20956
15d1b7bf1cd7
(update_syntax_table): Fix calculations using offset.
Karl Heuer <kwzh@gnu.org>
parents:
20905
diff
changeset
|
217 gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
218 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
219 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
220 |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
221 if (!EQ (tmp_table, gl_state.old_prop)) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
222 { |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
223 gl_state.current_syntax_table = tmp_table; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
224 gl_state.old_prop = tmp_table; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
225 if (EQ (Fsyntax_table_p (tmp_table), Qt)) |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
226 { |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
227 gl_state.use_global = 0; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
228 } |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
229 else if (CONSP (tmp_table)) |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
230 { |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
231 gl_state.use_global = 1; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
232 gl_state.global_code = tmp_table; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
233 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
234 else |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
235 { |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
236 gl_state.use_global = 0; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
237 gl_state.current_syntax_table = current_buffer->syntax_table; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
238 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
239 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
240 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
241 while (!NULL_INTERVAL_P (i)) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
242 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
243 if (cnt && !EQ (tmp_table, textget (i->plist, Qsyntax_table))) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
244 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
245 if (count > 0) |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
246 { |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
247 gl_state.e_property = i->position - gl_state.offset; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
248 gl_state.forward_i = i; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
249 } |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
250 else |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
251 { |
65215
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
252 gl_state.b_property |
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
253 = i->position + LENGTH (i) - gl_state.offset; |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
254 gl_state.backward_i = i; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
255 } |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
256 return; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
257 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
258 else if (cnt == INTERVALS_AT_ONCE) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
259 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
260 if (count > 0) |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
261 { |
65215
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
262 gl_state.e_property |
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
263 = i->position + LENGTH (i) - gl_state.offset |
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
264 /* e_property at EOB is not set to ZV but to ZV+1, so that |
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
265 we can do INC(from);UPDATE_SYNTAX_TABLE_FORWARD without |
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
266 having to check eob between the two. */ |
c37b7f6542ec
(update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64770
diff
changeset
|
267 + (NULL_INTERVAL_P (next_interval (i)) ? 1 : 0); |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
268 gl_state.forward_i = i; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
269 } |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
270 else |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
271 { |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
272 gl_state.b_property = i->position - gl_state.offset; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
273 gl_state.backward_i = i; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
274 } |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
275 return; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
276 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
277 cnt++; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
278 i = count > 0 ? next_interval (i) : previous_interval (i); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
279 } |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
280 eassert (NULL_INTERVAL_P (i)); /* This property goes to the end. */ |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
281 if (count > 0) |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
282 gl_state.e_property = gl_state.stop; |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
283 else |
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
284 gl_state.b_property = gl_state.start; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
285 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
286 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
287 /* Returns TRUE if char at CHARPOS is quoted. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
288 Global syntax-table data should be set up already to be good at CHARPOS |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
289 or after. On return global syntax data is good for lookup at CHARPOS. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
290 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
291 static int |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
292 char_quoted (EMACS_INT charpos, EMACS_INT bytepos) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
293 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
294 register enum syntaxcode code; |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
295 register EMACS_INT beg = BEGV; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
296 register int quoted = 0; |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
297 EMACS_INT orig = charpos; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
298 |
96898
6521e10c7e45
(char_quoted): Check "charpos > beg" before decrementing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96838
diff
changeset
|
299 while (charpos > beg) |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
300 { |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
301 int c; |
96898
6521e10c7e45
(char_quoted): Check "charpos > beg" before decrementing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96838
diff
changeset
|
302 DEC_BOTH (charpos, bytepos); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
303 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
304 UPDATE_SYNTAX_TABLE_BACKWARD (charpos); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
305 c = FETCH_CHAR_AS_MULTIBYTE (bytepos); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
306 code = SYNTAX (c); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
307 if (! (code == Scharquote || code == Sescape)) |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
308 break; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
309 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
310 quoted = !quoted; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
311 } |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
312 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
313 UPDATE_SYNTAX_TABLE (orig); |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
314 return quoted; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
315 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
316 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
317 /* Return the bytepos one character after BYTEPOS. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
318 We assume that BYTEPOS is not at the end of the buffer. */ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
319 |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
320 INLINE EMACS_INT |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
321 inc_bytepos (bytepos) |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
322 EMACS_INT bytepos; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
323 { |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
324 if (NILP (current_buffer->enable_multibyte_characters)) |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
325 return bytepos + 1; |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
326 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
327 INC_POS (bytepos); |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
328 return bytepos; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
329 } |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
330 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
331 /* Return the bytepos one character before BYTEPOS. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
332 We assume that BYTEPOS is not at the start of the buffer. */ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
333 |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
334 INLINE EMACS_INT |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
335 dec_bytepos (bytepos) |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
336 EMACS_INT bytepos; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
337 { |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
338 if (NILP (current_buffer->enable_multibyte_characters)) |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
339 return bytepos - 1; |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
340 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
341 DEC_POS (bytepos); |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
342 return bytepos; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
343 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
344 |
105426
d0a6d64c3cfc
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
105102
diff
changeset
|
345 /* Return a defun-start position before POS and not too far before. |
39195 | 346 It should be the last one before POS, or nearly the last. |
347 | |
348 When open_paren_in_column_0_is_defun_start is nonzero, | |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
349 only the beginning of the buffer is treated as a defun-start. |
39195 | 350 |
351 We record the information about where the scan started | |
352 and what its result was, so that another call in the same area | |
353 can return the same value very quickly. | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
354 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
355 There is no promise at which position the global syntax data is |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
356 valid on return from the subroutine, so the caller should explicitly |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
357 update the global data. */ |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
358 |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
359 static EMACS_INT |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
360 find_defun_start (pos, pos_byte) |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
361 EMACS_INT pos, pos_byte; |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
362 { |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
363 EMACS_INT opoint = PT, opoint_byte = PT_BYTE; |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
364 |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
365 if (!open_paren_in_column_0_is_defun_start) |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
366 { |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
367 find_start_value_byte = BEGV_BYTE; |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
368 return BEGV; |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
369 } |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
370 |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
371 /* Use previous finding, if it's valid and applies to this inquiry. */ |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
372 if (current_buffer == find_start_buffer |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
373 /* Reuse the defun-start even if POS is a little farther on. |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
374 POS might be in the next defun, but that's ok. |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
375 Our value may not be the best possible, but will still be usable. */ |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
376 && pos <= find_start_pos + 1000 |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
377 && pos >= find_start_value |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
378 && BEGV == find_start_begv |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
379 && MODIFF == find_start_modiff) |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
380 return find_start_value; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
381 |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
382 /* Back up to start of line. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
383 scan_newline (pos, pos_byte, BEGV, BEGV_BYTE, -1, 1); |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
384 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
385 /* We optimize syntax-table lookup for rare updates. Thus we accept |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
386 only those `^\s(' which are good in global _and_ text-property |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
387 syntax-tables. */ |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107335
diff
changeset
|
388 SETUP_BUFFER_SYNTAX_TABLE (); |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
389 while (PT > BEGV) |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
390 { |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
391 int c; |
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
392 |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
393 /* Open-paren at start of line means we may have found our |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
394 defun-start. */ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
395 c = FETCH_CHAR_AS_MULTIBYTE (PT_BYTE); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
396 if (SYNTAX (c) == Sopen) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
397 { |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
398 SETUP_SYNTAX_TABLE (PT + 1, -1); /* Try again... */ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
399 c = FETCH_CHAR_AS_MULTIBYTE (PT_BYTE); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
400 if (SYNTAX (c) == Sopen) |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
401 break; |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
402 /* Now fallback to the default value. */ |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107335
diff
changeset
|
403 SETUP_BUFFER_SYNTAX_TABLE (); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
404 } |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
405 /* Move to beg of previous line. */ |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
406 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -2, 1); |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
407 } |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
408 |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
409 /* Record what we found, for the next try. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
410 find_start_value = PT; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
411 find_start_value_byte = PT_BYTE; |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
412 find_start_buffer = current_buffer; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
413 find_start_modiff = MODIFF; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
414 find_start_begv = BEGV; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
415 find_start_pos = pos; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
416 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
417 TEMP_SET_PT_BOTH (opoint, opoint_byte); |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
418 |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
419 return find_start_value; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
420 } |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
421 |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
422 /* Return the SYNTAX_COMEND_FIRST of the character before POS, POS_BYTE. */ |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
423 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
424 static int |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
425 prev_char_comend_first (pos, pos_byte) |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
426 int pos, pos_byte; |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
427 { |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
428 int c, val; |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
429 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
430 DEC_BOTH (pos, pos_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
431 UPDATE_SYNTAX_TABLE_BACKWARD (pos); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
432 c = FETCH_CHAR (pos_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
433 val = SYNTAX_COMEND_FIRST (c); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
434 UPDATE_SYNTAX_TABLE_FORWARD (pos + 1); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
435 return val; |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
436 } |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
437 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
438 /* Return the SYNTAX_COMSTART_FIRST of the character before POS, POS_BYTE. */ |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
439 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
440 /* static int |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
441 * prev_char_comstart_first (pos, pos_byte) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
442 * int pos, pos_byte; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
443 * { |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
444 * int c, val; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
445 * |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
446 * DEC_BOTH (pos, pos_byte); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
447 * UPDATE_SYNTAX_TABLE_BACKWARD (pos); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
448 * c = FETCH_CHAR (pos_byte); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
449 * val = SYNTAX_COMSTART_FIRST (c); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
450 * UPDATE_SYNTAX_TABLE_FORWARD (pos + 1); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
451 * return val; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
452 * } */ |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
453 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
454 /* Checks whether charpos FROM is at the end of a comment. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
455 FROM_BYTE is the bytepos corresponding to FROM. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
456 Do not move back before STOP. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
457 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
458 Return a positive value if we find a comment ending at FROM/FROM_BYTE; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
459 return -1 otherwise. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
460 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
461 If successful, store the charpos of the comment's beginning |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
462 into *CHARPOS_PTR, and the bytepos into *BYTEPOS_PTR. |
20330
f76b9c0ebc4b
(back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents:
20292
diff
changeset
|
463 |
f76b9c0ebc4b
(back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents:
20292
diff
changeset
|
464 Global syntax data remains valid for backward search starting at |
f76b9c0ebc4b
(back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents:
20292
diff
changeset
|
465 the returned value (or at FROM, if the search was not successful). */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
466 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
467 static int |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
468 back_comment (from, from_byte, stop, comnested, comstyle, charpos_ptr, bytepos_ptr) |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
469 EMACS_INT from, from_byte, stop; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
470 int comnested, comstyle; |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
471 EMACS_INT *charpos_ptr, *bytepos_ptr; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
472 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
473 /* Look back, counting the parity of string-quotes, |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
474 and recording the comment-starters seen. |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
475 When we reach a safe place, assume that's not in a string; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
476 then step the main scan to the earliest comment-starter seen |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
477 an even number of string quotes away from the safe place. |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
478 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
479 OFROM[I] is position of the earliest comment-starter seen |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
480 which is I+2X quotes from the comment-end. |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
481 PARITY is current parity of quotes from the comment end. */ |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
482 int string_style = -1; /* Presumed outside of any string. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
483 int string_lossage = 0; |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
484 /* Not a real lossage: indicates that we have passed a matching comment |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
485 starter plus a non-matching comment-ender, meaning that any matching |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
486 comment-starter we might see later could be a false positive (hidden |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
487 inside another comment). |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
488 Test case: { a (* b } c (* d *) */ |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
489 int comment_lossage = 0; |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
490 EMACS_INT comment_end = from; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
491 EMACS_INT comment_end_byte = from_byte; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
492 EMACS_INT comstart_pos = 0; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
493 EMACS_INT comstart_byte; |
20766
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
494 /* Place where the containing defun starts, |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
495 or 0 if we didn't come across it yet. */ |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
496 EMACS_INT defun_start = 0; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
497 EMACS_INT defun_start_byte = 0; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
498 register enum syntaxcode code; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
499 int nesting = 1; /* current comment nesting */ |
18079
5fbb5aef5649
(back_comment): Detect 2-char comment starts properly.
Richard M. Stallman <rms@gnu.org>
parents:
17786
diff
changeset
|
500 int c; |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
501 int syntax = 0; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
502 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
503 /* FIXME: A }} comment-ender style leads to incorrect behavior |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
504 in the case of {{ c }}} because we ignore the last two chars which are |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
505 assumed to be comment-enders although they aren't. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
506 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
507 /* At beginning of range to scan, we're outside of strings; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
508 that determines quote parity to the comment-end. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
509 while (from != stop) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
510 { |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
511 int temp_byte, prev_syntax; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
512 int com2start, com2end; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
513 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
514 /* Move back and examine a character. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
515 DEC_BOTH (from, from_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
516 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
517 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
518 prev_syntax = syntax; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
519 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
520 syntax = SYNTAX_WITH_FLAGS (c); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
521 code = SYNTAX (c); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
522 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
523 /* Check for 2-char comment markers. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
524 com2start = (SYNTAX_FLAGS_COMSTART_FIRST (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
525 && SYNTAX_FLAGS_COMSTART_SECOND (prev_syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
526 && comstyle == SYNTAX_FLAGS_COMMENT_STYLE (prev_syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
527 && (SYNTAX_FLAGS_COMMENT_NESTED (prev_syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
528 || SYNTAX_FLAGS_COMMENT_NESTED (syntax)) == comnested); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
529 com2end = (SYNTAX_FLAGS_COMEND_FIRST (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
530 && SYNTAX_FLAGS_COMEND_SECOND (prev_syntax)); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
531 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
532 /* Nasty cases with overlapping 2-char comment markers: |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
533 - snmp-mode: -- c -- foo -- c -- |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
534 --- c -- |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
535 ------ c -- |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
536 - c-mode: *||* |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
537 |* *|* *| |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
538 |*| |* |*| |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
539 /// */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
540 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
541 /* If a 2-char comment sequence partly overlaps with another, |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
542 we don't try to be clever. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
543 if (from > stop && (com2end || com2start)) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
544 { |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
545 int next = from, next_byte = from_byte, next_c, next_syntax; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
546 DEC_BOTH (next, next_byte); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
547 UPDATE_SYNTAX_TABLE_BACKWARD (next); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
548 next_c = FETCH_CHAR_AS_MULTIBYTE (next_byte); |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
549 next_syntax = SYNTAX_WITH_FLAGS (next_c); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
550 if (((com2start || comnested) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
551 && SYNTAX_FLAGS_COMEND_SECOND (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
552 && SYNTAX_FLAGS_COMEND_FIRST (next_syntax)) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
553 || ((com2end || comnested) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
554 && SYNTAX_FLAGS_COMSTART_SECOND (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
555 && comstyle == SYNTAX_FLAGS_COMMENT_STYLE (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
556 && SYNTAX_FLAGS_COMSTART_FIRST (next_syntax))) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
557 goto lossage; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
558 /* UPDATE_SYNTAX_TABLE_FORWARD (next + 1); */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
559 } |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
560 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
561 if (com2start && comstart_pos == 0) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
562 /* We're looking at a comment starter. But it might be a comment |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
563 ender as well (see snmp-mode). The first time we see one, we |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
564 need to consider it as a comment starter, |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
565 and the subsequent times as a comment ender. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
566 com2end = 0; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
567 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
568 /* Turn a 2-char comment sequences into the appropriate syntax. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
569 if (com2end) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
570 code = Sendcomment; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
571 else if (com2start) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
572 code = Scomment; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
573 /* Ignore comment starters of a different style. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
574 else if (code == Scomment |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
575 && (comstyle != SYNTAX_FLAGS_COMMENT_STYLE (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
576 || SYNTAX_FLAGS_COMMENT_NESTED (syntax) != comnested)) |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
577 continue; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
578 |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
579 /* Ignore escaped characters, except comment-enders. */ |
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
580 if (code != Sendcomment && char_quoted (from, from_byte)) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
581 continue; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
582 |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
583 switch (code) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
584 { |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
585 case Sstring_fence: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
586 case Scomment_fence: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
587 c = (code == Sstring_fence ? ST_STRING_STYLE : ST_COMMENT_STYLE); |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
588 case Sstring: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
589 /* Track parity of quotes. */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
590 if (string_style == -1) |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
591 /* Entering a string. */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
592 string_style = c; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
593 else if (string_style == c) |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
594 /* Leaving the string. */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
595 string_style = -1; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
596 else |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
597 /* If we have two kinds of string delimiters. |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
598 There's no way to grok this scanning backwards. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
599 string_lossage = 1; |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
600 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
601 |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
602 case Scomment: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
603 /* We've already checked that it is the relevant comstyle. */ |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
604 if (string_style != -1 || comment_lossage || string_lossage) |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
605 /* There are odd string quotes involved, so let's be careful. |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
606 Test case in Pascal: " { " a { " } */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
607 goto lossage; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
608 |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
609 if (!comnested) |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
610 { |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
611 /* Record best comment-starter so far. */ |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
612 comstart_pos = from; |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
613 comstart_byte = from_byte; |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
614 } |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
615 else if (--nesting <= 0) |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
616 /* nested comments have to be balanced, so we don't need to |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
617 keep looking for earlier ones. We use here the same (slightly |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
618 incorrect) reasoning as below: since it is followed by uniform |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
619 paired string quotes, this comment-start has to be outside of |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
620 strings, else the comment-end itself would be inside a string. */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
621 goto done; |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
622 break; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
623 |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
624 case Sendcomment: |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
625 if (SYNTAX_FLAGS_COMMENT_STYLE (syntax) == comstyle |
49971
afbb2d6d2f07
(back_comment): Only check nestedness of 2nd char if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49600
diff
changeset
|
626 && ((com2end && SYNTAX_FLAGS_COMMENT_NESTED (prev_syntax)) |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
627 || SYNTAX_FLAGS_COMMENT_NESTED (syntax)) == comnested) |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
628 /* This is the same style of comment ender as ours. */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
629 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
630 if (comnested) |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
631 nesting++; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
632 else |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
633 /* Anything before that can't count because it would match |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
634 this comment-ender rather than ours. */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
635 from = stop; /* Break out of the loop. */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
636 } |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
637 else if (comstart_pos != 0 || c != '\n') |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
638 /* We're mixing comment styles here, so we'd better be careful. |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
639 The (comstart_pos != 0 || c != '\n') check is not quite correct |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
640 (we should just always set comment_lossage), but removing it |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
641 would imply that any multiline comment in C would go through |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
642 lossage, which seems overkill. |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
643 The failure should only happen in the rare cases such as |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
644 { (* } *) */ |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
645 comment_lossage = 1; |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
646 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
647 |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
648 case Sopen: |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
649 /* Assume a defun-start point is outside of strings. */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
650 if (open_paren_in_column_0_is_defun_start |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
651 && (from == stop |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
652 || (temp_byte = dec_bytepos (from_byte), |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
653 FETCH_CHAR (temp_byte) == '\n'))) |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
654 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
655 defun_start = from; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
656 defun_start_byte = from_byte; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
657 from = stop; /* Break out of the loop. */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
658 } |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
659 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
660 |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
661 default: |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
662 break; |
20766
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
663 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
664 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
665 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
666 if (comstart_pos == 0) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
667 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
668 from = comment_end; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
669 from_byte = comment_end_byte; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
670 UPDATE_SYNTAX_TABLE_FORWARD (comment_end - 1); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
671 } |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
672 /* If comstart_pos is set and we get here (ie. didn't jump to `lossage' |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
673 or `done'), then we've found the beginning of the non-nested comment. */ |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
674 else if (1) /* !comnested */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
675 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
676 from = comstart_pos; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
677 from_byte = comstart_byte; |
56720
7c89be334c1b
(back_comment): Fixup globals in all cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56719
diff
changeset
|
678 UPDATE_SYNTAX_TABLE_FORWARD (from - 1); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
679 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
680 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
681 { |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
682 struct lisp_parse_state state; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
683 lossage: |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
684 /* We had two kinds of string delimiters mixed up |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
685 together. Decode this going forwards. |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
686 Scan fwd from a known safe place (beginning-of-defun) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
687 to the one in question; this records where we |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
688 last passed a comment starter. */ |
20766
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
689 /* If we did not already find the defun start, find it now. */ |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
690 if (defun_start == 0) |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
691 { |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
692 defun_start = find_defun_start (comment_end, comment_end_byte); |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
693 defun_start_byte = find_start_value_byte; |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
694 } |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
695 do |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
696 { |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
697 scan_sexps_forward (&state, |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
698 defun_start, defun_start_byte, |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
699 comment_end, -10000, 0, Qnil, 0); |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
700 defun_start = comment_end; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
701 if (state.incomment == (comnested ? 1 : -1) |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
702 && state.comstyle == comstyle) |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
703 from = state.comstr_start; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
704 else |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
705 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
706 from = comment_end; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
707 if (state.incomment) |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
708 /* If comment_end is inside some other comment, maybe ours |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
709 is nested, so we need to try again from within the |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
710 surrounding comment. Example: { a (* " *) */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
711 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
712 /* FIXME: We should advance by one or two chars. */ |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
713 defun_start = state.comstr_start + 2; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
714 defun_start_byte = CHAR_TO_BYTE (defun_start); |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
715 } |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
716 } |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
717 } while (defun_start < comment_end); |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
718 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
719 from_byte = CHAR_TO_BYTE (from); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
720 UPDATE_SYNTAX_TABLE_FORWARD (from - 1); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
721 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
722 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
723 done: |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
724 *charpos_ptr = from; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
725 *bytepos_ptr = from_byte; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
726 |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
727 return (from == comment_end) ? -1 : from; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
728 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
729 |
163 | 730 DEFUN ("syntax-table-p", Fsyntax_table_p, Ssyntax_table_p, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
731 doc: /* Return t if OBJECT is a syntax table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
732 Currently, any char-table counts as a syntax table. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
733 (object) |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
734 Lisp_Object object; |
163 | 735 { |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
736 if (CHAR_TABLE_P (object) |
18113
9f7fdb0f76f3
(Fsyntax_table_p, check_syntax_table): Use EQ.
Richard M. Stallman <rms@gnu.org>
parents:
18080
diff
changeset
|
737 && EQ (XCHAR_TABLE (object)->purpose, Qsyntax_table)) |
163 | 738 return Qt; |
739 return Qnil; | |
740 } | |
741 | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
742 static void |
163 | 743 check_syntax_table (obj) |
744 Lisp_Object obj; | |
745 { | |
71843
2d05f598fa85
(check_syntax_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71787
diff
changeset
|
746 CHECK_TYPE (CHAR_TABLE_P (obj) && EQ (XCHAR_TABLE (obj)->purpose, Qsyntax_table), |
2d05f598fa85
(check_syntax_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71787
diff
changeset
|
747 Qsyntax_table_p, obj); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
748 } |
163 | 749 |
750 DEFUN ("syntax-table", Fsyntax_table, Ssyntax_table, 0, 0, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
751 doc: /* Return the current syntax table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
752 This is the one specified by the current buffer. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
753 () |
163 | 754 { |
755 return current_buffer->syntax_table; | |
756 } | |
757 | |
758 DEFUN ("standard-syntax-table", Fstandard_syntax_table, | |
759 Sstandard_syntax_table, 0, 0, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
760 doc: /* Return the standard syntax table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
761 This is the one used for new buffers. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
762 () |
163 | 763 { |
764 return Vstandard_syntax_table; | |
765 } | |
766 | |
767 DEFUN ("copy-syntax-table", Fcopy_syntax_table, Scopy_syntax_table, 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
768 doc: /* Construct a new syntax table and return it. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
769 It is a copy of the TABLE, which defaults to the standard syntax table. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
770 (table) |
163 | 771 Lisp_Object table; |
772 { | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
773 Lisp_Object copy; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
774 |
485 | 775 if (!NILP (table)) |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
776 check_syntax_table (table); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
777 else |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
778 table = Vstandard_syntax_table; |
163 | 779 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
780 copy = Fcopy_sequence (table); |
14661
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
781 |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
782 /* Only the standard syntax table should have a default element. |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
783 Other syntax tables should inherit from parents instead. */ |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
784 XCHAR_TABLE (copy)->defalt = Qnil; |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
785 |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
786 /* Copied syntax tables should all have parents. |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
787 If we copied one with no parent, such as the standard syntax table, |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
788 use the standard syntax table as the copy's parent. */ |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
789 if (NILP (XCHAR_TABLE (copy)->parent)) |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
790 Fset_char_table_parent (copy, Vstandard_syntax_table); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
791 return copy; |
163 | 792 } |
793 | |
794 DEFUN ("set-syntax-table", Fset_syntax_table, Sset_syntax_table, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
795 doc: /* Select a new syntax table for the current buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
796 One argument, a syntax table. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
797 (table) |
163 | 798 Lisp_Object table; |
799 { | |
28313
cdb964ab44c3
(Fset_syntax_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
28302
diff
changeset
|
800 int idx; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
801 check_syntax_table (table); |
163 | 802 current_buffer->syntax_table = table; |
803 /* Indicate that this buffer now has a specified syntax table. */ | |
28351 | 804 idx = PER_BUFFER_VAR_IDX (syntax_table); |
805 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1); | |
163 | 806 return table; |
807 } | |
808 | |
809 /* Convert a letter which signifies a syntax code | |
810 into the code it signifies. | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
811 This is used by modify-syntax-entry, and other things. */ |
163 | 812 |
813 unsigned char syntax_spec_code[0400] = | |
814 { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
815 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
816 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
817 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
818 (char) Swhitespace, (char) Scomment_fence, (char) Sstring, 0377, |
163 | 819 (char) Smath, 0377, 0377, (char) Squote, |
820 (char) Sopen, (char) Sclose, 0377, 0377, | |
821 0377, (char) Swhitespace, (char) Spunct, (char) Scharquote, | |
822 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
823 0377, 0377, 0377, 0377, | |
824 (char) Scomment, 0377, (char) Sendcomment, 0377, | |
5442
8cbae747a768
(describe_syntax): Handle Sinherit.
Richard M. Stallman <rms@gnu.org>
parents:
5339
diff
changeset
|
825 (char) Sinherit, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* @, A ... */ |
163 | 826 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, |
827 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword, | |
828 0377, 0377, 0377, 0377, (char) Sescape, 0377, 0377, (char) Ssymbol, | |
829 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* `, a, ... */ | |
830 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
831 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword, | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
832 0377, 0377, 0377, 0377, (char) Sstring_fence, 0377, 0377, 0377 |
163 | 833 }; |
834 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
835 /* Indexed by syntax code, give the letter that describes it. */ |
163 | 836 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
837 char syntax_code_spec[16] = |
163 | 838 { |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
839 ' ', '.', 'w', '_', '(', ')', '\'', '\"', '$', '\\', '/', '<', '>', '@', |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
840 '!', '|' |
163 | 841 }; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
842 |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
843 /* Indexed by syntax code, give the object (cons of syntax code and |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
844 nil) to be stored in syntax table. Since these objects can be |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
845 shared among syntax tables, we generate them in advance. By |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
846 sharing objects, the function `describe-syntax' can give a more |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
847 compact listing. */ |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
848 static Lisp_Object Vsyntax_code_object; |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
849 |
163 | 850 |
851 DEFUN ("char-syntax", Fchar_syntax, Schar_syntax, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
852 doc: /* Return the syntax code of CHARACTER, described by a character. |
105102
7a2f279a2c8d
* syntax.c (Fchar_syntax): Minor doc fix (Bug#119).
Chong Yidong <cyd@stupidchicken.com>
parents:
102145
diff
changeset
|
853 For example, if CHARACTER is a word constituent, the |
7a2f279a2c8d
* syntax.c (Fchar_syntax): Minor doc fix (Bug#119).
Chong Yidong <cyd@stupidchicken.com>
parents:
102145
diff
changeset
|
854 character `w' (119) is returned. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
855 The characters that correspond to various syntax codes |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
856 are listed in the documentation of `modify-syntax-entry'. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
857 (character) |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
858 Lisp_Object character; |
163 | 859 { |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
860 int char_int; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
861 CHECK_NUMBER (character); |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
862 char_int = XINT (character); |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107335
diff
changeset
|
863 SETUP_BUFFER_SYNTAX_TABLE (); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
864 return make_number (syntax_code_spec[(int) SYNTAX (char_int)]); |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
865 } |
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
866 |
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
867 DEFUN ("matching-paren", Fmatching_paren, Smatching_paren, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
868 doc: /* Return the matching parenthesis of CHARACTER, or nil if none. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
869 (character) |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
870 Lisp_Object character; |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
871 { |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
872 int char_int, code; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
873 CHECK_NUMBER (character); |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
874 char_int = XINT (character); |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107335
diff
changeset
|
875 SETUP_BUFFER_SYNTAX_TABLE (); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
876 code = SYNTAX (char_int); |
7975
49dc4ea976a0
(Fmatching_paren): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
7968
diff
changeset
|
877 if (code == Sopen || code == Sclose) |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18491
diff
changeset
|
878 return SYNTAX_MATCH (char_int); |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
879 return Qnil; |
163 | 880 } |
881 | |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
882 DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
883 doc: /* Convert a syntax specification STRING into syntax cell form. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
884 STRING should be a string as it is allowed as argument of |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
885 `modify-syntax-entry'. Value is the equivalent cons cell |
74563
da4c1968d862
Fix spurious open-paren-in-column-0 in a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74542
diff
changeset
|
886 \(CODE . MATCHING-CHAR) that can be used as value of a `syntax-table' |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
887 text property. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
888 (string) |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
889 Lisp_Object string; |
163 | 890 { |
46555
35e66a0949b8
(Fstring_to_syntax, skip_chars): Treat Lisp string
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
891 register const unsigned char *p; |
163 | 892 register enum syntaxcode code; |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
893 int val; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
894 Lisp_Object match; |
163 | 895 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
896 CHECK_STRING (string); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
897 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41598
diff
changeset
|
898 p = SDATA (string); |
163 | 899 code = (enum syntaxcode) syntax_spec_code[*p++]; |
900 if (((int) code & 0377) == 0377) | |
63703
bb4ab751a6a3
(Fstring_to_syntax): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
58897
diff
changeset
|
901 error ("Invalid syntax description letter: %c", p[-1]); |
163 | 902 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
903 if (code == Sinherit) |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
904 return Qnil; |
163 | 905 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
906 if (*p) |
13513
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
907 { |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
908 int len; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
909 int character = STRING_CHAR_AND_LENGTH (p, len); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
910 XSETINT (match, character); |
13513
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
911 if (XFASTINT (match) == ' ') |
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
912 match = Qnil; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
913 p += len; |
13513
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
914 } |
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
915 else |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
916 match = Qnil; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
917 |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
918 val = (int) code; |
163 | 919 while (*p) |
920 switch (*p++) | |
921 { | |
922 case '1': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
923 val |= 1 << 16; |
163 | 924 break; |
925 | |
926 case '2': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
927 val |= 1 << 17; |
163 | 928 break; |
929 | |
930 case '3': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
931 val |= 1 << 18; |
163 | 932 break; |
933 | |
934 case '4': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
935 val |= 1 << 19; |
163 | 936 break; |
937 | |
938 case 'p': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
939 val |= 1 << 20; |
163 | 940 break; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
941 |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
942 case 'b': |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
943 val |= 1 << 21; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
944 break; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
945 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
946 case 'n': |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
947 val |= 1 << 22; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
948 break; |
163 | 949 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
950 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
951 if (val < XVECTOR (Vsyntax_code_object)->size && NILP (match)) |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
952 return XVECTOR (Vsyntax_code_object)->contents[val]; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
953 else |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
954 /* Since we can't use a shared object, let's make a new one. */ |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
955 return Fcons (make_number (val), match); |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
956 } |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
957 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
958 /* I really don't know why this is interactive |
40286
0e7059267f7e
Fix comment ending.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40205
diff
changeset
|
959 help-form should at least be made useful whilst reading the second arg. */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
960 DEFUN ("modify-syntax-entry", Fmodify_syntax_entry, Smodify_syntax_entry, 2, 3, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
961 "cSet syntax for character: \nsSet syntax for %s to: ", |
40205
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
962 doc: /* Set syntax for character CHAR according to string NEWENTRY. |
55423
a9e10b866486
(Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54849
diff
changeset
|
963 The syntax is changed only for table SYNTAX-TABLE, which defaults to |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
964 the current buffer's syntax table. |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
965 CHAR may be a cons (MIN . MAX), in which case, syntaxes of all characters |
100345
b814c7996a93
* syntax.c (Fmodify_syntax_entry): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99020
diff
changeset
|
966 in the range MIN to MAX are changed. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
967 The first character of NEWENTRY should be one of the following: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
968 Space or - whitespace syntax. w word constituent. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
969 _ symbol constituent. . punctuation. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
970 ( open-parenthesis. ) close-parenthesis. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
971 " string quote. \\ escape. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
972 $ paired delimiter. ' expression quote or prefix operator. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
973 < comment starter. > comment ender. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
974 / character-quote. @ inherit from `standard-syntax-table'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
975 | generic string fence. ! generic comment fence. |
163 | 976 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
977 Only single-character comment start and end sequences are represented thus. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
978 Two-character sequences are represented as described below. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
979 The second character of NEWENTRY is the matching parenthesis, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
980 used only if the first character is `(' or `)'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
981 Any additional characters are flags. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
982 Defined flags are the characters 1, 2, 3, 4, b, p, and n. |
40205
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
983 1 means CHAR is the start of a two-char comment start sequence. |
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
984 2 means CHAR is the second character of such a sequence. |
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
985 3 means CHAR is the start of a two-char comment end sequence. |
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
986 4 means CHAR is the second character of such a sequence. |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
987 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
988 There can be up to two orthogonal comment sequences. This is to support |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
989 language modes such as C++. By default, all comment sequences are of style |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
990 a, but you can set the comment sequence style to b (on the second character |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
991 of a comment-start, or the first character of a comment-end sequence) using |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
992 this flag: |
40205
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
993 b means CHAR is part of comment sequence b. |
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
994 n means CHAR is part of a nestable comment sequence. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
995 |
40205
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
996 p means CHAR is a prefix character for `backward-prefix-chars'; |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
997 such characters are treated as whitespace when they occur |
40205
d13b14b50715
(modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
998 between expressions. |
100345
b814c7996a93
* syntax.c (Fmodify_syntax_entry): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99020
diff
changeset
|
999 usage: (modify-syntax-entry CHAR NEWENTRY &optional SYNTAX-TABLE) */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1000 (c, newentry, syntax_table) |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1001 Lisp_Object c, newentry, syntax_table; |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1002 { |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1003 if (CONSP (c)) |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1004 { |
89483 | 1005 CHECK_CHARACTER_CAR (c); |
1006 CHECK_CHARACTER_CDR (c); | |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1007 } |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1008 else |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1009 CHECK_CHARACTER (c); |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1010 |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1011 if (NILP (syntax_table)) |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1012 syntax_table = current_buffer->syntax_table; |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1013 else |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1014 check_syntax_table (syntax_table); |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1015 |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1016 newentry = Fstring_to_syntax (newentry); |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1017 if (CONSP (c)) |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1018 SET_RAW_SYNTAX_ENTRY_RANGE (syntax_table, c, newentry); |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1019 else |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1020 SET_RAW_SYNTAX_ENTRY (syntax_table, XINT (c), newentry); |
72945
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1021 |
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1022 /* We clear the regexp cache, since character classes can now have |
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1023 different values from those in the compiled regexps.*/ |
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1024 clear_regexp_cache (); |
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1025 |
163 | 1026 return Qnil; |
1027 } | |
1028 | |
1029 /* Dump syntax table to buffer in human-readable format */ | |
1030 | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1031 DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value, |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1032 Sinternal_describe_syntax_value, 1, 1, 0, |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1033 doc: /* Insert a description of the internal syntax description SYNTAX at point. */) |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1034 (syntax) |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1035 Lisp_Object syntax; |
163 | 1036 { |
1037 register enum syntaxcode code; | |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1038 char desc, start1, start2, end1, end2, prefix, comstyle, comnested; |
163 | 1039 char str[2]; |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1040 Lisp_Object first, match_lisp, value = syntax; |
163 | 1041 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1042 if (NILP (value)) |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1043 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1044 insert_string ("default"); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1045 return syntax; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1046 } |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1047 |
17109
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1048 if (CHAR_TABLE_P (value)) |
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1049 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1050 insert_string ("deeper char-table ..."); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1051 return syntax; |
17109
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1052 } |
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1053 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1054 if (!CONSP (value)) |
163 | 1055 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1056 insert_string ("invalid"); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1057 return syntax; |
163 | 1058 } |
1059 | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25659
diff
changeset
|
1060 first = XCAR (value); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25659
diff
changeset
|
1061 match_lisp = XCDR (value); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1062 |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1063 if (!INTEGERP (first) || !(NILP (match_lisp) || INTEGERP (match_lisp))) |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1064 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1065 insert_string ("invalid"); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1066 return syntax; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1067 } |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1068 |
18113
9f7fdb0f76f3
(Fsyntax_table_p, check_syntax_table): Use EQ.
Richard M. Stallman <rms@gnu.org>
parents:
18080
diff
changeset
|
1069 code = (enum syntaxcode) (XINT (first) & 0377); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1070 start1 = (XINT (first) >> 16) & 1; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1071 start2 = (XINT (first) >> 17) & 1; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1072 end1 = (XINT (first) >> 18) & 1; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1073 end2 = (XINT (first) >> 19) & 1; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1074 prefix = (XINT (first) >> 20) & 1; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1075 comstyle = (XINT (first) >> 21) & 1; |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1076 comnested = (XINT (first) >> 22) & 1; |
163 | 1077 |
1078 if ((int) code < 0 || (int) code >= (int) Smax) | |
1079 { | |
1080 insert_string ("invalid"); | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1081 return syntax; |
163 | 1082 } |
1083 desc = syntax_code_spec[(int) code]; | |
1084 | |
1085 str[0] = desc, str[1] = 0; | |
1086 insert (str, 1); | |
1087 | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1088 if (NILP (match_lisp)) |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1089 insert (" ", 1); |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1090 else |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1091 insert_char (XINT (match_lisp)); |
163 | 1092 |
1093 if (start1) | |
1094 insert ("1", 1); | |
1095 if (start2) | |
1096 insert ("2", 1); | |
1097 | |
1098 if (end1) | |
1099 insert ("3", 1); | |
1100 if (end2) | |
1101 insert ("4", 1); | |
1102 | |
1103 if (prefix) | |
1104 insert ("p", 1); | |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1105 if (comstyle) |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1106 insert ("b", 1); |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1107 if (comnested) |
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1108 insert ("n", 1); |
163 | 1109 |
1110 insert_string ("\twhich means: "); | |
1111 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
9863
diff
changeset
|
1112 switch (SWITCH_ENUM_CAST (code)) |
163 | 1113 { |
1114 case Swhitespace: | |
1115 insert_string ("whitespace"); break; | |
1116 case Spunct: | |
1117 insert_string ("punctuation"); break; | |
1118 case Sword: | |
1119 insert_string ("word"); break; | |
1120 case Ssymbol: | |
1121 insert_string ("symbol"); break; | |
1122 case Sopen: | |
1123 insert_string ("open"); break; | |
1124 case Sclose: | |
1125 insert_string ("close"); break; | |
1126 case Squote: | |
32508
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1127 insert_string ("prefix"); break; |
163 | 1128 case Sstring: |
1129 insert_string ("string"); break; | |
1130 case Smath: | |
1131 insert_string ("math"); break; | |
1132 case Sescape: | |
1133 insert_string ("escape"); break; | |
1134 case Scharquote: | |
1135 insert_string ("charquote"); break; | |
1136 case Scomment: | |
1137 insert_string ("comment"); break; | |
1138 case Sendcomment: | |
1139 insert_string ("endcomment"); break; | |
32508
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1140 case Sinherit: |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1141 insert_string ("inherit"); break; |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1142 case Scomment_fence: |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1143 insert_string ("comment fence"); break; |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1144 case Sstring_fence: |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1145 insert_string ("string fence"); break; |
163 | 1146 default: |
1147 insert_string ("invalid"); | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1148 return syntax; |
163 | 1149 } |
1150 | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1151 if (!NILP (match_lisp)) |
163 | 1152 { |
1153 insert_string (", matches "); | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1154 insert_char (XINT (match_lisp)); |
163 | 1155 } |
1156 | |
1157 if (start1) | |
1158 insert_string (",\n\t is the first character of a comment-start sequence"); | |
1159 if (start2) | |
1160 insert_string (",\n\t is the second character of a comment-start sequence"); | |
1161 | |
1162 if (end1) | |
1163 insert_string (",\n\t is the first character of a comment-end sequence"); | |
1164 if (end2) | |
1165 insert_string (",\n\t is the second character of a comment-end sequence"); | |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1166 if (comstyle) |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1167 insert_string (" (comment style b)"); |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1168 if (comnested) |
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1169 insert_string (" (nestable)"); |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1170 |
163 | 1171 if (prefix) |
1172 insert_string (",\n\t is a prefix character for `backward-prefix-chars'"); | |
1173 | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1174 return syntax; |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1175 } |
163 | 1176 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1177 int parse_sexp_ignore_comments; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1178 |
89483 | 1179 /* Char-table of functions that find the next or previous word |
1180 boundary. */ | |
1181 Lisp_Object Vfind_word_boundary_function_table; | |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1182 |
163 | 1183 /* Return the position across COUNT words from FROM. |
1184 If that many words cannot be found before the end of the buffer, return 0. | |
1185 COUNT negative means scan backward and stop at word beginning. */ | |
1186 | |
21514 | 1187 int |
163 | 1188 scan_words (from, count) |
1189 register int from, count; | |
1190 { | |
1191 register int beg = BEGV; | |
1192 register int end = ZV; | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1193 register int from_byte = CHAR_TO_BYTE (from); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1194 register enum syntaxcode code; |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1195 int ch0, ch1; |
89483 | 1196 Lisp_Object func, script, pos; |
163 | 1197 |
1198 immediate_quit = 1; | |
1199 QUIT; | |
1200 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1201 SETUP_SYNTAX_TABLE (from, count); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1202 |
163 | 1203 while (count > 0) |
1204 { | |
1205 while (1) | |
1206 { | |
1207 if (from == end) | |
1208 { | |
1209 immediate_quit = 0; | |
1210 return 0; | |
1211 } | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1212 UPDATE_SYNTAX_TABLE_FORWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1213 ch0 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1214 code = SYNTAX (ch0); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1215 INC_BOTH (from, from_byte); |
163 | 1216 if (words_include_escapes |
1217 && (code == Sescape || code == Scharquote)) | |
1218 break; | |
1219 if (code == Sword) | |
1220 break; | |
1221 } | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1222 /* Now CH0 is a character which begins a word and FROM is the |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1223 position of the next character. */ |
89483 | 1224 func = CHAR_TABLE_REF (Vfind_word_boundary_function_table, ch0); |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1225 if (! NILP (Ffboundp (func))) |
163 | 1226 { |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1227 pos = call2 (func, make_number (from - 1), make_number (end)); |
89483 | 1228 if (INTEGERP (pos) && XINT (pos) > from) |
1229 { | |
1230 from = XINT (pos); | |
1231 from_byte = CHAR_TO_BYTE (from); | |
1232 } | |
163 | 1233 } |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1234 else |
163 | 1235 { |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1236 script = CHAR_TABLE_REF (Vchar_script_table, ch0); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1237 while (1) |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1238 { |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1239 if (from == end) break; |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1240 UPDATE_SYNTAX_TABLE_FORWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1241 ch1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1242 code = SYNTAX (ch1); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1243 if ((code != Sword |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1244 && (! words_include_escapes |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1245 || (code != Sescape && code != Scharquote))) |
99020
08af05537037
(scan_words): Call word_boundary_p instead of comparing
Kenichi Handa <handa@m17n.org>
parents:
96988
diff
changeset
|
1246 || word_boundary_p (ch0, ch1)) |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1247 break; |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1248 INC_BOTH (from, from_byte); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1249 ch0 = ch1; |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1250 } |
163 | 1251 } |
1252 count--; | |
1253 } | |
1254 while (count < 0) | |
1255 { | |
1256 while (1) | |
1257 { | |
1258 if (from == beg) | |
1259 { | |
1260 immediate_quit = 0; | |
1261 return 0; | |
1262 } | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1263 DEC_BOTH (from, from_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1264 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1265 ch1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1266 code = SYNTAX (ch1); |
163 | 1267 if (words_include_escapes |
1268 && (code == Sescape || code == Scharquote)) | |
1269 break; | |
1270 if (code == Sword) | |
1271 break; | |
1272 } | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1273 /* Now CH1 is a character which ends a word and FROM is the |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1274 position of it. */ |
89483 | 1275 func = CHAR_TABLE_REF (Vfind_word_boundary_function_table, ch1); |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1276 if (! NILP (Ffboundp (func))) |
89483 | 1277 { |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1278 pos = call2 (func, make_number (from), make_number (beg)); |
89483 | 1279 if (INTEGERP (pos) && XINT (pos) < from) |
1280 { | |
1281 from = XINT (pos); | |
1282 from_byte = CHAR_TO_BYTE (from); | |
1283 } | |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1284 } |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1285 else |
163 | 1286 { |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1287 script = CHAR_TABLE_REF (Vchar_script_table, ch1); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1288 while (1) |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1289 { |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1290 if (from == beg) |
77927
d15a774f9796
(scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
Chong Yidong <cyd@stupidchicken.com>
parents:
77757
diff
changeset
|
1291 break; |
90851 | 1292 DEC_BOTH (from, from_byte); |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1293 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
90851 | 1294 ch0 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1295 code = SYNTAX (ch0); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1296 if ((code != Sword |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1297 && (! words_include_escapes |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1298 || (code != Sescape && code != Scharquote))) |
99020
08af05537037
(scan_words): Call word_boundary_p instead of comparing
Kenichi Handa <handa@m17n.org>
parents:
96988
diff
changeset
|
1299 || word_boundary_p (ch0, ch1)) |
90851 | 1300 { |
1301 INC_BOTH (from, from_byte); | |
1302 break; | |
1303 } | |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1304 ch1 = ch0; |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1305 } |
163 | 1306 } |
1307 count++; | |
1308 } | |
1309 | |
1310 immediate_quit = 0; | |
1311 | |
1312 return from; | |
1313 } | |
1314 | |
93546
45896a2e7bee
(Fforward_word): Add ^ interactive spec.
Chong Yidong <cyd@stupidchicken.com>
parents:
91806
diff
changeset
|
1315 DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p", |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1316 doc: /* Move point forward ARG words (backward if ARG is negative). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1317 Normally returns t. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1318 If an edge of the buffer or a field boundary is reached, point is left there |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1319 and the function returns nil. Field boundaries are not noticed if |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1320 `inhibit-field-text-motion' is non-nil. */) |
52213
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1321 (arg) |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1322 Lisp_Object arg; |
163 | 1323 { |
58897
98e94b29b59b
(Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57756
diff
changeset
|
1324 Lisp_Object tmp; |
26391
216416ad34fe
(Fforward_word): Handle fields even if would have hit
Richard M. Stallman <rms@gnu.org>
parents:
26272
diff
changeset
|
1325 int orig_val, val; |
52213
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1326 |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1327 if (NILP (arg)) |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1328 XSETFASTINT (arg, 1); |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1329 else |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1330 CHECK_NUMBER (arg); |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1331 |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1332 val = orig_val = scan_words (PT, XINT (arg)); |
26391
216416ad34fe
(Fforward_word): Handle fields even if would have hit
Richard M. Stallman <rms@gnu.org>
parents:
26272
diff
changeset
|
1333 if (! orig_val) |
52213
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1334 val = XINT (arg) > 0 ? ZV : BEGV; |
25401
3f78f1fed4e0
(Fforward_word): If in a mini-buffer and moving
Gerd Moellmann <gerd@gnu.org>
parents:
25290
diff
changeset
|
1335 |
26060
6edf64bf5e22
(Fforward_word): Supply new ESCAPE_FROM_EDGE parameter
Gerd Moellmann <gerd@gnu.org>
parents:
25771
diff
changeset
|
1336 /* Avoid jumping out of an input field. */ |
58897
98e94b29b59b
(Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57756
diff
changeset
|
1337 tmp = Fconstrain_to_field (make_number (val), make_number (PT), |
98e94b29b59b
(Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57756
diff
changeset
|
1338 Qt, Qnil, Qnil); |
98e94b29b59b
(Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57756
diff
changeset
|
1339 val = XFASTINT (tmp); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
1340 |
163 | 1341 SET_PT (val); |
27079
638b309011d9
(Fforward_word): Notice field boundaries only if
Gerd Moellmann <gerd@gnu.org>
parents:
26526
diff
changeset
|
1342 return val == orig_val ? Qt : Qnil; |
163 | 1343 } |
1344 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1345 Lisp_Object skip_chars (); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1346 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1347 DEFUN ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1348 doc: /* Move point forward, stopping before a char not in STRING, or at pos LIM. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1349 STRING is like the inside of a `[...]' in a regular expression |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1350 except that `]' is never special and `\\' quotes `^', `-' or `\\' |
102145
16ac9218f780
(Fskip_chars_forward): Fix doc typo.
Glenn Morris <rgm@gnu.org>
parents:
100951
diff
changeset
|
1351 (but not at the end of a range; quoting is never needed there). |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1352 Thus, with arg "a-zA-Z", this skips letters stopping before first nonletter. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1353 With arg "^a-zA-Z", skips nonletters stopping before first letter. |
56088 | 1354 Char classes, e.g. `[:alpha:]', are supported. |
1355 | |
1356 Returns the distance traveled, either zero or positive. */) | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1357 (string, lim) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1358 Lisp_Object string, lim; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1359 { |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1360 return skip_chars (1, string, lim, 1); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1361 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1362 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1363 DEFUN ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1364 doc: /* Move point backward, stopping after a char not in STRING, or at pos LIM. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1365 See `skip-chars-forward' for details. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1366 Returns the distance traveled, either zero or negative. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1367 (string, lim) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1368 Lisp_Object string, lim; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1369 { |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1370 return skip_chars (0, string, lim, 1); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1371 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1372 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1373 DEFUN ("skip-syntax-forward", Fskip_syntax_forward, Sskip_syntax_forward, 1, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1374 doc: /* Move point forward across chars in specified syntax classes. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1375 SYNTAX is a string of syntax code characters. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1376 Stop before a char whose syntax is not in SYNTAX, or at position LIM. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1377 If SYNTAX starts with ^, skip characters whose syntax is NOT in SYNTAX. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1378 This function returns the distance traveled, either zero or positive. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1379 (syntax, lim) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1380 Lisp_Object syntax, lim; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1381 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1382 return skip_syntaxes (1, syntax, lim); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1383 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1384 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1385 DEFUN ("skip-syntax-backward", Fskip_syntax_backward, Sskip_syntax_backward, 1, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1386 doc: /* Move point backward across chars in specified syntax classes. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1387 SYNTAX is a string of syntax code characters. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1388 Stop on reaching a char whose syntax is not in SYNTAX, or at position LIM. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1389 If SYNTAX starts with ^, skip characters whose syntax is NOT in SYNTAX. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1390 This function returns the distance traveled, either zero or negative. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1391 (syntax, lim) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1392 Lisp_Object syntax, lim; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1393 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1394 return skip_syntaxes (0, syntax, lim); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1395 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1396 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1397 static Lisp_Object |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1398 skip_chars (forwardp, string, lim, handle_iso_classes) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1399 int forwardp; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1400 Lisp_Object string, lim; |
56088 | 1401 int handle_iso_classes; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1402 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1403 register unsigned int c; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1404 unsigned char fastmap[0400]; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1405 /* Store the ranges of non-ASCII characters. */ |
20292
2befa7396e42
(skip_chars): Check type of `string' before using it.
Karl Heuer <kwzh@gnu.org>
parents:
18938
diff
changeset
|
1406 int *char_ranges; |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1407 int n_char_ranges = 0; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1408 int negate = 0; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1409 register int i, i_byte; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1410 /* Set to 1 if the current buffer is multibyte and the region |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1411 contains non-ASCII chars. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1412 int multibyte; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1413 /* Set to 1 if STRING is multibyte and it contains non-ASCII |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1414 chars. */ |
22486
a28020246db1
(skip_chars): Don't examine STRING before verifying that it is a string.
Richard M. Stallman <rms@gnu.org>
parents:
22432
diff
changeset
|
1415 int string_multibyte; |
a28020246db1
(skip_chars): Don't examine STRING before verifying that it is a string.
Richard M. Stallman <rms@gnu.org>
parents:
22432
diff
changeset
|
1416 int size_byte; |
46555
35e66a0949b8
(Fstring_to_syntax, skip_chars): Treat Lisp string
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
1417 const unsigned char *str; |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1418 int len; |
56088 | 1419 Lisp_Object iso_classes; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1420 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
1421 CHECK_STRING (string); |
56088 | 1422 iso_classes = Qnil; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1423 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1424 if (NILP (lim)) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1425 XSETINT (lim, forwardp ? ZV : BEGV); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1426 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
1427 CHECK_NUMBER_COERCE_MARKER (lim); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1428 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1429 /* In any case, don't allow scan outside bounds of buffer. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1430 if (XINT (lim) > ZV) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1431 XSETFASTINT (lim, ZV); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1432 if (XINT (lim) < BEGV) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1433 XSETFASTINT (lim, BEGV); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1434 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1435 multibyte = (!NILP (current_buffer->enable_multibyte_characters) |
89341
9664825d832f
(skip_chars, skip_syntaxes): Fix type errors.
Dave Love <fx@gnu.org>
parents:
89114
diff
changeset
|
1436 && (XINT (lim) - PT != CHAR_TO_BYTE (XINT (lim)) - PT_BYTE)); |
89483 | 1437 string_multibyte = SBYTES (string) > SCHARS (string); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1438 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1439 bzero (fastmap, sizeof fastmap); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1440 |
89483 | 1441 str = SDATA (string); |
1442 size_byte = SBYTES (string); | |
89103
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1443 |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1444 i_byte = 0; |
22130
b25abff012fd
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22116
diff
changeset
|
1445 if (i_byte < size_byte |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41598
diff
changeset
|
1446 && SREF (string, 0) == '^') |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1447 { |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1448 negate = 1; i_byte++; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1449 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1450 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1451 /* Find the characters specified and set their elements of fastmap. |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1452 Handle backslashes and ranges specially. |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1453 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1454 If STRING contains non-ASCII characters, setup char_ranges for |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1455 them and use fastmap only for their leading codes. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1456 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1457 if (! string_multibyte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1458 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1459 int string_has_eight_bit = 0; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1460 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1461 /* At first setup fastmap. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1462 while (i_byte < size_byte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1463 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1464 c = str[i_byte++]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1465 |
56088 | 1466 if (handle_iso_classes && c == '[' |
1467 && i_byte < size_byte | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1468 && str[i_byte] == ':') |
56088 | 1469 { |
1470 const unsigned char *class_beg = str + i_byte + 1; | |
1471 const unsigned char *class_end = class_beg; | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1472 const unsigned char *class_limit = str + size_byte - 2; |
74145 | 1473 /* Leave room for the null. */ |
56088 | 1474 unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1]; |
1475 re_wctype_t cc; | |
1476 | |
1477 if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH) | |
1478 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH; | |
1479 | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1480 while (class_end < class_limit |
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1481 && *class_end >= 'a' && *class_end <= 'z') |
56088 | 1482 class_end++; |
1483 | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1484 if (class_end == class_beg |
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1485 || *class_end != ':' || class_end[1] != ']') |
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1486 goto not_a_class_name; |
56088 | 1487 |
1488 bcopy (class_beg, class_name, class_end - class_beg); | |
1489 class_name[class_end - class_beg] = 0; | |
1490 | |
1491 cc = re_wctype (class_name); | |
1492 if (cc == 0) | |
1493 error ("Invalid ISO C character class"); | |
1494 | |
1495 iso_classes = Fcons (make_number (cc), iso_classes); | |
1496 | |
1497 i_byte = class_end + 2 - str; | |
1498 continue; | |
1499 } | |
1500 | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1501 not_a_class_name: |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1502 if (c == '\\') |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1503 { |
22130
b25abff012fd
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22116
diff
changeset
|
1504 if (i_byte == size_byte) |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1505 break; |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1506 |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1507 c = str[i_byte++]; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1508 } |
53508
c7553b3b3a60
(skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
1509 /* Treat `-' as range character only if another character |
c7553b3b3a60
(skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
1510 follows. */ |
c7553b3b3a60
(skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
1511 if (i_byte + 1 < size_byte |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1512 && str[i_byte] == '-') |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1513 { |
31944
05763e780521
(skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents:
31209
diff
changeset
|
1514 unsigned int c2; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1515 |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1516 /* Skip over the dash. */ |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1517 i_byte++; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1518 |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1519 /* Get the end of the range. */ |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1520 c2 = str[i_byte++]; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1521 if (c2 == '\\' |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1522 && i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1523 c2 = str[i_byte++]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1524 |
89483 | 1525 if (c <= c2) |
22116
09efd6a94b4b
(skip_chars): Fix bug in handling a range which
Kenichi Handa <handa@m17n.org>
parents:
22052
diff
changeset
|
1526 { |
09efd6a94b4b
(skip_chars): Fix bug in handling a range which
Kenichi Handa <handa@m17n.org>
parents:
22052
diff
changeset
|
1527 while (c <= c2) |
89483 | 1528 fastmap[c++] = 1; |
1529 if (! ASCII_CHAR_P (c2)) | |
1530 string_has_eight_bit = 1; | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1531 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1532 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1533 else |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1534 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1535 fastmap[c] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1536 if (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1537 string_has_eight_bit = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1538 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1539 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1540 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1541 /* If the current range is multibyte and STRING contains |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1542 eight-bit chars, arrange fastmap and setup char_ranges for |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1543 the corresponding multibyte chars. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1544 if (multibyte && string_has_eight_bit) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1545 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1546 unsigned char fastmap2[0400]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1547 int range_start_byte, range_start_char; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1548 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1549 bcopy (fastmap2 + 0200, fastmap + 0200, 0200); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1550 bzero (fastmap + 0200, 0200); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1551 /* We are sure that this loop stops. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1552 for (i = 0200; ! fastmap2[i]; i++); |
105661
bac26aa40069
Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105426
diff
changeset
|
1553 c = BYTE8_TO_CHAR (i); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1554 fastmap[CHAR_LEADING_CODE (c)] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1555 range_start_byte = i; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1556 range_start_char = c; |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1557 char_ranges = (int *) alloca (sizeof (int) * 128 * 2); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1558 for (i = 129; i < 0400; i++) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1559 { |
105661
bac26aa40069
Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105426
diff
changeset
|
1560 c = BYTE8_TO_CHAR (i); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1561 fastmap[CHAR_LEADING_CODE (c)] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1562 if (i - range_start_byte != c - range_start_char) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1563 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1564 char_ranges[n_char_ranges++] = range_start_char; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1565 char_ranges[n_char_ranges++] = ((i - 1 - range_start_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1566 + range_start_char); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1567 range_start_byte = i; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1568 range_start_char = c; |
89483 | 1569 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1570 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1571 char_ranges[n_char_ranges++] = range_start_char; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1572 char_ranges[n_char_ranges++] = ((i - 1 - range_start_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1573 + range_start_char); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1574 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1575 } |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1576 else /* STRING is multibyte */ |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1577 { |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1578 char_ranges = (int *) alloca (sizeof (int) * SCHARS (string) * 2); |
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1579 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1580 while (i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1581 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1582 unsigned char leading_code; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1583 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1584 leading_code = str[i_byte]; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1585 c = STRING_CHAR_AND_LENGTH (str + i_byte, len); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1586 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1587 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1588 if (handle_iso_classes && c == '[' |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1589 && i_byte < size_byte |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1590 && STRING_CHAR (str + i_byte) == ':') |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1591 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1592 const unsigned char *class_beg = str + i_byte + 1; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1593 const unsigned char *class_end = class_beg; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1594 const unsigned char *class_limit = str + size_byte - 2; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1595 /* Leave room for the null. */ |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1596 unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1]; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1597 re_wctype_t cc; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1598 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1599 if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1600 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1601 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1602 while (class_end < class_limit |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1603 && *class_end >= 'a' && *class_end <= 'z') |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1604 class_end++; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1605 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1606 if (class_end == class_beg |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1607 || *class_end != ':' || class_end[1] != ']') |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1608 goto not_a_class_name_multibyte; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1609 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1610 bcopy (class_beg, class_name, class_end - class_beg); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1611 class_name[class_end - class_beg] = 0; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1612 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1613 cc = re_wctype (class_name); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1614 if (cc == 0) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1615 error ("Invalid ISO C character class"); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1616 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1617 iso_classes = Fcons (make_number (cc), iso_classes); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1618 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1619 i_byte = class_end + 2 - str; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1620 continue; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1621 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1622 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1623 not_a_class_name_multibyte: |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1624 if (c == '\\') |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1625 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1626 if (i_byte == size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1627 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1628 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1629 leading_code = str[i_byte]; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1630 c = STRING_CHAR_AND_LENGTH (str + i_byte, len); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1631 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1632 } |
89880 | 1633 /* Treat `-' as range character only if another character |
1634 follows. */ | |
1635 if (i_byte + 1 < size_byte | |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1636 && str[i_byte] == '-') |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1637 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1638 unsigned int c2; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1639 unsigned char leading_code2; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1640 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1641 /* Skip over the dash. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1642 i_byte++; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1643 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1644 /* Get the end of the range. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1645 leading_code2 = str[i_byte]; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1646 c2 = STRING_CHAR_AND_LENGTH (str + i_byte, len); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1647 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1648 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1649 if (c2 == '\\' |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1650 && i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1651 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1652 leading_code2 = str[i_byte]; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1653 c2 =STRING_CHAR_AND_LENGTH (str + i_byte, len); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1654 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1655 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1656 |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1657 if (c > c2) |
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1658 continue; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1659 if (ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1660 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1661 while (c <= c2 && c < 0x80) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1662 fastmap[c++] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1663 leading_code = CHAR_LEADING_CODE (c); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1664 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1665 if (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1666 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1667 while (leading_code <= leading_code2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1668 fastmap[leading_code++] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1669 if (c <= c2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1670 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1671 char_ranges[n_char_ranges++] = c; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1672 char_ranges[n_char_ranges++] = c2; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1673 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1674 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1675 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1676 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1677 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1678 if (ASCII_CHAR_P (c)) |
30626
9d47c133b357
* syntax.c (skip_chars): Fix previous change. Make the handling of
Kenichi Handa <handa@m17n.org>
parents:
30596
diff
changeset
|
1679 fastmap[c] = 1; |
9d47c133b357
* syntax.c (skip_chars): Fix previous change. Make the handling of
Kenichi Handa <handa@m17n.org>
parents:
30596
diff
changeset
|
1680 else |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1681 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1682 fastmap[leading_code] = 1; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1683 char_ranges[n_char_ranges++] = c; |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1684 char_ranges[n_char_ranges++] = c; |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1685 } |
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1686 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1687 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1688 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1689 /* If the current range is unibyte and STRING contains non-ASCII |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1690 chars, arrange fastmap for the corresponding unibyte |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1691 chars. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1692 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1693 if (! multibyte && n_char_ranges > 0) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1694 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1695 bzero (fastmap + 0200, 0200); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1696 for (i = 0; i < n_char_ranges; i += 2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1697 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1698 int c1 = char_ranges[i]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1699 int c2 = char_ranges[i + 1]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1700 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1701 for (; c1 <= c2; c1++) |
95856
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1702 { |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1703 int b = CHAR_TO_BYTE_SAFE (c1); |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1704 if (b >= 0) |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1705 fastmap[b] = 1; |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1706 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1707 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1708 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1709 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1710 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1711 /* If ^ was the first character, complement the fastmap. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1712 if (negate) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1713 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1714 if (! multibyte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1715 for (i = 0; i < sizeof fastmap; i++) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1716 fastmap[i] ^= 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1717 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1718 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1719 for (i = 0; i < 0200; i++) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1720 fastmap[i] ^= 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1721 /* All non-ASCII chars possibly match. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1722 for (; i < sizeof fastmap; i++) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1723 fastmap[i] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1724 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1725 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1726 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1727 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1728 int start_point = PT; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1729 int pos = PT; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1730 int pos_byte = PT_BYTE; |
89483 | 1731 unsigned char *p = PT_ADDR, *endp, *stop; |
1732 | |
1733 if (forwardp) | |
1734 { | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1735 endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim)); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1736 stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp; |
89483 | 1737 } |
1738 else | |
1739 { | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1740 endp = CHAR_POS_ADDR (XINT (lim)); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1741 stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp; |
89483 | 1742 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1743 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1744 immediate_quit = 1; |
107335
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1745 /* This code may look up syntax tables using macros that rely on the |
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1746 gl_state object. To make sure this object is not out of date, |
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1747 let's initialize it manually. |
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1748 We ignore syntax-table text-properties for now, since that's |
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1749 what we've done in the past. */ |
107366
14ff9accfbd3
Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107335
diff
changeset
|
1750 SETUP_BUFFER_SYNTAX_TABLE (); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1751 if (forwardp) |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1752 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1753 if (multibyte) |
89483 | 1754 while (1) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1755 { |
89483 | 1756 int nbytes; |
1757 | |
1758 if (p >= stop) | |
1759 { | |
1760 if (p >= endp) | |
1761 break; | |
1762 p = GAP_END_ADDR; | |
1763 stop = endp; | |
1764 } | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1765 c = STRING_CHAR_AND_LENGTH (p, nbytes); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1766 if (! NILP (iso_classes) && in_classes (c, iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1767 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1768 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1769 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1770 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1771 goto fwd_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1772 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1773 |
89483 | 1774 if (! fastmap[*p]) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1775 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1776 if (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1777 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1778 /* As we are looking at a multibyte character, we |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1779 must look up the character in the table |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1780 CHAR_RANGES. If there's no data in the table, |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1781 that character is not what we want to skip. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1782 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1783 /* The following code do the right thing even if |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1784 n_char_ranges is zero (i.e. no data in |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1785 CHAR_RANGES). */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1786 for (i = 0; i < n_char_ranges; i += 2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1787 if (c >= char_ranges[i] && c <= char_ranges[i + 1]) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1788 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1789 if (!(negate ^ (i < n_char_ranges))) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1790 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1791 } |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1792 fwd_ok: |
89483 | 1793 p += nbytes, pos++, pos_byte += nbytes; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1794 } |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1795 else |
89483 | 1796 while (1) |
1797 { | |
1798 if (p >= stop) | |
1799 { | |
1800 if (p >= endp) | |
1801 break; | |
1802 p = GAP_END_ADDR; | |
1803 stop = endp; | |
1804 } | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1805 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1806 if (!NILP (iso_classes) && in_classes (*p, iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1807 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1808 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1809 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1810 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1811 goto fwd_unibyte_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1812 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1813 |
89483 | 1814 if (!fastmap[*p]) |
1815 break; | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1816 fwd_unibyte_ok: |
89483 | 1817 p++, pos++, pos_byte++; |
1818 } | |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1819 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1820 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1821 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1822 if (multibyte) |
89483 | 1823 while (1) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1824 { |
89483 | 1825 unsigned char *prev_p; |
1826 | |
1827 if (p <= stop) | |
1828 { | |
1829 if (p <= endp) | |
1830 break; | |
1831 p = GPT_ADDR; | |
1832 stop = endp; | |
1833 } | |
1834 prev_p = p; | |
1835 while (--p >= stop && ! CHAR_HEAD_P (*p)); | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1836 c = STRING_CHAR (p); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1837 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1838 if (! NILP (iso_classes) && in_classes (c, iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1839 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1840 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1841 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1842 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1843 goto back_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1844 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1845 |
89483 | 1846 if (! fastmap[*p]) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1847 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1848 if (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1849 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1850 /* See the comment in the previous similar code. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1851 for (i = 0; i < n_char_ranges; i += 2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1852 if (c >= char_ranges[i] && c <= char_ranges[i + 1]) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1853 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1854 if (!(negate ^ (i < n_char_ranges))) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1855 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1856 } |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1857 back_ok: |
89483 | 1858 pos--, pos_byte -= prev_p - p; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1859 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1860 else |
89483 | 1861 while (1) |
1862 { | |
1863 if (p <= stop) | |
1864 { | |
1865 if (p <= endp) | |
1866 break; | |
1867 p = GPT_ADDR; | |
1868 stop = endp; | |
1869 } | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1870 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1871 if (! NILP (iso_classes) && in_classes (p[-1], iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1872 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1873 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1874 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1875 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1876 goto back_unibyte_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1877 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1878 |
89483 | 1879 if (!fastmap[p[-1]]) |
1880 break; | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1881 back_unibyte_ok: |
89483 | 1882 p--, pos--, pos_byte--; |
1883 } | |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1884 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1885 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1886 SET_PT_BOTH (pos, pos_byte); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1887 immediate_quit = 0; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1888 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1889 return make_number (PT - start_point); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1890 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1891 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1892 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1893 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1894 static Lisp_Object |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1895 skip_syntaxes (forwardp, string, lim) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1896 int forwardp; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1897 Lisp_Object string, lim; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1898 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1899 register unsigned int c; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1900 unsigned char fastmap[0400]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1901 int negate = 0; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1902 register int i, i_byte; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1903 int multibyte; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1904 int size_byte; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1905 unsigned char *str; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1906 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1907 CHECK_STRING (string); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1908 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1909 if (NILP (lim)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1910 XSETINT (lim, forwardp ? ZV : BEGV); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1911 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1912 CHECK_NUMBER_COERCE_MARKER (lim); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1913 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1914 /* In any case, don't allow scan outside bounds of buffer. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1915 if (XINT (lim) > ZV) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1916 XSETFASTINT (lim, ZV); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1917 if (XINT (lim) < BEGV) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1918 XSETFASTINT (lim, BEGV); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1919 |
89114 | 1920 if (forwardp ? (PT >= XFASTINT (lim)) : (PT <= XFASTINT (lim))) |
90041
7e61e1c97f6b
(skip_syntaxes): Return lispy 0 (not nil) if point is
Kenichi Handa <handa@m17n.org>
parents:
89966
diff
changeset
|
1921 return make_number (0); |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1922 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1923 multibyte = (!NILP (current_buffer->enable_multibyte_characters) |
89341
9664825d832f
(skip_chars, skip_syntaxes): Fix type errors.
Dave Love <fx@gnu.org>
parents:
89114
diff
changeset
|
1924 && (XINT (lim) - PT != CHAR_TO_BYTE (XINT (lim)) - PT_BYTE)); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1925 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1926 bzero (fastmap, sizeof fastmap); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1927 |
89483 | 1928 if (SBYTES (string) > SCHARS (string)) |
1929 /* As this is very rare case (syntax spec is ASCII only), don't | |
1930 consider efficiency. */ | |
89103
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1931 string = string_make_unibyte (string); |
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1932 |
89483 | 1933 str = SDATA (string); |
1934 size_byte = SBYTES (string); | |
89103
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1935 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1936 i_byte = 0; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1937 if (i_byte < size_byte |
89483 | 1938 && SREF (string, 0) == '^') |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1939 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1940 negate = 1; i_byte++; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1941 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1942 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1943 /* Find the syntaxes specified and set their elements of fastmap. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1944 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1945 while (i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1946 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1947 c = str[i_byte++]; |
89483 | 1948 fastmap[syntax_spec_code[c]] = 1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1949 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1950 |
31944
05763e780521
(skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents:
31209
diff
changeset
|
1951 /* If ^ was the first character, complement the fastmap. */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1952 if (negate) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1953 for (i = 0; i < sizeof fastmap; i++) |
31944
05763e780521
(skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents:
31209
diff
changeset
|
1954 fastmap[i] ^= 1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1955 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1956 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1957 int start_point = PT; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1958 int pos = PT; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1959 int pos_byte = PT_BYTE; |
50675
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1960 unsigned char *p = PT_ADDR, *endp, *stop; |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1961 |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1962 if (forwardp) |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1963 { |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1964 endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim)); |
55423
a9e10b866486
(Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54849
diff
changeset
|
1965 stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp; |
50675
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1966 } |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1967 else |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1968 { |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1969 endp = CHAR_POS_ADDR (XINT (lim)); |
55423
a9e10b866486
(Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54849
diff
changeset
|
1970 stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp; |
50675
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
1971 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1972 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1973 immediate_quit = 1; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1974 SETUP_SYNTAX_TABLE (pos, forwardp ? 1 : -1); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1975 if (forwardp) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1976 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1977 if (multibyte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1978 { |
89483 | 1979 while (1) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1980 { |
89483 | 1981 int nbytes; |
1982 | |
1983 if (p >= stop) | |
1984 { | |
1985 if (p >= endp) | |
1986 break; | |
1987 p = GAP_END_ADDR; | |
1988 stop = endp; | |
1989 } | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1990 c = STRING_CHAR_AND_LENGTH (p, nbytes); |
89483 | 1991 if (! fastmap[(int) SYNTAX (c)]) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1992 break; |
89483 | 1993 p += nbytes, pos++, pos_byte += nbytes; |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1994 UPDATE_SYNTAX_TABLE_FORWARD (pos); |
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1995 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1996 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1997 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1998 { |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1999 while (1) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2000 { |
89483 | 2001 if (p >= stop) |
2002 { | |
2003 if (p >= endp) | |
50675
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2004 break; |
89483 | 2005 p = GAP_END_ADDR; |
2006 stop = endp; | |
2007 } | |
2008 if (! fastmap[(int) SYNTAX (*p)]) | |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2009 break; |
89483 | 2010 p++, pos++, pos_byte++; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2011 UPDATE_SYNTAX_TABLE_FORWARD (pos); |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
2012 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2013 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2014 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2015 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2016 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2017 if (multibyte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2018 { |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2019 while (1) |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
2020 { |
89483 | 2021 unsigned char *prev_p; |
2022 | |
2023 if (p <= stop) | |
2024 { | |
2025 if (p <= endp) | |
2026 break; | |
2027 p = GPT_ADDR; | |
2028 stop = endp; | |
2029 } | |
90851 | 2030 UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1); |
89483 | 2031 prev_p = p; |
2032 while (--p >= stop && ! CHAR_HEAD_P (*p)); | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
2033 c = STRING_CHAR (p); |
89483 | 2034 if (! fastmap[(int) SYNTAX (c)]) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2035 break; |
89483 | 2036 pos--, pos_byte -= prev_p - p; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2037 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2038 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2039 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2040 { |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2041 while (1) |
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2042 { |
89483 | 2043 if (p <= stop) |
2044 { | |
2045 if (p <= endp) | |
2046 break; | |
2047 p = GPT_ADDR; | |
2048 stop = endp; | |
2049 } | |
90846
c035421fe210
(skip_syntaxes): Synch with the trunk.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2050 UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1); |
89483 | 2051 if (! fastmap[(int) SYNTAX (p[-1])]) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2052 break; |
89483 | 2053 p--, pos--, pos_byte--; |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2054 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2055 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2056 } |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
2057 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2058 SET_PT_BOTH (pos, pos_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2059 immediate_quit = 0; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2060 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2061 return make_number (PT - start_point); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2062 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2063 } |
56088 | 2064 |
2065 /* Return 1 if character C belongs to one of the ISO classes | |
2066 in the list ISO_CLASSES. Each class is represented by an | |
2067 integer which is its type according to re_wctype. */ | |
2068 | |
2069 static int | |
2070 in_classes (c, iso_classes) | |
2071 int c; | |
2072 Lisp_Object iso_classes; | |
2073 { | |
2074 int fits_class = 0; | |
2075 | |
107335
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2076 while (CONSP (iso_classes)) |
56088 | 2077 { |
2078 Lisp_Object elt; | |
2079 elt = XCAR (iso_classes); | |
2080 iso_classes = XCDR (iso_classes); | |
2081 | |
2082 if (re_iswctype (c, XFASTINT (elt))) | |
2083 fits_class = 1; | |
2084 } | |
2085 | |
2086 return fits_class; | |
2087 } | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2088 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2089 /* Jump over a comment, assuming we are at the beginning of one. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2090 FROM is the current position. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2091 FROM_BYTE is the bytepos corresponding to FROM. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2092 Do not move past STOP (a charpos). |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2093 The comment over which we have to jump is of style STYLE |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2094 (either SYNTAX_COMMENT_STYLE(foo) or ST_COMMENT_STYLE). |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2095 NESTING should be positive to indicate the nesting at the beginning |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2096 for nested comments and should be zero or negative else. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2097 ST_COMMENT_STYLE cannot be nested. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2098 PREV_SYNTAX is the SYNTAX_WITH_FLAGS of the previous character |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2099 (or 0 If the search cannot start in the middle of a two-character). |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2100 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2101 If successful, return 1 and store the charpos of the comment's end |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2102 into *CHARPOS_PTR and the corresponding bytepos into *BYTEPOS_PTR. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2103 Else, return 0 and store the charpos STOP into *CHARPOS_PTR, the |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2104 corresponding bytepos into *BYTEPOS_PTR and the current nesting |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2105 (as defined for state.incomment) in *INCOMMENT_PTR. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2106 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2107 The comment end is the last character of the comment rather than the |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2108 character just after the comment. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2109 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2110 Global syntax data is assumed to initially be valid for FROM and |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2111 remains valid for forward search starting at the returned position. */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2112 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2113 static int |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2114 forw_comment (from, from_byte, stop, nesting, style, prev_syntax, |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2115 charpos_ptr, bytepos_ptr, incomment_ptr) |
71787
7e302766894f
(forw_comment): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71740
diff
changeset
|
2116 EMACS_INT from, from_byte, stop; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2117 int nesting, style, prev_syntax; |
71787
7e302766894f
(forw_comment): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71740
diff
changeset
|
2118 EMACS_INT *charpos_ptr, *bytepos_ptr; |
7e302766894f
(forw_comment): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71740
diff
changeset
|
2119 int *incomment_ptr; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2120 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2121 register int c, c1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2122 register enum syntaxcode code; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2123 register int syntax; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2124 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2125 if (nesting <= 0) nesting = -1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2126 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2127 /* Enter the loop in the middle so that we find |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2128 a 2-char comment ender if we start in the middle of it. */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2129 syntax = prev_syntax; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2130 if (syntax != 0) goto forw_incomment; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2131 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2132 while (1) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2133 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2134 if (from == stop) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2135 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2136 *incomment_ptr = nesting; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2137 *charpos_ptr = from; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2138 *bytepos_ptr = from_byte; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2139 return 0; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2140 } |
89483 | 2141 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2142 syntax = SYNTAX_WITH_FLAGS (c); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2143 code = syntax & 0xff; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2144 if (code == Sendcomment |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2145 && SYNTAX_FLAGS_COMMENT_STYLE (syntax) == style |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2146 && (SYNTAX_FLAGS_COMMENT_NESTED (syntax) ? |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2147 (nesting > 0 && --nesting == 0) : nesting < 0)) |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2148 /* we have encountered a comment end of the same style |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2149 as the comment sequence which began this comment |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2150 section */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2151 break; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2152 if (code == Scomment_fence |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2153 && style == ST_COMMENT_STYLE) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2154 /* we have encountered a comment end of the same style |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2155 as the comment sequence which began this comment |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2156 section. */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2157 break; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2158 if (nesting > 0 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2159 && code == Scomment |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2160 && SYNTAX_FLAGS_COMMENT_NESTED (syntax) |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2161 && SYNTAX_FLAGS_COMMENT_STYLE (syntax) == style) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2162 /* we have encountered a nested comment of the same style |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2163 as the comment sequence which began this comment section */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2164 nesting++; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2165 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2166 UPDATE_SYNTAX_TABLE_FORWARD (from); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2167 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2168 forw_incomment: |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2169 if (from < stop && SYNTAX_FLAGS_COMEND_FIRST (syntax) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2170 && SYNTAX_FLAGS_COMMENT_STYLE (syntax) == style |
89483 | 2171 && (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte), |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2172 SYNTAX_COMEND_SECOND (c1)) |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2173 && ((SYNTAX_FLAGS_COMMENT_NESTED (syntax) || |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2174 SYNTAX_COMMENT_NESTED (c1)) ? nesting > 0 : nesting < 0)) |
25771
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2175 { |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2176 if (--nesting <= 0) |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2177 /* we have encountered a comment end of the same style |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2178 as the comment sequence which began this comment |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2179 section */ |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2180 break; |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2181 else |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2182 { |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2183 INC_BOTH (from, from_byte); |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2184 UPDATE_SYNTAX_TABLE_FORWARD (from); |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2185 } |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2186 } |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2187 if (nesting > 0 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2188 && from < stop |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2189 && SYNTAX_FLAGS_COMSTART_FIRST (syntax) |
89483 | 2190 && (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte), |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2191 SYNTAX_COMMENT_STYLE (c1) == style |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2192 && SYNTAX_COMSTART_SECOND (c1)) |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2193 && (SYNTAX_FLAGS_COMMENT_NESTED (syntax) || |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2194 SYNTAX_COMMENT_NESTED (c1))) |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2195 /* we have encountered a nested comment of the same style |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2196 as the comment sequence which began this comment |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2197 section */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2198 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2199 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2200 UPDATE_SYNTAX_TABLE_FORWARD (from); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2201 nesting++; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2202 } |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2203 } |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2204 *charpos_ptr = from; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2205 *bytepos_ptr = from_byte; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2206 return 1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2207 } |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2208 |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2209 DEFUN ("forward-comment", Fforward_comment, Sforward_comment, 1, 1, 0, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49551
diff
changeset
|
2210 doc: /* |
48089 | 2211 Move forward across up to COUNT comments. If COUNT is negative, move backward. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2212 Stop scanning if we find something other than a comment or whitespace. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2213 Set point to where scanning stops. |
48089 | 2214 If COUNT comments are found as expected, with nothing except whitespace |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2215 between them, return t; otherwise return nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2216 (count) |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2217 Lisp_Object count; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2218 { |
71739
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2219 register EMACS_INT from; |
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2220 EMACS_INT from_byte; |
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2221 register EMACS_INT stop; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
2222 register int c, c1; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2223 register enum syntaxcode code; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2224 int comstyle = 0; /* style of comment encountered */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2225 int comnested = 0; /* whether the comment is nestable or not */ |
3087
ea0cb469490e
(Fforward_comment): Fix last change.
Richard M. Stallman <rms@gnu.org>
parents:
3086
diff
changeset
|
2226 int found; |
71739
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2227 EMACS_INT count1; |
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2228 EMACS_INT out_charpos, out_bytepos; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2229 int dummy; |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2230 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2231 CHECK_NUMBER (count); |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2232 count1 = XINT (count); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2233 stop = count1 > 0 ? ZV : BEGV; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2234 |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2235 immediate_quit = 1; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2236 QUIT; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2237 |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2238 from = PT; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2239 from_byte = PT_BYTE; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2240 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2241 SETUP_SYNTAX_TABLE (from, count1); |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2242 while (count1 > 0) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2243 { |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2244 do |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2245 { |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2246 int comstart_first; |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2247 |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2248 if (from == stop) |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2249 { |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2250 SET_PT_BOTH (from, from_byte); |
10947
e805ef6b931c
(Fforward_comment): Always clear immediate_quit for return.
Richard M. Stallman <rms@gnu.org>
parents:
10457
diff
changeset
|
2251 immediate_quit = 0; |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2252 return Qnil; |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2253 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2254 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2255 code = SYNTAX (c); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2256 comstart_first = SYNTAX_COMSTART_FIRST (c); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2257 comnested = SYNTAX_COMMENT_NESTED (c); |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
2258 comstyle = SYNTAX_COMMENT_STYLE (c); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2259 INC_BOTH (from, from_byte); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2260 UPDATE_SYNTAX_TABLE_FORWARD (from); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2261 if (from < stop && comstart_first |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2262 && (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte), |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
2263 SYNTAX_COMSTART_SECOND (c1))) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2264 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2265 /* We have encountered a comment start sequence and we |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2266 are ignoring all text inside comments. We must record |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2267 the comment style this sequence begins so that later, |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2268 only a comment end of the same style actually ends |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2269 the comment section. */ |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2270 code = Scomment; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
2271 comstyle = SYNTAX_COMMENT_STYLE (c1); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2272 comnested = comnested || SYNTAX_COMMENT_NESTED (c1); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2273 INC_BOTH (from, from_byte); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2274 UPDATE_SYNTAX_TABLE_FORWARD (from); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2275 } |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2276 } |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2277 while (code == Swhitespace || (code == Sendcomment && c == '\n')); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2278 |
25290
a80acb2a8273
(Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents:
24728
diff
changeset
|
2279 if (code == Scomment_fence) |
a80acb2a8273
(Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents:
24728
diff
changeset
|
2280 comstyle = ST_COMMENT_STYLE; |
a80acb2a8273
(Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents:
24728
diff
changeset
|
2281 else if (code != Scomment) |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2282 { |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2283 immediate_quit = 0; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2284 DEC_BOTH (from, from_byte); |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2285 SET_PT_BOTH (from, from_byte); |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2286 return Qnil; |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2287 } |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2288 /* We're at the start of a comment. */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2289 found = forw_comment (from, from_byte, stop, comnested, comstyle, 0, |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2290 &out_charpos, &out_bytepos, &dummy); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2291 from = out_charpos; from_byte = out_bytepos; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2292 if (!found) |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2293 { |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2294 immediate_quit = 0; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2295 SET_PT_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2296 return Qnil; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2297 } |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2298 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2299 UPDATE_SYNTAX_TABLE_FORWARD (from); |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2300 /* We have skipped one comment. */ |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2301 count1--; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2302 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2303 |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2304 while (count1 < 0) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2305 { |
18938
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2306 while (1) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2307 { |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
2308 int quoted; |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2309 |
18938
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2310 if (from <= stop) |
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2311 { |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2312 SET_PT_BOTH (BEGV, BEGV_BYTE); |
18938
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2313 immediate_quit = 0; |
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2314 return Qnil; |
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2315 } |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2316 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2317 DEC_BOTH (from, from_byte); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2318 /* char_quoted does UPDATE_SYNTAX_TABLE_BACKWARD (from). */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2319 quoted = char_quoted (from, from_byte); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2320 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2321 code = SYNTAX (c); |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2322 comstyle = 0; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2323 comnested = SYNTAX_COMMENT_NESTED (c); |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2324 if (code == Sendcomment) |
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2325 comstyle = SYNTAX_COMMENT_STYLE (c); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2326 if (from > stop && SYNTAX_COMEND_SECOND (c) |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2327 && prev_char_comend_first (from, from_byte) |
22432
ac339ec4a12a
(Fforward_comment): Properly compute BYTEPOS arg to char_quoted.
Richard M. Stallman <rms@gnu.org>
parents:
22394
diff
changeset
|
2328 && !char_quoted (from - 1, dec_bytepos (from_byte))) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2329 { |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2330 /* We must record the comment style encountered so that |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2331 later, we can match only the proper comment begin |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2332 sequence of the same style. */ |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2333 DEC_BOTH (from, from_byte); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2334 code = Sendcomment; |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2335 /* Calling char_quoted, above, set up global syntax position |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2336 at the new value of FROM. */ |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2337 c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2338 comstyle = SYNTAX_COMMENT_STYLE (c1); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2339 comnested = comnested || SYNTAX_COMMENT_NESTED (c1); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2340 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2341 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2342 if (code == Scomment_fence) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2343 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2344 /* Skip until first preceding unquoted comment_fence. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2345 int found = 0, ini = from, ini_byte = from_byte; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2346 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2347 while (1) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2348 { |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2349 DEC_BOTH (from, from_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2350 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2351 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2352 if (SYNTAX (c) == Scomment_fence |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2353 && !char_quoted (from, from_byte)) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2354 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2355 found = 1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2356 break; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2357 } |
70317
48f9beb0cfdc
(Fforward_comment): Detect generic comment at beginning of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70291
diff
changeset
|
2358 else if (from == stop) |
48f9beb0cfdc
(Fforward_comment): Detect generic comment at beginning of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70291
diff
changeset
|
2359 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2360 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2361 if (found == 0) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2362 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2363 from = ini; /* Set point to ini + 1. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2364 from_byte = ini_byte; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2365 goto leave; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2366 } |
70291
e4dbfbc6b5c6
(Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
2367 else |
e4dbfbc6b5c6
(Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
2368 /* We have skipped one comment. */ |
e4dbfbc6b5c6
(Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
2369 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2370 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2371 else if (code == Sendcomment) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2372 { |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2373 found = back_comment (from, from_byte, stop, comnested, comstyle, |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2374 &out_charpos, &out_bytepos); |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2375 if (found == -1) |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2376 { |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2377 if (c == '\n') |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2378 /* This end-of-line is not an end-of-comment. |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2379 Treat it like a whitespace. |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2380 CC-mode (and maybe others) relies on this behavior. */ |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2381 ; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2382 else |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2383 { |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2384 /* Failure: we should go back to the end of this |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2385 not-quite-endcomment. */ |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2386 if (SYNTAX(c) != code) |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2387 /* It was a two-char Sendcomment. */ |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2388 INC_BOTH (from, from_byte); |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2389 goto leave; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2390 } |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2391 } |
27719
73926d5a4d9f
(Fforward_comment): Undo the previous change, since cc-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27698
diff
changeset
|
2392 else |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2393 { |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2394 /* We have skipped one comment. */ |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2395 from = out_charpos, from_byte = out_bytepos; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2396 break; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2397 } |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2398 } |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2399 else if (code != Swhitespace || quoted) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2400 { |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2401 leave: |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2402 immediate_quit = 0; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2403 INC_BOTH (from, from_byte); |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2404 SET_PT_BOTH (from, from_byte); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2405 return Qnil; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2406 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2407 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2408 |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2409 count1++; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2410 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2411 |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2412 SET_PT_BOTH (from, from_byte); |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2413 immediate_quit = 0; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2414 return Qt; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2415 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2416 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2417 /* Return syntax code of character C if C is an ASCII character |
38047 | 2418 or `multibyte_symbol_p' is zero. Otherwise, return Ssymbol. */ |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2419 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2420 #define SYNTAX_WITH_MULTIBYTE_CHECK(c) \ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2421 ((ASCII_CHAR_P (c) || !multibyte_symbol_p) \ |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2422 ? SYNTAX (c) : Ssymbol) |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2423 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2424 static Lisp_Object |
163 | 2425 scan_lists (from, count, depth, sexpflag) |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2426 register EMACS_INT from; |
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2427 EMACS_INT count, depth; |
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2428 int sexpflag; |
163 | 2429 { |
2430 Lisp_Object val; | |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2431 register EMACS_INT stop = count > 0 ? ZV : BEGV; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2432 register int c, c1; |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2433 int stringterm; |
163 | 2434 int quoted; |
2435 int mathexit = 0; | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2436 register enum syntaxcode code, temp_code; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2437 int min_depth = depth; /* Err out if depth gets less than this. */ |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2438 int comstyle = 0; /* style of comment encountered */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2439 int comnested = 0; /* whether the comment is nestable or not */ |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2440 EMACS_INT temp_pos; |
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2441 EMACS_INT last_good = from; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2442 int found; |
71740
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2443 EMACS_INT from_byte; |
df55df8eb062
(back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71739
diff
changeset
|
2444 EMACS_INT out_bytepos, out_charpos; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2445 int temp, dummy; |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2446 int multibyte_symbol_p = sexpflag && multibyte_syntax_as_symbol; |
163 | 2447 |
2448 if (depth > 0) min_depth = 0; | |
2449 | |
23404
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2450 if (from > ZV) from = ZV; |
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2451 if (from < BEGV) from = BEGV; |
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2452 |
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2453 from_byte = CHAR_TO_BYTE (from); |
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2454 |
163 | 2455 immediate_quit = 1; |
2456 QUIT; | |
2457 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2458 SETUP_SYNTAX_TABLE (from, count); |
163 | 2459 while (count > 0) |
2460 { | |
2461 while (from < stop) | |
2462 { | |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2463 int comstart_first, prefix; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2464 UPDATE_SYNTAX_TABLE_FORWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2465 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2466 code = SYNTAX_WITH_MULTIBYTE_CHECK (c); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2467 comstart_first = SYNTAX_COMSTART_FIRST (c); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2468 comnested = SYNTAX_COMMENT_NESTED (c); |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
2469 comstyle = SYNTAX_COMMENT_STYLE (c); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2470 prefix = SYNTAX_PREFIX (c); |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2471 if (depth == min_depth) |
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2472 last_good = from; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2473 INC_BOTH (from, from_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2474 UPDATE_SYNTAX_TABLE_FORWARD (from); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2475 if (from < stop && comstart_first |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2476 && (c = FETCH_CHAR_AS_MULTIBYTE (from_byte), |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2477 SYNTAX_COMSTART_SECOND (c)) |
163 | 2478 && parse_sexp_ignore_comments) |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2479 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2480 /* we have encountered a comment start sequence and we |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2481 are ignoring all text inside comments. We must record |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2482 the comment style this sequence begins so that later, |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2483 only a comment end of the same style actually ends |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2484 the comment section */ |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2485 code = Scomment; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2486 c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2487 comstyle = SYNTAX_COMMENT_STYLE (c1); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2488 comnested = comnested || SYNTAX_COMMENT_NESTED (c1); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2489 INC_BOTH (from, from_byte); |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2490 UPDATE_SYNTAX_TABLE_FORWARD (from); |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2491 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2492 |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2493 if (prefix) |
163 | 2494 continue; |
2495 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
9863
diff
changeset
|
2496 switch (SWITCH_ENUM_CAST (code)) |
163 | 2497 { |
2498 case Sescape: | |
2499 case Scharquote: | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2500 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2501 goto lose; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2502 INC_BOTH (from, from_byte); |
163 | 2503 /* treat following character as a word constituent */ |
2504 case Sword: | |
2505 case Ssymbol: | |
2506 if (depth || !sexpflag) break; | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2507 /* This word counts as a sexp; return at end of it. */ |
163 | 2508 while (from < stop) |
2509 { | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2510 UPDATE_SYNTAX_TABLE_FORWARD (from); |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2511 |
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2512 /* Some compilers can't handle this inside the switch. */ |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2513 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2514 temp = SYNTAX_WITH_MULTIBYTE_CHECK (c); |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2515 switch (temp) |
163 | 2516 { |
2517 case Scharquote: | |
2518 case Sescape: | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2519 INC_BOTH (from, from_byte); |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2520 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2521 goto lose; |
163 | 2522 break; |
2523 case Sword: | |
2524 case Ssymbol: | |
2525 case Squote: | |
2526 break; | |
2527 default: | |
2528 goto done; | |
2529 } | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2530 INC_BOTH (from, from_byte); |
163 | 2531 } |
2532 goto done; | |
2533 | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2534 case Scomment_fence: |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2535 comstyle = ST_COMMENT_STYLE; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2536 /* FALLTHROUGH */ |
163 | 2537 case Scomment: |
2538 if (!parse_sexp_ignore_comments) break; | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2539 UPDATE_SYNTAX_TABLE_FORWARD (from); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2540 found = forw_comment (from, from_byte, stop, |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2541 comnested, comstyle, 0, |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2542 &out_charpos, &out_bytepos, &dummy); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2543 from = out_charpos, from_byte = out_bytepos; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2544 if (!found) |
163 | 2545 { |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2546 if (depth == 0) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2547 goto done; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2548 goto lose; |
163 | 2549 } |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2550 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2551 UPDATE_SYNTAX_TABLE_FORWARD (from); |
163 | 2552 break; |
2553 | |
2554 case Smath: | |
2555 if (!sexpflag) | |
2556 break; | |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2557 if (from != stop && c == FETCH_CHAR_AS_MULTIBYTE (from_byte)) |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2558 { |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2559 INC_BOTH (from, from_byte); |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2560 } |
163 | 2561 if (mathexit) |
2562 { | |
2563 mathexit = 0; | |
2564 goto close1; | |
2565 } | |
2566 mathexit = 1; | |
2567 | |
2568 case Sopen: | |
2569 if (!++depth) goto done; | |
2570 break; | |
2571 | |
2572 case Sclose: | |
2573 close1: | |
2574 if (!--depth) goto done; | |
2575 if (depth < min_depth) | |
71988 | 2576 xsignal3 (Qscan_error, |
2577 build_string ("Containing expression ends prematurely"), | |
2578 make_number (last_good), make_number (from)); | |
163 | 2579 break; |
2580 | |
2581 case Sstring: | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2582 case Sstring_fence: |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2583 temp_pos = dec_bytepos (from_byte); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2584 stringterm = FETCH_CHAR_AS_MULTIBYTE (temp_pos); |
163 | 2585 while (1) |
2586 { | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2587 if (from >= stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2588 goto lose; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2589 UPDATE_SYNTAX_TABLE_FORWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2590 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
34398
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
2591 if (code == Sstring |
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
2592 ? (c == stringterm |
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
2593 && SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring) |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2594 : SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring_fence) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2595 break; |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2596 |
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2597 /* Some compilers can't handle this inside the switch. */ |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2598 temp = SYNTAX_WITH_MULTIBYTE_CHECK (c); |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2599 switch (temp) |
163 | 2600 { |
2601 case Scharquote: | |
2602 case Sescape: | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2603 INC_BOTH (from, from_byte); |
163 | 2604 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2605 INC_BOTH (from, from_byte); |
163 | 2606 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2607 INC_BOTH (from, from_byte); |
163 | 2608 if (!depth && sexpflag) goto done; |
2609 break; | |
47872
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2610 default: |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2611 /* Ignore whitespace, punctuation, quote, endcomment. */ |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2612 break; |
163 | 2613 } |
2614 } | |
2615 | |
2616 /* Reached end of buffer. Error if within object, return nil if between */ | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2617 if (depth) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2618 goto lose; |
163 | 2619 |
2620 immediate_quit = 0; | |
2621 return Qnil; | |
2622 | |
2623 /* End of object reached */ | |
2624 done: | |
2625 count--; | |
2626 } | |
2627 | |
2628 while (count < 0) | |
2629 { | |
2630 while (from > stop) | |
2631 { | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2632 DEC_BOTH (from, from_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2633 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2634 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2635 code = SYNTAX_WITH_MULTIBYTE_CHECK (c); |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2636 if (depth == min_depth) |
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2637 last_good = from; |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2638 comstyle = 0; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2639 comnested = SYNTAX_COMMENT_NESTED (c); |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2640 if (code == Sendcomment) |
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2641 comstyle = SYNTAX_COMMENT_STYLE (c); |
163 | 2642 if (from > stop && SYNTAX_COMEND_SECOND (c) |
22486
a28020246db1
(skip_chars): Don't examine STRING before verifying that it is a string.
Richard M. Stallman <rms@gnu.org>
parents:
22432
diff
changeset
|
2643 && prev_char_comend_first (from, from_byte) |
163 | 2644 && parse_sexp_ignore_comments) |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2645 { |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2646 /* We must record the comment style encountered so that |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2647 later, we can match only the proper comment begin |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2648 sequence of the same style. */ |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2649 DEC_BOTH (from, from_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2650 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2651 code = Sendcomment; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2652 c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2653 comstyle = SYNTAX_COMMENT_STYLE (c1); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2654 comnested = comnested || SYNTAX_COMMENT_NESTED (c1); |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2655 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2656 |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2657 /* Quoting turns anything except a comment-ender |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
2658 into a word character. Note that this cannot be true |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2659 if we decremented FROM in the if-statement above. */ |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2660 if (code != Sendcomment && char_quoted (from, from_byte)) |
47872
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2661 { |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2662 DEC_BOTH (from, from_byte); |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2663 code = Sword; |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2664 } |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2665 else if (SYNTAX_PREFIX (c)) |
163 | 2666 continue; |
2667 | |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2668 switch (SWITCH_ENUM_CAST (code)) |
163 | 2669 { |
2670 case Sword: | |
2671 case Ssymbol: | |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2672 case Sescape: |
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2673 case Scharquote: |
163 | 2674 if (depth || !sexpflag) break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2675 /* This word counts as a sexp; count object finished |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2676 after passing it. */ |
163 | 2677 while (from > stop) |
2678 { | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2679 temp_pos = from_byte; |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2680 if (! NILP (current_buffer->enable_multibyte_characters)) |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2681 DEC_POS (temp_pos); |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2682 else |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2683 temp_pos--; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2684 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2685 c1 = FETCH_CHAR_AS_MULTIBYTE (temp_pos); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2686 temp_code = SYNTAX_WITH_MULTIBYTE_CHECK (c1); |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2687 /* Don't allow comment-end to be quoted. */ |
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2688 if (temp_code == Sendcomment) |
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2689 goto done2; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2690 quoted = char_quoted (from - 1, temp_pos); |
163 | 2691 if (quoted) |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2692 { |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2693 DEC_BOTH (from, from_byte); |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2694 temp_pos = dec_bytepos (temp_pos); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2695 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2696 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2697 c1 = FETCH_CHAR_AS_MULTIBYTE (temp_pos); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2698 temp_code = SYNTAX_WITH_MULTIBYTE_CHECK (c1); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2699 if (! (quoted || temp_code == Sword |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2700 || temp_code == Ssymbol |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2701 || temp_code == Squote)) |
163 | 2702 goto done2; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2703 DEC_BOTH (from, from_byte); |
163 | 2704 } |
2705 goto done2; | |
2706 | |
2707 case Smath: | |
2708 if (!sexpflag) | |
2709 break; | |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2710 temp_pos = dec_bytepos (from_byte); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2711 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2712 if (from != stop && c == FETCH_CHAR_AS_MULTIBYTE (temp_pos)) |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2713 DEC_BOTH (from, from_byte); |
163 | 2714 if (mathexit) |
2715 { | |
2716 mathexit = 0; | |
2717 goto open2; | |
2718 } | |
2719 mathexit = 1; | |
2720 | |
2721 case Sclose: | |
2722 if (!++depth) goto done2; | |
2723 break; | |
2724 | |
2725 case Sopen: | |
2726 open2: | |
2727 if (!--depth) goto done2; | |
2728 if (depth < min_depth) | |
71988 | 2729 xsignal3 (Qscan_error, |
2730 build_string ("Containing expression ends prematurely"), | |
2731 make_number (last_good), make_number (from)); | |
163 | 2732 break; |
2733 | |
2734 case Sendcomment: | |
2735 if (!parse_sexp_ignore_comments) | |
2736 break; | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2737 found = back_comment (from, from_byte, stop, comnested, comstyle, |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2738 &out_charpos, &out_bytepos); |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2739 /* FIXME: if found == -1, then it really wasn't a comment-end. |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2740 For single-char Sendcomment, we can't do much about it apart |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2741 from skipping the char. |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2742 For 2-char endcomments, we could try again, taking both |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2743 chars as separate entities, but it's a lot of trouble |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2744 for very little gain, so we don't bother either. -sm */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2745 if (found != -1) |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2746 from = out_charpos, from_byte = out_bytepos; |
163 | 2747 break; |
2748 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2749 case Scomment_fence: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2750 case Sstring_fence: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2751 while (1) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2752 { |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2753 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2754 goto lose; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2755 DEC_BOTH (from, from_byte); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2756 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2757 if (!char_quoted (from, from_byte) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2758 && (c = FETCH_CHAR_AS_MULTIBYTE (from_byte), |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2759 SYNTAX_WITH_MULTIBYTE_CHECK (c) == code)) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2760 break; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2761 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2762 if (code == Sstring_fence && !depth && sexpflag) goto done2; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2763 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2764 |
163 | 2765 case Sstring: |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2766 stringterm = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
163 | 2767 while (1) |
2768 { | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2769 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2770 goto lose; |
54849
3f107190e71f
(scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53508
diff
changeset
|
2771 DEC_BOTH (from, from_byte); |
3f107190e71f
(scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53508
diff
changeset
|
2772 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
3f107190e71f
(scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53508
diff
changeset
|
2773 if (!char_quoted (from, from_byte) |
89909 | 2774 && (stringterm |
2775 == (c = FETCH_CHAR_AS_MULTIBYTE (from_byte))) | |
34398
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
2776 && SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring) |
163 | 2777 break; |
2778 } | |
2779 if (!depth && sexpflag) goto done2; | |
2780 break; | |
47872
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2781 default: |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2782 /* Ignore whitespace, punctuation, quote, endcomment. */ |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
2783 break; |
163 | 2784 } |
2785 } | |
2786 | |
2787 /* Reached start of buffer. Error if within object, return nil if between */ | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2788 if (depth) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2789 goto lose; |
163 | 2790 |
2791 immediate_quit = 0; | |
2792 return Qnil; | |
2793 | |
2794 done2: | |
2795 count++; | |
2796 } | |
2797 | |
2798 | |
2799 immediate_quit = 0; | |
9320
4be3f8f9f090
(Fcopy_syntax_table, Fmodify_syntax_entry, scan_lists, init_syntax_once):
Karl Heuer <kwzh@gnu.org>
parents:
9111
diff
changeset
|
2800 XSETFASTINT (val, from); |
163 | 2801 return val; |
2802 | |
2803 lose: | |
71988 | 2804 xsignal3 (Qscan_error, |
2805 build_string ("Unbalanced parentheses"), | |
2806 make_number (last_good), make_number (from)); | |
163 | 2807 } |
2808 | |
2809 DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2810 doc: /* Scan from character number FROM by COUNT lists. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2811 Returns the character number of the position thus found. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2812 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2813 If DEPTH is nonzero, paren depth begins counting from that value, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2814 only places where the depth in parentheses becomes zero |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2815 are candidates for stopping; COUNT such places are counted. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2816 Thus, a positive value for DEPTH means go out levels. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2817 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2818 Comments are ignored if `parse-sexp-ignore-comments' is non-nil. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2819 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2820 If the beginning or end of (the accessible part of) the buffer is reached |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2821 and the depth is wrong, an error is signaled. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2822 If the depth is right but the count is not used up, nil is returned. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2823 (from, count, depth) |
163 | 2824 Lisp_Object from, count, depth; |
2825 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2826 CHECK_NUMBER (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2827 CHECK_NUMBER (count); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2828 CHECK_NUMBER (depth); |
163 | 2829 |
2830 return scan_lists (XINT (from), XINT (count), XINT (depth), 0); | |
2831 } | |
2832 | |
2833 DEFUN ("scan-sexps", Fscan_sexps, Sscan_sexps, 2, 2, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2834 doc: /* Scan from character number FROM by COUNT balanced expressions. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2835 If COUNT is negative, scan backwards. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2836 Returns the character number of the position thus found. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2837 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2838 Comments are ignored if `parse-sexp-ignore-comments' is non-nil. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2839 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2840 If the beginning or end of (the accessible part of) the buffer is reached |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2841 in the middle of a parenthetical grouping, an error is signaled. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2842 If the beginning or end is reached between groupings |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2843 but before count is used up, nil is returned. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2844 (from, count) |
163 | 2845 Lisp_Object from, count; |
2846 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2847 CHECK_NUMBER (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2848 CHECK_NUMBER (count); |
163 | 2849 |
2850 return scan_lists (XINT (from), XINT (count), 0, 1); | |
2851 } | |
2852 | |
2853 DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2854 0, 0, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2855 doc: /* Move point backward over any number of chars with prefix syntax. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2856 This includes chars with "quote" or "prefix" syntax (' or p). */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2857 () |
163 | 2858 { |
2859 int beg = BEGV; | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2860 int opoint = PT; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2861 int opoint_byte = PT_BYTE; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
14661
diff
changeset
|
2862 int pos = PT; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2863 int pos_byte = PT_BYTE; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2864 int c; |
163 | 2865 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2866 if (pos <= beg) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2867 { |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2868 SET_PT_BOTH (opoint, opoint_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2869 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2870 return Qnil; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2871 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2872 |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2873 SETUP_SYNTAX_TABLE (pos, -1); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2874 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2875 DEC_BOTH (pos, pos_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2876 |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2877 while (!char_quoted (pos, pos_byte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2878 /* Previous statement updates syntax table. */ |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2879 && ((c = FETCH_CHAR_AS_MULTIBYTE (pos_byte), SYNTAX (c) == Squote) |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2880 || SYNTAX_PREFIX (c))) |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2881 { |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2882 opoint = pos; |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2883 opoint_byte = pos_byte; |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2884 |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2885 if (pos + 1 > beg) |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2886 DEC_BOTH (pos, pos_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2887 } |
163 | 2888 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2889 SET_PT_BOTH (opoint, opoint_byte); |
163 | 2890 |
2891 return Qnil; | |
2892 } | |
2893 | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2894 /* Parse forward from FROM / FROM_BYTE to END, |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2895 assuming that FROM has state OLDSTATE (nil means FROM is start of function), |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2896 and return a description of the state of the parse at END. |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
2897 If STOPBEFORE is nonzero, stop at the start of an atom. |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
2898 If COMMENTSTOP is 1, stop at the start of a comment. |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
2899 If COMMENTSTOP is -1, stop at the start or end of a comment, |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
2900 after the beginning of a string, or after the end of a string. */ |
163 | 2901 |
3720
408c7ee69be7
(scan_lists, Fforward_comment): Pass 0 as commentstop arg
Richard M. Stallman <rms@gnu.org>
parents:
3684
diff
changeset
|
2902 static void |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2903 scan_sexps_forward (stateptr, from, from_byte, end, targetdepth, |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
2904 stopbefore, oldstate, commentstop) |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2905 struct lisp_parse_state *stateptr; |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
2906 register EMACS_INT from; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
2907 EMACS_INT from_byte, end; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
2908 int targetdepth, stopbefore; |
163 | 2909 Lisp_Object oldstate; |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
2910 int commentstop; |
163 | 2911 { |
2912 struct lisp_parse_state state; | |
2913 | |
2914 register enum syntaxcode code; | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2915 int c1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2916 int comnested; |
163 | 2917 struct level { int last, prev; }; |
2918 struct level levelstart[100]; | |
2919 register struct level *curlevel = levelstart; | |
2920 struct level *endlevel = levelstart + 100; | |
2921 register int depth; /* Paren depth of current scanning location. | |
2922 level - levelstart equals this except | |
2923 when the depth becomes negative. */ | |
2924 int mindepth; /* Lowest DEPTH value seen. */ | |
2925 int start_quoted = 0; /* Nonzero means starting after a char quote */ | |
2926 Lisp_Object tem; | |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
2927 EMACS_INT prev_from; /* Keep one character before FROM. */ |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
2928 EMACS_INT prev_from_byte; |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2929 int prev_from_syntax; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2930 int boundary_stop = commentstop == -1; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2931 int nofence; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2932 int found; |
71867
c8c21ddb276e
(scan_sexps_forward): Use EMACS_INT for out_bytepos and
Andreas Schwab <schwab@suse.de>
parents:
71843
diff
changeset
|
2933 EMACS_INT out_bytepos, out_charpos; |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2934 int temp; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2935 |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2936 prev_from = from; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2937 prev_from_byte = from_byte; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2938 if (from != BEGV) |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2939 DEC_BOTH (prev_from, prev_from_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2940 |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2941 /* Use this macro instead of `from++'. */ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2942 #define INC_FROM \ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2943 do { prev_from = from; \ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2944 prev_from_byte = from_byte; \ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2945 temp = FETCH_CHAR_AS_MULTIBYTE (prev_from_byte); \ |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
2946 prev_from_syntax = SYNTAX_WITH_FLAGS (temp); \ |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2947 INC_BOTH (from, from_byte); \ |
48266
a404c0056619
(scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48236
diff
changeset
|
2948 if (from < end) \ |
a404c0056619
(scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48236
diff
changeset
|
2949 UPDATE_SYNTAX_TABLE_FORWARD (from); \ |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2950 } while (0) |
163 | 2951 |
2952 immediate_quit = 1; | |
2953 QUIT; | |
2954 | |
485 | 2955 if (NILP (oldstate)) |
163 | 2956 { |
2957 depth = 0; | |
2958 state.instring = -1; | |
2959 state.incomment = 0; | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2960 state.comstyle = 0; /* comment style a by default. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2961 state.comstr_start = -1; /* no comment/string seen. */ |
163 | 2962 } |
2963 else | |
2964 { | |
2965 tem = Fcar (oldstate); | |
485 | 2966 if (!NILP (tem)) |
163 | 2967 depth = XINT (tem); |
2968 else | |
2969 depth = 0; | |
2970 | |
2971 oldstate = Fcdr (oldstate); | |
2972 oldstate = Fcdr (oldstate); | |
2973 oldstate = Fcdr (oldstate); | |
2974 tem = Fcar (oldstate); | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2975 /* Check whether we are inside string_fence-style string: */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2976 state.instring = (!NILP (tem) |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2977 ? (INTEGERP (tem) ? XINT (tem) : ST_STRING_STYLE) |
26272
1cbb1b30793d
Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents:
26060
diff
changeset
|
2978 : -1); |
163 | 2979 |
2980 oldstate = Fcdr (oldstate); | |
2981 tem = Fcar (oldstate); | |
26272
1cbb1b30793d
Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents:
26060
diff
changeset
|
2982 state.incomment = (!NILP (tem) |
1cbb1b30793d
Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents:
26060
diff
changeset
|
2983 ? (INTEGERP (tem) ? XINT (tem) : -1) |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2984 : 0); |
163 | 2985 |
2986 oldstate = Fcdr (oldstate); | |
2987 tem = Fcar (oldstate); | |
485 | 2988 start_quoted = !NILP (tem); |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2989 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2990 /* if the eighth element of the list is nil, we are in comment |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2991 style a. If it is non-nil, we are in comment style b */ |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2992 oldstate = Fcdr (oldstate); |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2993 oldstate = Fcdr (oldstate); |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2994 tem = Fcar (oldstate); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2995 state.comstyle = NILP (tem) ? 0 : (EQ (tem, Qsyntax_table) |
26272
1cbb1b30793d
Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents:
26060
diff
changeset
|
2996 ? ST_COMMENT_STYLE : 1); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2997 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2998 oldstate = Fcdr (oldstate); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2999 tem = Fcar (oldstate); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3000 state.comstr_start = NILP (tem) ? -1 : XINT (tem) ; |
22394
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3001 oldstate = Fcdr (oldstate); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3002 tem = Fcar (oldstate); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3003 while (!NILP (tem)) /* >= second enclosing sexps. */ |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3004 { |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3005 /* curlevel++->last ran into compiler bug on Apollo */ |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3006 curlevel->last = XINT (Fcar (tem)); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3007 if (++curlevel == endlevel) |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
3008 curlevel--; /* error ("Nesting too deep for parser"); */ |
22394
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3009 curlevel->prev = -1; |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3010 curlevel->last = -1; |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3011 tem = Fcdr (tem); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3012 } |
163 | 3013 } |
3014 state.quoted = 0; | |
3015 mindepth = depth; | |
3016 | |
3017 curlevel->prev = -1; | |
3018 curlevel->last = -1; | |
3019 | |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3020 SETUP_SYNTAX_TABLE (prev_from, 1); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
3021 temp = FETCH_CHAR (prev_from_byte); |
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
3022 prev_from_syntax = SYNTAX_WITH_FLAGS (temp); |
48266
a404c0056619
(scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48236
diff
changeset
|
3023 UPDATE_SYNTAX_TABLE_FORWARD (from); |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3024 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3025 /* Enter the loop at a place appropriate for initial state. */ |
163 | 3026 |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3027 if (state.incomment) |
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3028 goto startincomment; |
163 | 3029 if (state.instring >= 0) |
3030 { | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3031 nofence = state.instring != ST_STRING_STYLE; |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3032 if (start_quoted) |
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3033 goto startquotedinstring; |
163 | 3034 goto startinstring; |
3035 } | |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3036 else if (start_quoted) |
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3037 goto startquoted; |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
3038 |
163 | 3039 while (from < end) |
3040 { | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3041 INC_FROM; |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
3042 code = prev_from_syntax & 0xff; |
18491
bf0d449581c8
(scan_sexps_forward): Split up a complex if-test.
Richard M. Stallman <rms@gnu.org>
parents:
18113
diff
changeset
|
3043 |
57756
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3044 if (from < end |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3045 && SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax) |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3046 && (c1 = FETCH_CHAR (from_byte), |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3047 SYNTAX_COMSTART_SECOND (c1))) |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3048 /* Duplicate code to avoid a complex if-expression |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3049 which causes trouble for the SGI compiler. */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3050 { |
57756
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3051 /* Record the comment style we have entered so that only |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3052 the comment-end sequence of the same style actually |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3053 terminates the comment section. */ |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3054 state.comstyle = SYNTAX_COMMENT_STYLE (c1); |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3055 comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax); |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3056 comnested = comnested || SYNTAX_COMMENT_NESTED (c1); |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3057 state.incomment = comnested ? 1 : -1; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3058 state.comstr_start = prev_from; |
57756
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3059 INC_FROM; |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3060 code = Scomment; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3061 } |
18491
bf0d449581c8
(scan_sexps_forward): Split up a complex if-test.
Richard M. Stallman <rms@gnu.org>
parents:
18113
diff
changeset
|
3062 else if (code == Scomment_fence) |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3063 { |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3064 /* Record the comment style we have entered so that only |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3065 the comment-end sequence of the same style actually |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3066 terminates the comment section. */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3067 state.comstyle = ST_COMMENT_STYLE; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3068 state.incomment = -1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3069 state.comstr_start = prev_from; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3070 code = Scomment; |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3071 } |
57756
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3072 else if (code == Scomment) |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3073 { |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3074 state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax); |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3075 state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ? |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3076 1 : -1); |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3077 state.comstr_start = prev_from; |
a8bc01ac68d0
(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56724
diff
changeset
|
3078 } |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3079 |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
3080 if (SYNTAX_FLAGS_PREFIX (prev_from_syntax)) |
163 | 3081 continue; |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
9863
diff
changeset
|
3082 switch (SWITCH_ENUM_CAST (code)) |
163 | 3083 { |
3084 case Sescape: | |
3085 case Scharquote: | |
3086 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3087 curlevel->last = prev_from; |
163 | 3088 startquoted: |
3089 if (from == end) goto endquoted; | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3090 INC_FROM; |
163 | 3091 goto symstarted; |
3092 /* treat following character as a word constituent */ | |
3093 case Sword: | |
3094 case Ssymbol: | |
3095 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3096 curlevel->last = prev_from; |
163 | 3097 symstarted: |
3098 while (from < end) | |
3099 { | |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3100 /* Some compilers can't handle this inside the switch. */ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
3101 temp = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
3102 temp = SYNTAX (temp); |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3103 switch (temp) |
163 | 3104 { |
3105 case Scharquote: | |
3106 case Sescape: | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3107 INC_FROM; |
163 | 3108 if (from == end) goto endquoted; |
3109 break; | |
3110 case Sword: | |
3111 case Ssymbol: | |
3112 case Squote: | |
3113 break; | |
3114 default: | |
3115 goto symdone; | |
3116 } | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3117 INC_FROM; |
163 | 3118 } |
3119 symdone: | |
3120 curlevel->prev = curlevel->last; | |
3121 break; | |
3122 | |
47872
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
3123 case Scomment_fence: /* Can't happen because it's handled above. */ |
29823
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3124 case Scomment: |
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3125 if (commentstop || boundary_stop) goto done; |
9475
c15caadae3c4
(scan_sexps_forward): At startincomment,
Richard M. Stallman <rms@gnu.org>
parents:
9411
diff
changeset
|
3126 startincomment: |
29823
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3127 /* The (from == BEGV) test was to enter the loop in the middle so |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3128 that we find a 2-char comment ender even if we start in the |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
3129 middle of it. We don't want to do that if we're just at the |
29823
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3130 beginning of the comment (think of (*) ... (*)). */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3131 found = forw_comment (from, from_byte, end, |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3132 state.incomment, state.comstyle, |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
3133 (from == BEGV || from < state.comstr_start + 3) |
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
3134 ? 0 : prev_from_syntax, |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3135 &out_charpos, &out_bytepos, &state.incomment); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3136 from = out_charpos; from_byte = out_bytepos; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3137 /* Beware! prev_from and friends are invalid now. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3138 Luckily, the `done' doesn't use them and the INC_FROM |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3139 sets them to a sane value without looking at them. */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3140 if (!found) goto done; |
29823
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3141 INC_FROM; |
163 | 3142 state.incomment = 0; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3143 state.comstyle = 0; /* reset the comment style */ |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3144 if (boundary_stop) goto done; |
163 | 3145 break; |
3146 | |
3147 case Sopen: | |
3148 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
3149 depth++; | |
3150 /* curlevel++->last ran into compiler bug on Apollo */ | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3151 curlevel->last = prev_from; |
163 | 3152 if (++curlevel == endlevel) |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
3153 curlevel--; /* error ("Nesting too deep for parser"); */ |
163 | 3154 curlevel->prev = -1; |
3155 curlevel->last = -1; | |
12894
b2a75405de3c
(scan_sexps_forward): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
12870
diff
changeset
|
3156 if (targetdepth == depth) goto done; |
163 | 3157 break; |
3158 | |
3159 case Sclose: | |
3160 depth--; | |
3161 if (depth < mindepth) | |
3162 mindepth = depth; | |
3163 if (curlevel != levelstart) | |
3164 curlevel--; | |
3165 curlevel->prev = curlevel->last; | |
12894
b2a75405de3c
(scan_sexps_forward): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
12870
diff
changeset
|
3166 if (targetdepth == depth) goto done; |
163 | 3167 break; |
3168 | |
3169 case Sstring: | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3170 case Sstring_fence: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3171 state.comstr_start = from - 1; |
163 | 3172 if (stopbefore) goto stop; /* this arg means stop at sexp start */ |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3173 curlevel->last = prev_from; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3174 state.instring = (code == Sstring |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
3175 ? (FETCH_CHAR_AS_MULTIBYTE (prev_from_byte)) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3176 : ST_STRING_STYLE); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3177 if (boundary_stop) goto done; |
163 | 3178 startinstring: |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3179 { |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3180 nofence = state.instring != ST_STRING_STYLE; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3181 |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3182 while (1) |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3183 { |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3184 int c; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3185 |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3186 if (from >= end) goto done; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
3187 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3188 /* Some compilers can't handle this inside the switch. */ |
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3189 temp = SYNTAX (c); |
24148
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3190 |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3191 /* Check TEMP here so that if the char has |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3192 a syntax-table property which says it is NOT |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3193 a string character, it does not end the string. */ |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3194 if (nofence && c == state.instring && temp == Sstring) |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3195 break; |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3196 |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3197 switch (temp) |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3198 { |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3199 case Sstring_fence: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3200 if (!nofence) goto string_end; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3201 break; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3202 case Scharquote: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3203 case Sescape: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3204 INC_FROM; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3205 startquotedinstring: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3206 if (from >= end) goto endquoted; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3207 } |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3208 INC_FROM; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3209 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3210 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3211 string_end: |
163 | 3212 state.instring = -1; |
3213 curlevel->prev = curlevel->last; | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3214 INC_FROM; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3215 if (boundary_stop) goto done; |
163 | 3216 break; |
3217 | |
3218 case Smath: | |
47872
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
3219 /* FIXME: We should do something with it. */ |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
3220 break; |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
3221 default: |
e5d59debb925
(scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46555
diff
changeset
|
3222 /* Ignore whitespace, punctuation, quote, endcomment. */ |
163 | 3223 break; |
3224 } | |
3225 } | |
3226 goto done; | |
3227 | |
3228 stop: /* Here if stopping before start of sexp. */ | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3229 from = prev_from; /* We have just fetched the char that starts it; */ |
163 | 3230 goto done; /* but return the position before it. */ |
3231 | |
3232 endquoted: | |
3233 state.quoted = 1; | |
3234 done: | |
3235 state.depth = depth; | |
3236 state.mindepth = mindepth; | |
3237 state.thislevelstart = curlevel->prev; | |
3238 state.prevlevelstart | |
3239 = (curlevel == levelstart) ? -1 : (curlevel - 1)->last; | |
3240 state.location = from; | |
22394
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3241 state.levelstarts = Qnil; |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3242 while (--curlevel >= levelstart) |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3243 state.levelstarts = Fcons (make_number (curlevel->last), |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3244 state.levelstarts); |
163 | 3245 immediate_quit = 0; |
3246 | |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3247 *stateptr = state; |
163 | 3248 } |
3249 | |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
3250 DEFUN ("parse-partial-sexp", Fparse_partial_sexp, Sparse_partial_sexp, 2, 6, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3251 doc: /* Parse Lisp syntax starting at FROM until TO; return status of parse at TO. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3252 Parsing stops at TO or when certain criteria are met; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3253 point is set to where parsing stops. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3254 If fifth arg OLDSTATE is omitted or nil, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3255 parsing assumes that FROM is the beginning of a function. |
66525
aaac09f838e0
(Fparse_partial_sexp): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65215
diff
changeset
|
3256 Value is a list of elements describing final state of parsing: |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3257 0. depth in parens. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3258 1. character address of start of innermost containing list; nil if none. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3259 2. character address of start of last complete sexp terminated. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3260 3. non-nil if inside a string. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3261 (it is the character that will terminate the string, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3262 or t if the string should be terminated by a generic string delimiter.) |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3263 4. nil if outside a comment, t if inside a non-nestable comment, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3264 else an integer (the current comment nesting). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3265 5. t if following a quote character. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3266 6. the minimum paren-depth encountered during this scan. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3267 7. t if in a comment of style b; symbol `syntax-table' if the comment |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3268 should be terminated by a generic comment delimiter. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3269 8. character address of start of comment or string; nil if not in one. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3270 9. Intermediate data for continuation of parsing (subject to change). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3271 If third arg TARGETDEPTH is non-nil, parsing stops if the depth |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3272 in parentheses becomes equal to TARGETDEPTH. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3273 Fourth arg STOPBEFORE non-nil means stop when come to |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3274 any character that starts a sexp. |
66525
aaac09f838e0
(Fparse_partial_sexp): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65215
diff
changeset
|
3275 Fifth arg OLDSTATE is a list like what this function returns. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3276 It is used to initialize the state of the parse. Elements number 1, 2, 6 |
74542
31287a59d704
* syntax.c (Fpartial_parse_sexp): Correct Docco: Elt 8 of the
Alan Mackenzie <acm@muc.de>
parents:
74145
diff
changeset
|
3277 and 8 are ignored. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3278 Sixth arg COMMENTSTOP non-nil means stop at the start of a comment. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3279 If it is symbol `syntax-table', stop after the start of a comment or a |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3280 string, or after end of a comment or a string. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3281 (from, to, targetdepth, stopbefore, oldstate, commentstop) |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
3282 Lisp_Object from, to, targetdepth, stopbefore, oldstate, commentstop; |
163 | 3283 { |
3284 struct lisp_parse_state state; | |
3285 int target; | |
3286 | |
485 | 3287 if (!NILP (targetdepth)) |
163 | 3288 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
3289 CHECK_NUMBER (targetdepth); |
163 | 3290 target = XINT (targetdepth); |
3291 } | |
3292 else | |
3293 target = -100000; /* We won't reach this depth */ | |
3294 | |
3295 validate_region (&from, &to); | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
3296 scan_sexps_forward (&state, XINT (from), CHAR_TO_BYTE (XINT (from)), |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
3297 XINT (to), |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
3298 target, !NILP (stopbefore), oldstate, |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3299 (NILP (commentstop) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3300 ? 0 : (EQ (commentstop, Qsyntax_table) ? -1 : 1))); |
163 | 3301 |
3302 SET_PT (state.location); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3303 |
163 | 3304 return Fcons (make_number (state.depth), |
3305 Fcons (state.prevlevelstart < 0 ? Qnil : make_number (state.prevlevelstart), | |
3306 Fcons (state.thislevelstart < 0 ? Qnil : make_number (state.thislevelstart), | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3307 Fcons (state.instring >= 0 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3308 ? (state.instring == ST_STRING_STYLE |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3309 ? Qt : make_number (state.instring)) : Qnil, |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3310 Fcons (state.incomment < 0 ? Qt : |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3311 (state.incomment == 0 ? Qnil : |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3312 make_number (state.incomment)), |
163 | 3313 Fcons (state.quoted ? Qt : Qnil, |
20486
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3314 Fcons (make_number (state.mindepth), |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3315 Fcons ((state.comstyle |
20486
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3316 ? (state.comstyle == ST_COMMENT_STYLE |
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3317 ? Qsyntax_table : Qt) : |
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3318 Qnil), |
24728
e94104cf5891
(Fparse_partial_sexp): Correct test for element 8 to be
Dave Love <fx@gnu.org>
parents:
24148
diff
changeset
|
3319 Fcons (((state.incomment |
e94104cf5891
(Fparse_partial_sexp): Correct test for element 8 to be
Dave Love <fx@gnu.org>
parents:
24148
diff
changeset
|
3320 || (state.instring >= 0)) |
20486
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3321 ? make_number (state.comstr_start) |
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3322 : Qnil), |
22394
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3323 Fcons (state.levelstarts, Qnil)))))))))); |
163 | 3324 } |
3325 | |
21514 | 3326 void |
163 | 3327 init_syntax_once () |
3328 { | |
17126
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3329 register int i, c; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3330 Lisp_Object temp; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3331 |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3332 /* This has to be done here, before we call Fmake_char_table. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3333 Qsyntax_table = intern_c_string ("syntax-table"); |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3334 staticpro (&Qsyntax_table); |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3335 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3336 /* Intern_C_String this now in case it isn't already done. |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3337 Setting this variable twice is harmless. |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3338 But don't staticpro it here--that is done in alloc.c. */ |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3339 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots"); |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3340 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3341 /* Create objects which can be shared among syntax tables. */ |
34398
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
3342 Vsyntax_code_object = Fmake_vector (make_number (Smax), Qnil); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3343 for (i = 0; i < XVECTOR (Vsyntax_code_object)->size; i++) |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3344 XVECTOR (Vsyntax_code_object)->contents[i] |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3345 = Fcons (make_number (i), Qnil); |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3346 |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3347 /* Now we are ready to set up this property, so we can |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3348 create syntax tables. */ |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3349 Fput (Qsyntax_table, Qchar_table_extra_slots, make_number (0)); |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3350 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3351 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Swhitespace]; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3352 |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3353 Vstandard_syntax_table = Fmake_char_table (Qsyntax_table, temp); |
163 | 3354 |
71395
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3355 /* Control characters should not be whitespace. */ |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3356 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct]; |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3357 for (i = 0; i <= ' ' - 1; i++) |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3358 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3359 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 0177, temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3360 |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3361 /* Except that a few really are whitespace. */ |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3362 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Swhitespace]; |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3363 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ' ', temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3364 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\t', temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3365 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\n', temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3366 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 015, temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3367 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 014, temp); |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3368 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3369 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword]; |
163 | 3370 for (i = 'a'; i <= 'z'; i++) |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3371 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); |
163 | 3372 for (i = 'A'; i <= 'Z'; i++) |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3373 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); |
163 | 3374 for (i = '0'; i <= '9'; i++) |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3375 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3376 |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3377 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '$', temp); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3378 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '%', temp); |
163 | 3379 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3380 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '(', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3381 Fcons (make_number (Sopen), make_number (')'))); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3382 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ')', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3383 Fcons (make_number (Sclose), make_number ('('))); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3384 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '[', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3385 Fcons (make_number (Sopen), make_number (']'))); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3386 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ']', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3387 Fcons (make_number (Sclose), make_number ('['))); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3388 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '{', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3389 Fcons (make_number (Sopen), make_number ('}'))); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3390 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '}', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3391 Fcons (make_number (Sclose), make_number ('{'))); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3392 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '"', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3393 Fcons (make_number ((int) Sstring), Qnil)); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3394 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\\', |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3395 Fcons (make_number ((int) Sescape), Qnil)); |
163 | 3396 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3397 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Ssymbol]; |
163 | 3398 for (i = 0; i < 10; i++) |
17126
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3399 { |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3400 c = "_-+*/&|<>="[i]; |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3401 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, c, temp); |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3402 } |
163 | 3403 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3404 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct]; |
163 | 3405 for (i = 0; i < 12; i++) |
17126
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3406 { |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3407 c = ".,;:?!#@~^'`"[i]; |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3408 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, c, temp); |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3409 } |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3410 |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3411 /* All multibyte characters have syntax `word' by default. */ |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3412 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword]; |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
3413 char_table_set_range (Vstandard_syntax_table, 0x80, MAX_CHAR, temp); |
163 | 3414 } |
3415 | |
21514 | 3416 void |
163 | 3417 syms_of_syntax () |
3418 { | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3419 Qsyntax_table_p = intern_c_string ("syntax-table-p"); |
163 | 3420 staticpro (&Qsyntax_table_p); |
3421 | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3422 staticpro (&Vsyntax_code_object); |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3423 |
64319
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3424 staticpro (&gl_state.object); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3425 staticpro (&gl_state.global_code); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3426 staticpro (&gl_state.current_syntax_table); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3427 staticpro (&gl_state.old_prop); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3428 |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3429 /* Defined in regex.c */ |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3430 staticpro (&re_match_object); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3431 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3432 Qscan_error = intern_c_string ("scan-error"); |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
3433 staticpro (&Qscan_error); |
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
3434 Fput (Qscan_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3435 pure_cons (Qscan_error, pure_cons (Qerror, Qnil))); |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
3436 Fput (Qscan_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3437 make_pure_c_string ("Scan error")); |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
3438 |
163 | 3439 DEFVAR_BOOL ("parse-sexp-ignore-comments", &parse_sexp_ignore_comments, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3440 doc: /* Non-nil means `forward-sexp', etc., should treat comments as whitespace. */); |
163 | 3441 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3442 DEFVAR_BOOL ("parse-sexp-lookup-properties", &parse_sexp_lookup_properties, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3443 doc: /* Non-nil means `forward-sexp', etc., obey `syntax-table' property. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3444 Otherwise, that text property is simply ignored. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3445 See the info node `(elisp)Syntax Properties' for a description of the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3446 `syntax-table' property. */); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3447 |
163 | 3448 words_include_escapes = 0; |
3449 DEFVAR_BOOL ("words-include-escapes", &words_include_escapes, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3450 doc: /* Non-nil means `forward-word', etc., should treat escape chars part of words. */); |
163 | 3451 |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3452 DEFVAR_BOOL ("multibyte-syntax-as-symbol", &multibyte_syntax_as_symbol, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
3453 doc: /* Non-nil means `scan-sexps' treats all multibyte characters as symbol. */); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3454 multibyte_syntax_as_symbol = 0; |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3455 |
28302
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
3456 DEFVAR_BOOL ("open-paren-in-column-0-is-defun-start", |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
3457 &open_paren_in_column_0_is_defun_start, |
49551 | 3458 doc: /* *Non-nil means an open paren in column 0 denotes the start of a defun. */); |
28302
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
3459 open_paren_in_column_0_is_defun_start = 1; |
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
3460 |
89483 | 3461 |
3462 DEFVAR_LISP ("find-word-boundary-function-table", | |
3463 &Vfind_word_boundary_function_table, | |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3464 doc: /* |
89483 | 3465 Char table of functions to search for the word boundary. |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3466 Each function is called with two arguments; POS and LIMIT. |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3467 POS and LIMIT are character positions in the current buffer. |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3468 |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3469 If POS is less than LIMIT, POS is at the first character of a word, |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3470 and the return value of a function is a position after the last |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3471 character of that word. |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3472 |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3473 If POS is not less than LIMIT, POS is at the last character of a word, |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3474 and the return value of a function is a position at the first |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3475 character of that word. |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3476 |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3477 In both cases, LIMIT bounds the search. */); |
89483 | 3478 Vfind_word_boundary_function_table = Fmake_char_table (Qnil, Qnil); |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3479 |
163 | 3480 defsubr (&Ssyntax_table_p); |
3481 defsubr (&Ssyntax_table); | |
3482 defsubr (&Sstandard_syntax_table); | |
3483 defsubr (&Scopy_syntax_table); | |
3484 defsubr (&Sset_syntax_table); | |
3485 defsubr (&Schar_syntax); | |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
3486 defsubr (&Smatching_paren); |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
3487 defsubr (&Sstring_to_syntax); |
163 | 3488 defsubr (&Smodify_syntax_entry); |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
3489 defsubr (&Sinternal_describe_syntax_value); |
163 | 3490 |
3491 defsubr (&Sforward_word); | |
3492 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3493 defsubr (&Sskip_chars_forward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3494 defsubr (&Sskip_chars_backward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3495 defsubr (&Sskip_syntax_forward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3496 defsubr (&Sskip_syntax_backward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3497 |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
3498 defsubr (&Sforward_comment); |
163 | 3499 defsubr (&Sscan_lists); |
3500 defsubr (&Sscan_sexps); | |
3501 defsubr (&Sbackward_prefix_chars); | |
3502 defsubr (&Sparse_partial_sexp); | |
3503 } | |
52401 | 3504 |
3505 /* arch-tag: 3e297b9f-088e-4b64-8f4c-fb0b3443e412 | |
3506 (do not change this comment) */ |