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