annotate src/syntax.c @ 111711:c4f2770ebd72

shr.el (shr-insert): Fix the way to fold lines. shr-color.el (shr-color->hexadecimal): Use color-rgb->hex color.el: Rename from color-lab.el (color-rgb->hex): Add. (color-complement): Add. (color-complement-hex): Add.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 25 Nov 2010 14:51:51 +0000
parents 8bd4a845ba2a
children ac49e05bfcf2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 74563
diff changeset
2 Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106185
diff changeset
3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 74563
diff changeset
4 Free Software Foundation, Inc.
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6 This file is part of GNU Emacs.
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93546
diff changeset
8 GNU Emacs is free software: you can redistribute it and/or modify
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93546
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93546
diff changeset
11 (at your option) any later version.
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 GNU General Public License for more details.
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93546
diff changeset
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4458
diff changeset
22 #include <config.h>
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 #include <ctype.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105661
diff changeset
24 #include <setjmp.h>
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25 #include "lisp.h"
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 #include "commands.h"
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27 #include "buffer.h"
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
28 #include "character.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39195
diff changeset
29 #include "keymap.h"
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
30 #include "regex.h"
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
31
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
32 /* Make syntax table lookup grant data in gl_state. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
33 #define SYNTAX_ENTRY_VIA_PROPERTY
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
34
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 #include "syntax.h"
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
36 #include "intervals.h"
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
37 #include "category.h"
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
38
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
39 /* Then there are seven single-bit flags that have the following meanings:
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
40 1. This character is the first of a two-character comment-start sequence.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
41 2. This character is the second of a two-character comment-start sequence.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
42 3. This character is the first of a two-character comment-end sequence.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
43 4. This character is the second of a two-character comment-end sequence.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
44 5. This character is a prefix, for backward-prefix-chars.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
45 6. The char is part of a delimiter for comments of style "b".
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
46 7. This character is part of a nestable comment sequence.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
47 8. The char is part of a delimiter for comments of style "c".
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
48 Note that any two-character sequence whose first character has flag 1
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
49 and whose second character has flag 2 will be interpreted as a comment start.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
50
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
51 bit 6 and 8 are used to discriminate between different comment styles.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
52 Languages such as C++ allow two orthogonal syntax start/end pairs
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
53 and bit 6 is used to determine whether a comment-end or Scommentend
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
54 ends style a or b. Comment markers can start style a, b, c, or bc.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
55 Style a is always the default.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
56 For 2-char comment markers, the style b flag is only looked up on the second
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
57 char of the comment marker and on the first char of the comment ender.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
58 For style c (like to for the nested flag), the flag can be placed on any
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
59 one of the chars.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
60 */
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
61
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
62 /* These macros extract specific flags from an integer
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
63 that holds the syntax code and the flags. */
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
64
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
65 #define SYNTAX_FLAGS_COMSTART_FIRST(flags) (((flags) >> 16) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
66
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
67 #define SYNTAX_FLAGS_COMSTART_SECOND(flags) (((flags) >> 17) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
68
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
69 #define SYNTAX_FLAGS_COMEND_FIRST(flags) (((flags) >> 18) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
70
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
71 #define SYNTAX_FLAGS_COMEND_SECOND(flags) (((flags) >> 19) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
72
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
73 #define SYNTAX_FLAGS_PREFIX(flags) (((flags) >> 20) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
74
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
75 #define SYNTAX_FLAGS_COMMENT_STYLEB(flags) (((flags) >> 21) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
76 #define SYNTAX_FLAGS_COMMENT_STYLEC(flags) (((flags) >> 22) & 2)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
77 /* FLAGS should be the flags of the main char of the comment marker, e.g.
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
78 the second for comstart and the first for comend. */
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
79 #define SYNTAX_FLAGS_COMMENT_STYLE(flags, other_flags) \
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
80 (SYNTAX_FLAGS_COMMENT_STYLEB (flags) \
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
81 | SYNTAX_FLAGS_COMMENT_STYLEC (flags) \
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
82 | SYNTAX_FLAGS_COMMENT_STYLEC (other_flags))
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
83
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
84 #define SYNTAX_FLAGS_COMMENT_NESTED(flags) (((flags) >> 22) & 1)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
85
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
86 /* These macros extract a particular flag for a given character. */
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
87
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
88 #define SYNTAX_COMEND_FIRST(c) \
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
89 (SYNTAX_FLAGS_COMEND_FIRST (SYNTAX_WITH_FLAGS (c)))
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
90 #define SYNTAX_PREFIX(c) (SYNTAX_FLAGS_PREFIX (SYNTAX_WITH_FLAGS (c)))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
91
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
92 /* We use these constants in place for comment-style and
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
93 string-ender-char to distinguish comments/strings started by
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
94 comment_fence and string_fence codes. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
95
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
96 #define ST_COMMENT_STYLE (256 + 1)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
97 #define ST_STRING_STYLE (256 + 2)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98
16992
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
99 Lisp_Object Qsyntax_table_p, Qsyntax_table, Qscan_error;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 int words_include_escapes;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
102 int parse_sexp_lookup_properties;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
104 /* Nonzero means `scan-sexps' treat all multibyte characters as symbol. */
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
105 int multibyte_syntax_as_symbol;
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
106
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
107 /* Used as a temporary in SYNTAX_ENTRY and other macros in syntax.h,
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
108 if not compiled with GCC. No need to mark it, since it is used
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
109 only very temporarily. */
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
110 Lisp_Object syntax_temp;
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
111
28302
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
112 /* Non-zero means an open parenthesis in column 0 is always considered
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
113 to be the start of a defun. Zero means an open parenthesis in
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
114 column 0 has no special meaning. */
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
115
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
116 int open_paren_in_column_0_is_defun_start;
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
117
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
118 /* 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
119
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
120 struct lisp_parse_state
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
121 {
96988
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
122 int depth; /* Depth at end of parsing. */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
123 int instring; /* -1 if not within string, else desired terminator. */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
124 int incomment; /* -1 if in unnestable comment else comment nesting */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
125 int comstyle; /* comment style a=0, or b=1, or ST_COMMENT_STYLE. */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
126 int quoted; /* Nonzero if just after an escape char at end of parsing */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
127 int mindepth; /* Minimum depth seen while scanning. */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
128 /* Char number of most recent start-of-expression at current level */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
129 EMACS_INT thislevelstart;
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
130 /* Char number of start of containing expression */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
131 EMACS_INT prevlevelstart;
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
132 EMACS_INT location; /* Char number at which parsing stopped. */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
133 EMACS_INT comstr_start; /* Position of last comment/string starter. */
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
134 Lisp_Object levelstarts; /* Char numbers of starts-of-expression
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
135 of levels (starting from outermost). */
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
136 };
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
137
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
138 /* 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
139 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
140 find_start_value is the defun start position found for it.
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
141 find_start_value_byte is the corresponding byte position.
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
142 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
143 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
144 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
145
96838
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
146 static EMACS_INT find_start_pos;
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
147 static EMACS_INT find_start_value;
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
148 static EMACS_INT find_start_value_byte;
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
149 static struct buffer *find_start_buffer;
96838
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
150 static EMACS_INT find_start_begv;
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
151 static int find_start_modiff;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
152
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
153
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
154 static Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
155 static Lisp_Object skip_syntaxes (int, Lisp_Object, Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
156 static Lisp_Object scan_lists (EMACS_INT, EMACS_INT, EMACS_INT, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
157 static void scan_sexps_forward (struct lisp_parse_state *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
158 EMACS_INT, EMACS_INT, EMACS_INT, int,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
159 int, Lisp_Object, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108246
diff changeset
160 static int in_classes (int, Lisp_Object);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
161
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
162 /* Whether the syntax of the character C has the prefix flag set. */
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
163 int syntax_prefix_flag_p (int c)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
164 {
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
165 return SYNTAX_PREFIX (c);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
166 }
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
167
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
168 struct gl_state_s gl_state; /* Global state of syntax parser. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
169
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
170 INTERVAL interval_of (int, Lisp_Object);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
171 #define INTERVALS_AT_ONCE 10 /* 1 + max-number of intervals
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
172 to scan to property-change. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
173
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
174 /* Update gl_state to an appropriate interval which contains CHARPOS. The
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
175 sign of COUNT give the relative position of CHARPOS wrt the previously
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
176 valid interval. If INIT, only [be]_property fields of gl_state are
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
177 valid at start, the rest is filled basing on OBJECT.
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
178
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
179 `gl_state.*_i' are the intervals, and CHARPOS is further in the search
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
180 direction than the intervals - or in an interval. We update the
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
181 current syntax-table basing on the property of this interval, and
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
182 update the interval to start further than CHARPOS - or be
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
183 NULL_INTERVAL. We also update lim_property to be the next value of
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
184 charpos to call this subroutine again - or be before/after the
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
185 start/end of OBJECT. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
186
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
187 void
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
188 update_syntax_table (EMACS_INT charpos, int count, int init,
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
189 Lisp_Object object)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
190 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
191 Lisp_Object tmp_table;
25771
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
192 int cnt = 0, invalidate = 1;
65215
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
193 INTERVAL i;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
194
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
195 if (init)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
196 {
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
197 gl_state.old_prop = Qnil;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
198 gl_state.start = gl_state.b_property;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
199 gl_state.stop = gl_state.e_property;
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
200 i = interval_of (charpos, object);
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
201 gl_state.backward_i = gl_state.forward_i = i;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
202 invalidate = 0;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
203 if (NULL_INTERVAL_P (i))
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
204 return;
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
205 /* interval_of updates only ->position of the return value, so
21011
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
206 update the parents manually to speed up update_interval. */
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
207 while (!NULL_PARENT (i))
21011
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
208 {
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
209 if (AM_RIGHT_CHILD (i))
28269
fd13be8ae190 Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents: 27812
diff changeset
210 INTERVAL_PARENT (i)->position = i->position
21011
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
211 - LEFT_TOTAL_LENGTH (i) + TOTAL_LENGTH (i) /* right end */
28269
fd13be8ae190 Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents: 27812
diff changeset
212 - TOTAL_LENGTH (INTERVAL_PARENT (i))
fd13be8ae190 Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents: 27812
diff changeset
213 + LEFT_TOTAL_LENGTH (INTERVAL_PARENT (i));
21011
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
214 else
28269
fd13be8ae190 Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents: 27812
diff changeset
215 INTERVAL_PARENT (i)->position = i->position - LEFT_TOTAL_LENGTH (i)
21011
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
216 + TOTAL_LENGTH (i);
28269
fd13be8ae190 Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
parents: 27812
diff changeset
217 i = INTERVAL_PARENT (i);
21011
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
218 }
ceb05db73a63 (update_syntax_table): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
parents: 20956
diff changeset
219 i = gl_state.forward_i;
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
220 gl_state.b_property = i->position - gl_state.offset;
20956
15d1b7bf1cd7 (update_syntax_table): Fix calculations using offset.
Karl Heuer <kwzh@gnu.org>
parents: 20905
diff changeset
221 gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
222 goto update;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
223 }
65215
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
224 i = count > 0 ? gl_state.forward_i : gl_state.backward_i;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
225
37532
f14973be41f5 (update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34398
diff changeset
226 /* We are guaranteed to be called with CHARPOS either in i,
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
227 or further off. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
228 if (NULL_INTERVAL_P (i))
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
229 error ("Error in syntax_table logic for to-the-end intervals");
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
230 else if (charpos < i->position) /* Move left. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
231 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
232 if (count > 0)
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
233 error ("Error in syntax_table logic for intervals <-");
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
234 /* Update the interval. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
235 i = update_interval (i, charpos);
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
236 if (INTERVAL_LAST_POS (i) != gl_state.b_property)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
237 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
238 invalidate = 0;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
239 gl_state.forward_i = i;
20956
15d1b7bf1cd7 (update_syntax_table): Fix calculations using offset.
Karl Heuer <kwzh@gnu.org>
parents: 20905
diff changeset
240 gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
241 }
37532
f14973be41f5 (update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34398
diff changeset
242 }
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
243 else if (charpos >= INTERVAL_LAST_POS (i)) /* Move right. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
244 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
245 if (count < 0)
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
246 error ("Error in syntax_table logic for intervals ->");
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
247 /* Update the interval. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
248 i = update_interval (i, charpos);
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
249 if (i->position != gl_state.e_property)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
250 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
251 invalidate = 0;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
252 gl_state.backward_i = i;
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
253 gl_state.b_property = i->position - gl_state.offset;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
254 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
255 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
256
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
257 update:
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
258 tmp_table = textget (i->plist, Qsyntax_table);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
259
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
260 if (invalidate)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
261 invalidate = !EQ (tmp_table, gl_state.old_prop); /* Need to invalidate? */
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
262
37532
f14973be41f5 (update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34398
diff changeset
263 if (invalidate) /* Did not get to adjacent interval. */
f14973be41f5 (update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34398
diff changeset
264 { /* with the same table => */
f14973be41f5 (update_syntax_table): Check that oldi has the same
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34398
diff changeset
265 /* invalidate the old range. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
266 if (count > 0)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
267 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
268 gl_state.backward_i = i;
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
269 gl_state.b_property = i->position - gl_state.offset;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
270 }
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
271 else
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
272 {
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
273 gl_state.forward_i = i;
20956
15d1b7bf1cd7 (update_syntax_table): Fix calculations using offset.
Karl Heuer <kwzh@gnu.org>
parents: 20905
diff changeset
274 gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
275 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
276 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
277
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
278 if (!EQ (tmp_table, gl_state.old_prop))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
279 {
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
280 gl_state.current_syntax_table = tmp_table;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
281 gl_state.old_prop = tmp_table;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
282 if (EQ (Fsyntax_table_p (tmp_table), Qt))
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
283 {
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
284 gl_state.use_global = 0;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
285 }
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
286 else if (CONSP (tmp_table))
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
287 {
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
288 gl_state.use_global = 1;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
289 gl_state.global_code = tmp_table;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
290 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
291 else
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
292 {
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
293 gl_state.use_global = 0;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
294 gl_state.current_syntax_table = current_buffer->syntax_table;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
295 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
296 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
297
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
298 while (!NULL_INTERVAL_P (i))
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
299 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
300 if (cnt && !EQ (tmp_table, textget (i->plist, Qsyntax_table)))
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
301 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
302 if (count > 0)
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
303 {
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
304 gl_state.e_property = i->position - gl_state.offset;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
305 gl_state.forward_i = i;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
306 }
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
307 else
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
308 {
65215
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
309 gl_state.b_property
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
310 = i->position + LENGTH (i) - gl_state.offset;
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
311 gl_state.backward_i = i;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
312 }
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
313 return;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
314 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
315 else if (cnt == INTERVALS_AT_ONCE)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
316 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
317 if (count > 0)
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
318 {
65215
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
319 gl_state.e_property
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
320 = i->position + LENGTH (i) - gl_state.offset
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
321 /* e_property at EOB is not set to ZV but to ZV+1, so that
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
322 we can do INC(from);UPDATE_SYNTAX_TABLE_FORWARD without
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
323 having to check eob between the two. */
c37b7f6542ec (update_syntax_table): Properly reproduce the special +1
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64770
diff changeset
324 + (NULL_INTERVAL_P (next_interval (i)) ? 1 : 0);
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
325 gl_state.forward_i = i;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
326 }
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
327 else
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
328 {
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
329 gl_state.b_property = i->position - gl_state.offset;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
330 gl_state.backward_i = i;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
331 }
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
332 return;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
333 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
334 cnt++;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
335 i = count > 0 ? next_interval (i) : previous_interval (i);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
336 }
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
337 eassert (NULL_INTERVAL_P (i)); /* This property goes to the end. */
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
338 if (count > 0)
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
339 gl_state.e_property = gl_state.stop;
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
340 else
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
341 gl_state.b_property = gl_state.start;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
342 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
343
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
344 /* Returns TRUE if char at CHARPOS is quoted.
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
345 Global syntax-table data should be set up already to be good at CHARPOS
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
346 or after. On return global syntax data is good for lookup at CHARPOS. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
347
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
348 static int
96988
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
349 char_quoted (EMACS_INT charpos, EMACS_INT bytepos)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
350 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
351 register enum syntaxcode code;
96988
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
352 register EMACS_INT beg = BEGV;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
353 register int quoted = 0;
96988
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
354 EMACS_INT orig = charpos;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
355
96898
6521e10c7e45 (char_quoted): Check "charpos > beg" before decrementing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96838
diff changeset
356 while (charpos > beg)
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
357 {
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
358 int c;
96898
6521e10c7e45 (char_quoted): Check "charpos > beg" before decrementing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96838
diff changeset
359 DEC_BOTH (charpos, bytepos);
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
360
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
361 UPDATE_SYNTAX_TABLE_BACKWARD (charpos);
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
362 c = FETCH_CHAR_AS_MULTIBYTE (bytepos);
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
363 code = SYNTAX (c);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
364 if (! (code == Scharquote || code == Sescape))
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
365 break;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
366
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
367 quoted = !quoted;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
368 }
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
369
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
370 UPDATE_SYNTAX_TABLE (orig);
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
371 return quoted;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
372 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
373
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
374 /* Return the bytepos one character before BYTEPOS.
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
375 We assume that BYTEPOS is not at the start of the buffer. */
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
376
111640
8bd4a845ba2a * src/xfaces.c (lookup_face): Make static.
Andreas Schwab <schwab@linux-m68k.org>
parents: 110551
diff changeset
377 static INLINE EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
378 dec_bytepos (EMACS_INT bytepos)
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
379 {
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
380 if (NILP (current_buffer->enable_multibyte_characters))
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
381 return bytepos - 1;
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
382
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
383 DEC_POS (bytepos);
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
384 return bytepos;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
385 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
386
105426
d0a6d64c3cfc Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 105102
diff changeset
387 /* Return a defun-start position before POS and not too far before.
39195
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
388 It should be the last one before POS, or nearly the last.
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
389
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
390 When open_paren_in_column_0_is_defun_start is nonzero,
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
391 only the beginning of the buffer is treated as a defun-start.
39195
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
392
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
393 We record the information about where the scan started
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
394 and what its result was, so that another call in the same area
004939041c32 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 38047
diff changeset
395 can return the same value very quickly.
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
396
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
397 There is no promise at which position the global syntax data is
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
398 valid on return from the subroutine, so the caller should explicitly
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
399 update the global data. */
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
400
96988
77625aa3eac4 (struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 96898
diff changeset
401 static EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
402 find_defun_start (EMACS_INT pos, EMACS_INT pos_byte)
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
403 {
96838
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
404 EMACS_INT opoint = PT, opoint_byte = PT_BYTE;
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
405
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
406 if (!open_paren_in_column_0_is_defun_start)
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
407 {
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
408 find_start_value_byte = BEGV_BYTE;
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
409 return BEGV;
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
410 }
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
411
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
412 /* 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
413 if (current_buffer == find_start_buffer
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
414 /* 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
415 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
416 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
417 && pos <= find_start_pos + 1000
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
418 && pos >= find_start_value
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
419 && BEGV == find_start_begv
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
420 && MODIFF == find_start_modiff)
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
421 return find_start_value;
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
422
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
423 /* Back up to start of line. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
424 scan_newline (pos, pos_byte, BEGV, BEGV_BYTE, -1, 1);
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
425
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
426 /* We optimize syntax-table lookup for rare updates. Thus we accept
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
427 only those `^\s(' which are good in global _and_ text-property
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
428 syntax-tables. */
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
429 SETUP_BUFFER_SYNTAX_TABLE ();
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
430 while (PT > BEGV)
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
431 {
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
432 int c;
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
433
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
434 /* Open-paren at start of line means we may have found our
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
435 defun-start. */
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
436 c = FETCH_CHAR_AS_MULTIBYTE (PT_BYTE);
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
437 if (SYNTAX (c) == Sopen)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
438 {
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
439 SETUP_SYNTAX_TABLE (PT + 1, -1); /* Try again... */
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
440 c = FETCH_CHAR_AS_MULTIBYTE (PT_BYTE);
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
441 if (SYNTAX (c) == Sopen)
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
442 break;
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
443 /* Now fallback to the default value. */
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
444 SETUP_BUFFER_SYNTAX_TABLE ();
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
445 }
51036
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
446 /* Move to beg of previous line. */
5a30d8fb640c (find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents: 50697
diff changeset
447 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -2, 1);
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
448 }
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
449
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
450 /* Record what we found, for the next try. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
451 find_start_value = PT;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
452 find_start_value_byte = PT_BYTE;
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
453 find_start_buffer = current_buffer;
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
454 find_start_modiff = MODIFF;
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
455 find_start_begv = BEGV;
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
456 find_start_pos = pos;
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
457
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
458 TEMP_SET_PT_BOTH (opoint, opoint_byte);
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
459
1167
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
460 return find_start_value;
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
461 }
a9aeeaa9da8f (scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents: 1085
diff changeset
462
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
463 /* Return the SYNTAX_COMEND_FIRST of the character before POS, POS_BYTE. */
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
464
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
465 static int
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
466 prev_char_comend_first (EMACS_INT pos, EMACS_INT pos_byte)
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
467 {
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
468 int c, val;
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
469
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
470 DEC_BOTH (pos, pos_byte);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
471 UPDATE_SYNTAX_TABLE_BACKWARD (pos);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
472 c = FETCH_CHAR (pos_byte);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
473 val = SYNTAX_COMEND_FIRST (c);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
474 UPDATE_SYNTAX_TABLE_FORWARD (pos + 1);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
475 return val;
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
476 }
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
477
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
478 /* Return the SYNTAX_COMSTART_FIRST of the character before POS, POS_BYTE. */
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
479
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
480 /* static int
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
481 * prev_char_comstart_first (pos, pos_byte)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
482 * int pos, pos_byte;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
483 * {
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
484 * int c, val;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
485 *
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
486 * DEC_BOTH (pos, pos_byte);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
487 * UPDATE_SYNTAX_TABLE_BACKWARD (pos);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
488 * c = FETCH_CHAR (pos_byte);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
489 * val = SYNTAX_COMSTART_FIRST (c);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
490 * UPDATE_SYNTAX_TABLE_FORWARD (pos + 1);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
491 * return val;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
492 * } */
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
493
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
494 /* Checks whether charpos FROM is at the end of a comment.
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
495 FROM_BYTE is the bytepos corresponding to FROM.
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
496 Do not move back before STOP.
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
497
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
498 Return a positive value if we find a comment ending at FROM/FROM_BYTE;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
499 return -1 otherwise.
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
500
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
501 If successful, store the charpos of the comment's beginning
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
502 into *CHARPOS_PTR, and the bytepos into *BYTEPOS_PTR.
20330
f76b9c0ebc4b (back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents: 20292
diff changeset
503
f76b9c0ebc4b (back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents: 20292
diff changeset
504 Global syntax data remains valid for backward search starting at
f76b9c0ebc4b (back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents: 20292
diff changeset
505 the returned value (or at FROM, if the search was not successful). */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
506
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
507 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
508 back_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, int comnested, int comstyle, EMACS_INT *charpos_ptr, EMACS_INT *bytepos_ptr)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
509 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
510 /* Look back, counting the parity of string-quotes,
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
511 and recording the comment-starters seen.
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
512 When we reach a safe place, assume that's not in a string;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
513 then step the main scan to the earliest comment-starter seen
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
514 an even number of string quotes away from the safe place.
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
515
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
516 OFROM[I] is position of the earliest comment-starter seen
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
517 which is I+2X quotes from the comment-end.
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
518 PARITY is current parity of quotes from the comment end. */
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
519 int string_style = -1; /* Presumed outside of any string. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
520 int string_lossage = 0;
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
521 /* Not a real lossage: indicates that we have passed a matching comment
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
522 starter plus a non-matching comment-ender, meaning that any matching
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
523 comment-starter we might see later could be a false positive (hidden
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
524 inside another comment).
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
525 Test case: { a (* b } c (* d *) */
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
526 int comment_lossage = 0;
96838
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
527 EMACS_INT comment_end = from;
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
528 EMACS_INT comment_end_byte = from_byte;
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
529 EMACS_INT comstart_pos = 0;
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
530 EMACS_INT comstart_byte;
20766
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
531 /* Place where the containing defun starts,
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
532 or 0 if we didn't come across it yet. */
96838
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
533 EMACS_INT defun_start = 0;
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
534 EMACS_INT defun_start_byte = 0;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
535 register enum syntaxcode code;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
536 int nesting = 1; /* current comment nesting */
18079
5fbb5aef5649 (back_comment): Detect 2-char comment starts properly.
Richard M. Stallman <rms@gnu.org>
parents: 17786
diff changeset
537 int c;
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
538 int syntax = 0;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
539
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
540 /* FIXME: A }} comment-ender style leads to incorrect behavior
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
541 in the case of {{ c }}} because we ignore the last two chars which are
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
542 assumed to be comment-enders although they aren't. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
543
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
544 /* At beginning of range to scan, we're outside of strings;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
545 that determines quote parity to the comment-end. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
546 while (from != stop)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
547 {
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
548 EMACS_INT temp_byte;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
549 int prev_syntax, com2start, com2end;
110530
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
550 int comstart;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
551
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
552 /* Move back and examine a character. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
553 DEC_BOTH (from, from_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
554 UPDATE_SYNTAX_TABLE_BACKWARD (from);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
555
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
556 prev_syntax = syntax;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
557 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
558 syntax = SYNTAX_WITH_FLAGS (c);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
559 code = SYNTAX (c);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
560
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
561 /* Check for 2-char comment markers. */
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
562 com2start = (SYNTAX_FLAGS_COMSTART_FIRST (syntax)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
563 && SYNTAX_FLAGS_COMSTART_SECOND (prev_syntax)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
564 && (comstyle
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
565 == SYNTAX_FLAGS_COMMENT_STYLE (prev_syntax, syntax))
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
566 && (SYNTAX_FLAGS_COMMENT_NESTED (prev_syntax)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
567 || SYNTAX_FLAGS_COMMENT_NESTED (syntax)) == comnested);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
568 com2end = (SYNTAX_FLAGS_COMEND_FIRST (syntax)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
569 && SYNTAX_FLAGS_COMEND_SECOND (prev_syntax));
110530
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
570 comstart = (com2start || code == Scomment);
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
571
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
572 /* Nasty cases with overlapping 2-char comment markers:
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
573 - snmp-mode: -- c -- foo -- c --
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
574 --- c --
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
575 ------ c --
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
576 - c-mode: *||*
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
577 |* *|* *|
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
578 |*| |* |*|
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
579 /// */
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
580
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
581 /* If a 2-char comment sequence partly overlaps with another,
110530
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
582 we don't try to be clever. E.g. |*| in C, or }% in modes that
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
583 have %..\n and %{..}%. */
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
584 if (from > stop && (com2end || comstart))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
585 {
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
586 EMACS_INT next = from, next_byte = from_byte;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
587 int next_c, next_syntax;
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
588 DEC_BOTH (next, next_byte);
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
589 UPDATE_SYNTAX_TABLE_BACKWARD (next);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
590 next_c = FETCH_CHAR_AS_MULTIBYTE (next_byte);
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
591 next_syntax = SYNTAX_WITH_FLAGS (next_c);
110530
2d0eee1a24b9 * src/syntax.c (back_comment): Detect the case where a 1-char comment
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
592 if (((comstart || comnested)
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
593 && SYNTAX_FLAGS_COMEND_SECOND (syntax)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
594 && SYNTAX_FLAGS_COMEND_FIRST (next_syntax))
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
595 || ((com2end || comnested)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
596 && SYNTAX_FLAGS_COMSTART_SECOND (syntax)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
597 && (comstyle
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
598 == SYNTAX_FLAGS_COMMENT_STYLE (syntax, prev_syntax))
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
599 && SYNTAX_FLAGS_COMSTART_FIRST (next_syntax)))
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
600 goto lossage;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
601 /* UPDATE_SYNTAX_TABLE_FORWARD (next + 1); */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
602 }
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
603
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
604 if (com2start && comstart_pos == 0)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
605 /* We're looking at a comment starter. But it might be a comment
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
606 ender as well (see snmp-mode). The first time we see one, we
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
607 need to consider it as a comment starter,
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
608 and the subsequent times as a comment ender. */
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
609 com2end = 0;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
610
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
611 /* Turn a 2-char comment sequences into the appropriate syntax. */
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
612 if (com2end)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
613 code = Sendcomment;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
614 else if (com2start)
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
615 code = Scomment;
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
616 /* Ignore comment starters of a different style. */
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
617 else if (code == Scomment
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
618 && (comstyle != SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0)
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
619 || SYNTAX_FLAGS_COMMENT_NESTED (syntax) != comnested))
27698
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
620 continue;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
621
20674
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
622 /* Ignore escaped characters, except comment-enders. */
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
623 if (code != Sendcomment && char_quoted (from, from_byte))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
624 continue;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
625
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
626 switch (code)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
627 {
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
628 case Sstring_fence:
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
629 case Scomment_fence:
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
630 c = (code == Sstring_fence ? ST_STRING_STYLE : ST_COMMENT_STYLE);
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
631 case Sstring:
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
632 /* Track parity of quotes. */
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
633 if (string_style == -1)
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
634 /* Entering a string. */
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
635 string_style = c;
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
636 else if (string_style == c)
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
637 /* Leaving the string. */
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
638 string_style = -1;
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
639 else
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
640 /* If we have two kinds of string delimiters.
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
641 There's no way to grok this scanning backwards. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
642 string_lossage = 1;
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
643 break;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
644
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
645 case Scomment:
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
646 /* We've already checked that it is the relevant comstyle. */
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
647 if (string_style != -1 || comment_lossage || string_lossage)
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
648 /* There are odd string quotes involved, so let's be careful.
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
649 Test case in Pascal: " { " a { " } */
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
650 goto lossage;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
651
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
652 if (!comnested)
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
653 {
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
654 /* Record best comment-starter so far. */
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
655 comstart_pos = from;
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
656 comstart_byte = from_byte;
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
657 }
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
658 else if (--nesting <= 0)
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
659 /* nested comments have to be balanced, so we don't need to
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
660 keep looking for earlier ones. We use here the same (slightly
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
661 incorrect) reasoning as below: since it is followed by uniform
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
662 paired string quotes, this comment-start has to be outside of
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
663 strings, else the comment-end itself would be inside a string. */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
664 goto done;
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
665 break;
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
666
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
667 case Sendcomment:
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
668 if (SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0) == comstyle
49971
afbb2d6d2f07 (back_comment): Only check nestedness of 2nd char if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49600
diff changeset
669 && ((com2end && SYNTAX_FLAGS_COMMENT_NESTED (prev_syntax))
32087
83ecc6bc4bc2 (prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32086
diff changeset
670 || SYNTAX_FLAGS_COMMENT_NESTED (syntax)) == comnested)
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
671 /* This is the same style of comment ender as ours. */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
672 {
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
673 if (comnested)
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
674 nesting++;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
675 else
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
676 /* Anything before that can't count because it would match
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
677 this comment-ender rather than ours. */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
678 from = stop; /* Break out of the loop. */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
679 }
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
680 else if (comstart_pos != 0 || c != '\n')
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
681 /* We're mixing comment styles here, so we'd better be careful.
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
682 The (comstart_pos != 0 || c != '\n') check is not quite correct
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
683 (we should just always set comment_lossage), but removing it
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
684 would imply that any multiline comment in C would go through
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
685 lossage, which seems overkill.
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
686 The failure should only happen in the rare cases such as
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
687 { (* } *) */
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
688 comment_lossage = 1;
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
689 break;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
690
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
691 case Sopen:
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
692 /* Assume a defun-start point is outside of strings. */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
693 if (open_paren_in_column_0_is_defun_start
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
694 && (from == stop
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
695 || (temp_byte = dec_bytepos (from_byte),
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
696 FETCH_CHAR (temp_byte) == '\n')))
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
697 {
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
698 defun_start = from;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
699 defun_start_byte = from_byte;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
700 from = stop; /* Break out of the loop. */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
701 }
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
702 break;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
703
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
704 default:
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
705 break;
20766
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
706 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
707 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
708
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
709 if (comstart_pos == 0)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
710 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
711 from = comment_end;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
712 from_byte = comment_end_byte;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
713 UPDATE_SYNTAX_TABLE_FORWARD (comment_end - 1);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
714 }
31209
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
715 /* If comstart_pos is set and we get here (ie. didn't jump to `lossage'
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
716 or `done'), then we've found the beginning of the non-nested comment. */
00943ea58fd1 (back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30626
diff changeset
717 else if (1) /* !comnested */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
718 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
719 from = comstart_pos;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
720 from_byte = comstart_byte;
56720
7c89be334c1b (back_comment): Fixup globals in all cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56719
diff changeset
721 UPDATE_SYNTAX_TABLE_FORWARD (from - 1);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
722 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
723 else
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
724 {
29835
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
725 struct lisp_parse_state state;
5dec8ee96c0c (back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29823
diff changeset
726 lossage:
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
727 /* We had two kinds of string delimiters mixed up
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
728 together. Decode this going forwards.
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
729 Scan fwd from a known safe place (beginning-of-defun)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
730 to the one in question; this records where we
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
731 last passed a comment starter. */
20766
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
732 /* If we did not already find the defun start, find it now. */
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
733 if (defun_start == 0)
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
734 {
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
735 defun_start = find_defun_start (comment_end, comment_end_byte);
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
736 defun_start_byte = find_start_value_byte;
92c662c4ab0e (back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents: 20704
diff changeset
737 }
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
738 do
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
739 {
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
740 scan_sexps_forward (&state,
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
741 defun_start, defun_start_byte,
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
742 comment_end, -10000, 0, Qnil, 0);
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
743 defun_start = comment_end;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
744 if (state.incomment == (comnested ? 1 : -1)
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
745 && state.comstyle == comstyle)
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
746 from = state.comstr_start;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
747 else
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
748 {
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
749 from = comment_end;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
750 if (state.incomment)
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
751 /* If comment_end is inside some other comment, maybe ours
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
752 is nested, so we need to try again from within the
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
753 surrounding comment. Example: { a (* " *) */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
754 {
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
755 /* FIXME: We should advance by one or two chars. */
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
756 defun_start = state.comstr_start + 2;
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
757 defun_start_byte = CHAR_TO_BYTE (defun_start);
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
758 }
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
759 }
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
760 } while (defun_start < comment_end);
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
761
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
762 from_byte = CHAR_TO_BYTE (from);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
763 UPDATE_SYNTAX_TABLE_FORWARD (from - 1);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
764 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
765
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
766 done:
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
767 *charpos_ptr = from;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
768 *bytepos_ptr = from_byte;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
769
27698
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
770 return (from == comment_end) ? -1 : from;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
771 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
772
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
773 DEFUN ("syntax-table-p", Fsyntax_table_p, Ssyntax_table_p, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
774 doc: /* Return t if OBJECT is a syntax table.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
775 Currently, any char-table counts as a syntax table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
776 (Lisp_Object object)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
777 {
14087
1709d9f11c66 (Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents: 13513
diff changeset
778 if (CHAR_TABLE_P (object)
18113
9f7fdb0f76f3 (Fsyntax_table_p, check_syntax_table): Use EQ.
Richard M. Stallman <rms@gnu.org>
parents: 18080
diff changeset
779 && EQ (XCHAR_TABLE (object)->purpose, Qsyntax_table))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
780 return Qt;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
781 return Qnil;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
782 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
783
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
784 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
785 check_syntax_table (Lisp_Object obj)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
786 {
71843
2d05f598fa85 (check_syntax_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents: 71787
diff changeset
787 CHECK_TYPE (CHAR_TABLE_P (obj) && EQ (XCHAR_TABLE (obj)->purpose, Qsyntax_table),
2d05f598fa85 (check_syntax_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents: 71787
diff changeset
788 Qsyntax_table_p, obj);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
789 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
790
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
791 DEFUN ("syntax-table", Fsyntax_table, Ssyntax_table, 0, 0, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
792 doc: /* Return the current syntax table.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
793 This is the one specified by the current buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
794 (void)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
795 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
796 return current_buffer->syntax_table;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
797 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
798
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
799 DEFUN ("standard-syntax-table", Fstandard_syntax_table,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
800 Sstandard_syntax_table, 0, 0, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
801 doc: /* Return the standard syntax table.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
802 This is the one used for new buffers. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
803 (void)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
804 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
805 return Vstandard_syntax_table;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
806 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
807
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
808 DEFUN ("copy-syntax-table", Fcopy_syntax_table, Scopy_syntax_table, 0, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
809 doc: /* Construct a new syntax table and return it.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
810 It is a copy of the TABLE, which defaults to the standard syntax table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
811 (Lisp_Object table)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
812 {
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
813 Lisp_Object copy;
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
814
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 163
diff changeset
815 if (!NILP (table))
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
816 check_syntax_table (table);
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
817 else
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
818 table = Vstandard_syntax_table;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
819
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
820 copy = Fcopy_sequence (table);
14661
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
821
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
822 /* Only the standard syntax table should have a default element.
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
823 Other syntax tables should inherit from parents instead. */
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
824 XCHAR_TABLE (copy)->defalt = Qnil;
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
825
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
826 /* Copied syntax tables should all have parents.
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
827 If we copied one with no parent, such as the standard syntax table,
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
828 use the standard syntax table as the copy's parent. */
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
829 if (NILP (XCHAR_TABLE (copy)->parent))
46ba65e7976c (Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
830 Fset_char_table_parent (copy, Vstandard_syntax_table);
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
831 return copy;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
832 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
833
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
834 DEFUN ("set-syntax-table", Fset_syntax_table, Sset_syntax_table, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
835 doc: /* Select a new syntax table for the current buffer.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
836 One argument, a syntax table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
837 (Lisp_Object table)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
838 {
28313
cdb964ab44c3 (Fset_syntax_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents: 28302
diff changeset
839 int idx;
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
840 check_syntax_table (table);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
841 current_buffer->syntax_table = table;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
842 /* Indicate that this buffer now has a specified syntax table. */
28351
e3d57f7fba49 Use new macro names
Gerd Moellmann <gerd@gnu.org>
parents: 28313
diff changeset
843 idx = PER_BUFFER_VAR_IDX (syntax_table);
e3d57f7fba49 Use new macro names
Gerd Moellmann <gerd@gnu.org>
parents: 28313
diff changeset
844 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
845 return table;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
846 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
847
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
848 /* Convert a letter which signifies a syntax code
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
849 into the code it signifies.
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
850 This is used by modify-syntax-entry, and other things. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
851
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
852 unsigned char syntax_spec_code[0400] =
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
853 { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
854 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
855 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
856 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
857 (char) Swhitespace, (char) Scomment_fence, (char) Sstring, 0377,
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
858 (char) Smath, 0377, 0377, (char) Squote,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
859 (char) Sopen, (char) Sclose, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
860 0377, (char) Swhitespace, (char) Spunct, (char) Scharquote,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
861 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
862 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
863 (char) Scomment, 0377, (char) Sendcomment, 0377,
5442
8cbae747a768 (describe_syntax): Handle Sinherit.
Richard M. Stallman <rms@gnu.org>
parents: 5339
diff changeset
864 (char) Sinherit, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* @, A ... */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
865 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
866 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
867 0377, 0377, 0377, 0377, (char) Sescape, 0377, 0377, (char) Ssymbol,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
868 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* `, a, ... */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
869 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
870 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword,
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
871 0377, 0377, 0377, 0377, (char) Sstring_fence, 0377, 0377, 0377
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
872 };
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
873
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
874 /* Indexed by syntax code, give the letter that describes it. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
875
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
876 char syntax_code_spec[16] =
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
877 {
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
878 ' ', '.', 'w', '_', '(', ')', '\'', '\"', '$', '\\', '/', '<', '>', '@',
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
879 '!', '|'
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
880 };
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
881
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
882 /* Indexed by syntax code, give the object (cons of syntax code and
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
883 nil) to be stored in syntax table. Since these objects can be
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
884 shared among syntax tables, we generate them in advance. By
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
885 sharing objects, the function `describe-syntax' can give a more
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
886 compact listing. */
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
887 static Lisp_Object Vsyntax_code_object;
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
888
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
889
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
890 DEFUN ("char-syntax", Fchar_syntax, Schar_syntax, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
891 doc: /* Return the syntax code of CHARACTER, described by a character.
105102
7a2f279a2c8d * syntax.c (Fchar_syntax): Minor doc fix (Bug#119).
Chong Yidong <cyd@stupidchicken.com>
parents: 102145
diff changeset
892 For example, if CHARACTER is a word constituent, the
7a2f279a2c8d * syntax.c (Fchar_syntax): Minor doc fix (Bug#119).
Chong Yidong <cyd@stupidchicken.com>
parents: 102145
diff changeset
893 character `w' (119) is returned.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
894 The characters that correspond to various syntax codes
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
895 are listed in the documentation of `modify-syntax-entry'. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
896 (Lisp_Object character)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
897 {
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
898 int char_int;
108246
ea6ba19c6edd * syntax.c (Fchar_syntax): Check the arg is a character.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107366
diff changeset
899 CHECK_CHARACTER (character);
14087
1709d9f11c66 (Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents: 13513
diff changeset
900 char_int = XINT (character);
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
901 SETUP_BUFFER_SYNTAX_TABLE ();
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
902 return make_number (syntax_code_spec[(int) SYNTAX (char_int)]);
7968
a6372621abd9 (Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7924
diff changeset
903 }
a6372621abd9 (Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7924
diff changeset
904
a6372621abd9 (Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7924
diff changeset
905 DEFUN ("matching-paren", Fmatching_paren, Smatching_paren, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
906 doc: /* Return the matching parenthesis of CHARACTER, or nil if none. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
907 (Lisp_Object character)
7968
a6372621abd9 (Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7924
diff changeset
908 {
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
909 int char_int, code;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
910 CHECK_NUMBER (character);
14087
1709d9f11c66 (Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents: 13513
diff changeset
911 char_int = XINT (character);
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
912 SETUP_BUFFER_SYNTAX_TABLE ();
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
913 code = SYNTAX (char_int);
7975
49dc4ea976a0 (Fmatching_paren): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents: 7968
diff changeset
914 if (code == Sopen || code == Sclose)
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18491
diff changeset
915 return SYNTAX_MATCH (char_int);
7968
a6372621abd9 (Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7924
diff changeset
916 return Qnil;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
917 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
918
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
919 DEFUN ("string-to-syntax", Fstring_to_syntax, Sstring_to_syntax, 1, 1, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
920 doc: /* Convert a syntax specification STRING into syntax cell form.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
921 STRING should be a string as it is allowed as argument of
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
922 `modify-syntax-entry'. Value is the equivalent cons cell
74563
da4c1968d862 Fix spurious open-paren-in-column-0 in a comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 74542
diff changeset
923 \(CODE . MATCHING-CHAR) that can be used as value of a `syntax-table'
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
924 text property. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
925 (Lisp_Object string)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
926 {
46555
35e66a0949b8 (Fstring_to_syntax, skip_chars): Treat Lisp string
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
927 register const unsigned char *p;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
928 register enum syntaxcode code;
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
929 int val;
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
930 Lisp_Object match;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
931
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
932 CHECK_STRING (string);
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
933
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 41598
diff changeset
934 p = SDATA (string);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
935 code = (enum syntaxcode) syntax_spec_code[*p++];
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
936 if (((int) code & 0377) == 0377)
63703
bb4ab751a6a3 (Fstring_to_syntax): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 58897
diff changeset
937 error ("Invalid syntax description letter: %c", p[-1]);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
938
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
939 if (code == Sinherit)
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
940 return Qnil;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
941
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
942 if (*p)
13513
907544cb2c7d (check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents: 13218
diff changeset
943 {
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
944 int len;
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
945 int character = STRING_CHAR_AND_LENGTH (p, len);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
946 XSETINT (match, character);
13513
907544cb2c7d (check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents: 13218
diff changeset
947 if (XFASTINT (match) == ' ')
907544cb2c7d (check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents: 13218
diff changeset
948 match = Qnil;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
949 p += len;
13513
907544cb2c7d (check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents: 13218
diff changeset
950 }
907544cb2c7d (check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents: 13218
diff changeset
951 else
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
952 match = Qnil;
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
953
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
954 val = (int) code;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
955 while (*p)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
956 switch (*p++)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
957 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
958 case '1':
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
959 val |= 1 << 16;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
960 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
961
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
962 case '2':
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
963 val |= 1 << 17;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
964 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
965
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
966 case '3':
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
967 val |= 1 << 18;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
968 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
969
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
970 case '4':
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
971 val |= 1 << 19;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
972 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
973
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
974 case 'p':
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
975 val |= 1 << 20;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
976 break;
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
977
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
978 case 'b':
9333
925795f1a594 (Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9320
diff changeset
979 val |= 1 << 21;
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
980 break;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
981
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
982 case 'n':
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
983 val |= 1 << 22;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
984 break;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
985
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
986 case 'c':
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
987 val |= 1 << 23;
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
988 break;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
989 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
990
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
991 if (val < XVECTOR (Vsyntax_code_object)->size && NILP (match))
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
992 return XVECTOR (Vsyntax_code_object)->contents[val];
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
993 else
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
994 /* Since we can't use a shared object, let's make a new one. */
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
995 return Fcons (make_number (val), match);
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
996 }
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
997
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
998 /* I really don't know why this is interactive
40286
0e7059267f7e Fix comment ending.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40205
diff changeset
999 help-form should at least be made useful whilst reading the second arg. */
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
1000 DEFUN ("modify-syntax-entry", Fmodify_syntax_entry, Smodify_syntax_entry, 2, 3,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1001 "cSet syntax for character: \nsSet syntax for %s to: ",
40205
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1002 doc: /* Set syntax for character CHAR according to string NEWENTRY.
55423
a9e10b866486 (Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54849
diff changeset
1003 The syntax is changed only for table SYNTAX-TABLE, which defaults to
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1004 the current buffer's syntax table.
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1005 CHAR may be a cons (MIN . MAX), in which case, syntaxes of all characters
100345
b814c7996a93 * syntax.c (Fmodify_syntax_entry): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 99020
diff changeset
1006 in the range MIN to MAX are changed.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1007 The first character of NEWENTRY should be one of the following:
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1008 Space or - whitespace syntax. w word constituent.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1009 _ symbol constituent. . punctuation.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1010 ( open-parenthesis. ) close-parenthesis.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1011 " string quote. \\ escape.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1012 $ paired delimiter. ' expression quote or prefix operator.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1013 < comment starter. > comment ender.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1014 / character-quote. @ inherit from `standard-syntax-table'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1015 | generic string fence. ! generic comment fence.
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1016
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1017 Only single-character comment start and end sequences are represented thus.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1018 Two-character sequences are represented as described below.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1019 The second character of NEWENTRY is the matching parenthesis,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1020 used only if the first character is `(' or `)'.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1021 Any additional characters are flags.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1022 Defined flags are the characters 1, 2, 3, 4, b, p, and n.
40205
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1023 1 means CHAR is the start of a two-char comment start sequence.
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1024 2 means CHAR is the second character of such a sequence.
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1025 3 means CHAR is the start of a two-char comment end sequence.
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1026 4 means CHAR is the second character of such a sequence.
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1027
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1028 There can be several orthogonal comment sequences. This is to support
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1029 language modes such as C++. By default, all comment sequences are of style
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1030 a, but you can set the comment sequence style to b (on the second character
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1031 of a comment-start, and the first character of a comment-end sequence) and/or
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1032 c (on any of its chars) using this flag:
40205
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1033 b means CHAR is part of comment sequence b.
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1034 c means CHAR is part of comment sequence c.
40205
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1035 n means CHAR is part of a nestable comment sequence.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1036
40205
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1037 p means CHAR is a prefix character for `backward-prefix-chars';
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1038 such characters are treated as whitespace when they occur
40205
d13b14b50715 (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage.
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
1039 between expressions.
100345
b814c7996a93 * syntax.c (Fmodify_syntax_entry): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 99020
diff changeset
1040 usage: (modify-syntax-entry CHAR NEWENTRY &optional SYNTAX-TABLE) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1041 (Lisp_Object c, Lisp_Object newentry, Lisp_Object syntax_table)
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1042 {
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1043 if (CONSP (c))
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1044 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1045 CHECK_CHARACTER_CAR (c);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1046 CHECK_CHARACTER_CDR (c);
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1047 }
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1048 else
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1049 CHECK_CHARACTER (c);
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1050
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1051 if (NILP (syntax_table))
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1052 syntax_table = current_buffer->syntax_table;
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1053 else
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1054 check_syntax_table (syntax_table);
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
1055
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1056 newentry = Fstring_to_syntax (newentry);
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1057 if (CONSP (c))
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1058 SET_RAW_SYNTAX_ENTRY_RANGE (syntax_table, c, newentry);
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1059 else
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1060 SET_RAW_SYNTAX_ENTRY (syntax_table, XINT (c), newentry);
72945
d4ecc69b8d2e * search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 71988
diff changeset
1061
d4ecc69b8d2e * search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 71988
diff changeset
1062 /* We clear the regexp cache, since character classes can now have
d4ecc69b8d2e * search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 71988
diff changeset
1063 different values from those in the compiled regexps.*/
d4ecc69b8d2e * search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 71988
diff changeset
1064 clear_regexp_cache ();
d4ecc69b8d2e * search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents: 71988
diff changeset
1065
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1066 return Qnil;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1067 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1068
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1069 /* Dump syntax table to buffer in human-readable format */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1070
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1071 DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value,
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1072 Sinternal_describe_syntax_value, 1, 1, 0,
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1073 doc: /* Insert a description of the internal syntax description SYNTAX at point. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1074 (Lisp_Object syntax)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1075 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1076 register enum syntaxcode code;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1077 int syntax_code;
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1078 char desc, start1, start2, end1, end2, prefix,
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1079 comstyleb, comstylec, comnested;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1080 char str[2];
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1081 Lisp_Object first, match_lisp, value = syntax;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1082
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1083 if (NILP (value))
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1084 {
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1085 insert_string ("default");
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1086 return syntax;
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1087 }
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1088
17109
dfe4f98935c4 (describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents: 17044
diff changeset
1089 if (CHAR_TABLE_P (value))
dfe4f98935c4 (describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents: 17044
diff changeset
1090 {
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1091 insert_string ("deeper char-table ...");
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1092 return syntax;
17109
dfe4f98935c4 (describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents: 17044
diff changeset
1093 }
dfe4f98935c4 (describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents: 17044
diff changeset
1094
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1095 if (!CONSP (value))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1096 {
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1097 insert_string ("invalid");
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1098 return syntax;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1099 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1100
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25659
diff changeset
1101 first = XCAR (value);
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25659
diff changeset
1102 match_lisp = XCDR (value);
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1103
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1104 if (!INTEGERP (first) || !(NILP (match_lisp) || INTEGERP (match_lisp)))
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1105 {
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1106 insert_string ("invalid");
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1107 return syntax;
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1108 }
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1109
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1110 syntax_code = XINT (first);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1111 code = (enum syntaxcode) (syntax_code & 0377);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1112 start1 = SYNTAX_FLAGS_COMSTART_FIRST (syntax_code);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1113 start2 = SYNTAX_FLAGS_COMSTART_SECOND (syntax_code);;
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1114 end1 = SYNTAX_FLAGS_COMEND_FIRST (syntax_code);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1115 end2 = SYNTAX_FLAGS_COMEND_SECOND (syntax_code);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1116 prefix = SYNTAX_FLAGS_PREFIX (syntax_code);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1117 comstyleb = SYNTAX_FLAGS_COMMENT_STYLEB (syntax_code);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1118 comstylec = SYNTAX_FLAGS_COMMENT_STYLEC (syntax_code);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1119 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax_code);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1120
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1121 if ((int) code < 0 || (int) code >= (int) Smax)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1122 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1123 insert_string ("invalid");
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1124 return syntax;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1125 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1126 desc = syntax_code_spec[(int) code];
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1127
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1128 str[0] = desc, str[1] = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1129 insert (str, 1);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1130
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1131 if (NILP (match_lisp))
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1132 insert (" ", 1);
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1133 else
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1134 insert_char (XINT (match_lisp));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1135
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1136 if (start1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1137 insert ("1", 1);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1138 if (start2)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1139 insert ("2", 1);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1140
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1141 if (end1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1142 insert ("3", 1);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1143 if (end2)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1144 insert ("4", 1);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1145
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1146 if (prefix)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1147 insert ("p", 1);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1148 if (comstyleb)
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
1149 insert ("b", 1);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1150 if (comstylec)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1151 insert ("c", 1);
29821
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
1152 if (comnested)
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
1153 insert ("n", 1);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1154
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1155 insert_string ("\twhich means: ");
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1156
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 9863
diff changeset
1157 switch (SWITCH_ENUM_CAST (code))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1158 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1159 case Swhitespace:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1160 insert_string ("whitespace"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1161 case Spunct:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1162 insert_string ("punctuation"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1163 case Sword:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1164 insert_string ("word"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1165 case Ssymbol:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1166 insert_string ("symbol"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1167 case Sopen:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1168 insert_string ("open"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1169 case Sclose:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1170 insert_string ("close"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1171 case Squote:
32508
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1172 insert_string ("prefix"); break;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1173 case Sstring:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1174 insert_string ("string"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1175 case Smath:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1176 insert_string ("math"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1177 case Sescape:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1178 insert_string ("escape"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1179 case Scharquote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1180 insert_string ("charquote"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1181 case Scomment:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1182 insert_string ("comment"); break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1183 case Sendcomment:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1184 insert_string ("endcomment"); break;
32508
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1185 case Sinherit:
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1186 insert_string ("inherit"); break;
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1187 case Scomment_fence:
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1188 insert_string ("comment fence"); break;
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1189 case Sstring_fence:
d371f8c371bd (describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32506
diff changeset
1190 insert_string ("string fence"); break;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1191 default:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1192 insert_string ("invalid");
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1193 return syntax;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1194 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1195
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1196 if (!NILP (match_lisp))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1197 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1198 insert_string (", matches ");
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
1199 insert_char (XINT (match_lisp));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1200 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1201
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1202 if (start1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1203 insert_string (",\n\t is the first character of a comment-start sequence");
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1204 if (start2)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1205 insert_string (",\n\t is the second character of a comment-start sequence");
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1206
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1207 if (end1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1208 insert_string (",\n\t is the first character of a comment-end sequence");
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1209 if (end2)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1210 insert_string (",\n\t is the second character of a comment-end sequence");
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1211 if (comstyleb)
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
1212 insert_string (" (comment style b)");
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1213 if (comstylec)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
1214 insert_string (" (comment style c)");
29821
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
1215 if (comnested)
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
1216 insert_string (" (nestable)");
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
1217
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1218 if (prefix)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1219 insert_string (",\n\t is a prefix character for `backward-prefix-chars'");
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1220
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1221 return syntax;
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
1222 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1223
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1224 int parse_sexp_ignore_comments;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1225
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1226 /* Char-table of functions that find the next or previous word
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1227 boundary. */
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1228 Lisp_Object Vfind_word_boundary_function_table;
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1229
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1230 /* Return the position across COUNT words from FROM.
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1231 If that many words cannot be found before the end of the buffer, return 0.
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1232 COUNT negative means scan backward and stop at word beginning. */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1233
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1234 EMACS_INT
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1235 scan_words (register EMACS_INT from, register EMACS_INT count)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1236 {
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1237 register EMACS_INT beg = BEGV;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1238 register EMACS_INT end = ZV;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1239 register EMACS_INT from_byte = CHAR_TO_BYTE (from);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1240 register enum syntaxcode code;
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1241 int ch0, ch1;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1242 Lisp_Object func, script, pos;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1243
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1244 immediate_quit = 1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1245 QUIT;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1246
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1247 SETUP_SYNTAX_TABLE (from, count);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1248
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1249 while (count > 0)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1250 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1251 while (1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1252 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1253 if (from == end)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1254 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1255 immediate_quit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1256 return 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1257 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1258 UPDATE_SYNTAX_TABLE_FORWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1259 ch0 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1260 code = SYNTAX (ch0);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
1261 INC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1262 if (words_include_escapes
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1263 && (code == Sescape || code == Scharquote))
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1264 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1265 if (code == Sword)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1266 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1267 }
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1268 /* Now CH0 is a character which begins a word and FROM is the
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1269 position of the next character. */
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1270 func = CHAR_TABLE_REF (Vfind_word_boundary_function_table, ch0);
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1271 if (! NILP (Ffboundp (func)))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1272 {
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1273 pos = call2 (func, make_number (from - 1), make_number (end));
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1274 if (INTEGERP (pos) && XINT (pos) > from)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1275 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1276 from = XINT (pos);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1277 from_byte = CHAR_TO_BYTE (from);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1278 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1279 }
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1280 else
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1281 {
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1282 script = CHAR_TABLE_REF (Vchar_script_table, ch0);
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1283 while (1)
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1284 {
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1285 if (from == end) break;
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1286 UPDATE_SYNTAX_TABLE_FORWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1287 ch1 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1288 code = SYNTAX (ch1);
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1289 if ((code != Sword
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1290 && (! words_include_escapes
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1291 || (code != Sescape && code != Scharquote)))
99020
08af05537037 (scan_words): Call word_boundary_p instead of comparing
Kenichi Handa <handa@m17n.org>
parents: 96988
diff changeset
1292 || word_boundary_p (ch0, ch1))
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1293 break;
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1294 INC_BOTH (from, from_byte);
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1295 ch0 = ch1;
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1296 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1297 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1298 count--;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1299 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1300 while (count < 0)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1301 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1302 while (1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1303 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1304 if (from == beg)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1305 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1306 immediate_quit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1307 return 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1308 }
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
1309 DEC_BOTH (from, from_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1310 UPDATE_SYNTAX_TABLE_BACKWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1311 ch1 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1312 code = SYNTAX (ch1);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1313 if (words_include_escapes
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1314 && (code == Sescape || code == Scharquote))
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1315 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1316 if (code == Sword)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1317 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1318 }
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1319 /* Now CH1 is a character which ends a word and FROM is the
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
1320 position of it. */
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1321 func = CHAR_TABLE_REF (Vfind_word_boundary_function_table, ch1);
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1322 if (! NILP (Ffboundp (func)))
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1323 {
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1324 pos = call2 (func, make_number (from), make_number (beg));
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1325 if (INTEGERP (pos) && XINT (pos) < from)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1326 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1327 from = XINT (pos);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1328 from_byte = CHAR_TO_BYTE (from);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1329 }
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1330 }
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
1331 else
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1332 {
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1333 script = CHAR_TABLE_REF (Vchar_script_table, ch1);
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1334 while (1)
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1335 {
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1336 if (from == beg)
77927
d15a774f9796 (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
Chong Yidong <cyd@stupidchicken.com>
parents: 77757
diff changeset
1337 break;
90851
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
1338 DEC_BOTH (from, from_byte);
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1339 UPDATE_SYNTAX_TABLE_BACKWARD (from);
90851
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
1340 ch0 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1341 code = SYNTAX (ch0);
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1342 if ((code != Sword
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1343 && (! words_include_escapes
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1344 || (code != Sescape && code != Scharquote)))
99020
08af05537037 (scan_words): Call word_boundary_p instead of comparing
Kenichi Handa <handa@m17n.org>
parents: 96988
diff changeset
1345 || word_boundary_p (ch0, ch1))
90851
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
1346 {
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
1347 INC_BOTH (from, from_byte);
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
1348 break;
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
1349 }
89010
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1350 ch1 = ch0;
0b75ae2e80b1 (scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents: 88970
diff changeset
1351 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1352 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1353 count++;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1354 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1355
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1356 immediate_quit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1357
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1358 return from;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1359 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1360
93546
45896a2e7bee (Fforward_word): Add ^ interactive spec.
Chong Yidong <cyd@stupidchicken.com>
parents: 91806
diff changeset
1361 DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p",
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1362 doc: /* Move point forward ARG words (backward if ARG is negative).
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1363 Normally returns t.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1364 If an edge of the buffer or a field boundary is reached, point is left there
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1365 and the function returns nil. Field boundaries are not noticed if
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1366 `inhibit-field-text-motion' is non-nil. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1367 (Lisp_Object arg)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1368 {
58897
98e94b29b59b (Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57756
diff changeset
1369 Lisp_Object tmp;
26391
216416ad34fe (Fforward_word): Handle fields even if would have hit
Richard M. Stallman <rms@gnu.org>
parents: 26272
diff changeset
1370 int orig_val, val;
52213
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1371
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1372 if (NILP (arg))
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1373 XSETFASTINT (arg, 1);
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1374 else
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1375 CHECK_NUMBER (arg);
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1376
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1377 val = orig_val = scan_words (PT, XINT (arg));
26391
216416ad34fe (Fforward_word): Handle fields even if would have hit
Richard M. Stallman <rms@gnu.org>
parents: 26272
diff changeset
1378 if (! orig_val)
52213
d8341603541c (Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents: 51036
diff changeset
1379 val = XINT (arg) > 0 ? ZV : BEGV;
25401
3f78f1fed4e0 (Fforward_word): If in a mini-buffer and moving
Gerd Moellmann <gerd@gnu.org>
parents: 25290
diff changeset
1380
26060
6edf64bf5e22 (Fforward_word): Supply new ESCAPE_FROM_EDGE parameter
Gerd Moellmann <gerd@gnu.org>
parents: 25771
diff changeset
1381 /* Avoid jumping out of an input field. */
58897
98e94b29b59b (Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57756
diff changeset
1382 tmp = Fconstrain_to_field (make_number (val), make_number (PT),
98e94b29b59b (Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57756
diff changeset
1383 Qt, Qnil, Qnil);
98e94b29b59b (Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 57756
diff changeset
1384 val = XFASTINT (tmp);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
1385
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1386 SET_PT (val);
27079
638b309011d9 (Fforward_word): Notice field boundaries only if
Gerd Moellmann <gerd@gnu.org>
parents: 26526
diff changeset
1387 return val == orig_val ? Qt : Qnil;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1388 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1389
109139
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
1390 Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1391
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1392 DEFUN ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1393 doc: /* Move point forward, stopping before a char not in STRING, or at pos LIM.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1394 STRING is like the inside of a `[...]' in a regular expression
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1395 except that `]' is never special and `\\' quotes `^', `-' or `\\'
102145
16ac9218f780 (Fskip_chars_forward): Fix doc typo.
Glenn Morris <rgm@gnu.org>
parents: 100951
diff changeset
1396 (but not at the end of a range; quoting is never needed there).
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1397 Thus, with arg "a-zA-Z", this skips letters stopping before first nonletter.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1398 With arg "^a-zA-Z", skips nonletters stopping before first letter.
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1399 Char classes, e.g. `[:alpha:]', are supported.
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1400
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1401 Returns the distance traveled, either zero or positive. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1402 (Lisp_Object string, Lisp_Object lim)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1403 {
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1404 return skip_chars (1, string, lim, 1);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1405 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1406
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1407 DEFUN ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1408 doc: /* Move point backward, stopping after a char not in STRING, or at pos LIM.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1409 See `skip-chars-forward' for details.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1410 Returns the distance traveled, either zero or negative. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1411 (Lisp_Object string, Lisp_Object lim)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1412 {
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1413 return skip_chars (0, string, lim, 1);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1414 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1415
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1416 DEFUN ("skip-syntax-forward", Fskip_syntax_forward, Sskip_syntax_forward, 1, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1417 doc: /* Move point forward across chars in specified syntax classes.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1418 SYNTAX is a string of syntax code characters.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1419 Stop before a char whose syntax is not in SYNTAX, or at position LIM.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1420 If SYNTAX starts with ^, skip characters whose syntax is NOT in SYNTAX.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1421 This function returns the distance traveled, either zero or positive. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1422 (Lisp_Object syntax, Lisp_Object lim)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1423 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1424 return skip_syntaxes (1, syntax, lim);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1425 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1426
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1427 DEFUN ("skip-syntax-backward", Fskip_syntax_backward, Sskip_syntax_backward, 1, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1428 doc: /* Move point backward across chars in specified syntax classes.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1429 SYNTAX is a string of syntax code characters.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1430 Stop on reaching a char whose syntax is not in SYNTAX, or at position LIM.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1431 If SYNTAX starts with ^, skip characters whose syntax is NOT in SYNTAX.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
1432 This function returns the distance traveled, either zero or negative. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1433 (Lisp_Object syntax, Lisp_Object lim)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1434 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1435 return skip_syntaxes (0, syntax, lim);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1436 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1437
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
1438 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1439 skip_chars (int forwardp, Lisp_Object string, Lisp_Object lim, int handle_iso_classes)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1440 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1441 register unsigned int c;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1442 unsigned char fastmap[0400];
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1443 /* Store the ranges of non-ASCII characters. */
20292
2befa7396e42 (skip_chars): Check type of `string' before using it.
Karl Heuer <kwzh@gnu.org>
parents: 18938
diff changeset
1444 int *char_ranges;
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
1445 int n_char_ranges = 0;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1446 int negate = 0;
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1447 register EMACS_INT i, i_byte;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1448 /* Set to 1 if the current buffer is multibyte and the region
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1449 contains non-ASCII chars. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1450 int multibyte;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1451 /* Set to 1 if STRING is multibyte and it contains non-ASCII
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1452 chars. */
22486
a28020246db1 (skip_chars): Don't examine STRING before verifying that it is a string.
Richard M. Stallman <rms@gnu.org>
parents: 22432
diff changeset
1453 int string_multibyte;
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1454 EMACS_INT size_byte;
46555
35e66a0949b8 (Fstring_to_syntax, skip_chars): Treat Lisp string
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
1455 const unsigned char *str;
30596
48a9e9f4fd9d (skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 30594
diff changeset
1456 int len;
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1457 Lisp_Object iso_classes;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1458
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
1459 CHECK_STRING (string);
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1460 iso_classes = Qnil;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1461
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1462 if (NILP (lim))
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1463 XSETINT (lim, forwardp ? ZV : BEGV);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1464 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
1465 CHECK_NUMBER_COERCE_MARKER (lim);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1466
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1467 /* In any case, don't allow scan outside bounds of buffer. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1468 if (XINT (lim) > ZV)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1469 XSETFASTINT (lim, ZV);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1470 if (XINT (lim) < BEGV)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1471 XSETFASTINT (lim, BEGV);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1472
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1473 multibyte = (!NILP (current_buffer->enable_multibyte_characters)
89341
9664825d832f (skip_chars, skip_syntaxes): Fix type errors.
Dave Love <fx@gnu.org>
parents: 89114
diff changeset
1474 && (XINT (lim) - PT != CHAR_TO_BYTE (XINT (lim)) - PT_BYTE));
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1475 string_multibyte = SBYTES (string) > SCHARS (string);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1476
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1477 memset (fastmap, 0, sizeof fastmap);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1478
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1479 str = SDATA (string);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1480 size_byte = SBYTES (string);
89103
c4712a200dcb (skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89072
diff changeset
1481
30596
48a9e9f4fd9d (skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 30594
diff changeset
1482 i_byte = 0;
22130
b25abff012fd (skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 22116
diff changeset
1483 if (i_byte < size_byte
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 41598
diff changeset
1484 && SREF (string, 0) == '^')
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1485 {
30596
48a9e9f4fd9d (skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 30594
diff changeset
1486 negate = 1; i_byte++;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1487 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1488
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1489 /* Find the characters specified and set their elements of fastmap.
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1490 Handle backslashes and ranges specially.
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1491
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1492 If STRING contains non-ASCII characters, setup char_ranges for
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1493 them and use fastmap only for their leading codes. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1494
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1495 if (! string_multibyte)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1496 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1497 int string_has_eight_bit = 0;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1498
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1499 /* At first setup fastmap. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1500 while (i_byte < size_byte)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1501 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1502 c = str[i_byte++];
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1503
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1504 if (handle_iso_classes && c == '['
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1505 && i_byte < size_byte
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1506 && str[i_byte] == ':')
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1507 {
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1508 const unsigned char *class_beg = str + i_byte + 1;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1509 const unsigned char *class_end = class_beg;
56116
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1510 const unsigned char *class_limit = str + size_byte - 2;
74145
8eceefbbcde7 Space/tab mixup.
Juanma Barranquero <lekktu@gmail.com>
parents: 72945
diff changeset
1511 /* Leave room for the null. */
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1512 unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1];
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1513 re_wctype_t cc;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1514
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1515 if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH)
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1516 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1517
56116
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1518 while (class_end < class_limit
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1519 && *class_end >= 'a' && *class_end <= 'z')
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1520 class_end++;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1521
56116
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1522 if (class_end == class_beg
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1523 || *class_end != ':' || class_end[1] != ']')
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1524 goto not_a_class_name;
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1525
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1526 memcpy (class_name, class_beg, class_end - class_beg);
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1527 class_name[class_end - class_beg] = 0;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1528
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1529 cc = re_wctype (class_name);
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1530 if (cc == 0)
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1531 error ("Invalid ISO C character class");
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1532
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1533 iso_classes = Fcons (make_number (cc), iso_classes);
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1534
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1535 i_byte = class_end + 2 - str;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1536 continue;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1537 }
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
1538
56116
6725db0f57d5 (skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents: 56088
diff changeset
1539 not_a_class_name:
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1540 if (c == '\\')
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1541 {
22130
b25abff012fd (skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 22116
diff changeset
1542 if (i_byte == size_byte)
20626
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1543 break;
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1544
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1545 c = str[i_byte++];
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1546 }
53508
c7553b3b3a60 (skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
1547 /* Treat `-' as range character only if another character
c7553b3b3a60 (skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
1548 follows. */
c7553b3b3a60 (skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents: 52401
diff changeset
1549 if (i_byte + 1 < size_byte
30596
48a9e9f4fd9d (skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 30594
diff changeset
1550 && str[i_byte] == '-')
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1551 {
31944
05763e780521 (skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents: 31209
diff changeset
1552 unsigned int c2;
20626
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1553
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1554 /* Skip over the dash. */
30596
48a9e9f4fd9d (skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 30594
diff changeset
1555 i_byte++;
20626
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1556
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1557 /* Get the end of the range. */
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1558 c2 = str[i_byte++];
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1559 if (c2 == '\\'
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1560 && i_byte < size_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1561 c2 = str[i_byte++];
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1562
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1563 if (c <= c2)
22116
09efd6a94b4b (skip_chars): Fix bug in handling a range which
Kenichi Handa <handa@m17n.org>
parents: 22052
diff changeset
1564 {
09efd6a94b4b (skip_chars): Fix bug in handling a range which
Kenichi Handa <handa@m17n.org>
parents: 22052
diff changeset
1565 while (c <= c2)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1566 fastmap[c++] = 1;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1567 if (! ASCII_CHAR_P (c2))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1568 string_has_eight_bit = 1;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1569 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1570 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1571 else
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
1572 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1573 fastmap[c] = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1574 if (! ASCII_CHAR_P (c))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1575 string_has_eight_bit = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1576 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1577 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1578
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1579 /* If the current range is multibyte and STRING contains
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1580 eight-bit chars, arrange fastmap and setup char_ranges for
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1581 the corresponding multibyte chars. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1582 if (multibyte && string_has_eight_bit)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1583 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1584 unsigned char fastmap2[0400];
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1585 int range_start_byte, range_start_char;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1586
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1587 memcpy (fastmap + 0200, fastmap2 + 0200, 0200);
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1588 memset (fastmap + 0200, 0, 0200);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1589 /* We are sure that this loop stops. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1590 for (i = 0200; ! fastmap2[i]; i++);
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
1591 c = BYTE8_TO_CHAR (i);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1592 fastmap[CHAR_LEADING_CODE (c)] = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1593 range_start_byte = i;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1594 range_start_char = c;
89622
96081c0be5ca (skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1595 char_ranges = (int *) alloca (sizeof (int) * 128 * 2);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1596 for (i = 129; i < 0400; i++)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1597 {
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105426
diff changeset
1598 c = BYTE8_TO_CHAR (i);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1599 fastmap[CHAR_LEADING_CODE (c)] = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1600 if (i - range_start_byte != c - range_start_char)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1601 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1602 char_ranges[n_char_ranges++] = range_start_char;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1603 char_ranges[n_char_ranges++] = ((i - 1 - range_start_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1604 + range_start_char);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1605 range_start_byte = i;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1606 range_start_char = c;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1607 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1608 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1609 char_ranges[n_char_ranges++] = range_start_char;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1610 char_ranges[n_char_ranges++] = ((i - 1 - range_start_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1611 + range_start_char);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1612 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1613 }
89622
96081c0be5ca (skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1614 else /* STRING is multibyte */
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1615 {
89622
96081c0be5ca (skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1616 char_ranges = (int *) alloca (sizeof (int) * SCHARS (string) * 2);
96081c0be5ca (skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1617
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1618 while (i_byte < size_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1619 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1620 unsigned char leading_code;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1621
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1622 leading_code = str[i_byte];
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1623 c = STRING_CHAR_AND_LENGTH (str + i_byte, len);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1624 i_byte += len;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1625
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1626 if (handle_iso_classes && c == '['
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1627 && i_byte < size_byte
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1628 && STRING_CHAR (str + i_byte) == ':')
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1629 {
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1630 const unsigned char *class_beg = str + i_byte + 1;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1631 const unsigned char *class_end = class_beg;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1632 const unsigned char *class_limit = str + size_byte - 2;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1633 /* Leave room for the null. */
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1634 unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1];
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1635 re_wctype_t cc;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1636
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1637 if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH)
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1638 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1639
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1640 while (class_end < class_limit
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1641 && *class_end >= 'a' && *class_end <= 'z')
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1642 class_end++;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1643
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1644 if (class_end == class_beg
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1645 || *class_end != ':' || class_end[1] != ']')
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1646 goto not_a_class_name_multibyte;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1647
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1648 memcpy (class_name, class_beg, class_end - class_beg);
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1649 class_name[class_end - class_beg] = 0;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1650
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1651 cc = re_wctype (class_name);
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1652 if (cc == 0)
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1653 error ("Invalid ISO C character class");
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1654
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1655 iso_classes = Fcons (make_number (cc), iso_classes);
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1656
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1657 i_byte = class_end + 2 - str;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1658 continue;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1659 }
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1660
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1661 not_a_class_name_multibyte:
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1662 if (c == '\\')
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1663 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1664 if (i_byte == size_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1665 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1666
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1667 leading_code = str[i_byte];
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1668 c = STRING_CHAR_AND_LENGTH (str + i_byte, len);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1669 i_byte += len;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1670 }
89880
51677cb10ced Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89622
diff changeset
1671 /* Treat `-' as range character only if another character
51677cb10ced Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89622
diff changeset
1672 follows. */
51677cb10ced Sync to HEAD.
Kenichi Handa <handa@m17n.org>
parents: 89622
diff changeset
1673 if (i_byte + 1 < size_byte
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1674 && str[i_byte] == '-')
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1675 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1676 unsigned int c2;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1677 unsigned char leading_code2;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1678
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1679 /* Skip over the dash. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1680 i_byte++;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1681
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1682 /* Get the end of the range. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1683 leading_code2 = str[i_byte];
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1684 c2 = STRING_CHAR_AND_LENGTH (str + i_byte, len);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1685 i_byte += len;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1686
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1687 if (c2 == '\\'
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1688 && i_byte < size_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1689 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1690 leading_code2 = str[i_byte];
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1691 c2 =STRING_CHAR_AND_LENGTH (str + i_byte, len);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1692 i_byte += len;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1693 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1694
89622
96081c0be5ca (skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1695 if (c > c2)
96081c0be5ca (skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
1696 continue;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1697 if (ASCII_CHAR_P (c))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1698 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1699 while (c <= c2 && c < 0x80)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1700 fastmap[c++] = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1701 leading_code = CHAR_LEADING_CODE (c);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1702 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1703 if (! ASCII_CHAR_P (c))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1704 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1705 while (leading_code <= leading_code2)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1706 fastmap[leading_code++] = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1707 if (c <= c2)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1708 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1709 char_ranges[n_char_ranges++] = c;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1710 char_ranges[n_char_ranges++] = c2;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1711 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1712 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1713 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1714 else
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1715 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1716 if (ASCII_CHAR_P (c))
30626
9d47c133b357 * syntax.c (skip_chars): Fix previous change. Make the handling of
Kenichi Handa <handa@m17n.org>
parents: 30596
diff changeset
1717 fastmap[c] = 1;
9d47c133b357 * syntax.c (skip_chars): Fix previous change. Make the handling of
Kenichi Handa <handa@m17n.org>
parents: 30596
diff changeset
1718 else
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
1719 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1720 fastmap[leading_code] = 1;
20626
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1721 char_ranges[n_char_ranges++] = c;
a39bcf9c0e1e (skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents: 20546
diff changeset
1722 char_ranges[n_char_ranges++] = c;
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
1723 }
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
1724 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1725 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1726
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1727 /* If the current range is unibyte and STRING contains non-ASCII
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1728 chars, arrange fastmap for the corresponding unibyte
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1729 chars. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1730
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1731 if (! multibyte && n_char_ranges > 0)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1732 {
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1733 memset (fastmap + 0200, 0, 0200);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1734 for (i = 0; i < n_char_ranges; i += 2)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1735 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1736 int c1 = char_ranges[i];
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1737 int c2 = char_ranges[i + 1];
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1738
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1739 for (; c1 <= c2; c1++)
95856
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
1740 {
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
1741 int b = CHAR_TO_BYTE_SAFE (c1);
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
1742 if (b >= 0)
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
1743 fastmap[b] = 1;
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
1744 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1745 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1746 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1747 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1748
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1749 /* If ^ was the first character, complement the fastmap. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1750 if (negate)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1751 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1752 if (! multibyte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1753 for (i = 0; i < sizeof fastmap; i++)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1754 fastmap[i] ^= 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1755 else
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1756 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1757 for (i = 0; i < 0200; i++)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1758 fastmap[i] ^= 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1759 /* All non-ASCII chars possibly match. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1760 for (; i < sizeof fastmap; i++)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1761 fastmap[i] = 1;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1762 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1763 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1764
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1765 {
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1766 EMACS_INT start_point = PT;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1767 EMACS_INT pos = PT;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1768 EMACS_INT pos_byte = PT_BYTE;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1769 unsigned char *p = PT_ADDR, *endp, *stop;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1770
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1771 if (forwardp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1772 {
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1773 endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1774 stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1775 }
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1776 else
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1777 {
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1778 endp = CHAR_POS_ADDR (XINT (lim));
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1779 stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1780 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1781
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1782 immediate_quit = 1;
107335
230cb6c59526 (skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
1783 /* This code may look up syntax tables using macros that rely on the
230cb6c59526 (skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
1784 gl_state object. To make sure this object is not out of date,
230cb6c59526 (skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
1785 let's initialize it manually.
230cb6c59526 (skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
1786 We ignore syntax-table text-properties for now, since that's
230cb6c59526 (skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
1787 what we've done in the past. */
107366
14ff9accfbd3 Cleanup setup of gl_state in various parts of the code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107335
diff changeset
1788 SETUP_BUFFER_SYNTAX_TABLE ();
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1789 if (forwardp)
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1790 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1791 if (multibyte)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1792 while (1)
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1793 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1794 int nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1795
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1796 if (p >= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1797 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1798 if (p >= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1799 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1800 p = GAP_END_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1801 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1802 }
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1803 c = STRING_CHAR_AND_LENGTH (p, nbytes);
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1804 if (! NILP (iso_classes) && in_classes (c, iso_classes))
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1805 {
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1806 if (negate)
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1807 break;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1808 else
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1809 goto fwd_ok;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1810 }
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1811
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1812 if (! fastmap[*p])
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1813 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1814 if (! ASCII_CHAR_P (c))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1815 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1816 /* As we are looking at a multibyte character, we
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1817 must look up the character in the table
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1818 CHAR_RANGES. If there's no data in the table,
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1819 that character is not what we want to skip. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1820
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1821 /* The following code do the right thing even if
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1822 n_char_ranges is zero (i.e. no data in
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1823 CHAR_RANGES). */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1824 for (i = 0; i < n_char_ranges; i += 2)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1825 if (c >= char_ranges[i] && c <= char_ranges[i + 1])
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1826 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1827 if (!(negate ^ (i < n_char_ranges)))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1828 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1829 }
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1830 fwd_ok:
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1831 p += nbytes, pos++, pos_byte += nbytes;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1832 }
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1833 else
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1834 while (1)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1835 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1836 if (p >= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1837 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1838 if (p >= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1839 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1840 p = GAP_END_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1841 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1842 }
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1843
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1844 if (!NILP (iso_classes) && in_classes (*p, iso_classes))
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1845 {
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1846 if (negate)
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1847 break;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1848 else
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1849 goto fwd_unibyte_ok;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1850 }
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1851
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1852 if (!fastmap[*p])
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1853 break;
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1854 fwd_unibyte_ok:
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1855 p++, pos++, pos_byte++;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1856 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1857 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1858 else
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1859 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1860 if (multibyte)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1861 while (1)
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1862 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1863 unsigned char *prev_p;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1864
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1865 if (p <= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1866 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1867 if (p <= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1868 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1869 p = GPT_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1870 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1871 }
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1872 prev_p = p;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1873 while (--p >= stop && ! CHAR_HEAD_P (*p));
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1874 c = STRING_CHAR (p);
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1875
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1876 if (! NILP (iso_classes) && in_classes (c, iso_classes))
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1877 {
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1878 if (negate)
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1879 break;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1880 else
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1881 goto back_ok;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1882 }
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1883
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1884 if (! fastmap[*p])
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1885 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1886 if (! ASCII_CHAR_P (c))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1887 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1888 /* See the comment in the previous similar code. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1889 for (i = 0; i < n_char_ranges; i += 2)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1890 if (c >= char_ranges[i] && c <= char_ranges[i + 1])
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1891 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1892 if (!(negate ^ (i < n_char_ranges)))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1893 break;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1894 }
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1895 back_ok:
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1896 pos--, pos_byte -= prev_p - p;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1897 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1898 else
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1899 while (1)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1900 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1901 if (p <= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1902 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1903 if (p <= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1904 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1905 p = GPT_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1906 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1907 }
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1908
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1909 if (! NILP (iso_classes) && in_classes (p[-1], iso_classes))
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1910 {
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1911 if (negate)
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1912 break;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1913 else
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1914 goto back_unibyte_ok;
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1915 }
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1916
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1917 if (!fastmap[p[-1]])
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1918 break;
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
1919 back_unibyte_ok:
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1920 p--, pos--, pos_byte--;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1921 }
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
1922 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1923
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1924 SET_PT_BOTH (pos, pos_byte);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1925 immediate_quit = 0;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1926
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1927 return make_number (PT - start_point);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1928 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1929 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1930
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1931
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1932 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
1933 skip_syntaxes (int forwardp, Lisp_Object string, Lisp_Object lim)
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1934 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1935 register unsigned int c;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1936 unsigned char fastmap[0400];
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1937 int negate = 0;
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1938 register EMACS_INT i, i_byte;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1939 int multibyte;
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1940 EMACS_INT size_byte;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1941 unsigned char *str;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1942
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1943 CHECK_STRING (string);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1944
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1945 if (NILP (lim))
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1946 XSETINT (lim, forwardp ? ZV : BEGV);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1947 else
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1948 CHECK_NUMBER_COERCE_MARKER (lim);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1949
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1950 /* In any case, don't allow scan outside bounds of buffer. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1951 if (XINT (lim) > ZV)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1952 XSETFASTINT (lim, ZV);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1953 if (XINT (lim) < BEGV)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1954 XSETFASTINT (lim, BEGV);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1955
89114
099689a1feb6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89113
diff changeset
1956 if (forwardp ? (PT >= XFASTINT (lim)) : (PT <= XFASTINT (lim)))
90041
7e61e1c97f6b (skip_syntaxes): Return lispy 0 (not nil) if point is
Kenichi Handa <handa@m17n.org>
parents: 89966
diff changeset
1957 return make_number (0);
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
1958
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1959 multibyte = (!NILP (current_buffer->enable_multibyte_characters)
89341
9664825d832f (skip_chars, skip_syntaxes): Fix type errors.
Dave Love <fx@gnu.org>
parents: 89114
diff changeset
1960 && (XINT (lim) - PT != CHAR_TO_BYTE (XINT (lim)) - PT_BYTE));
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1961
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109139
diff changeset
1962 memset (fastmap, 0, sizeof fastmap);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1963
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1964 if (SBYTES (string) > SCHARS (string))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1965 /* As this is very rare case (syntax spec is ASCII only), don't
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1966 consider efficiency. */
89103
c4712a200dcb (skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89072
diff changeset
1967 string = string_make_unibyte (string);
c4712a200dcb (skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89072
diff changeset
1968
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1969 str = SDATA (string);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1970 size_byte = SBYTES (string);
89103
c4712a200dcb (skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89072
diff changeset
1971
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1972 i_byte = 0;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1973 if (i_byte < size_byte
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1974 && SREF (string, 0) == '^')
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1975 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1976 negate = 1; i_byte++;
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1977 }
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1978
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1979 /* Find the syntaxes specified and set their elements of fastmap. */
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1980
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1981 while (i_byte < size_byte)
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1982 {
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
1983 c = str[i_byte++];
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
1984 fastmap[syntax_spec_code[c]] = 1;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1985 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1986
31944
05763e780521 (skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents: 31209
diff changeset
1987 /* If ^ was the first character, complement the fastmap. */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1988 if (negate)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1989 for (i = 0; i < sizeof fastmap; i++)
31944
05763e780521 (skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents: 31209
diff changeset
1990 fastmap[i] ^= 1;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1991
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
1992 {
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1993 EMACS_INT start_point = PT;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1994 EMACS_INT pos = PT;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
1995 EMACS_INT pos_byte = PT_BYTE;
50675
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
1996 unsigned char *p = PT_ADDR, *endp, *stop;
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
1997
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
1998 if (forwardp)
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
1999 {
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2000 endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));
55423
a9e10b866486 (Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54849
diff changeset
2001 stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp;
50675
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2002 }
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2003 else
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2004 {
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2005 endp = CHAR_POS_ADDR (XINT (lim));
55423
a9e10b866486 (Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54849
diff changeset
2006 stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp;
50675
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2007 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2008
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2009 immediate_quit = 1;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2010 SETUP_SYNTAX_TABLE (pos, forwardp ? 1 : -1);
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2011 if (forwardp)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2012 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2013 if (multibyte)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2014 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2015 while (1)
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2016 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2017 int nbytes;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2018
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2019 if (p >= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2020 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2021 if (p >= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2022 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2023 p = GAP_END_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2024 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2025 }
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
2026 c = STRING_CHAR_AND_LENGTH (p, nbytes);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2027 if (! fastmap[(int) SYNTAX (c)])
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2028 break;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2029 p += nbytes, pos++, pos_byte += nbytes;
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2030 UPDATE_SYNTAX_TABLE_FORWARD (pos);
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2031 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2032 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2033 else
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2034 {
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2035 while (1)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2036 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2037 if (p >= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2038 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2039 if (p >= endp)
50675
96dc22fa49d3 (skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents: 49971
diff changeset
2040 break;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2041 p = GAP_END_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2042 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2043 }
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2044 if (! fastmap[(int) SYNTAX (*p)])
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2045 break;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2046 p++, pos++, pos_byte++;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2047 UPDATE_SYNTAX_TABLE_FORWARD (pos);
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
2048 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2049 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2050 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2051 else
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2052 {
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2053 if (multibyte)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2054 {
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2055 while (1)
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
2056 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2057 unsigned char *prev_p;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2058
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2059 if (p <= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2060 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2061 if (p <= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2062 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2063 p = GPT_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2064 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2065 }
90851
31beec9ee600 Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90846 77927
diff changeset
2066 UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2067 prev_p = p;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2068 while (--p >= stop && ! CHAR_HEAD_P (*p));
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
2069 c = STRING_CHAR (p);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2070 if (! fastmap[(int) SYNTAX (c)])
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2071 break;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2072 pos--, pos_byte -= prev_p - p;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2073 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2074 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2075 else
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2076 {
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2077 while (1)
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2078 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2079 if (p <= stop)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2080 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2081 if (p <= endp)
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2082 break;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2083 p = GPT_ADDR;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2084 stop = endp;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2085 }
90846
c035421fe210 (skip_syntaxes): Synch with the trunk.
Kenichi Handa <handa@m17n.org>
parents: 90737
diff changeset
2086 UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2087 if (! fastmap[(int) SYNTAX (p[-1])])
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2088 break;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2089 p--, pos--, pos_byte--;
89113
326caaedbfef (skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89112
diff changeset
2090 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2091 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2092 }
17564
050f15e0b948 (skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents: 17466
diff changeset
2093
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2094 SET_PT_BOTH (pos, pos_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2095 immediate_quit = 0;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2096
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2097 return make_number (PT - start_point);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2098 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2099 }
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2100
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2101 /* Return 1 if character C belongs to one of the ISO classes
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2102 in the list ISO_CLASSES. Each class is represented by an
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2103 integer which is its type according to re_wctype. */
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2104
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2105 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2106 in_classes (int c, Lisp_Object iso_classes)
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2107 {
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2108 int fits_class = 0;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2109
107335
230cb6c59526 (skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106815
diff changeset
2110 while (CONSP (iso_classes))
56088
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2111 {
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2112 Lisp_Object elt;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2113 elt = XCAR (iso_classes);
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2114 iso_classes = XCDR (iso_classes);
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2115
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2116 if (re_iswctype (c, XFASTINT (elt)))
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2117 fits_class = 1;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2118 }
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2119
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2120 return fits_class;
a7a676c680d4 Include regex.h.
Richard M. Stallman <rms@gnu.org>
parents: 56067
diff changeset
2121 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2122
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2123 /* Jump over a comment, assuming we are at the beginning of one.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2124 FROM is the current position.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2125 FROM_BYTE is the bytepos corresponding to FROM.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2126 Do not move past STOP (a charpos).
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2127 The comment over which we have to jump is of style STYLE
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2128 (either SYNTAX_FLAGS_COMMENT_STYLE(foo) or ST_COMMENT_STYLE).
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2129 NESTING should be positive to indicate the nesting at the beginning
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2130 for nested comments and should be zero or negative else.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2131 ST_COMMENT_STYLE cannot be nested.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2132 PREV_SYNTAX is the SYNTAX_WITH_FLAGS of the previous character
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2133 (or 0 If the search cannot start in the middle of a two-character).
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2134
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2135 If successful, return 1 and store the charpos of the comment's end
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2136 into *CHARPOS_PTR and the corresponding bytepos into *BYTEPOS_PTR.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2137 Else, return 0 and store the charpos STOP into *CHARPOS_PTR, the
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2138 corresponding bytepos into *BYTEPOS_PTR and the current nesting
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2139 (as defined for state.incomment) in *INCOMMENT_PTR.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2140
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2141 The comment end is the last character of the comment rather than the
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2142 character just after the comment.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2143
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2144 Global syntax data is assumed to initially be valid for FROM and
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2145 remains valid for forward search starting at the returned position. */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2146
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2147 static int
109139
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
2148 forw_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
2149 int nesting, int style, int prev_syntax,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
2150 EMACS_INT *charpos_ptr, EMACS_INT *bytepos_ptr,
c25c24812fb1 Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
2151 int *incomment_ptr)
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2152 {
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2153 register int c, c1;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2154 register enum syntaxcode code;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2155 register int syntax, other_syntax;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2156
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2157 if (nesting <= 0) nesting = -1;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2158
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2159 /* Enter the loop in the middle so that we find
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2160 a 2-char comment ender if we start in the middle of it. */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2161 syntax = prev_syntax;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2162 if (syntax != 0) goto forw_incomment;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2163
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2164 while (1)
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2165 {
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2166 if (from == stop)
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2167 {
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2168 *incomment_ptr = nesting;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2169 *charpos_ptr = from;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2170 *bytepos_ptr = from_byte;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2171 return 0;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2172 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2173 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2174 syntax = SYNTAX_WITH_FLAGS (c);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2175 code = syntax & 0xff;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2176 if (code == Sendcomment
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2177 && SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0) == style
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2178 && (SYNTAX_FLAGS_COMMENT_NESTED (syntax) ?
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2179 (nesting > 0 && --nesting == 0) : nesting < 0))
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2180 /* we have encountered a comment end of the same style
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2181 as the comment sequence which began this comment
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2182 section */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2183 break;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2184 if (code == Scomment_fence
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2185 && style == ST_COMMENT_STYLE)
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2186 /* we have encountered a comment end of the same style
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2187 as the comment sequence which began this comment
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2188 section. */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2189 break;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2190 if (nesting > 0
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2191 && code == Scomment
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2192 && SYNTAX_FLAGS_COMMENT_NESTED (syntax)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2193 && SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0) == style)
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2194 /* we have encountered a nested comment of the same style
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2195 as the comment sequence which began this comment section */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2196 nesting++;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2197 INC_BOTH (from, from_byte);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2198 UPDATE_SYNTAX_TABLE_FORWARD (from);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2199
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2200 forw_incomment:
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2201 if (from < stop && SYNTAX_FLAGS_COMEND_FIRST (syntax)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2202 && (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte),
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2203 other_syntax = SYNTAX_WITH_FLAGS (c1),
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2204 SYNTAX_FLAGS_COMEND_SECOND (other_syntax))
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2205 && SYNTAX_FLAGS_COMMENT_STYLE (syntax, other_syntax) == style
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2206 && ((SYNTAX_FLAGS_COMMENT_NESTED (syntax) ||
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2207 SYNTAX_FLAGS_COMMENT_NESTED (other_syntax))
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2208 ? nesting > 0 : nesting < 0))
25771
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2209 {
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2210 if (--nesting <= 0)
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2211 /* we have encountered a comment end of the same style
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2212 as the comment sequence which began this comment
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2213 section */
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2214 break;
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2215 else
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2216 {
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2217 INC_BOTH (from, from_byte);
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2218 UPDATE_SYNTAX_TABLE_FORWARD (from);
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2219 }
21925339c7d2 (update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
2220 }
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2221 if (nesting > 0
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2222 && from < stop
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2223 && SYNTAX_FLAGS_COMSTART_FIRST (syntax)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
2224 && (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte),
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2225 other_syntax = SYNTAX_WITH_FLAGS (c1),
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2226 SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax) == style
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2227 && SYNTAX_FLAGS_COMSTART_SECOND (other_syntax))
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2228 && (SYNTAX_FLAGS_COMMENT_NESTED (syntax) ||
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2229 SYNTAX_FLAGS_COMMENT_NESTED (other_syntax)))
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2230 /* we have encountered a nested comment of the same style
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2231 as the comment sequence which began this comment
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2232 section */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2233 {
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2234 INC_BOTH (from, from_byte);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2235 UPDATE_SYNTAX_TABLE_FORWARD (from);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2236 nesting++;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2237 }
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2238 }
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2239 *charpos_ptr = from;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2240 *bytepos_ptr = from_byte;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2241 return 1;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2242 }
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2243
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2244 DEFUN ("forward-comment", Fforward_comment, Sforward_comment, 1, 1, 0,
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49551
diff changeset
2245 doc: /*
48089
8bd7557b4421 (Fforward_comment): Doc fix.
Dave Love <fx@gnu.org>
parents: 47942
diff changeset
2246 Move forward across up to COUNT comments. If COUNT is negative, move backward.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2247 Stop scanning if we find something other than a comment or whitespace.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2248 Set point to where scanning stops.
48089
8bd7557b4421 (Fforward_comment): Doc fix.
Dave Love <fx@gnu.org>
parents: 47942
diff changeset
2249 If COUNT comments are found as expected, with nothing except whitespace
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2250 between them, return t; otherwise return nil. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2251 (Lisp_Object count)
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2252 {
71739
a5eb5d8b1eca (Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71734
diff changeset
2253 register EMACS_INT from;
a5eb5d8b1eca (Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71734
diff changeset
2254 EMACS_INT from_byte;
a5eb5d8b1eca (Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71734
diff changeset
2255 register EMACS_INT stop;
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
2256 register int c, c1;
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2257 register enum syntaxcode code;
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2258 int comstyle = 0; /* style of comment encountered */
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2259 int comnested = 0; /* whether the comment is nestable or not */
3087
ea0cb469490e (Fforward_comment): Fix last change.
Richard M. Stallman <rms@gnu.org>
parents: 3086
diff changeset
2260 int found;
71739
a5eb5d8b1eca (Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71734
diff changeset
2261 EMACS_INT count1;
a5eb5d8b1eca (Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71734
diff changeset
2262 EMACS_INT out_charpos, out_bytepos;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2263 int dummy;
3095
ef7d99920f81 (Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents: 3087
diff changeset
2264
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
2265 CHECK_NUMBER (count);
3095
ef7d99920f81 (Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents: 3087
diff changeset
2266 count1 = XINT (count);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2267 stop = count1 > 0 ? ZV : BEGV;
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2268
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2269 immediate_quit = 1;
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2270 QUIT;
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2271
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2272 from = PT;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2273 from_byte = PT_BYTE;
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2274
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2275 SETUP_SYNTAX_TABLE (from, count1);
3095
ef7d99920f81 (Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents: 3087
diff changeset
2276 while (count1 > 0)
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2277 {
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2278 do
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2279 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2280 int comstart_first, syntax, other_syntax;
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2281
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2282 if (from == stop)
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2283 {
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2284 SET_PT_BOTH (from, from_byte);
10947
e805ef6b931c (Fforward_comment): Always clear immediate_quit for return.
Richard M. Stallman <rms@gnu.org>
parents: 10457
diff changeset
2285 immediate_quit = 0;
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2286 return Qnil;
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2287 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2288 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2289 syntax = SYNTAX_WITH_FLAGS (c);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2290 code = SYNTAX (c);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2291 comstart_first = SYNTAX_FLAGS_COMSTART_FIRST (syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2292 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2293 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2294 INC_BOTH (from, from_byte);
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2295 UPDATE_SYNTAX_TABLE_FORWARD (from);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2296 if (from < stop && comstart_first
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2297 && (c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte),
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2298 other_syntax = SYNTAX_WITH_FLAGS (c1),
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2299 SYNTAX_FLAGS_COMSTART_SECOND (other_syntax)))
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2300 {
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2301 /* We have encountered a comment start sequence and we
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2302 are ignoring all text inside comments. We must record
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2303 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
2304 only a comment end of the same style actually ends
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2305 the comment section. */
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2306 code = Scomment;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2307 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2308 comnested
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2309 = comnested || SYNTAX_FLAGS_COMMENT_NESTED (other_syntax);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2310 INC_BOTH (from, from_byte);
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2311 UPDATE_SYNTAX_TABLE_FORWARD (from);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2312 }
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2313 }
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2314 while (code == Swhitespace || (code == Sendcomment && c == '\n'));
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2315
25290
a80acb2a8273 (Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents: 24728
diff changeset
2316 if (code == Scomment_fence)
a80acb2a8273 (Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents: 24728
diff changeset
2317 comstyle = ST_COMMENT_STYLE;
a80acb2a8273 (Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents: 24728
diff changeset
2318 else if (code != Scomment)
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2319 {
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2320 immediate_quit = 0;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2321 DEC_BOTH (from, from_byte);
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2322 SET_PT_BOTH (from, from_byte);
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2323 return Qnil;
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2324 }
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2325 /* We're at the start of a comment. */
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2326 found = forw_comment (from, from_byte, stop, comnested, comstyle, 0,
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2327 &out_charpos, &out_bytepos, &dummy);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2328 from = out_charpos; from_byte = out_bytepos;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2329 if (!found)
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2330 {
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2331 immediate_quit = 0;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2332 SET_PT_BOTH (from, from_byte);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2333 return Qnil;
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2334 }
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2335 INC_BOTH (from, from_byte);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2336 UPDATE_SYNTAX_TABLE_FORWARD (from);
6142
2dbc79d01191 (Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents: 5755
diff changeset
2337 /* We have skipped one comment. */
3095
ef7d99920f81 (Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents: 3087
diff changeset
2338 count1--;
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2339 }
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2340
3095
ef7d99920f81 (Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents: 3087
diff changeset
2341 while (count1 < 0)
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2342 {
18938
444939f3c18f (Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents: 18738
diff changeset
2343 while (1)
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2344 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2345 int quoted, syntax;
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2346
18938
444939f3c18f (Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents: 18738
diff changeset
2347 if (from <= stop)
444939f3c18f (Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents: 18738
diff changeset
2348 {
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2349 SET_PT_BOTH (BEGV, BEGV_BYTE);
18938
444939f3c18f (Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents: 18738
diff changeset
2350 immediate_quit = 0;
444939f3c18f (Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents: 18738
diff changeset
2351 return Qnil;
444939f3c18f (Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents: 18738
diff changeset
2352 }
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2353
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2354 DEC_BOTH (from, from_byte);
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2355 /* char_quoted does UPDATE_SYNTAX_TABLE_BACKWARD (from). */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2356 quoted = char_quoted (from, from_byte);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2357 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2358 syntax = SYNTAX_WITH_FLAGS (c);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2359 code = SYNTAX (c);
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2360 comstyle = 0;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2361 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax);
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2362 if (code == Sendcomment)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2363 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2364 if (from > stop && SYNTAX_FLAGS_COMEND_SECOND (syntax)
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2365 && prev_char_comend_first (from, from_byte)
22432
ac339ec4a12a (Fforward_comment): Properly compute BYTEPOS arg to char_quoted.
Richard M. Stallman <rms@gnu.org>
parents: 22394
diff changeset
2366 && !char_quoted (from - 1, dec_bytepos (from_byte)))
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2367 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2368 int other_syntax;
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2369 /* We must record the comment style encountered so that
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2370 later, we can match only the proper comment begin
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2371 sequence of the same style. */
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2372 DEC_BOTH (from, from_byte);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2373 code = Sendcomment;
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2374 /* Calling char_quoted, above, set up global syntax position
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2375 at the new value of FROM. */
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2376 c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2377 other_syntax = SYNTAX_WITH_FLAGS (c1);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2378 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2379 comnested
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2380 = comnested || SYNTAX_FLAGS_COMMENT_NESTED (other_syntax);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2381 }
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2382
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2383 if (code == Scomment_fence)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2384 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2385 /* Skip until first preceding unquoted comment_fence. */
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2386 int found = 0;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2387 EMACS_INT ini = from, ini_byte = from_byte;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2388
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2389 while (1)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2390 {
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2391 DEC_BOTH (from, from_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2392 UPDATE_SYNTAX_TABLE_BACKWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2393 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2394 if (SYNTAX (c) == Scomment_fence
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2395 && !char_quoted (from, from_byte))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2396 {
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2397 found = 1;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2398 break;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2399 }
70317
48f9beb0cfdc (Fforward_comment): Detect generic comment at beginning of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70291
diff changeset
2400 else if (from == stop)
48f9beb0cfdc (Fforward_comment): Detect generic comment at beginning of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 70291
diff changeset
2401 break;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2402 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2403 if (found == 0)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2404 {
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2405 from = ini; /* Set point to ini + 1. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2406 from_byte = ini_byte;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2407 goto leave;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2408 }
70291
e4dbfbc6b5c6 (Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
2409 else
e4dbfbc6b5c6 (Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
2410 /* We have skipped one comment. */
e4dbfbc6b5c6 (Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
2411 break;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2412 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2413 else if (code == Sendcomment)
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2414 {
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2415 found = back_comment (from, from_byte, stop, comnested, comstyle,
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2416 &out_charpos, &out_bytepos);
27698
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2417 if (found == -1)
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2418 {
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2419 if (c == '\n')
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2420 /* This end-of-line is not an end-of-comment.
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2421 Treat it like a whitespace.
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2422 CC-mode (and maybe others) relies on this behavior. */
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2423 ;
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2424 else
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2425 {
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2426 /* Failure: we should go back to the end of this
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2427 not-quite-endcomment. */
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2428 if (SYNTAX (c) != code)
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2429 /* It was a two-char Sendcomment. */
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2430 INC_BOTH (from, from_byte);
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2431 goto leave;
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2432 }
27698
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2433 }
27719
73926d5a4d9f (Fforward_comment): Undo the previous change, since cc-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27698
diff changeset
2434 else
32086
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2435 {
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2436 /* We have skipped one comment. */
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2437 from = out_charpos, from_byte = out_bytepos;
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2438 break;
73d18e25e303 (forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31944
diff changeset
2439 }
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2440 }
39796
dcc6aae53ac8 (update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
2441 else if (code != Swhitespace || quoted)
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2442 {
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2443 leave:
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2444 immediate_quit = 0;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2445 INC_BOTH (from, from_byte);
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2446 SET_PT_BOTH (from, from_byte);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2447 return Qnil;
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2448 }
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2449 }
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2450
3095
ef7d99920f81 (Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents: 3087
diff changeset
2451 count1++;
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2452 }
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2453
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2454 SET_PT_BOTH (from, from_byte);
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2455 immediate_quit = 0;
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2456 return Qt;
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2457 }
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
2458
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2459 /* Return syntax code of character C if C is an ASCII character
38047
46bbf160c47f Fixed a typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 37532
diff changeset
2460 or `multibyte_symbol_p' is zero. Otherwise, return Ssymbol. */
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2461
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2462 #define SYNTAX_WITH_MULTIBYTE_CHECK(c) \
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2463 ((ASCII_CHAR_P (c) || !multibyte_symbol_p) \
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2464 ? SYNTAX (c) : Ssymbol)
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2465
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2466 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
2467 scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpflag)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2468 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2469 Lisp_Object val;
71740
df55df8eb062 (back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71739
diff changeset
2470 register EMACS_INT stop = count > 0 ? ZV : BEGV;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2471 register int c, c1;
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2472 int stringterm;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2473 int quoted;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2474 int mathexit = 0;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2475 register enum syntaxcode code, temp_code;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2476 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
2477 int comstyle = 0; /* style of comment encountered */
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2478 int comnested = 0; /* whether the comment is nestable or not */
71740
df55df8eb062 (back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71739
diff changeset
2479 EMACS_INT temp_pos;
df55df8eb062 (back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71739
diff changeset
2480 EMACS_INT last_good = from;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2481 int found;
71740
df55df8eb062 (back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71739
diff changeset
2482 EMACS_INT from_byte;
df55df8eb062 (back_comment, scan_lists): Also use EMACS_INT for buffer positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71739
diff changeset
2483 EMACS_INT out_bytepos, out_charpos;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2484 int temp, dummy;
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2485 int multibyte_symbol_p = sexpflag && multibyte_syntax_as_symbol;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2486
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2487 if (depth > 0) min_depth = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2488
23404
529689c4a32c (scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents: 22994
diff changeset
2489 if (from > ZV) from = ZV;
529689c4a32c (scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents: 22994
diff changeset
2490 if (from < BEGV) from = BEGV;
529689c4a32c (scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents: 22994
diff changeset
2491
529689c4a32c (scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents: 22994
diff changeset
2492 from_byte = CHAR_TO_BYTE (from);
529689c4a32c (scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents: 22994
diff changeset
2493
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2494 immediate_quit = 1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2495 QUIT;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2496
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2497 SETUP_SYNTAX_TABLE (from, count);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2498 while (count > 0)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2499 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2500 while (from < stop)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2501 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2502 int comstart_first, prefix, syntax, other_syntax;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2503 UPDATE_SYNTAX_TABLE_FORWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2504 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2505 syntax = SYNTAX_WITH_FLAGS (c);
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2506 code = SYNTAX_WITH_MULTIBYTE_CHECK (c);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2507 comstart_first = SYNTAX_FLAGS_COMSTART_FIRST (syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2508 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2509 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2510 prefix = SYNTAX_FLAGS_PREFIX (syntax);
16992
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
2511 if (depth == min_depth)
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
2512 last_good = from;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2513 INC_BOTH (from, from_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2514 UPDATE_SYNTAX_TABLE_FORWARD (from);
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2515 if (from < stop && comstart_first
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
2516 && (c = FETCH_CHAR_AS_MULTIBYTE (from_byte),
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2517 other_syntax = SYNTAX_WITH_FLAGS (c),
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2518 SYNTAX_FLAGS_COMSTART_SECOND (other_syntax))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2519 && 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
2520 {
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2521 /* we have encountered a comment start sequence and we
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2522 are ignoring all text inside comments. We must record
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2523 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
2524 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
2525 the comment section */
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2526 code = Scomment;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2527 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2528 comnested
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2529 = comnested || SYNTAX_FLAGS_COMMENT_NESTED (other_syntax);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2530 INC_BOTH (from, from_byte);
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2531 UPDATE_SYNTAX_TABLE_FORWARD (from);
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2532 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2533
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2534 if (prefix)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2535 continue;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2536
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 9863
diff changeset
2537 switch (SWITCH_ENUM_CAST (code))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2538 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2539 case Sescape:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2540 case Scharquote:
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2541 if (from == stop)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2542 goto lose;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2543 INC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2544 /* treat following character as a word constituent */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2545 case Sword:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2546 case Ssymbol:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2547 if (depth || !sexpflag) break;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2548 /* This word counts as a sexp; return at end of it. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2549 while (from < stop)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2550 {
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2551 UPDATE_SYNTAX_TABLE_FORWARD (from);
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2552
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2553 /* Some compilers can't handle this inside the switch. */
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2554 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2555 temp = SYNTAX_WITH_MULTIBYTE_CHECK (c);
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2556 switch (temp)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2557 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2558 case Scharquote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2559 case Sescape:
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2560 INC_BOTH (from, from_byte);
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2561 if (from == stop)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2562 goto lose;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2563 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2564 case Sword:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2565 case Ssymbol:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2566 case Squote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2567 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2568 default:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2569 goto done;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2570 }
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2571 INC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2572 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2573 goto done;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2574
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2575 case Scomment_fence:
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2576 comstyle = ST_COMMENT_STYLE;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2577 /* FALLTHROUGH */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2578 case Scomment:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2579 if (!parse_sexp_ignore_comments) break;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2580 UPDATE_SYNTAX_TABLE_FORWARD (from);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2581 found = forw_comment (from, from_byte, stop,
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2582 comnested, comstyle, 0,
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2583 &out_charpos, &out_bytepos, &dummy);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2584 from = out_charpos, from_byte = out_bytepos;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2585 if (!found)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2586 {
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2587 if (depth == 0)
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2588 goto done;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2589 goto lose;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2590 }
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2591 INC_BOTH (from, from_byte);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2592 UPDATE_SYNTAX_TABLE_FORWARD (from);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2593 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2594
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2595 case Smath:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2596 if (!sexpflag)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2597 break;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2598 if (from != stop && c == FETCH_CHAR_AS_MULTIBYTE (from_byte))
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2599 {
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2600 INC_BOTH (from, from_byte);
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2601 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2602 if (mathexit)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2603 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2604 mathexit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2605 goto close1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2606 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2607 mathexit = 1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2608
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2609 case Sopen:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2610 if (!++depth) goto done;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2611 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2612
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2613 case Sclose:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2614 close1:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2615 if (!--depth) goto done;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2616 if (depth < min_depth)
71988
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2617 xsignal3 (Qscan_error,
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2618 build_string ("Containing expression ends prematurely"),
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2619 make_number (last_good), make_number (from));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2620 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2621
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2622 case Sstring:
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2623 case Sstring_fence:
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2624 temp_pos = dec_bytepos (from_byte);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2625 stringterm = FETCH_CHAR_AS_MULTIBYTE (temp_pos);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2626 while (1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2627 {
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2628 if (from >= stop)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2629 goto lose;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2630 UPDATE_SYNTAX_TABLE_FORWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2631 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
34398
945b3e6bf3e7 (scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32794
diff changeset
2632 if (code == Sstring
945b3e6bf3e7 (scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32794
diff changeset
2633 ? (c == stringterm
945b3e6bf3e7 (scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32794
diff changeset
2634 && SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring)
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2635 : SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring_fence)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2636 break;
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2637
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2638 /* Some compilers can't handle this inside the switch. */
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2639 temp = SYNTAX_WITH_MULTIBYTE_CHECK (c);
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2640 switch (temp)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2641 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2642 case Scharquote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2643 case Sescape:
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2644 INC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2645 }
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2646 INC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2647 }
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2648 INC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2649 if (!depth && sexpflag) goto done;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2650 break;
47872
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2651 default:
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2652 /* Ignore whitespace, punctuation, quote, endcomment. */
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2653 break;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2654 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2655 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2656
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2657 /* Reached end of buffer. Error if within object, return nil if between */
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2658 if (depth)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2659 goto lose;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2660
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2661 immediate_quit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2662 return Qnil;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2663
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2664 /* End of object reached */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2665 done:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2666 count--;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2667 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2668
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2669 while (count < 0)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2670 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2671 while (from > stop)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2672 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2673 int syntax;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2674 DEC_BOTH (from, from_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2675 UPDATE_SYNTAX_TABLE_BACKWARD (from);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2676 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2677 syntax= SYNTAX_WITH_FLAGS (c);
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2678 code = SYNTAX_WITH_MULTIBYTE_CHECK (c);
16992
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
2679 if (depth == min_depth)
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
2680 last_good = from;
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2681 comstyle = 0;
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2682 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax);
4953
7545290052bf (Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2683 if (code == Sendcomment)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2684 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2685 if (from > stop && SYNTAX_FLAGS_COMEND_SECOND (syntax)
22486
a28020246db1 (skip_chars): Don't examine STRING before verifying that it is a string.
Richard M. Stallman <rms@gnu.org>
parents: 22432
diff changeset
2686 && prev_char_comend_first (from, from_byte)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2687 && 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
2688 {
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2689 /* We must record the comment style encountered so that
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2690 later, we can match only the proper comment begin
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2691 sequence of the same style. */
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2692 int c1, other_syntax;
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2693 DEC_BOTH (from, from_byte);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2694 UPDATE_SYNTAX_TABLE_BACKWARD (from);
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2695 code = Sendcomment;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2696 c1 = FETCH_CHAR_AS_MULTIBYTE (from_byte);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2697 other_syntax = SYNTAX_WITH_FLAGS (c1);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2698 comstyle = SYNTAX_FLAGS_COMMENT_STYLE (other_syntax, syntax);
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2699 comnested
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2700 = comnested || SYNTAX_FLAGS_COMMENT_NESTED (other_syntax);
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2701 }
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2702
20674
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2703 /* Quoting turns anything except a comment-ender
29821
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
2704 into a word character. Note that this cannot be true
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2705 if we decremented FROM in the if-statement above. */
20674
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2706 if (code != Sendcomment && char_quoted (from, from_byte))
47872
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2707 {
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2708 DEC_BOTH (from, from_byte);
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2709 code = Sword;
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2710 }
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
2711 else if (SYNTAX_FLAGS_PREFIX (syntax))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2712 continue;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2713
20674
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2714 switch (SWITCH_ENUM_CAST (code))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2715 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2716 case Sword:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2717 case Ssymbol:
20674
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2718 case Sescape:
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2719 case Scharquote:
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2720 if (depth || !sexpflag) break;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2721 /* This word counts as a sexp; count object finished
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2722 after passing it. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2723 while (from > stop)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2724 {
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2725 temp_pos = from_byte;
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2726 if (! NILP (current_buffer->enable_multibyte_characters))
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2727 DEC_POS (temp_pos);
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2728 else
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2729 temp_pos--;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2730 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2731 c1 = FETCH_CHAR_AS_MULTIBYTE (temp_pos);
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2732 temp_code = SYNTAX_WITH_MULTIBYTE_CHECK (c1);
20674
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2733 /* Don't allow comment-end to be quoted. */
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2734 if (temp_code == Sendcomment)
fa7d4c0ee36c (skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents: 20626
diff changeset
2735 goto done2;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2736 quoted = char_quoted (from - 1, temp_pos);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2737 if (quoted)
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2738 {
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2739 DEC_BOTH (from, from_byte);
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2740 temp_pos = dec_bytepos (temp_pos);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2741 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2742 }
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2743 c1 = FETCH_CHAR_AS_MULTIBYTE (temp_pos);
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2744 temp_code = SYNTAX_WITH_MULTIBYTE_CHECK (c1);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2745 if (! (quoted || temp_code == Sword
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2746 || temp_code == Ssymbol
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2747 || temp_code == Squote))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2748 goto done2;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2749 DEC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2750 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2751 goto done2;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2752
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2753 case Smath:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2754 if (!sexpflag)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2755 break;
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2756 temp_pos = dec_bytepos (from_byte);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2757 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1);
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2758 if (from != stop && c == FETCH_CHAR_AS_MULTIBYTE (temp_pos))
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2759 DEC_BOTH (from, from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2760 if (mathexit)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2761 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2762 mathexit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2763 goto open2;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2764 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2765 mathexit = 1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2766
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2767 case Sclose:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2768 if (!++depth) goto done2;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2769 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2770
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2771 case Sopen:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2772 open2:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2773 if (!--depth) goto done2;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2774 if (depth < min_depth)
71988
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2775 xsignal3 (Qscan_error,
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2776 build_string ("Containing expression ends prematurely"),
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2777 make_number (last_good), make_number (from));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2778 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2779
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2780 case Sendcomment:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2781 if (!parse_sexp_ignore_comments)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2782 break;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2783 found = back_comment (from, from_byte, stop, comnested, comstyle,
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2784 &out_charpos, &out_bytepos);
27698
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2785 /* FIXME: if found == -1, then it really wasn't a comment-end.
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2786 For single-char Sendcomment, we can't do much about it apart
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2787 from skipping the char.
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2788 For 2-char endcomments, we could try again, taking both
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2789 chars as separate entities, but it's a lot of trouble
9c61956399b2 (back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 27080
diff changeset
2790 for very little gain, so we don't bother either. -sm */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2791 if (found != -1)
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2792 from = out_charpos, from_byte = out_bytepos;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2793 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2794
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2795 case Scomment_fence:
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2796 case Sstring_fence:
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2797 while (1)
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2798 {
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2799 if (from == stop)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2800 goto lose;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2801 DEC_BOTH (from, from_byte);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2802 UPDATE_SYNTAX_TABLE_BACKWARD (from);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2803 if (!char_quoted (from, from_byte)
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2804 && (c = FETCH_CHAR_AS_MULTIBYTE (from_byte),
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
2805 SYNTAX_WITH_MULTIBYTE_CHECK (c) == code))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2806 break;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2807 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2808 if (code == Sstring_fence && !depth && sexpflag) goto done2;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2809 break;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2810
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2811 case Sstring:
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2812 stringterm = FETCH_CHAR_AS_MULTIBYTE (from_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2813 while (1)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2814 {
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2815 if (from == stop)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2816 goto lose;
54849
3f107190e71f (scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53508
diff changeset
2817 DEC_BOTH (from, from_byte);
3f107190e71f (scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53508
diff changeset
2818 UPDATE_SYNTAX_TABLE_BACKWARD (from);
3f107190e71f (scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53508
diff changeset
2819 if (!char_quoted (from, from_byte)
89909
68c22ea6027c Sync to HEAD
Kenichi Handa <handa@m17n.org>
parents: 89880
diff changeset
2820 && (stringterm
68c22ea6027c Sync to HEAD
Kenichi Handa <handa@m17n.org>
parents: 89880
diff changeset
2821 == (c = FETCH_CHAR_AS_MULTIBYTE (from_byte)))
34398
945b3e6bf3e7 (scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32794
diff changeset
2822 && SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2823 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2824 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2825 if (!depth && sexpflag) goto done2;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2826 break;
47872
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2827 default:
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2828 /* Ignore whitespace, punctuation, quote, endcomment. */
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
2829 break;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2830 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2831 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2832
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2833 /* Reached start of buffer. Error if within object, return nil if between */
91806
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2834 if (depth)
6c0a55931b1c (scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91327
diff changeset
2835 goto lose;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2836
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2837 immediate_quit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2838 return Qnil;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2839
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2840 done2:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2841 count++;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2842 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2843
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2844
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2845 immediate_quit = 0;
9320
4be3f8f9f090 (Fcopy_syntax_table, Fmodify_syntax_entry, scan_lists, init_syntax_once):
Karl Heuer <kwzh@gnu.org>
parents: 9111
diff changeset
2846 XSETFASTINT (val, from);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2847 return val;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2848
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2849 lose:
71988
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2850 xsignal3 (Qscan_error,
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2851 build_string ("Unbalanced parentheses"),
8d894204c732 (scan_lists): Use xsignal3.
Kim F. Storm <storm@cua.dk>
parents: 71867
diff changeset
2852 make_number (last_good), make_number (from));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2853 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2854
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2855 DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2856 doc: /* Scan from character number FROM by COUNT lists.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2857 Returns the character number of the position thus found.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2858
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2859 If DEPTH is nonzero, paren depth begins counting from that value,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2860 only places where the depth in parentheses becomes zero
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2861 are candidates for stopping; COUNT such places are counted.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2862 Thus, a positive value for DEPTH means go out levels.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2863
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2864 Comments are ignored if `parse-sexp-ignore-comments' is non-nil.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2865
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2866 If the beginning or end of (the accessible part of) the buffer is reached
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2867 and the depth is wrong, an error is signaled.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2868 If the depth is right but the count is not used up, nil is returned. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2869 (Lisp_Object from, Lisp_Object count, Lisp_Object depth)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2870 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
2871 CHECK_NUMBER (from);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
2872 CHECK_NUMBER (count);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
2873 CHECK_NUMBER (depth);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2874
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2875 return scan_lists (XINT (from), XINT (count), XINT (depth), 0);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2876 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2877
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2878 DEFUN ("scan-sexps", Fscan_sexps, Sscan_sexps, 2, 2, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2879 doc: /* Scan from character number FROM by COUNT balanced expressions.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2880 If COUNT is negative, scan backwards.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2881 Returns the character number of the position thus found.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2882
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2883 Comments are ignored if `parse-sexp-ignore-comments' is non-nil.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2884
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2885 If the beginning or end of (the accessible part of) the buffer is reached
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2886 in the middle of a parenthetical grouping, an error is signaled.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2887 If the beginning or end is reached between groupings
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2888 but before count is used up, nil is returned. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2889 (Lisp_Object from, Lisp_Object count)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2890 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
2891 CHECK_NUMBER (from);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
2892 CHECK_NUMBER (count);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2893
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2894 return scan_lists (XINT (from), XINT (count), 0, 1);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2895 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2896
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2897 DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2898 0, 0, 0,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2899 doc: /* Move point backward over any number of chars with prefix syntax.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
2900 This includes chars with "quote" or "prefix" syntax (' or p). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2901 (void)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2902 {
110551
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2903 EMACS_INT beg = BEGV;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2904 EMACS_INT opoint = PT;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2905 EMACS_INT opoint_byte = PT_BYTE;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2906 EMACS_INT pos = PT;
f28cc7ff91f9 Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110533
diff changeset
2907 EMACS_INT pos_byte = PT_BYTE;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2908 int c;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2909
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
2910 if (pos <= beg)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2911 {
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2912 SET_PT_BOTH (opoint, opoint_byte);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2913
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2914 return Qnil;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2915 }
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2916
22370
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2917 SETUP_SYNTAX_TABLE (pos, -1);
1f0dc0251be3 (scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents: 22130
diff changeset
2918
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2919 DEC_BOTH (pos, pos_byte);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2920
21207
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2921 while (!char_quoted (pos, pos_byte)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2922 /* Previous statement updates syntax table. */
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
2923 && ((c = FETCH_CHAR_AS_MULTIBYTE (pos_byte), SYNTAX (c) == Squote)
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2924 || SYNTAX_PREFIX (c)))
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2925 {
21207
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2926 opoint = pos;
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2927 opoint_byte = pos_byte;
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2928
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2929 if (pos + 1 > beg)
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2930 DEC_BOTH (pos, pos_byte);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2931 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2932
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2933 SET_PT_BOTH (opoint, opoint_byte);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2934
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2935 return Qnil;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2936 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2937
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2938 /* Parse forward from FROM / FROM_BYTE to END,
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
2939 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
2940 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
2941 If STOPBEFORE is nonzero, stop at the start of an atom.
20475
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
2942 If COMMENTSTOP is 1, stop at the start of a comment.
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
2943 If COMMENTSTOP is -1, stop at the start or end of a comment,
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
2944 after the beginning of a string, or after the end of a string. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2945
3720
408c7ee69be7 (scan_lists, Fforward_comment): Pass 0 as commentstop arg
Richard M. Stallman <rms@gnu.org>
parents: 3684
diff changeset
2946 static void
109364
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109179
diff changeset
2947 scan_sexps_forward (struct lisp_parse_state *stateptr,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109179
diff changeset
2948 EMACS_INT from, EMACS_INT from_byte, EMACS_INT end,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109179
diff changeset
2949 int targetdepth, int stopbefore,
89a16701cde1 Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents: 109179
diff changeset
2950 Lisp_Object oldstate, int commentstop)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2951 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2952 struct lisp_parse_state state;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2953
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2954 register enum syntaxcode code;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2955 int c1;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2956 int comnested;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2957 struct level { int last, prev; };
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2958 struct level levelstart[100];
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2959 register struct level *curlevel = levelstart;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2960 struct level *endlevel = levelstart + 100;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2961 register int depth; /* Paren depth of current scanning location.
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2962 level - levelstart equals this except
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2963 when the depth becomes negative. */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2964 int mindepth; /* Lowest DEPTH value seen. */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2965 int start_quoted = 0; /* Nonzero means starting after a char quote */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2966 Lisp_Object tem;
96838
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
2967 EMACS_INT prev_from; /* Keep one character before FROM. */
e39a36c3dcc3 (find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents: 96752
diff changeset
2968 EMACS_INT prev_from_byte;
21207
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
2969 int prev_from_syntax;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2970 int boundary_stop = commentstop == -1;
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
2971 int nofence;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
2972 int found;
71867
c8c21ddb276e (scan_sexps_forward): Use EMACS_INT for out_bytepos and
Andreas Schwab <schwab@suse.de>
parents: 71843
diff changeset
2973 EMACS_INT out_bytepos, out_charpos;
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
2974 int temp;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2975
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2976 prev_from = from;
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2977 prev_from_byte = from_byte;
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2978 if (from != BEGV)
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2979 DEC_BOTH (prev_from, prev_from_byte);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2980
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
2981 /* Use this macro instead of `from++'. */
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2982 #define INC_FROM \
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2983 do { prev_from = from; \
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2984 prev_from_byte = from_byte; \
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
2985 temp = FETCH_CHAR_AS_MULTIBYTE (prev_from_byte); \
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
2986 prev_from_syntax = SYNTAX_WITH_FLAGS (temp); \
20905
e646a6ae42cd (skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents: 20766
diff changeset
2987 INC_BOTH (from, from_byte); \
48266
a404c0056619 (scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48236
diff changeset
2988 if (from < end) \
a404c0056619 (scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48236
diff changeset
2989 UPDATE_SYNTAX_TABLE_FORWARD (from); \
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
2990 } while (0)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2991
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2992 immediate_quit = 1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2993 QUIT;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2994
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 163
diff changeset
2995 if (NILP (oldstate))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2996 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2997 depth = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2998 state.instring = -1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2999 state.incomment = 0;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3000 state.comstyle = 0; /* comment style a by default. */
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3001 state.comstr_start = -1; /* no comment/string seen. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3002 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3003 else
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3004 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3005 tem = Fcar (oldstate);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 163
diff changeset
3006 if (!NILP (tem))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3007 depth = XINT (tem);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3008 else
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3009 depth = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3010
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3011 oldstate = Fcdr (oldstate);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3012 oldstate = Fcdr (oldstate);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3013 oldstate = Fcdr (oldstate);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3014 tem = Fcar (oldstate);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3015 /* Check whether we are inside string_fence-style string: */
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3016 state.instring = (!NILP (tem)
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3017 ? (INTEGERP (tem) ? XINT (tem) : ST_STRING_STYLE)
26272
1cbb1b30793d Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents: 26060
diff changeset
3018 : -1);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3019
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3020 oldstate = Fcdr (oldstate);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3021 tem = Fcar (oldstate);
26272
1cbb1b30793d Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents: 26060
diff changeset
3022 state.incomment = (!NILP (tem)
1cbb1b30793d Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents: 26060
diff changeset
3023 ? (INTEGERP (tem) ? XINT (tem) : -1)
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3024 : 0);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3025
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3026 oldstate = Fcdr (oldstate);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3027 tem = Fcar (oldstate);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 163
diff changeset
3028 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
3029
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3030 /* if the eighth element of the list is nil, we are in comment
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3031 style a. If it is non-nil, we are in comment style b */
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3032 oldstate = Fcdr (oldstate);
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3033 oldstate = Fcdr (oldstate);
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3034 tem = Fcar (oldstate);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3035 state.comstyle = (NILP (tem)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3036 ? 0
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3037 : (EQ (tem, Qsyntax_table)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3038 ? ST_COMMENT_STYLE
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3039 : INTEGERP (tem) ? XINT (tem) : 1));
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3040
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3041 oldstate = Fcdr (oldstate);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3042 tem = Fcar (oldstate);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3043 state.comstr_start = NILP (tem) ? -1 : XINT (tem) ;
22394
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3044 oldstate = Fcdr (oldstate);
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3045 tem = Fcar (oldstate);
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3046 while (!NILP (tem)) /* >= second enclosing sexps. */
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3047 {
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3048 /* curlevel++->last ran into compiler bug on Apollo */
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3049 curlevel->last = XINT (Fcar (tem));
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3050 if (++curlevel == endlevel)
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
3051 curlevel--; /* error ("Nesting too deep for parser"); */
22394
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3052 curlevel->prev = -1;
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3053 curlevel->last = -1;
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3054 tem = Fcdr (tem);
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3055 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3056 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3057 state.quoted = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3058 mindepth = depth;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3059
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3060 curlevel->prev = -1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3061 curlevel->last = -1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3062
22994
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3063 SETUP_SYNTAX_TABLE (prev_from, 1);
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
3064 temp = FETCH_CHAR (prev_from_byte);
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
3065 prev_from_syntax = SYNTAX_WITH_FLAGS (temp);
48266
a404c0056619 (scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48236
diff changeset
3066 UPDATE_SYNTAX_TABLE_FORWARD (from);
22994
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3067
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3068 /* Enter the loop at a place appropriate for initial state. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3069
22994
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3070 if (state.incomment)
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3071 goto startincomment;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3072 if (state.instring >= 0)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3073 {
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3074 nofence = state.instring != ST_STRING_STYLE;
22994
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3075 if (start_quoted)
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3076 goto startquotedinstring;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3077 goto startinstring;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3078 }
22994
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3079 else if (start_quoted)
85f64bf341c3 (scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents: 22547
diff changeset
3080 goto startquoted;
21207
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
3081
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3082 while (from < end)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3083 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3084 int syntax;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3085 INC_FROM;
21207
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
3086 code = prev_from_syntax & 0xff;
18491
bf0d449581c8 (scan_sexps_forward): Split up a complex if-test.
Richard M. Stallman <rms@gnu.org>
parents: 18113
diff changeset
3087
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3088 if (from < end
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3089 && SYNTAX_FLAGS_COMSTART_FIRST (prev_from_syntax)
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3090 && (c1 = FETCH_CHAR (from_byte),
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3091 syntax = SYNTAX_WITH_FLAGS (c1),
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3092 SYNTAX_FLAGS_COMSTART_SECOND (syntax)))
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3093 /* Duplicate code to avoid a complex if-expression
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3094 which causes trouble for the SGI compiler. */
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3095 {
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3096 /* Record the comment style we have entered so that only
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3097 the comment-end sequence of the same style actually
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3098 terminates the comment section. */
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3099 state.comstyle
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3100 = SYNTAX_FLAGS_COMMENT_STYLE (syntax, prev_from_syntax);
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3101 comnested = SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax);
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3102 comnested = comnested || SYNTAX_FLAGS_COMMENT_NESTED (syntax);
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3103 state.incomment = comnested ? 1 : -1;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3104 state.comstr_start = prev_from;
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3105 INC_FROM;
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3106 code = Scomment;
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3107 }
18491
bf0d449581c8 (scan_sexps_forward): Split up a complex if-test.
Richard M. Stallman <rms@gnu.org>
parents: 18113
diff changeset
3108 else if (code == Scomment_fence)
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3109 {
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3110 /* 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
3111 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
3112 terminates the comment section. */
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3113 state.comstyle = ST_COMMENT_STYLE;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3114 state.incomment = -1;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3115 state.comstr_start = prev_from;
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3116 code = Scomment;
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3117 }
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3118 else if (code == Scomment)
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3119 {
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3120 state.comstyle = SYNTAX_FLAGS_COMMENT_STYLE (prev_from_syntax, 0);
57756
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3121 state.incomment = (SYNTAX_FLAGS_COMMENT_NESTED (prev_from_syntax) ?
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3122 1 : -1);
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3123 state.comstr_start = prev_from;
a8bc01ac68d0 (scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56724
diff changeset
3124 }
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3125
21207
390b39d69836 (Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents: 21011
diff changeset
3126 if (SYNTAX_FLAGS_PREFIX (prev_from_syntax))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3127 continue;
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 9863
diff changeset
3128 switch (SWITCH_ENUM_CAST (code))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3129 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3130 case Sescape:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3131 case Scharquote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3132 if (stopbefore) goto stop; /* this arg means stop at sexp start */
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3133 curlevel->last = prev_from;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3134 startquoted:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3135 if (from == end) goto endquoted;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3136 INC_FROM;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3137 goto symstarted;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3138 /* treat following character as a word constituent */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3139 case Sword:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3140 case Ssymbol:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3141 if (stopbefore) goto stop; /* this arg means stop at sexp start */
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3142 curlevel->last = prev_from;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3143 symstarted:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3144 while (from < end)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3145 {
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3146 /* Some compilers can't handle this inside the switch. */
89943
4c90ffeb71c5 Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
parents: 89909 56116
diff changeset
3147 temp = FETCH_CHAR_AS_MULTIBYTE (from_byte);
56067
c1e92ca4c785 (char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents: 55423
diff changeset
3148 temp = SYNTAX (temp);
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3149 switch (temp)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3150 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3151 case Scharquote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3152 case Sescape:
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3153 INC_FROM;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3154 if (from == end) goto endquoted;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3155 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3156 case Sword:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3157 case Ssymbol:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3158 case Squote:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3159 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3160 default:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3161 goto symdone;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3162 }
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3163 INC_FROM;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3164 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3165 symdone:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3166 curlevel->prev = curlevel->last;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3167 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3168
47872
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
3169 case Scomment_fence: /* Can't happen because it's handled above. */
29823
5a736b07dbf2 (scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29821
diff changeset
3170 case Scomment:
5a736b07dbf2 (scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29821
diff changeset
3171 if (commentstop || boundary_stop) goto done;
9475
c15caadae3c4 (scan_sexps_forward): At startincomment,
Richard M. Stallman <rms@gnu.org>
parents: 9411
diff changeset
3172 startincomment:
29823
5a736b07dbf2 (scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29821
diff changeset
3173 /* The (from == BEGV) test was to enter the loop in the middle so
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3174 that we find a 2-char comment ender even if we start in the
29821
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
3175 middle of it. We don't want to do that if we're just at the
29823
5a736b07dbf2 (scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29821
diff changeset
3176 beginning of the comment (think of (*) ... (*)). */
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3177 found = forw_comment (from, from_byte, end,
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3178 state.incomment, state.comstyle,
29821
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
3179 (from == BEGV || from < state.comstr_start + 3)
819dfcbd36c7 (describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29757
diff changeset
3180 ? 0 : prev_from_syntax,
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3181 &out_charpos, &out_bytepos, &state.incomment);
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3182 from = out_charpos; from_byte = out_bytepos;
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3183 /* Beware! prev_from and friends are invalid now.
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3184 Luckily, the `done' doesn't use them and the INC_FROM
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3185 sets them to a sane value without looking at them. */
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3186 if (!found) goto done;
29823
5a736b07dbf2 (scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29821
diff changeset
3187 INC_FROM;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3188 state.incomment = 0;
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3189 state.comstyle = 0; /* reset the comment style */
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3190 if (boundary_stop) goto done;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3191 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3192
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3193 case Sopen:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3194 if (stopbefore) goto stop; /* this arg means stop at sexp start */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3195 depth++;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3196 /* curlevel++->last ran into compiler bug on Apollo */
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3197 curlevel->last = prev_from;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3198 if (++curlevel == endlevel)
30156
f59021679260 (back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29835
diff changeset
3199 curlevel--; /* error ("Nesting too deep for parser"); */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3200 curlevel->prev = -1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3201 curlevel->last = -1;
12894
b2a75405de3c (scan_sexps_forward): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 12870
diff changeset
3202 if (targetdepth == depth) goto done;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3203 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3204
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3205 case Sclose:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3206 depth--;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3207 if (depth < mindepth)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3208 mindepth = depth;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3209 if (curlevel != levelstart)
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3210 curlevel--;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3211 curlevel->prev = curlevel->last;
12894
b2a75405de3c (scan_sexps_forward): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 12870
diff changeset
3212 if (targetdepth == depth) goto done;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3213 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3214
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3215 case Sstring:
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3216 case Sstring_fence:
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3217 state.comstr_start = from - 1;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3218 if (stopbefore) goto stop; /* this arg means stop at sexp start */
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3219 curlevel->last = prev_from;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3220 state.instring = (code == Sstring
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
3221 ? (FETCH_CHAR_AS_MULTIBYTE (prev_from_byte))
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3222 : ST_STRING_STYLE);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3223 if (boundary_stop) goto done;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3224 startinstring:
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3225 {
20475
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3226 nofence = state.instring != ST_STRING_STYLE;
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3227
20475
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3228 while (1)
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3229 {
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3230 int c;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3231
20475
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3232 if (from >= end) goto done;
89063
2054397a36be (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents: 89010
diff changeset
3233 c = FETCH_CHAR_AS_MULTIBYTE (from_byte);
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3234 /* Some compilers can't handle this inside the switch. */
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3235 temp = SYNTAX (c);
24148
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3236
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3237 /* Check TEMP here so that if the char has
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3238 a syntax-table property which says it is NOT
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3239 a string character, it does not end the string. */
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3240 if (nofence && c == state.instring && temp == Sstring)
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3241 break;
b69751ec40fe (scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents: 23503
diff changeset
3242
22006
31c39cdc9e11 (scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3243 switch (temp)
20475
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3244 {
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3245 case Sstring_fence:
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3246 if (!nofence) goto string_end;
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3247 break;
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3248 case Scharquote:
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3249 case Sescape:
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3250 INC_FROM;
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3251 startquotedinstring:
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3252 if (from >= end) goto endquoted;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3253 }
20475
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3254 INC_FROM;
efbebc38e077 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 20330
diff changeset
3255 }
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3256 }
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3257 string_end:
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3258 state.instring = -1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3259 curlevel->prev = curlevel->last;
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3260 INC_FROM;
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3261 if (boundary_stop) goto done;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3262 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3263
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3264 case Smath:
47872
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
3265 /* FIXME: We should do something with it. */
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
3266 break;
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
3267 default:
e5d59debb925 (scan_lists): Don't get fooled by a symbol ending with a backslash-quoted char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46555
diff changeset
3268 /* Ignore whitespace, punctuation, quote, endcomment. */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3269 break;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3270 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3271 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3272 goto done;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3273
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3274 stop: /* Here if stopping before start of sexp. */
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3275 from = prev_from; /* We have just fetched the char that starts it; */
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3276 goto done; /* but return the position before it. */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3277
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3278 endquoted:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3279 state.quoted = 1;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3280 done:
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3281 state.depth = depth;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3282 state.mindepth = mindepth;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3283 state.thislevelstart = curlevel->prev;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3284 state.prevlevelstart
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3285 = (curlevel == levelstart) ? -1 : (curlevel - 1)->last;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3286 state.location = from;
22394
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3287 state.levelstarts = Qnil;
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3288 while (--curlevel >= levelstart)
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3289 state.levelstarts = Fcons (make_number (curlevel->last),
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3290 state.levelstarts);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3291 immediate_quit = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3292
1085
91a456e52db1 (scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents: 726
diff changeset
3293 *stateptr = state;
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3294 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3295
3568
3ee951a22a80 (Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents: 3095
diff changeset
3296 DEFUN ("parse-partial-sexp", Fparse_partial_sexp, Sparse_partial_sexp, 2, 6, 0,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3297 doc: /* Parse Lisp syntax starting at FROM until TO; return status of parse at TO.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3298 Parsing stops at TO or when certain criteria are met;
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3299 point is set to where parsing stops.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3300 If fifth arg OLDSTATE is omitted or nil,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3301 parsing assumes that FROM is the beginning of a function.
66525
aaac09f838e0 (Fparse_partial_sexp): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65215
diff changeset
3302 Value is a list of elements describing final state of parsing:
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3303 0. depth in parens.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3304 1. character address of start of innermost containing list; nil if none.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3305 2. character address of start of last complete sexp terminated.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3306 3. non-nil if inside a string.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3307 (it is the character that will terminate the string,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3308 or t if the string should be terminated by a generic string delimiter.)
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3309 4. nil if outside a comment, t if inside a non-nestable comment,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3310 else an integer (the current comment nesting).
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3311 5. t if following a quote character.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3312 6. the minimum paren-depth encountered during this scan.
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3313 7. style of comment, if any.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3314 8. character address of start of comment or string; nil if not in one.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3315 9. Intermediate data for continuation of parsing (subject to change).
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3316 If third arg TARGETDEPTH is non-nil, parsing stops if the depth
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3317 in parentheses becomes equal to TARGETDEPTH.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3318 Fourth arg STOPBEFORE non-nil means stop when come to
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3319 any character that starts a sexp.
66525
aaac09f838e0 (Fparse_partial_sexp): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65215
diff changeset
3320 Fifth arg OLDSTATE is a list like what this function returns.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3321 It is used to initialize the state of the parse. Elements number 1, 2, 6
74542
31287a59d704 * syntax.c (Fpartial_parse_sexp): Correct Docco: Elt 8 of the
Alan Mackenzie <acm@muc.de>
parents: 74145
diff changeset
3322 and 8 are ignored.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3323 Sixth arg COMMENTSTOP non-nil means stop at the start of a comment.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3324 If it is symbol `syntax-table', stop after the start of a comment or a
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3325 string, or after end of a comment or a string. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3326 (Lisp_Object from, Lisp_Object to, Lisp_Object targetdepth, Lisp_Object stopbefore, Lisp_Object oldstate, Lisp_Object commentstop)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3327 {
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3328 struct lisp_parse_state state;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3329 int target;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3330
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 163
diff changeset
3331 if (!NILP (targetdepth))
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3332 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40286
diff changeset
3333 CHECK_NUMBER (targetdepth);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3334 target = XINT (targetdepth);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3335 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3336 else
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3337 target = -100000; /* We won't reach this depth */
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3338
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3339 validate_region (&from, &to);
20546
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
3340 scan_sexps_forward (&state, XINT (from), CHAR_TO_BYTE (XINT (from)),
a475efff810e (scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 20486
diff changeset
3341 XINT (to),
3568
3ee951a22a80 (Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents: 3095
diff changeset
3342 target, !NILP (stopbefore), oldstate,
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3343 (NILP (commentstop)
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3344 ? 0 : (EQ (commentstop, Qsyntax_table) ? -1 : 1)));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3345
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3346 SET_PT (state.location);
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3347
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3348 return Fcons (make_number (state.depth),
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3349 Fcons (state.prevlevelstart < 0
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3350 ? Qnil : make_number (state.prevlevelstart),
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3351 Fcons (state.thislevelstart < 0
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3352 ? Qnil : make_number (state.thislevelstart),
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3353 Fcons (state.instring >= 0
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3354 ? (state.instring == ST_STRING_STYLE
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3355 ? Qt : make_number (state.instring)) : Qnil,
25445
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3356 Fcons (state.incomment < 0 ? Qt :
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3357 (state.incomment == 0 ? Qnil :
d678b229c05a (lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents: 25401
diff changeset
3358 make_number (state.incomment)),
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3359 Fcons (state.quoted ? Qt : Qnil,
20486
26d12c66acc1 (Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents: 20475
diff changeset
3360 Fcons (make_number (state.mindepth),
47942
080b4586492b Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 47872
diff changeset
3361 Fcons ((state.comstyle
20486
26d12c66acc1 (Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents: 20475
diff changeset
3362 ? (state.comstyle == ST_COMMENT_STYLE
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3363 ? Qsyntax_table
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3364 : make_number (state.comstyle))
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109364
diff changeset
3365 : Qnil),
24728
e94104cf5891 (Fparse_partial_sexp): Correct test for element 8 to be
Dave Love <fx@gnu.org>
parents: 24148
diff changeset
3366 Fcons (((state.incomment
e94104cf5891 (Fparse_partial_sexp): Correct test for element 8 to be
Dave Love <fx@gnu.org>
parents: 24148
diff changeset
3367 || (state.instring >= 0))
20486
26d12c66acc1 (Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents: 20475
diff changeset
3368 ? make_number (state.comstr_start)
26d12c66acc1 (Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents: 20475
diff changeset
3369 : Qnil),
22394
5e1f0caf1873 (struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents: 22370
diff changeset
3370 Fcons (state.levelstarts, Qnil))))))))));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3371 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3372
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21207
diff changeset
3373 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3374 init_syntax_once (void)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3375 {
17126
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3376 register int i, c;
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3377 Lisp_Object temp;
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3378
13218
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3379 /* This has to be done here, before we call Fmake_char_table. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3380 Qsyntax_table = intern_c_string ("syntax-table");
13218
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3381 staticpro (&Qsyntax_table);
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3382
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3383 /* Intern_C_String this now in case it isn't already done.
13218
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3384 Setting this variable twice is harmless.
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3385 But don't staticpro it here--that is done in alloc.c. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3386 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
13218
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3387
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3388 /* Create objects which can be shared among syntax tables. */
34398
945b3e6bf3e7 (scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32794
diff changeset
3389 Vsyntax_code_object = Fmake_vector (make_number (Smax), Qnil);
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3390 for (i = 0; i < XVECTOR (Vsyntax_code_object)->size; i++)
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3391 XVECTOR (Vsyntax_code_object)->contents[i]
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3392 = Fcons (make_number (i), Qnil);
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3393
13218
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3394 /* Now we are ready to set up this property, so we can
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3395 create syntax tables. */
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3396 Fput (Qsyntax_table, Qchar_table_extra_slots, make_number (0));
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3397
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3398 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Swhitespace];
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3399
13218
d2fc560c7740 (Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13144
diff changeset
3400 Vstandard_syntax_table = Fmake_char_table (Qsyntax_table, temp);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3401
71395
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3402 /* Control characters should not be whitespace. */
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3403 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct];
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3404 for (i = 0; i <= ' ' - 1; i++)
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3405 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3406 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 0177, temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3407
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3408 /* Except that a few really are whitespace. */
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3409 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Swhitespace];
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3410 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ' ', temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3411 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\t', temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3412 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\n', temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3413 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 015, temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3414 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 014, temp);
923b7f99b0d7 (init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents: 70317
diff changeset
3415
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3416 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword];
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3417 for (i = 'a'; i <= 'z'; i++)
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3418 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3419 for (i = 'A'; i <= 'Z'; i++)
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3420 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3421 for (i = '0'; i <= '9'; i++)
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3422 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp);
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3423
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3424 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '$', temp);
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3425 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '%', temp);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3426
13144
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3427 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '(',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3428 Fcons (make_number (Sopen), make_number (')')));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3429 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ')',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3430 Fcons (make_number (Sclose), make_number ('(')));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3431 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '[',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3432 Fcons (make_number (Sopen), make_number (']')));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3433 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ']',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3434 Fcons (make_number (Sclose), make_number ('[')));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3435 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '{',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3436 Fcons (make_number (Sopen), make_number ('}')));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3437 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '}',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3438 Fcons (make_number (Sclose), make_number ('{')));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3439 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '"',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3440 Fcons (make_number ((int) Sstring), Qnil));
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3441 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\\',
fd14ccddb85a (describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents: 12894
diff changeset
3442 Fcons (make_number ((int) Sescape), Qnil));
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3443
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3444 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Ssymbol];
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3445 for (i = 0; i < 10; i++)
17126
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3446 {
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3447 c = "_-+*/&|<>="[i];
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3448 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, c, temp);
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3449 }
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3450
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3451 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct];
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3452 for (i = 0; i < 12; i++)
17126
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3453 {
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3454 c = ".,;:?!#@~^'`"[i];
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3455 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, c, temp);
f8d7263cce09 (init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents: 17109
diff changeset
3456 }
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
3457
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
3458 /* All multibyte characters have syntax `word' by default. */
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
3459 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword];
88389
39b2b971cdb3 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 41598
diff changeset
3460 char_table_set_range (Vstandard_syntax_table, 0x80, MAX_CHAR, temp);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3461 }
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3462
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21207
diff changeset
3463 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
3464 syms_of_syntax (void)
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3465 {
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3466 Qsyntax_table_p = intern_c_string ("syntax-table-p");
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3467 staticpro (&Qsyntax_table_p);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3468
17044
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3469 staticpro (&Vsyntax_code_object);
f07c36097f33 Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents: 16992
diff changeset
3470
64319
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3471 staticpro (&gl_state.object);
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3472 staticpro (&gl_state.global_code);
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3473 staticpro (&gl_state.current_syntax_table);
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3474 staticpro (&gl_state.old_prop);
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3475
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3476 /* Defined in regex.c */
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3477 staticpro (&re_match_object);
6ba9b52e77fc (syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents: 64084
diff changeset
3478
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3479 Qscan_error = intern_c_string ("scan-error");
16992
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
3480 staticpro (&Qscan_error);
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
3481 Fput (Qscan_error, Qerror_conditions,
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3482 pure_cons (Qscan_error, pure_cons (Qerror, Qnil)));
16992
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
3483 Fput (Qscan_error, Qerror_message,
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
3484 make_pure_c_string ("Scan error"));
16992
ff7346c31184 (scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents: 16039
diff changeset
3485
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3486 DEFVAR_BOOL ("parse-sexp-ignore-comments", &parse_sexp_ignore_comments,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3487 doc: /* Non-nil means `forward-sexp', etc., should treat comments as whitespace. */);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3488
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3489 DEFVAR_BOOL ("parse-sexp-lookup-properties", &parse_sexp_lookup_properties,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3490 doc: /* Non-nil means `forward-sexp', etc., obey `syntax-table' property.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3491 Otherwise, that text property is simply ignored.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3492 See the info node `(elisp)Syntax Properties' for a description of the
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3493 `syntax-table' property. */);
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3494
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3495 words_include_escapes = 0;
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3496 DEFVAR_BOOL ("words-include-escapes", &words_include_escapes,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3497 doc: /* Non-nil means `forward-word', etc., should treat escape chars part of words. */);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3498
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
3499 DEFVAR_BOOL ("multibyte-syntax-as-symbol", &multibyte_syntax_as_symbol,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39796
diff changeset
3500 doc: /* Non-nil means `scan-sexps' treats all multibyte characters as symbol. */);
27812
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
3501 multibyte_syntax_as_symbol = 0;
e2216823484d (multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents: 27719
diff changeset
3502
28302
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
3503 DEFVAR_BOOL ("open-paren-in-column-0-is-defun-start",
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
3504 &open_paren_in_column_0_is_defun_start,
49551
fd7582381b9e (Fskip_chars_forward)
Dave Love <fx@gnu.org>
parents: 48324
diff changeset
3505 doc: /* *Non-nil means an open paren in column 0 denotes the start of a defun. */);
28302
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
3506 open_paren_in_column_0_is_defun_start = 1;
27ffe1e3b06d (open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28269
diff changeset
3507
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
3508
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
3509 DEFVAR_LISP ("find-word-boundary-function-table",
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
3510 &Vfind_word_boundary_function_table,
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3511 doc: /*
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
3512 Char table of functions to search for the word boundary.
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3513 Each function is called with two arguments; POS and LIMIT.
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3514 POS and LIMIT are character positions in the current buffer.
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3515
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3516 If POS is less than LIMIT, POS is at the first character of a word,
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3517 and the return value of a function is a position after the last
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3518 character of that word.
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3519
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3520 If POS is not less than LIMIT, POS is at the last character of a word,
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3521 and the return value of a function is a position at the first
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3522 character of that word.
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3523
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3524 In both cases, LIMIT bounds the search. */);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89341
diff changeset
3525 Vfind_word_boundary_function_table = Fmake_char_table (Qnil, Qnil);
88970
a65b3bd9379c (Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88935
diff changeset
3526
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3527 defsubr (&Ssyntax_table_p);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3528 defsubr (&Ssyntax_table);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3529 defsubr (&Sstandard_syntax_table);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3530 defsubr (&Scopy_syntax_table);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3531 defsubr (&Sset_syntax_table);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3532 defsubr (&Schar_syntax);
7968
a6372621abd9 (Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7924
diff changeset
3533 defsubr (&Smatching_paren);
32506
a85522b7799c (Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32496
diff changeset
3534 defsubr (&Sstring_to_syntax);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3535 defsubr (&Smodify_syntax_entry);
40663
046e69b1b128 (describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40656
diff changeset
3536 defsubr (&Sinternal_describe_syntax_value);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3537
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3538 defsubr (&Sforward_word);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3539
17464
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3540 defsubr (&Sskip_chars_forward);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3541 defsubr (&Sskip_chars_backward);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3542 defsubr (&Sskip_syntax_forward);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3543 defsubr (&Sskip_syntax_backward);
36483a1ada24 (SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents: 17126
diff changeset
3544
1998
656f4297962e (describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents: 1394
diff changeset
3545 defsubr (&Sforward_comment);
163
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3546 defsubr (&Sscan_lists);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3547 defsubr (&Sscan_sexps);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3548 defsubr (&Sbackward_prefix_chars);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3549 defsubr (&Sparse_partial_sexp);
0f3996cb4ae5 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3550 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52213
diff changeset
3551
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52213
diff changeset
3552 /* arch-tag: 3e297b9f-088e-4b64-8f4c-fb0b3443e412
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52213
diff changeset
3553 (do not change this comment) */