Mercurial > emacs
annotate src/syntax.c @ 3568:3ee951a22a80
(Fforward_comment): Set point to where scan stops,
thus moving acros whitespace. When moving fwd, treat Sendcomment
as whitespace; likewise for Scomment when moving back.
(scan_sexps_forward): New arg COMMENTSTOP.
(Fparse_partial_sexp): Likewise.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 08 Jun 1993 06:12:08 +0000 |
| parents | ef7d99920f81 |
| children | 507f64624555 |
| rev | line source |
|---|---|
| 163 | 1 /* GNU Emacs routines to deal with syntax tables; also word and list parsing. |
| 2961 | 2 Copyright (C) 1985, 1987, 1993 Free Software Foundation, Inc. |
| 163 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is free software; you can redistribute it and/or modify | |
| 7 it under the terms of the GNU General Public License as published by | |
| 726 | 8 the Free Software Foundation; either version 2, or (at your option) |
| 163 | 9 any later version. |
| 10 | |
| 11 GNU Emacs is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with GNU Emacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
| 19 | |
| 20 | |
| 21 #include "config.h" | |
| 22 #include <ctype.h> | |
| 23 #include "lisp.h" | |
| 24 #include "commands.h" | |
| 25 #include "buffer.h" | |
| 26 #include "syntax.h" | |
| 27 | |
| 28 Lisp_Object Qsyntax_table_p; | |
| 29 | |
| 30 int words_include_escapes; | |
| 31 | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
32 /* 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
|
33 |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
34 struct lisp_parse_state |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
35 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
36 int depth; /* Depth at end of parsing */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
37 int instring; /* -1 if not within string, else desired terminator. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
38 int incomment; /* Nonzero if within a comment at end of parsing */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
39 int comstyle; /* comment style a=0, or b=1 */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
40 int quoted; /* Nonzero if just after an escape char at end of parsing */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
41 int thislevelstart; /* Char number of most recent start-of-expression at current level */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
42 int prevlevelstart; /* Char number of start of containing expression */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
43 int location; /* Char number at which parsing stopped. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
44 int mindepth; /* Minimum depth seen while scanning. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
45 int comstart; /* Position just after last comment starter. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
46 }; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
47 |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
48 /* 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
|
49 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
|
50 find_start_value is the defun start position found for it. |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
51 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
|
52 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
|
53 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
|
54 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
55 static int find_start_pos; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
56 static int find_start_value; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
57 static struct buffer *find_start_buffer; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
58 static int find_start_begv; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
59 static int find_start_modiff; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
60 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
61 /* Find a defun-start that is the last one before POS (or nearly the last). |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
62 We record what we find, so that another call in the same area |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
63 can return the same value right away. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
64 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
65 static int |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
66 find_defun_start (pos) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
67 int pos; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
68 { |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
69 int tem; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
70 int shortage; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
71 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
72 /* 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
|
73 if (current_buffer == find_start_buffer |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
74 /* 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
|
75 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
|
76 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
|
77 && pos <= find_start_pos + 1000 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
78 && pos >= find_start_value |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
79 && BEGV == find_start_begv |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
80 && MODIFF == find_start_modiff) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
81 return find_start_value; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
82 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
83 /* Back up to start of line. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
84 tem = scan_buffer ('\n', pos, -1, &shortage); |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
85 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
86 while (tem > BEGV) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
87 { |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
88 /* Open-paren at start of line means we found our defun-start. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
89 if (SYNTAX (FETCH_CHAR (tem)) == Sopen) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
90 break; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
91 /* Move to beg of previous line. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
92 tem = scan_buffer ('\n', tem, -2, &shortage); |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
93 } |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
94 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
95 /* Record what we found, for the next try. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
96 find_start_value = tem; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
97 find_start_buffer = current_buffer; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
98 find_start_modiff = MODIFF; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
99 find_start_begv = BEGV; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
100 find_start_pos = pos; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
101 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
102 return find_start_value; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
103 } |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
104 |
| 163 | 105 DEFUN ("syntax-table-p", Fsyntax_table_p, Ssyntax_table_p, 1, 1, 0, |
| 106 "Return t if ARG is a syntax table.\n\ | |
| 107 Any vector of 256 elements will do.") | |
| 108 (obj) | |
| 109 Lisp_Object obj; | |
| 110 { | |
| 111 if (XTYPE (obj) == Lisp_Vector && XVECTOR (obj)->size == 0400) | |
| 112 return Qt; | |
| 113 return Qnil; | |
| 114 } | |
| 115 | |
| 116 Lisp_Object | |
| 117 check_syntax_table (obj) | |
| 118 Lisp_Object obj; | |
| 119 { | |
| 120 register Lisp_Object tem; | |
| 121 while (tem = Fsyntax_table_p (obj), | |
| 485 | 122 NILP (tem)) |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
123 obj = wrong_type_argument (Qsyntax_table_p, obj); |
| 163 | 124 return obj; |
| 125 } | |
| 126 | |
| 127 | |
| 128 DEFUN ("syntax-table", Fsyntax_table, Ssyntax_table, 0, 0, 0, | |
| 129 "Return the current syntax table.\n\ | |
| 130 This is the one specified by the current buffer.") | |
| 131 () | |
| 132 { | |
| 133 return current_buffer->syntax_table; | |
| 134 } | |
| 135 | |
| 136 DEFUN ("standard-syntax-table", Fstandard_syntax_table, | |
| 137 Sstandard_syntax_table, 0, 0, 0, | |
| 138 "Return the standard syntax table.\n\ | |
| 139 This is the one used for new buffers.") | |
| 140 () | |
| 141 { | |
| 142 return Vstandard_syntax_table; | |
| 143 } | |
| 144 | |
| 145 DEFUN ("copy-syntax-table", Fcopy_syntax_table, Scopy_syntax_table, 0, 1, 0, | |
| 146 "Construct a new syntax table and return it.\n\ | |
| 147 It is a copy of the TABLE, which defaults to the standard syntax table.") | |
| 148 (table) | |
| 149 Lisp_Object table; | |
| 150 { | |
| 151 Lisp_Object size, val; | |
| 152 XFASTINT (size) = 0400; | |
| 153 XFASTINT (val) = 0; | |
| 154 val = Fmake_vector (size, val); | |
| 485 | 155 if (!NILP (table)) |
| 163 | 156 table = check_syntax_table (table); |
| 485 | 157 else if (NILP (Vstandard_syntax_table)) |
| 163 | 158 /* Can only be null during initialization */ |
| 159 return val; | |
| 160 else table = Vstandard_syntax_table; | |
| 161 | |
| 162 bcopy (XVECTOR (table)->contents, | |
| 163 XVECTOR (val)->contents, 0400 * sizeof (Lisp_Object)); | |
| 164 return val; | |
| 165 } | |
| 166 | |
| 167 DEFUN ("set-syntax-table", Fset_syntax_table, Sset_syntax_table, 1, 1, 0, | |
| 168 "Select a new syntax table for the current buffer.\n\ | |
| 169 One argument, a syntax table.") | |
| 170 (table) | |
| 171 Lisp_Object table; | |
| 172 { | |
| 173 table = check_syntax_table (table); | |
| 174 current_buffer->syntax_table = table; | |
| 175 /* Indicate that this buffer now has a specified syntax table. */ | |
| 176 current_buffer->local_var_flags |= buffer_local_flags.syntax_table; | |
| 177 return table; | |
| 178 } | |
| 179 | |
| 180 /* Convert a letter which signifies a syntax code | |
| 181 into the code it signifies. | |
| 182 This is used by modify-syntax-entry, and other things. */ | |
| 183 | |
| 184 unsigned char syntax_spec_code[0400] = | |
| 185 { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 186 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 187 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 188 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 189 (char) Swhitespace, 0377, (char) Sstring, 0377, | |
| 190 (char) Smath, 0377, 0377, (char) Squote, | |
| 191 (char) Sopen, (char) Sclose, 0377, 0377, | |
| 192 0377, (char) Swhitespace, (char) Spunct, (char) Scharquote, | |
| 193 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 194 0377, 0377, 0377, 0377, | |
| 195 (char) Scomment, 0377, (char) Sendcomment, 0377, | |
| 196 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* @, A, ... */ | |
| 197 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 198 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword, | |
| 199 0377, 0377, 0377, 0377, (char) Sescape, 0377, 0377, (char) Ssymbol, | |
| 200 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* `, a, ... */ | |
| 201 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
| 202 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword, | |
| 203 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377 | |
| 204 }; | |
| 205 | |
| 206 /* Indexed by syntax code, give the letter that describes it. */ | |
| 207 | |
| 208 char syntax_code_spec[13] = | |
| 209 { | |
| 210 ' ', '.', 'w', '_', '(', ')', '\'', '\"', '$', '\\', '/', '<', '>' | |
| 211 }; | |
| 212 | |
| 213 DEFUN ("char-syntax", Fchar_syntax, Schar_syntax, 1, 1, 0, | |
| 214 "Return the syntax code of CHAR, described by a character.\n\ | |
| 215 For example, if CHAR is a word constituent, the character `?w' is returned.\n\ | |
| 216 The characters that correspond to various syntax codes\n\ | |
| 217 are listed in the documentation of `modify-syntax-entry'.") | |
| 218 (ch) | |
| 219 Lisp_Object ch; | |
| 220 { | |
| 221 CHECK_NUMBER (ch, 0); | |
| 222 return make_number (syntax_code_spec[(int) SYNTAX (0xFF & XINT (ch))]); | |
| 223 } | |
| 224 | |
| 225 /* This comment supplies the doc string for modify-syntax-entry, | |
| 226 for make-docfile to see. We cannot put this in the real DEFUN | |
| 227 due to limits in the Unix cpp. | |
| 228 | |
| 229 DEFUN ("modify-syntax-entry", foo, bar, 0, 0, 0, | |
| 230 "Set syntax for character CHAR according to string S.\n\ | |
| 231 The syntax is changed only for table TABLE, which defaults to\n\ | |
| 232 the current buffer's syntax table.\n\ | |
| 233 The first character of S should be one of the following:\n\ | |
| 624 | 234 Space or - whitespace syntax. w word constituent.\n\ |
| 235 _ symbol constituent. . punctuation.\n\ | |
| 236 ( open-parenthesis. ) close-parenthesis.\n\ | |
| 237 \" string quote. \\ escape.\n\ | |
| 238 $ paired delimiter. ' expression quote or prefix operator.\n\ | |
| 239 < comment starter. > comment ender.\n\ | |
| 240 / character-quote.\n\ | |
| 163 | 241 Only single-character comment start and end sequences are represented thus.\n\ |
| 242 Two-character sequences are represented as described below.\n\ | |
| 243 The second character of S is the matching parenthesis,\n\ | |
| 244 used only if the first character is `(' or `)'.\n\ | |
| 245 Any additional characters are flags.\n\ | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
246 Defined flags are the characters 1, 2, 3, 4, b, and p.\n\ |
| 163 | 247 1 means C is the start of a two-char comment start sequence.\n\ |
| 248 2 means C is the second character of such a sequence.\n\ | |
| 249 3 means C is the start of a two-char comment end sequence.\n\ | |
| 250 4 means C is the second character of such a sequence.\n\ | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
251 \n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
252 There can be up to two orthogonal comment sequences. This is to support\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
253 language modes such as C++. By default, all comment sequences are of style\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
254 a, but you can set the comment sequence style to b (on the second character of a\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
255 comment-start, or the first character of a comment-end sequence) by using\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
256 this flag:\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
257 b means C is part of comment sequence b.\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
258 \n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
259 p means C is a prefix character for `backward-prefix-chars';\n\ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
260 such characters are treated as whitespace when they occur\n\ |
| 163 | 261 between expressions.") |
| 262 | |
| 263 */ | |
| 264 | |
| 265 DEFUN ("modify-syntax-entry", Fmodify_syntax_entry, Smodify_syntax_entry, 2, 3, | |
| 266 /* I really don't know why this is interactive | |
| 267 help-form should at least be made useful whilst reading the second arg | |
| 268 */ | |
| 269 "cSet syntax for character: \nsSet syntax for %s to: ", | |
| 270 0 /* See immediately above */) | |
| 271 (c, newentry, syntax_table) | |
| 272 Lisp_Object c, newentry, syntax_table; | |
| 273 { | |
| 274 register unsigned char *p, match; | |
| 275 register enum syntaxcode code; | |
| 276 Lisp_Object val; | |
| 277 | |
| 278 CHECK_NUMBER (c, 0); | |
| 279 CHECK_STRING (newentry, 1); | |
| 485 | 280 if (NILP (syntax_table)) |
| 163 | 281 syntax_table = current_buffer->syntax_table; |
| 282 else | |
| 283 syntax_table = check_syntax_table (syntax_table); | |
| 284 | |
| 285 p = XSTRING (newentry)->data; | |
| 286 code = (enum syntaxcode) syntax_spec_code[*p++]; | |
| 287 if (((int) code & 0377) == 0377) | |
| 288 error ("invalid syntax description letter: %c", c); | |
| 289 | |
| 290 match = *p; | |
| 291 if (match) p++; | |
| 292 if (match == ' ') match = 0; | |
| 293 | |
| 294 XFASTINT (val) = (match << 8) + (int) code; | |
| 295 while (*p) | |
| 296 switch (*p++) | |
| 297 { | |
| 298 case '1': | |
| 299 XFASTINT (val) |= 1 << 16; | |
| 300 break; | |
| 301 | |
| 302 case '2': | |
| 303 XFASTINT (val) |= 1 << 17; | |
| 304 break; | |
| 305 | |
| 306 case '3': | |
| 307 XFASTINT (val) |= 1 << 18; | |
| 308 break; | |
| 309 | |
| 310 case '4': | |
| 311 XFASTINT (val) |= 1 << 19; | |
| 312 break; | |
| 313 | |
| 314 case 'p': | |
| 315 XFASTINT (val) |= 1 << 20; | |
| 316 break; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
317 |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
318 case 'b': |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
319 XFASTINT (val) |= 1 << 21; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
320 break; |
| 163 | 321 } |
| 322 | |
| 323 XVECTOR (syntax_table)->contents[0xFF & XINT (c)] = val; | |
| 324 | |
| 325 return Qnil; | |
| 326 } | |
| 327 | |
| 328 /* Dump syntax table to buffer in human-readable format */ | |
| 329 | |
| 330 describe_syntax (value) | |
| 331 Lisp_Object value; | |
| 332 { | |
| 333 register enum syntaxcode code; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
334 char desc, match, start1, start2, end1, end2, prefix, comstyle; |
| 163 | 335 char str[2]; |
| 336 | |
| 337 Findent_to (make_number (16), make_number (1)); | |
| 338 | |
| 339 if (XTYPE (value) != Lisp_Int) | |
| 340 { | |
| 341 insert_string ("invalid"); | |
| 342 return; | |
| 343 } | |
| 344 | |
| 345 code = (enum syntaxcode) (XINT (value) & 0377); | |
| 346 match = (XINT (value) >> 8) & 0377; | |
| 347 start1 = (XINT (value) >> 16) & 1; | |
| 348 start2 = (XINT (value) >> 17) & 1; | |
| 349 end1 = (XINT (value) >> 18) & 1; | |
| 350 end2 = (XINT (value) >> 19) & 1; | |
| 351 prefix = (XINT (value) >> 20) & 1; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
352 comstyle = (XINT (value) >> 21) & 1; |
| 163 | 353 |
| 354 if ((int) code < 0 || (int) code >= (int) Smax) | |
| 355 { | |
| 356 insert_string ("invalid"); | |
| 357 return; | |
| 358 } | |
| 359 desc = syntax_code_spec[(int) code]; | |
| 360 | |
| 361 str[0] = desc, str[1] = 0; | |
| 362 insert (str, 1); | |
| 363 | |
| 364 str[0] = match ? match : ' '; | |
| 365 insert (str, 1); | |
| 366 | |
| 367 | |
| 368 if (start1) | |
| 369 insert ("1", 1); | |
| 370 if (start2) | |
| 371 insert ("2", 1); | |
| 372 | |
| 373 if (end1) | |
| 374 insert ("3", 1); | |
| 375 if (end2) | |
| 376 insert ("4", 1); | |
| 377 | |
| 378 if (prefix) | |
| 379 insert ("p", 1); | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
380 if (comstyle) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
381 insert ("b", 1); |
| 163 | 382 |
| 383 insert_string ("\twhich means: "); | |
| 384 | |
| 385 #ifdef SWITCH_ENUM_BUG | |
| 386 switch ((int) code) | |
| 387 #else | |
| 388 switch (code) | |
| 389 #endif | |
| 390 { | |
| 391 case Swhitespace: | |
| 392 insert_string ("whitespace"); break; | |
| 393 case Spunct: | |
| 394 insert_string ("punctuation"); break; | |
| 395 case Sword: | |
| 396 insert_string ("word"); break; | |
| 397 case Ssymbol: | |
| 398 insert_string ("symbol"); break; | |
| 399 case Sopen: | |
| 400 insert_string ("open"); break; | |
| 401 case Sclose: | |
| 402 insert_string ("close"); break; | |
| 403 case Squote: | |
| 404 insert_string ("quote"); break; | |
| 405 case Sstring: | |
| 406 insert_string ("string"); break; | |
| 407 case Smath: | |
| 408 insert_string ("math"); break; | |
| 409 case Sescape: | |
| 410 insert_string ("escape"); break; | |
| 411 case Scharquote: | |
| 412 insert_string ("charquote"); break; | |
| 413 case Scomment: | |
| 414 insert_string ("comment"); break; | |
| 415 case Sendcomment: | |
| 416 insert_string ("endcomment"); break; | |
| 417 default: | |
| 418 insert_string ("invalid"); | |
| 419 return; | |
| 420 } | |
| 421 | |
| 422 if (match) | |
| 423 { | |
| 424 insert_string (", matches "); | |
|
1292
d9a103f4843e
(describe_syntax): Use insert_char to insert `match'.
Joseph Arceneaux <jla@gnu.org>
parents:
1167
diff
changeset
|
425 insert_char (match); |
| 163 | 426 } |
| 427 | |
| 428 if (start1) | |
| 429 insert_string (",\n\t is the first character of a comment-start sequence"); | |
| 430 if (start2) | |
| 431 insert_string (",\n\t is the second character of a comment-start sequence"); | |
| 432 | |
| 433 if (end1) | |
| 434 insert_string (",\n\t is the first character of a comment-end sequence"); | |
| 435 if (end2) | |
| 436 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
|
437 if (comstyle) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
438 insert_string (" (comment style b)"); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
439 |
| 163 | 440 if (prefix) |
| 441 insert_string (",\n\t is a prefix character for `backward-prefix-chars'"); | |
| 442 | |
| 443 insert_string ("\n"); | |
| 444 } | |
| 445 | |
| 446 Lisp_Object | |
| 447 describe_syntax_1 (vector) | |
| 448 Lisp_Object vector; | |
| 449 { | |
| 450 struct buffer *old = current_buffer; | |
| 451 set_buffer_internal (XBUFFER (Vstandard_output)); | |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
452 describe_vector (vector, Qnil, describe_syntax, 0, Qnil); |
| 163 | 453 set_buffer_internal (old); |
| 454 return Qnil; | |
| 455 } | |
| 456 | |
| 457 DEFUN ("describe-syntax", Fdescribe_syntax, Sdescribe_syntax, 0, 0, "", | |
| 458 "Describe the syntax specifications in the syntax table.\n\ | |
| 459 The descriptions are inserted in a buffer, which is then displayed.") | |
| 460 () | |
| 461 { | |
| 462 internal_with_output_to_temp_buffer | |
| 463 ("*Help*", describe_syntax_1, current_buffer->syntax_table); | |
| 464 | |
| 465 return Qnil; | |
| 466 } | |
| 467 | |
| 468 /* Return the position across COUNT words from FROM. | |
| 469 If that many words cannot be found before the end of the buffer, return 0. | |
| 470 COUNT negative means scan backward and stop at word beginning. */ | |
| 471 | |
| 472 scan_words (from, count) | |
| 473 register int from, count; | |
| 474 { | |
| 475 register int beg = BEGV; | |
| 476 register int end = ZV; | |
| 477 register int code; | |
| 478 | |
| 479 immediate_quit = 1; | |
| 480 QUIT; | |
| 481 | |
| 482 while (count > 0) | |
| 483 { | |
| 484 while (1) | |
| 485 { | |
| 486 if (from == end) | |
| 487 { | |
| 488 immediate_quit = 0; | |
| 489 return 0; | |
| 490 } | |
| 491 code = SYNTAX (FETCH_CHAR (from)); | |
| 492 if (words_include_escapes | |
| 493 && (code == Sescape || code == Scharquote)) | |
| 494 break; | |
| 495 if (code == Sword) | |
| 496 break; | |
| 497 from++; | |
| 498 } | |
| 499 while (1) | |
| 500 { | |
| 501 if (from == end) break; | |
| 502 code = SYNTAX (FETCH_CHAR (from)); | |
| 503 if (!(words_include_escapes | |
| 504 && (code == Sescape || code == Scharquote))) | |
| 505 if (code != Sword) | |
| 506 break; | |
| 507 from++; | |
| 508 } | |
| 509 count--; | |
| 510 } | |
| 511 while (count < 0) | |
| 512 { | |
| 513 while (1) | |
| 514 { | |
| 515 if (from == beg) | |
| 516 { | |
| 517 immediate_quit = 0; | |
| 518 return 0; | |
| 519 } | |
| 520 code = SYNTAX (FETCH_CHAR (from - 1)); | |
| 521 if (words_include_escapes | |
| 522 && (code == Sescape || code == Scharquote)) | |
| 523 break; | |
| 524 if (code == Sword) | |
| 525 break; | |
| 526 from--; | |
| 527 } | |
| 528 while (1) | |
| 529 { | |
| 530 if (from == beg) break; | |
| 531 code = SYNTAX (FETCH_CHAR (from - 1)); | |
| 532 if (!(words_include_escapes | |
| 533 && (code == Sescape || code == Scharquote))) | |
| 534 if (code != Sword) | |
| 535 break; | |
| 536 from--; | |
| 537 } | |
| 538 count++; | |
| 539 } | |
| 540 | |
| 541 immediate_quit = 0; | |
| 542 | |
| 543 return from; | |
| 544 } | |
| 545 | |
| 546 DEFUN ("forward-word", Fforward_word, Sforward_word, 1, 1, "p", | |
| 547 "Move point forward ARG words (backward if ARG is negative).\n\ | |
| 548 Normally returns t.\n\ | |
| 549 If an edge of the buffer is reached, point is left there\n\ | |
| 550 and nil is returned.") | |
| 551 (count) | |
| 552 Lisp_Object count; | |
| 553 { | |
| 554 int val; | |
| 555 CHECK_NUMBER (count, 0); | |
| 556 | |
| 557 if (!(val = scan_words (point, XINT (count)))) | |
| 558 { | |
| 559 SET_PT (XINT (count) > 0 ? ZV : BEGV); | |
| 560 return Qnil; | |
| 561 } | |
| 562 SET_PT (val); | |
| 563 return Qt; | |
| 564 } | |
| 565 | |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
566 DEFUN ("forward-comment", Fforward_comment, Sforward_comment, 1, 1, 0, |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
567 "Move forward across up to N comments. If N is negative, move backward.\n\ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
568 Stop scanning if we find something other than a comment or whitespace.\n\ |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
569 Set point to where scanning stops.\n\ |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
570 If N comments are found as expected, with nothing except whitespace\n\ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
571 between them, return t; otherwise return nil.") |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
572 (count) |
|
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
573 Lisp_Object count; |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
574 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
575 register int from; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
576 register int stop; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
577 register int c; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
578 register enum syntaxcode code; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
579 int comstyle = 0; /* style of comment encountered */ |
|
3087
ea0cb469490e
(Fforward_comment): Fix last change.
Richard M. Stallman <rms@gnu.org>
parents:
3086
diff
changeset
|
580 int found; |
|
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
581 int count1; |
|
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
582 |
|
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
583 CHECK_NUMBER (count, 0); |
|
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
584 count1 = XINT (count); |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
585 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
586 immediate_quit = 1; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
587 QUIT; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
588 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
589 from = PT; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
590 |
|
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
591 while (count1 > 0) |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
592 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
593 stop = ZV; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
594 while (from < stop) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
595 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
596 c = FETCH_CHAR (from); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
597 code = SYNTAX (c); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
598 from++; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
599 comstyle = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
600 if (from < stop && SYNTAX_COMSTART_FIRST (c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
601 && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from))) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
602 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
603 /* we have encountered a comment start sequence and we |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
604 are ignoring all text inside comments. we must record |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
605 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
|
606 only a comment end of the same style actually ends |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
607 the comment section */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
608 code = Scomment; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
609 comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
610 from++; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
611 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
612 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
613 if (code == Scomment) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
614 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
615 while (1) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
616 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
617 if (from == stop) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
618 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
619 immediate_quit = 0; |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
620 SET_PT (from); |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
621 return Qnil; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
622 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
623 c = FETCH_CHAR (from); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
624 if (SYNTAX (c) == Sendcomment |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
625 && SYNTAX_COMMENT_STYLE (c) == comstyle) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
626 /* we have encountered a comment end of the same style |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
627 as the comment sequence which began this comment |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
628 section */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
629 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
630 from++; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
631 if (from < stop && SYNTAX_COMEND_FIRST (c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
632 && SYNTAX_COMEND_SECOND (FETCH_CHAR (from)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
633 && SYNTAX_COMMENT_STYLE (c) == comstyle) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
634 /* we have encountered a comment end of the same style |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
635 as the comment sequence which began this comment |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
636 section */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
637 { from++; break; } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
638 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
639 /* We have skipped one comment. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
640 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
641 } |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
642 else if (code != Swhitespace && code != Sendcomment) |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
643 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
644 immediate_quit = 0; |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
645 SET_PT (from - 1); |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
646 return Qnil; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
647 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
648 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
649 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
650 /* End of comment reached */ |
|
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
651 count1--; |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
652 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
653 |
|
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
654 while (count1 < 0) |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
655 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
656 stop = BEGV; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
657 while (from > stop) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
658 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
659 int quoted; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
660 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
661 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
662 quoted = char_quoted (from); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
663 if (quoted) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
664 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
665 c = FETCH_CHAR (from); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
666 code = SYNTAX (c); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
667 comstyle = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
668 if (from > stop && SYNTAX_COMEND_SECOND (c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
669 && SYNTAX_COMEND_FIRST (FETCH_CHAR (from - 1)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
670 && !char_quoted (from - 1)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
671 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
672 /* we must record the comment style encountered so that |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
673 later, we can match only the proper comment begin |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
674 sequence of the same style */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
675 code = Sendcomment; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
676 comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from - 1)); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
677 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
678 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
679 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
680 if (code == Sendcomment && !quoted) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
681 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
682 if (code != SYNTAX (c)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
683 /* For a two-char comment ender, we can assume |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
684 it does end a comment. So scan back in a simple way. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
685 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
686 if (from != stop) from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
687 while (1) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
688 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
689 if (SYNTAX (c = FETCH_CHAR (from)) == Scomment |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
690 && SYNTAX_COMMENT_STYLE (c) == comstyle) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
691 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
692 if (from == stop) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
693 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
694 immediate_quit = 0; |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
695 SET_PT (from); |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
696 return Qnil; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
697 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
698 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
699 if (SYNTAX_COMSTART_SECOND (c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
700 && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
701 && SYNTAX_COMMENT_STYLE (c) == comstyle |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
702 && !char_quoted (from)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
703 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
704 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
705 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
706 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
707 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
708 /* Look back, counting the parity of string-quotes, |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
709 and recording the comment-starters seen. |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
710 When we reach a safe place, assume that's not in a string; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
711 then step the main scan to the earliest comment-starter seen |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
712 an even number of string quotes away from the safe place. |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
713 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
714 OFROM[I] is position of the earliest comment-starter seen |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
715 which is I+2X quotes from the comment-end. |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
716 PARITY is current parity of quotes from the comment end. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
717 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
718 int parity = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
719 char my_stringend = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
720 int string_lossage = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
721 int comment_end = from; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
722 int comstart_pos = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
723 int comstart_parity = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
724 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
725 /* At beginning of range to scan, we're outside of strings; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
726 that determines quote parity to the comment-end. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
727 while (from != stop) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
728 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
729 /* Move back and examine a character. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
730 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
731 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
732 c = FETCH_CHAR (from); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
733 code = SYNTAX (c); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
734 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
735 /* If this char is the second of a 2-char comment sequence, |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
736 back up and give the pair the appropriate syntax. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
737 if (from > stop && SYNTAX_COMEND_SECOND (c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
738 && SYNTAX_COMEND_FIRST (FETCH_CHAR (from - 1))) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
739 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
740 code = Sendcomment; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
741 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
742 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
743 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
744 else if (from > stop && SYNTAX_COMSTART_SECOND (c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
745 && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
746 && comstyle == SYNTAX_COMMENT_STYLE (c)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
747 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
748 code = Scomment; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
749 from--; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
750 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
751 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
752 /* Ignore escaped characters. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
753 if (char_quoted (from)) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
754 continue; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
755 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
756 /* Track parity of quotes. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
757 if (code == Sstring) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
758 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
759 parity ^= 1; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
760 if (my_stringend == 0) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
761 my_stringend = c; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
762 /* If we have two kinds of string delimiters. |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
763 There's no way to grok this scanning backwards. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
764 else if (my_stringend != c) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
765 string_lossage = 1; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
766 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
767 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
768 /* Record comment-starters according to that |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
769 quote-parity to the comment-end. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
770 if (code == Scomment) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
771 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
772 comstart_parity = parity; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
773 comstart_pos = from; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
774 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
775 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
776 /* If we find another earlier comment-ender, |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
777 any comment-starts earier than that don't count |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
778 (because they go with the earlier comment-ender). */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
779 if (code == Sendcomment |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
780 && SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)) == comstyle) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
781 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
782 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
783 /* Assume a defun-start point is outside of strings. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
784 if (code == Sopen |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
785 && (from == stop || FETCH_CHAR (from - 1) == '\n')) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
786 break; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
787 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
788 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
789 if (comstart_pos == 0) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
790 from = comment_end; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
791 /* If the earliest comment starter |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
792 is followed by uniform paired string quotes or none, |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
793 we know it can't be inside a string |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
794 since if it were then the comment ender would be inside one. |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
795 So it does start a comment. Skip back to it. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
796 else if (comstart_parity == 0 && !string_lossage) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
797 from = comstart_pos; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
798 else |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
799 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
800 /* We had two kinds of string delimiters mixed up |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
801 together. Decode this going forwards. |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
802 Scan fwd from the previous comment ender |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
803 to the one in question; this records where we |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
804 last passed a comment starter. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
805 struct lisp_parse_state state; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
806 scan_sexps_forward (&state, find_defun_start (comment_end), |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
807 comment_end - 1, -10000, 0, Qnil); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
808 if (state.incomment) |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
809 from = state.comstart; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
810 else |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
811 /* We can't grok this as a comment; scan it normally. */ |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
812 from = comment_end; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
813 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
814 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
815 } |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
816 else if ((code != Swhitespace && code != Scomment) || quoted) |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
817 { |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
818 immediate_quit = 0; |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
819 SET_PT (from + 1); |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
820 return Qnil; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
821 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
822 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
823 |
|
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
824 count1++; |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
825 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
826 |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
827 SET_PT (from); |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
828 immediate_quit = 0; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
829 return Qt; |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
830 } |
|
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
831 |
| 163 | 832 int parse_sexp_ignore_comments; |
| 833 | |
| 834 Lisp_Object | |
| 835 scan_lists (from, count, depth, sexpflag) | |
| 836 register int from; | |
| 837 int count, depth, sexpflag; | |
| 838 { | |
| 839 Lisp_Object val; | |
| 840 register int stop; | |
| 841 register int c; | |
| 842 char stringterm; | |
| 843 int quoted; | |
| 844 int mathexit = 0; | |
| 845 register enum syntaxcode code; | |
| 846 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
|
847 int comstyle = 0; /* style of comment encountered */ |
| 163 | 848 |
| 849 if (depth > 0) min_depth = 0; | |
| 850 | |
| 851 immediate_quit = 1; | |
| 852 QUIT; | |
| 853 | |
| 854 while (count > 0) | |
| 855 { | |
| 856 stop = ZV; | |
| 857 while (from < stop) | |
| 858 { | |
| 859 c = FETCH_CHAR (from); | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
860 code = SYNTAX (c); |
| 163 | 861 from++; |
| 862 if (from < stop && SYNTAX_COMSTART_FIRST (c) | |
| 863 && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from)) | |
| 864 && 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
|
865 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
866 /* we have encountered a comment start sequence and we |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
867 are ignoring all text inside comments. we must record |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
868 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
|
869 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
|
870 the comment section */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
871 code = Scomment; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
872 comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
873 from++; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
874 } |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
875 |
| 163 | 876 if (SYNTAX_PREFIX (c)) |
| 877 continue; | |
| 878 | |
| 879 #ifdef SWITCH_ENUM_BUG | |
| 880 switch ((int) code) | |
| 881 #else | |
| 882 switch (code) | |
| 883 #endif | |
| 884 { | |
| 885 case Sescape: | |
| 886 case Scharquote: | |
| 887 if (from == stop) goto lose; | |
| 888 from++; | |
| 889 /* treat following character as a word constituent */ | |
| 890 case Sword: | |
| 891 case Ssymbol: | |
| 892 if (depth || !sexpflag) break; | |
| 893 /* This word counts as a sexp; return at end of it. */ | |
| 894 while (from < stop) | |
| 895 { | |
| 896 #ifdef SWITCH_ENUM_BUG | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
897 switch ((int) SYNTAX (FETCH_CHAR (from))) |
| 163 | 898 #else |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
899 switch (SYNTAX (FETCH_CHAR (from))) |
| 163 | 900 #endif |
| 901 { | |
| 902 case Scharquote: | |
| 903 case Sescape: | |
| 904 from++; | |
| 905 if (from == stop) goto lose; | |
| 906 break; | |
| 907 case Sword: | |
| 908 case Ssymbol: | |
| 909 case Squote: | |
| 910 break; | |
| 911 default: | |
| 912 goto done; | |
| 913 } | |
| 914 from++; | |
| 915 } | |
| 916 goto done; | |
| 917 | |
| 918 case Scomment: | |
| 919 if (!parse_sexp_ignore_comments) break; | |
| 920 while (1) | |
| 921 { | |
| 922 if (from == stop) goto done; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
923 c = FETCH_CHAR (from); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
924 if (SYNTAX (c) == Sendcomment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
925 && SYNTAX_COMMENT_STYLE (c) == comstyle) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
926 /* we have encountered a comment end of the same style |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
927 as the comment sequence which began this comment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
928 section */ |
| 163 | 929 break; |
| 930 from++; | |
| 931 if (from < stop && SYNTAX_COMEND_FIRST (c) | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
932 && SYNTAX_COMEND_SECOND (FETCH_CHAR (from)) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
933 && SYNTAX_COMMENT_STYLE (c) == comstyle) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
934 /* we have encountered a comment end of the same style |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
935 as the comment sequence which began this comment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
936 section */ |
| 163 | 937 { from++; break; } |
| 938 } | |
| 939 break; | |
| 940 | |
| 941 case Smath: | |
| 942 if (!sexpflag) | |
| 943 break; | |
| 944 if (from != stop && c == FETCH_CHAR (from)) | |
| 945 from++; | |
| 946 if (mathexit) | |
| 947 { | |
| 948 mathexit = 0; | |
| 949 goto close1; | |
| 950 } | |
| 951 mathexit = 1; | |
| 952 | |
| 953 case Sopen: | |
| 954 if (!++depth) goto done; | |
| 955 break; | |
| 956 | |
| 957 case Sclose: | |
| 958 close1: | |
| 959 if (!--depth) goto done; | |
| 960 if (depth < min_depth) | |
| 961 error ("Containing expression ends prematurely"); | |
| 962 break; | |
| 963 | |
| 964 case Sstring: | |
| 965 stringterm = FETCH_CHAR (from - 1); | |
| 966 while (1) | |
| 967 { | |
| 968 if (from >= stop) goto lose; | |
| 969 if (FETCH_CHAR (from) == stringterm) break; | |
| 970 #ifdef SWITCH_ENUM_BUG | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
971 switch ((int) SYNTAX (FETCH_CHAR (from))) |
| 163 | 972 #else |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
973 switch (SYNTAX (FETCH_CHAR (from))) |
| 163 | 974 #endif |
| 975 { | |
| 976 case Scharquote: | |
| 977 case Sescape: | |
| 978 from++; | |
| 979 } | |
| 980 from++; | |
| 981 } | |
| 982 from++; | |
| 983 if (!depth && sexpflag) goto done; | |
| 984 break; | |
| 985 } | |
| 986 } | |
| 987 | |
| 988 /* Reached end of buffer. Error if within object, return nil if between */ | |
| 989 if (depth) goto lose; | |
| 990 | |
| 991 immediate_quit = 0; | |
| 992 return Qnil; | |
| 993 | |
| 994 /* End of object reached */ | |
| 995 done: | |
| 996 count--; | |
| 997 } | |
| 998 | |
| 999 while (count < 0) | |
| 1000 { | |
| 1001 stop = BEGV; | |
| 1002 while (from > stop) | |
| 1003 { | |
| 1004 from--; | |
| 1005 if (quoted = char_quoted (from)) | |
| 1006 from--; | |
| 1007 c = FETCH_CHAR (from); | |
| 1008 code = SYNTAX (c); | |
| 1009 if (from > stop && SYNTAX_COMEND_SECOND (c) | |
| 1010 && SYNTAX_COMEND_FIRST (FETCH_CHAR (from - 1)) | |
| 1011 && !char_quoted (from - 1) | |
| 1012 && 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
|
1013 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1014 /* we must record the comment style encountered so that |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1015 later, we can match only the proper comment begin |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1016 sequence of the same style */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1017 code = Sendcomment; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1018 comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from - 1)); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1019 from--; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1020 } |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1021 |
| 163 | 1022 if (SYNTAX_PREFIX (c)) |
| 1023 continue; | |
| 1024 | |
| 1025 #ifdef SWITCH_ENUM_BUG | |
| 1026 switch ((int) (quoted ? Sword : code)) | |
| 1027 #else | |
| 1028 switch (quoted ? Sword : code) | |
| 1029 #endif | |
| 1030 { | |
| 1031 case Sword: | |
| 1032 case Ssymbol: | |
| 1033 if (depth || !sexpflag) break; | |
| 1034 /* This word counts as a sexp; count object finished after passing it. */ | |
| 1035 while (from > stop) | |
| 1036 { | |
| 1037 quoted = char_quoted (from - 1); | |
| 1038 if (quoted) | |
| 1039 from--; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1040 if (! (quoted || SYNTAX (FETCH_CHAR (from - 1)) == Sword |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1041 || SYNTAX (FETCH_CHAR (from - 1)) == Ssymbol |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1042 || SYNTAX (FETCH_CHAR (from - 1)) == Squote)) |
| 163 | 1043 goto done2; |
| 1044 from--; | |
| 1045 } | |
| 1046 goto done2; | |
| 1047 | |
| 1048 case Smath: | |
| 1049 if (!sexpflag) | |
| 1050 break; | |
| 1051 if (from != stop && c == FETCH_CHAR (from - 1)) | |
| 1052 from--; | |
| 1053 if (mathexit) | |
| 1054 { | |
| 1055 mathexit = 0; | |
| 1056 goto open2; | |
| 1057 } | |
| 1058 mathexit = 1; | |
| 1059 | |
| 1060 case Sclose: | |
| 1061 if (!++depth) goto done2; | |
| 1062 break; | |
| 1063 | |
| 1064 case Sopen: | |
| 1065 open2: | |
| 1066 if (!--depth) goto done2; | |
| 1067 if (depth < min_depth) | |
| 1068 error ("Containing expression ends prematurely"); | |
| 1069 break; | |
| 1070 | |
| 1071 case Sendcomment: | |
| 1072 if (!parse_sexp_ignore_comments) | |
| 1073 break; | |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1074 if (code != SYNTAX (c)) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1075 /* For a two-char comment ender, we can assume |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1076 it does end a comment. So scan back in a simple way. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1077 { |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1078 if (from != stop) from--; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1079 while (1) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1080 { |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1081 if (SYNTAX (c = FETCH_CHAR (from)) == Scomment |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1082 && SYNTAX_COMMENT_STYLE (c) == comstyle) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1083 break; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1084 if (from == stop) goto done; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1085 from--; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1086 if (SYNTAX_COMSTART_SECOND (c) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1087 && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from)) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1088 && SYNTAX_COMMENT_STYLE (c) == comstyle |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1089 && !char_quoted (from)) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1090 break; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1091 } |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1092 break; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1093 } |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1094 |
| 163 | 1095 /* Look back, counting the parity of string-quotes, |
| 1096 and recording the comment-starters seen. | |
| 1097 When we reach a safe place, assume that's not in a string; | |
| 1098 then step the main scan to the earliest comment-starter seen | |
| 1099 an even number of string quotes away from the safe place. | |
| 1100 | |
| 1101 OFROM[I] is position of the earliest comment-starter seen | |
| 1102 which is I+2X quotes from the comment-end. | |
| 1103 PARITY is current parity of quotes from the comment end. */ | |
| 1104 { | |
| 1105 int parity = 0; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1106 char my_stringend = 0; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1107 int string_lossage = 0; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1108 int comment_end = from; |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1109 int comstart_pos = 0; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1110 int comstart_parity = 0; |
| 163 | 1111 |
| 1112 /* At beginning of range to scan, we're outside of strings; | |
| 1113 that determines quote parity to the comment-end. */ | |
| 1114 while (from != stop) | |
| 1115 { | |
| 1116 /* Move back and examine a character. */ | |
| 1117 from--; | |
| 1118 | |
| 1119 c = FETCH_CHAR (from); | |
| 1120 code = SYNTAX (c); | |
| 1121 | |
| 1122 /* If this char is the second of a 2-char comment sequence, | |
| 1123 back up and give the pair the appropriate syntax. */ | |
| 1124 if (from > stop && SYNTAX_COMEND_SECOND (c) | |
| 1125 && SYNTAX_COMEND_FIRST (FETCH_CHAR (from - 1))) | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1126 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1127 code = Sendcomment; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1128 from--; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1129 } |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1130 |
| 163 | 1131 else if (from > stop && SYNTAX_COMSTART_SECOND (c) |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1132 && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1)) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1133 && comstyle == SYNTAX_COMMENT_STYLE (c)) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1134 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1135 code = Scomment; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1136 from--; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1137 } |
| 163 | 1138 |
| 1139 /* Ignore escaped characters. */ | |
| 1140 if (char_quoted (from)) | |
| 1141 continue; | |
| 1142 | |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1143 /* Track parity of quotes. */ |
| 163 | 1144 if (code == Sstring) |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1145 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1146 parity ^= 1; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1147 if (my_stringend == 0) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1148 my_stringend = c; |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1149 /* If we have two kinds of string delimiters. |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1150 There's no way to grok this scanning backwards. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1151 else if (my_stringend != c) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1152 string_lossage = 1; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1153 } |
| 163 | 1154 |
| 1155 /* Record comment-starters according to that | |
| 1156 quote-parity to the comment-end. */ | |
| 1157 if (code == Scomment) | |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1158 { |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1159 comstart_parity = parity; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1160 comstart_pos = from; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1161 } |
| 163 | 1162 |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1163 /* If we find another earlier comment-ender, |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1164 any comment-starts earier than that don't count |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1165 (because they go with the earlier comment-ender). */ |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1166 if (code == Sendcomment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1167 && SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)) == comstyle) |
| 163 | 1168 break; |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1169 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1170 /* Assume a defun-start point is outside of strings. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1171 if (code == Sopen |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1172 && (from == stop || FETCH_CHAR (from - 1) == '\n')) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1173 break; |
| 163 | 1174 } |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1175 |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1176 if (comstart_pos == 0) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1177 from = comment_end; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1178 /* If the earliest comment starter |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1179 is followed by uniform paired string quotes or none, |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1180 we know it can't be inside a string |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1181 since if it were then the comment ender would be inside one. |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1182 So it does start a comment. Skip back to it. */ |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1183 else if (comstart_parity == 0 && !string_lossage) |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1184 from = comstart_pos; |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1185 else |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1186 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1187 /* We had two kinds of string delimiters mixed up |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1188 together. Decode this going forwards. |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1189 Scan fwd from the previous comment ender |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1190 to the one in question; this records where we |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1191 last passed a comment starter. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1192 struct lisp_parse_state state; |
|
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1193 scan_sexps_forward (&state, find_defun_start (comment_end), |
|
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
1194 comment_end - 1, -10000, 0, Qnil); |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1195 if (state.incomment) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1196 from = state.comstart; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1197 else |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1198 /* We can't grok this as a comment; scan it normally. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1199 from = comment_end; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1200 } |
| 163 | 1201 } |
| 1202 break; | |
| 1203 | |
| 1204 case Sstring: | |
| 1205 stringterm = FETCH_CHAR (from); | |
| 1206 while (1) | |
| 1207 { | |
| 1208 if (from == stop) goto lose; | |
| 1209 if (!char_quoted (from - 1) | |
| 1210 && stringterm == FETCH_CHAR (from - 1)) | |
| 1211 break; | |
| 1212 from--; | |
| 1213 } | |
| 1214 from--; | |
| 1215 if (!depth && sexpflag) goto done2; | |
| 1216 break; | |
| 1217 } | |
| 1218 } | |
| 1219 | |
| 1220 /* Reached start of buffer. Error if within object, return nil if between */ | |
| 1221 if (depth) goto lose; | |
| 1222 | |
| 1223 immediate_quit = 0; | |
| 1224 return Qnil; | |
| 1225 | |
| 1226 done2: | |
| 1227 count++; | |
| 1228 } | |
| 1229 | |
| 1230 | |
| 1231 immediate_quit = 0; | |
| 1232 XFASTINT (val) = from; | |
| 1233 return val; | |
| 1234 | |
| 1235 lose: | |
| 1236 error ("Unbalanced parentheses"); | |
| 1237 /* NOTREACHED */ | |
| 1238 } | |
| 1239 | |
| 1240 char_quoted (pos) | |
| 1241 register int pos; | |
| 1242 { | |
| 1243 register enum syntaxcode code; | |
| 1244 register int beg = BEGV; | |
| 1245 register int quoted = 0; | |
| 1246 | |
| 1247 while (pos > beg | |
| 1248 && ((code = SYNTAX (FETCH_CHAR (pos - 1))) == Scharquote | |
| 1249 || code == Sescape)) | |
| 1250 pos--, quoted = !quoted; | |
| 1251 return quoted; | |
| 1252 } | |
| 1253 | |
| 1254 DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0, | |
| 1255 "Scan from character number FROM by COUNT lists.\n\ | |
| 1256 Returns the character number of the position thus found.\n\ | |
| 1257 \n\ | |
| 1258 If DEPTH is nonzero, paren depth begins counting from that value,\n\ | |
| 1259 only places where the depth in parentheses becomes zero\n\ | |
| 1260 are candidates for stopping; COUNT such places are counted.\n\ | |
| 1261 Thus, a positive value for DEPTH means go out levels.\n\ | |
| 1262 \n\ | |
| 1263 Comments are ignored if `parse-sexp-ignore-comments' is non-nil.\n\ | |
| 1264 \n\ | |
| 1265 If the beginning or end of (the accessible part of) the buffer is reached\n\ | |
| 1266 and the depth is wrong, an error is signaled.\n\ | |
| 1267 If the depth is right but the count is not used up, nil is returned.") | |
| 1268 (from, count, depth) | |
| 1269 Lisp_Object from, count, depth; | |
| 1270 { | |
| 1271 CHECK_NUMBER (from, 0); | |
| 1272 CHECK_NUMBER (count, 1); | |
| 1273 CHECK_NUMBER (depth, 2); | |
| 1274 | |
| 1275 return scan_lists (XINT (from), XINT (count), XINT (depth), 0); | |
| 1276 } | |
| 1277 | |
| 1278 DEFUN ("scan-sexps", Fscan_sexps, Sscan_sexps, 2, 2, 0, | |
| 1279 "Scan from character number FROM by COUNT balanced expressions.\n\ | |
| 1280 If COUNT is negative, scan backwards.\n\ | |
| 1281 Returns the character number of the position thus found.\n\ | |
| 1282 \n\ | |
| 1283 Comments are ignored if `parse-sexp-ignore-comments' is non-nil.\n\ | |
| 1284 \n\ | |
| 1285 If the beginning or end of (the accessible part of) the buffer is reached\n\ | |
| 1286 in the middle of a parenthetical grouping, an error is signaled.\n\ | |
| 1287 If the beginning or end is reached between groupings\n\ | |
| 1288 but before count is used up, nil is returned.") | |
| 1289 (from, count) | |
| 1290 Lisp_Object from, count; | |
| 1291 { | |
| 1292 CHECK_NUMBER (from, 0); | |
| 1293 CHECK_NUMBER (count, 1); | |
| 1294 | |
| 1295 return scan_lists (XINT (from), XINT (count), 0, 1); | |
| 1296 } | |
| 1297 | |
| 1298 DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars, | |
| 1299 0, 0, 0, | |
| 1300 "Move point backward over any number of chars with prefix syntax.\n\ | |
| 1301 This includes chars with \"quote\" or \"prefix\" syntax (' or p).") | |
| 1302 () | |
| 1303 { | |
| 1304 int beg = BEGV; | |
| 1305 int pos = point; | |
| 1306 | |
| 1307 while (pos > beg && !char_quoted (pos - 1) | |
| 1308 && (SYNTAX (FETCH_CHAR (pos - 1)) == Squote | |
| 1309 || SYNTAX_PREFIX (FETCH_CHAR (pos - 1)))) | |
| 1310 pos--; | |
| 1311 | |
| 1312 SET_PT (pos); | |
| 1313 | |
| 1314 return Qnil; | |
| 1315 } | |
| 1316 | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1317 /* Parse forward from FROM to END, |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1318 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
|
1319 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
|
1320 If STOPBEFORE is nonzero, stop at the start of an atom. |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1321 If COMMENTSTOP is nonzero, stop at the start of a comment. */ |
| 163 | 1322 |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1323 scan_sexps_forward (stateptr, from, end, targetdepth, |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1324 stopbefore, oldstate, commentstop) |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1325 struct lisp_parse_state *stateptr; |
| 163 | 1326 register int from; |
| 1327 int end, targetdepth, stopbefore; | |
| 1328 Lisp_Object oldstate; | |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1329 int commentstop; |
| 163 | 1330 { |
| 1331 struct lisp_parse_state state; | |
| 1332 | |
| 1333 register enum syntaxcode code; | |
| 1334 struct level { int last, prev; }; | |
| 1335 struct level levelstart[100]; | |
| 1336 register struct level *curlevel = levelstart; | |
| 1337 struct level *endlevel = levelstart + 100; | |
| 1338 char prev; | |
| 1339 register int depth; /* Paren depth of current scanning location. | |
| 1340 level - levelstart equals this except | |
| 1341 when the depth becomes negative. */ | |
| 1342 int mindepth; /* Lowest DEPTH value seen. */ | |
| 1343 int start_quoted = 0; /* Nonzero means starting after a char quote */ | |
| 1344 Lisp_Object tem; | |
| 1345 | |
| 1346 immediate_quit = 1; | |
| 1347 QUIT; | |
| 1348 | |
| 485 | 1349 if (NILP (oldstate)) |
| 163 | 1350 { |
| 1351 depth = 0; | |
| 1352 state.instring = -1; | |
| 1353 state.incomment = 0; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1354 state.comstyle = 0; /* comment style a by default */ |
| 163 | 1355 } |
| 1356 else | |
| 1357 { | |
| 1358 tem = Fcar (oldstate); | |
| 485 | 1359 if (!NILP (tem)) |
| 163 | 1360 depth = XINT (tem); |
| 1361 else | |
| 1362 depth = 0; | |
| 1363 | |
| 1364 oldstate = Fcdr (oldstate); | |
| 1365 oldstate = Fcdr (oldstate); | |
| 1366 oldstate = Fcdr (oldstate); | |
| 1367 tem = Fcar (oldstate); | |
| 485 | 1368 state.instring = !NILP (tem) ? XINT (tem) : -1; |
| 163 | 1369 |
| 1370 oldstate = Fcdr (oldstate); | |
| 1371 tem = Fcar (oldstate); | |
| 485 | 1372 state.incomment = !NILP (tem); |
| 163 | 1373 |
| 1374 oldstate = Fcdr (oldstate); | |
| 1375 tem = Fcar (oldstate); | |
| 485 | 1376 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
|
1377 |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1378 /* if the eight element of the list is nil, we are in comment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1379 style a. if it is non-nil, we are in comment style b */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1380 oldstate = Fcdr (oldstate); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1381 oldstate = Fcdr (oldstate); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1382 oldstate = Fcdr (oldstate); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1383 tem = Fcar (oldstate); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1384 state.comstyle = !NILP (tem); |
| 163 | 1385 } |
| 1386 state.quoted = 0; | |
| 1387 mindepth = depth; | |
| 1388 | |
| 1389 curlevel->prev = -1; | |
| 1390 curlevel->last = -1; | |
| 1391 | |
| 1392 /* Enter the loop at a place appropriate for initial state. */ | |
| 1393 | |
| 1394 if (state.incomment) goto startincomment; | |
| 1395 if (state.instring >= 0) | |
| 1396 { | |
| 1397 if (start_quoted) goto startquotedinstring; | |
| 1398 goto startinstring; | |
| 1399 } | |
| 1400 if (start_quoted) goto startquoted; | |
| 1401 | |
| 1402 while (from < end) | |
| 1403 { | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1404 code = SYNTAX (FETCH_CHAR (from)); |
| 163 | 1405 from++; |
| 1406 if (from < end && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1)) | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1407 && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from))) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1408 { |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1409 /* 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
|
1410 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
|
1411 terminates the comment section. */ |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1412 code = Scomment; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1413 state.comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from)); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1414 from++; |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1415 } |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1416 |
| 163 | 1417 if (SYNTAX_PREFIX (FETCH_CHAR (from - 1))) |
| 1418 continue; | |
| 1419 #ifdef SWITCH_ENUM_BUG | |
| 1420 switch ((int) code) | |
| 1421 #else | |
| 1422 switch (code) | |
| 1423 #endif | |
| 1424 { | |
| 1425 case Sescape: | |
| 1426 case Scharquote: | |
| 1427 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
| 1428 curlevel->last = from - 1; | |
| 1429 startquoted: | |
| 1430 if (from == end) goto endquoted; | |
| 1431 from++; | |
| 1432 goto symstarted; | |
| 1433 /* treat following character as a word constituent */ | |
| 1434 case Sword: | |
| 1435 case Ssymbol: | |
| 1436 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
| 1437 curlevel->last = from - 1; | |
| 1438 symstarted: | |
| 1439 while (from < end) | |
| 1440 { | |
| 1441 #ifdef SWITCH_ENUM_BUG | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1442 switch ((int) SYNTAX (FETCH_CHAR (from))) |
| 163 | 1443 #else |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1444 switch (SYNTAX (FETCH_CHAR (from))) |
| 163 | 1445 #endif |
| 1446 { | |
| 1447 case Scharquote: | |
| 1448 case Sescape: | |
| 1449 from++; | |
| 1450 if (from == end) goto endquoted; | |
| 1451 break; | |
| 1452 case Sword: | |
| 1453 case Ssymbol: | |
| 1454 case Squote: | |
| 1455 break; | |
| 1456 default: | |
| 1457 goto symdone; | |
| 1458 } | |
| 1459 from++; | |
| 1460 } | |
| 1461 symdone: | |
| 1462 curlevel->prev = curlevel->last; | |
| 1463 break; | |
| 1464 | |
| 1465 case Scomment: | |
| 1466 state.incomment = 1; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1467 state.comstart = from; |
| 163 | 1468 startincomment: |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1469 if (commentstop) |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1470 goto done; |
| 163 | 1471 while (1) |
| 1472 { | |
| 1473 if (from == end) goto done; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1474 prev = FETCH_CHAR (from); |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1475 if (SYNTAX (prev) == Sendcomment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1476 && SYNTAX_COMMENT_STYLE (prev) == state.comstyle) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1477 /* Only terminate the comment section if the endcomment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1478 of the same style as the start sequence has been |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1479 encountered. */ |
| 163 | 1480 break; |
| 1481 from++; | |
| 1482 if (from < end && SYNTAX_COMEND_FIRST (prev) | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1483 && SYNTAX_COMEND_SECOND (FETCH_CHAR (from)) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1484 && SYNTAX_COMMENT_STYLE (prev) == state.comstyle) |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1485 /* Only terminate the comment section if the end-comment |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1486 sequence of the same style as the start sequence has |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1487 been encountered. */ |
| 163 | 1488 { from++; break; } |
| 1489 } | |
| 1490 state.incomment = 0; | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1491 state.comstyle = 0; /* reset the comment style */ |
| 163 | 1492 break; |
| 1493 | |
| 1494 case Sopen: | |
| 1495 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
| 1496 depth++; | |
| 1497 /* curlevel++->last ran into compiler bug on Apollo */ | |
| 1498 curlevel->last = from - 1; | |
| 1499 if (++curlevel == endlevel) | |
| 1500 error ("Nesting too deep for parser"); | |
| 1501 curlevel->prev = -1; | |
| 1502 curlevel->last = -1; | |
| 1503 if (!--targetdepth) goto done; | |
| 1504 break; | |
| 1505 | |
| 1506 case Sclose: | |
| 1507 depth--; | |
| 1508 if (depth < mindepth) | |
| 1509 mindepth = depth; | |
| 1510 if (curlevel != levelstart) | |
| 1511 curlevel--; | |
| 1512 curlevel->prev = curlevel->last; | |
| 1513 if (!++targetdepth) goto done; | |
| 1514 break; | |
| 1515 | |
| 1516 case Sstring: | |
| 1517 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
| 1518 curlevel->last = from - 1; | |
| 1519 state.instring = FETCH_CHAR (from - 1); | |
| 1520 startinstring: | |
| 1521 while (1) | |
| 1522 { | |
| 1523 if (from >= end) goto done; | |
| 1524 if (FETCH_CHAR (from) == state.instring) break; | |
| 1525 #ifdef SWITCH_ENUM_BUG | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1526 switch ((int) SYNTAX (FETCH_CHAR (from))) |
| 163 | 1527 #else |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1528 switch (SYNTAX (FETCH_CHAR (from))) |
| 163 | 1529 #endif |
| 1530 { | |
| 1531 case Scharquote: | |
| 1532 case Sescape: | |
| 1533 from++; | |
| 1534 startquotedinstring: | |
| 1535 if (from >= end) goto endquoted; | |
| 1536 } | |
| 1537 from++; | |
| 1538 } | |
| 1539 state.instring = -1; | |
| 1540 curlevel->prev = curlevel->last; | |
| 1541 from++; | |
| 1542 break; | |
| 1543 | |
| 1544 case Smath: | |
| 1545 break; | |
| 1546 } | |
| 1547 } | |
| 1548 goto done; | |
| 1549 | |
| 1550 stop: /* Here if stopping before start of sexp. */ | |
| 1551 from--; /* We have just fetched the char that starts it; */ | |
| 1552 goto done; /* but return the position before it. */ | |
| 1553 | |
| 1554 endquoted: | |
| 1555 state.quoted = 1; | |
| 1556 done: | |
| 1557 state.depth = depth; | |
| 1558 state.mindepth = mindepth; | |
| 1559 state.thislevelstart = curlevel->prev; | |
| 1560 state.prevlevelstart | |
| 1561 = (curlevel == levelstart) ? -1 : (curlevel - 1)->last; | |
| 1562 state.location = from; | |
| 1563 immediate_quit = 0; | |
| 1564 | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1565 *stateptr = state; |
| 163 | 1566 } |
| 1567 | |
| 1568 /* This comment supplies the doc string for parse-partial-sexp, | |
| 1569 for make-docfile to see. We cannot put this in the real DEFUN | |
| 1570 due to limits in the Unix cpp. | |
| 1571 | |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1572 DEFUN ("parse-partial-sexp", Ffoo, Sfoo, 2, 6, 0, |
| 163 | 1573 "Parse Lisp syntax starting at FROM until TO; return status of parse at TO.\n\ |
| 1574 Parsing stops at TO or when certain criteria are met;\n\ | |
| 1575 point is set to where parsing stops.\n\ | |
| 1576 If fifth arg STATE is omitted or nil,\n\ | |
| 1577 parsing assumes that FROM is the beginning of a function.\n\ | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1578 Value is a list of eight elements describing final state of parsing:\n\ |
| 163 | 1579 1. depth in parens.\n\ |
| 1580 2. character address of start of innermost containing list; nil if none.\n\ | |
| 1581 3. character address of start of last complete sexp terminated.\n\ | |
| 1582 4. non-nil if inside a string.\n\ | |
| 1583 (it is the character that will terminate the string.)\n\ | |
| 1584 5. t if inside a comment.\n\ | |
| 1585 6. t if following a quote character.\n\ | |
| 1586 7. the minimum paren-depth encountered during this scan.\n\ | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1587 8. t if in a comment of style `b'.\n\ |
| 163 | 1588 If third arg TARGETDEPTH is non-nil, parsing stops if the depth\n\ |
| 1589 in parentheses becomes equal to TARGETDEPTH.\n\ | |
| 1590 Fourth arg STOPBEFORE non-nil means stop when come to\n\ | |
| 1591 any character that starts a sexp.\n\ | |
| 1592 Fifth arg STATE is a seven-list like what this function returns.\n\ | |
| 726 | 1593 It is used to initialize the state of the parse. Its second and third |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1594 elements are ignored. |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1595 Sixth args COMMENTSTOP non-nil means stop at the start of a comment.") |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1596 (from, to, targetdepth, stopbefore, state, commentstop) |
| 163 | 1597 */ |
| 1598 | |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1599 DEFUN ("parse-partial-sexp", Fparse_partial_sexp, Sparse_partial_sexp, 2, 6, 0, |
| 163 | 1600 0 /* See immediately above */) |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1601 (from, to, targetdepth, stopbefore, oldstate, commentstop) |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1602 Lisp_Object from, to, targetdepth, stopbefore, oldstate, commentstop; |
| 163 | 1603 { |
| 1604 struct lisp_parse_state state; | |
| 1605 int target; | |
| 1606 | |
| 485 | 1607 if (!NILP (targetdepth)) |
| 163 | 1608 { |
| 1609 CHECK_NUMBER (targetdepth, 3); | |
| 1610 target = XINT (targetdepth); | |
| 1611 } | |
| 1612 else | |
| 1613 target = -100000; /* We won't reach this depth */ | |
| 1614 | |
| 1615 validate_region (&from, &to); | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1616 scan_sexps_forward (&state, XINT (from), XINT (to), |
|
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1617 target, !NILP (stopbefore), oldstate, |
|
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
1618 !NILP (commentstop)); |
| 163 | 1619 |
| 1620 SET_PT (state.location); | |
| 1621 | |
| 1622 return Fcons (make_number (state.depth), | |
| 1623 Fcons (state.prevlevelstart < 0 ? Qnil : make_number (state.prevlevelstart), | |
| 1624 Fcons (state.thislevelstart < 0 ? Qnil : make_number (state.thislevelstart), | |
| 1625 Fcons (state.instring >= 0 ? make_number (state.instring) : Qnil, | |
| 1626 Fcons (state.incomment ? Qt : Qnil, | |
| 1627 Fcons (state.quoted ? Qt : Qnil, | |
|
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1628 Fcons (make_number (state.mindepth), |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1629 Fcons (state.comstyle ? Qt : Qnil, |
|
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1630 Qnil)))))))); |
| 163 | 1631 } |
| 1632 | |
| 1633 init_syntax_once () | |
| 1634 { | |
| 1635 register int i; | |
| 1636 register struct Lisp_Vector *v; | |
| 1637 | |
| 1638 /* Set this now, so first buffer creation can refer to it. */ | |
| 1639 /* Make it nil before calling copy-syntax-table | |
| 1640 so that copy-syntax-table will know not to try to copy from garbage */ | |
| 1641 Vstandard_syntax_table = Qnil; | |
| 1642 Vstandard_syntax_table = Fcopy_syntax_table (Qnil); | |
| 1643 | |
| 1644 v = XVECTOR (Vstandard_syntax_table); | |
| 1645 | |
| 1646 for (i = 'a'; i <= 'z'; i++) | |
| 1647 XFASTINT (v->contents[i]) = (int) Sword; | |
| 1648 for (i = 'A'; i <= 'Z'; i++) | |
| 1649 XFASTINT (v->contents[i]) = (int) Sword; | |
| 1650 for (i = '0'; i <= '9'; i++) | |
| 1651 XFASTINT (v->contents[i]) = (int) Sword; | |
| 1652 XFASTINT (v->contents['$']) = (int) Sword; | |
| 1653 XFASTINT (v->contents['%']) = (int) Sword; | |
| 1654 | |
| 1655 XFASTINT (v->contents['(']) = (int) Sopen + (')' << 8); | |
| 1656 XFASTINT (v->contents[')']) = (int) Sclose + ('(' << 8); | |
| 1657 XFASTINT (v->contents['[']) = (int) Sopen + (']' << 8); | |
| 1658 XFASTINT (v->contents[']']) = (int) Sclose + ('[' << 8); | |
| 1659 XFASTINT (v->contents['{']) = (int) Sopen + ('}' << 8); | |
| 1660 XFASTINT (v->contents['}']) = (int) Sclose + ('{' << 8); | |
| 1661 XFASTINT (v->contents['"']) = (int) Sstring; | |
| 1662 XFASTINT (v->contents['\\']) = (int) Sescape; | |
| 1663 | |
| 1664 for (i = 0; i < 10; i++) | |
| 1665 XFASTINT (v->contents["_-+*/&|<>="[i]]) = (int) Ssymbol; | |
| 1666 | |
| 1667 for (i = 0; i < 12; i++) | |
| 1668 XFASTINT (v->contents[".,;:?!#@~^'`"[i]]) = (int) Spunct; | |
| 1669 } | |
| 1670 | |
| 1671 syms_of_syntax () | |
| 1672 { | |
| 1673 Qsyntax_table_p = intern ("syntax-table-p"); | |
| 1674 staticpro (&Qsyntax_table_p); | |
| 1675 | |
| 1676 DEFVAR_BOOL ("parse-sexp-ignore-comments", &parse_sexp_ignore_comments, | |
| 1677 "Non-nil means `forward-sexp', etc., should treat comments as whitespace."); | |
| 1678 | |
| 1679 words_include_escapes = 0; | |
| 1680 DEFVAR_BOOL ("words-include-escapes", &words_include_escapes, | |
| 1681 "Non-nil means `forward-word', etc., should treat escape chars part of words."); | |
| 1682 | |
| 1683 defsubr (&Ssyntax_table_p); | |
| 1684 defsubr (&Ssyntax_table); | |
| 1685 defsubr (&Sstandard_syntax_table); | |
| 1686 defsubr (&Scopy_syntax_table); | |
| 1687 defsubr (&Sset_syntax_table); | |
| 1688 defsubr (&Schar_syntax); | |
| 1689 defsubr (&Smodify_syntax_entry); | |
| 1690 defsubr (&Sdescribe_syntax); | |
| 1691 | |
| 1692 defsubr (&Sforward_word); | |
| 1693 | |
|
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
1694 defsubr (&Sforward_comment); |
| 163 | 1695 defsubr (&Sscan_lists); |
| 1696 defsubr (&Sscan_sexps); | |
| 1697 defsubr (&Sbackward_prefix_chars); | |
| 1698 defsubr (&Sparse_partial_sexp); | |
| 1699 } |
