Mercurial > emacs
annotate src/syntax.c @ 111193:e9767f86681c
Fix bug #7281.
cmds.c (internal_self_insert): Don't insert if argument N is zero.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 26 Oct 2010 20:03:34 +0200 |
parents | f28cc7ff91f9 |
children | 8bd4a845ba2a |
rev | line source |
---|---|
163 | 1 /* GNU Emacs routines to deal with syntax tables; also word and list parsing. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74563
diff
changeset
|
2 Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001, |
106815 | 3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74563
diff
changeset
|
4 Free Software Foundation, Inc. |
163 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
163 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
11 (at your option) any later version. |
163 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93546
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
163 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4458
diff
changeset
|
22 #include <config.h> |
163 | 23 #include <ctype.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105661
diff
changeset
|
24 #include <setjmp.h> |
163 | 25 #include "lisp.h" |
26 #include "commands.h" | |
27 #include "buffer.h" | |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
28 #include "character.h" |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39195
diff
changeset
|
29 #include "keymap.h" |
56088 | 30 #include "regex.h" |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
31 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
32 /* Make syntax table lookup grant data in gl_state. */ |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
33 #define SYNTAX_ENTRY_VIA_PROPERTY |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
34 |
163 | 35 #include "syntax.h" |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
36 #include "intervals.h" |
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 | 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 | 100 |
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 | 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>
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 after 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 end of the buffer. */ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
376 |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
377 INLINE EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
378 inc_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 INC_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; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
385 } |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
386 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
387 /* 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
|
388 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
|
389 |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
390 INLINE EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
391 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
|
392 { |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
393 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
|
394 return bytepos - 1; |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
395 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
396 DEC_POS (bytepos); |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
397 return bytepos; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
398 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
399 |
105426
d0a6d64c3cfc
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
105102
diff
changeset
|
400 /* Return a defun-start position before POS and not too far before. |
39195 | 401 It should be the last one before POS, or nearly the last. |
402 | |
403 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
|
404 only the beginning of the buffer is treated as a defun-start. |
39195 | 405 |
406 We record the information about where the scan started | |
407 and what its result was, so that another call in the same area | |
408 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
|
409 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
410 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
|
411 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
|
412 update the global data. */ |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
413 |
96988
77625aa3eac4
(struct lisp_parse_state, char_quoted, inc_bytepos)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96898
diff
changeset
|
414 static EMACS_INT |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
415 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
|
416 { |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
417 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
|
418 |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
419 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
|
420 { |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
421 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
|
422 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
|
423 } |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
424 |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
425 /* 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
|
426 if (current_buffer == find_start_buffer |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
427 /* 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
|
428 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
|
429 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
|
430 && pos <= find_start_pos + 1000 |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
431 && pos >= find_start_value |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
432 && BEGV == find_start_begv |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
433 && MODIFF == find_start_modiff) |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
434 return find_start_value; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
435 |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
436 /* 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
|
437 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
|
438 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
439 /* 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
|
440 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
|
441 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
|
442 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
|
443 while (PT > BEGV) |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
444 { |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
445 int c; |
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
446 |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
447 /* 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
|
448 defun-start. */ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
449 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
|
450 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
|
451 { |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
452 SETUP_SYNTAX_TABLE (PT + 1, -1); /* Try again... */ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
453 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
|
454 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
|
455 break; |
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
456 /* 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
|
457 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
|
458 } |
51036
5a30d8fb640c
(find_defun_start): When open_paren_in_column_0_is_defun_start,
Richard M. Stallman <rms@gnu.org>
parents:
50697
diff
changeset
|
459 /* 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
|
460 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
|
461 } |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
462 |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
463 /* 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
|
464 find_start_value = PT; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
465 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
|
466 find_start_buffer = current_buffer; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
467 find_start_modiff = MODIFF; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
468 find_start_begv = BEGV; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
469 find_start_pos = pos; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
470 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
471 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
|
472 |
1167
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
473 return find_start_value; |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
474 } |
a9aeeaa9da8f
(scan_lists): When searching back for comment:
Richard M. Stallman <rms@gnu.org>
parents:
1085
diff
changeset
|
475 |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
476 /* 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
|
477 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
478 static int |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
479 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
|
480 { |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
481 int c, val; |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
482 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
483 DEC_BOTH (pos, pos_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
484 UPDATE_SYNTAX_TABLE_BACKWARD (pos); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
485 c = FETCH_CHAR (pos_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
486 val = SYNTAX_COMEND_FIRST (c); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
487 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
|
488 return val; |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
489 } |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
490 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
491 /* 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
|
492 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
493 /* static int |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
494 * prev_char_comstart_first (pos, pos_byte) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
495 * int pos, pos_byte; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
496 * { |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
497 * int c, val; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
498 * |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
499 * DEC_BOTH (pos, pos_byte); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
500 * UPDATE_SYNTAX_TABLE_BACKWARD (pos); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
501 * c = FETCH_CHAR (pos_byte); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
502 * val = SYNTAX_COMSTART_FIRST (c); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
503 * UPDATE_SYNTAX_TABLE_FORWARD (pos + 1); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
504 * return val; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
505 * } */ |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
506 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
507 /* 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
|
508 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
|
509 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
|
510 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
511 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
|
512 return -1 otherwise. |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
513 |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
514 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
|
515 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
|
516 |
f76b9c0ebc4b
(back_comment): Handle 2-char comment starts
Karl Heuer <kwzh@gnu.org>
parents:
20292
diff
changeset
|
517 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
|
518 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
|
519 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
520 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
521 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
|
522 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
523 /* 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
|
524 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
|
525 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
|
526 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
|
527 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
|
528 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
529 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
|
530 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
|
531 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
|
532 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
|
533 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
|
534 /* 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
|
535 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
|
536 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
|
537 inside another comment). |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
538 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
|
539 int comment_lossage = 0; |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
540 EMACS_INT comment_end = from; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
541 EMACS_INT comment_end_byte = from_byte; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
542 EMACS_INT comstart_pos = 0; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
543 EMACS_INT comstart_byte; |
20766
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
544 /* 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
|
545 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
|
546 EMACS_INT defun_start = 0; |
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
547 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
|
548 register enum syntaxcode code; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
549 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
|
550 int c; |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
551 int syntax = 0; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
552 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
553 /* 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
|
554 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
|
555 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
|
556 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
557 /* 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
|
558 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
|
559 while (from != stop) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
560 { |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
561 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
|
562 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
|
563 int comstart; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
564 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
565 /* 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
|
566 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
|
567 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
|
568 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
569 prev_syntax = syntax; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
570 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
571 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
|
572 code = SYNTAX (c); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
573 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
574 /* Check for 2-char comment markers. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
575 com2start = (SYNTAX_FLAGS_COMSTART_FIRST (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
576 && 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
|
577 && (comstyle |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
578 == SYNTAX_FLAGS_COMMENT_STYLE (prev_syntax, syntax)) |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
579 && (SYNTAX_FLAGS_COMMENT_NESTED (prev_syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
580 || SYNTAX_FLAGS_COMMENT_NESTED (syntax)) == comnested); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
581 com2end = (SYNTAX_FLAGS_COMEND_FIRST (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
582 && 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
|
583 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
|
584 |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
585 /* Nasty cases with overlapping 2-char comment markers: |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
586 - snmp-mode: -- c -- foo -- c -- |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
587 --- c -- |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
588 ------ c -- |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
589 - c-mode: *||* |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
590 |* *|* *| |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
591 |*| |* |*| |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
592 /// */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
593 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
594 /* 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
|
595 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
|
596 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
|
597 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
|
598 { |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
599 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
|
600 int next_c, next_syntax; |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
601 DEC_BOTH (next, next_byte); |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
602 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
|
603 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
|
604 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
|
605 if (((comstart || comnested) |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
606 && SYNTAX_FLAGS_COMEND_SECOND (syntax) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
607 && SYNTAX_FLAGS_COMEND_FIRST (next_syntax)) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
608 || ((com2end || comnested) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
609 && SYNTAX_FLAGS_COMSTART_SECOND (syntax) |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
610 && (comstyle |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
611 == SYNTAX_FLAGS_COMMENT_STYLE (syntax, prev_syntax)) |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
612 && SYNTAX_FLAGS_COMSTART_FIRST (next_syntax))) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
613 goto lossage; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
614 /* 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
|
615 } |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
616 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
617 if (com2start && comstart_pos == 0) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
618 /* 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
|
619 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
|
620 need to consider it as a comment starter, |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
621 and the subsequent times as a comment ender. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
622 com2end = 0; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
623 |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
624 /* 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
|
625 if (com2end) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
626 code = Sendcomment; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
627 else if (com2start) |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
628 code = Scomment; |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
629 /* Ignore comment starters of a different style. */ |
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
630 else if (code == Scomment |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
631 && (comstyle != SYNTAX_FLAGS_COMMENT_STYLE (syntax, 0) |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
632 || 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
|
633 continue; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
634 |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
635 /* 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
|
636 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
|
637 continue; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
638 |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
639 switch (code) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
640 { |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
641 case Sstring_fence: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
642 case Scomment_fence: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
643 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
|
644 case Sstring: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
645 /* Track parity of quotes. */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
646 if (string_style == -1) |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
647 /* Entering a string. */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
648 string_style = c; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
649 else if (string_style == c) |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
650 /* Leaving the string. */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
651 string_style = -1; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
652 else |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
653 /* 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
|
654 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
|
655 string_lossage = 1; |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
656 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
657 |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
658 case Scomment: |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
659 /* 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
|
660 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
|
661 /* 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
|
662 Test case in Pascal: " { " a { " } */ |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
663 goto lossage; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
664 |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
665 if (!comnested) |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
666 { |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
667 /* 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
|
668 comstart_pos = from; |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
669 comstart_byte = from_byte; |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
670 } |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
671 else if (--nesting <= 0) |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
672 /* 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
|
673 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
|
674 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
|
675 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
|
676 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
|
677 goto done; |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
678 break; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
679 |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
680 case Sendcomment: |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
681 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
|
682 && ((com2end && SYNTAX_FLAGS_COMMENT_NESTED (prev_syntax)) |
32087
83ecc6bc4bc2
(prev_char_comstart_first): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32086
diff
changeset
|
683 || 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
|
684 /* 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
|
685 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
686 if (comnested) |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
687 nesting++; |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
688 else |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
689 /* 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
|
690 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
|
691 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
|
692 } |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
693 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
|
694 /* 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
|
695 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
|
696 (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
|
697 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
|
698 lossage, which seems overkill. |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
699 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
|
700 { (* } *) */ |
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
701 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
|
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 case Sopen: |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
705 /* 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
|
706 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
|
707 && (from == stop |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
708 || (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
|
709 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
|
710 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
711 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
|
712 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
|
713 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
|
714 } |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
715 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
716 |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
717 default: |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
718 break; |
20766
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
719 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
720 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
721 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
722 if (comstart_pos == 0) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
723 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
724 from = comment_end; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
725 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
|
726 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
|
727 } |
31209
00943ea58fd1
(back_comment): Detect cases where a comment-starter is
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30626
diff
changeset
|
728 /* 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
|
729 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
|
730 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
|
731 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
732 from = comstart_pos; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
733 from_byte = comstart_byte; |
56720
7c89be334c1b
(back_comment): Fixup globals in all cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56719
diff
changeset
|
734 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
|
735 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
736 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
737 { |
29835
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
738 struct lisp_parse_state state; |
5dec8ee96c0c
(back_comment): Simplify string-parity counting (with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29823
diff
changeset
|
739 lossage: |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
740 /* 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
|
741 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
|
742 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
|
743 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
|
744 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
|
745 /* 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
|
746 if (defun_start == 0) |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
747 { |
92c662c4ab0e
(back_comment): Move the find_defun_start call
Richard M. Stallman <rms@gnu.org>
parents:
20704
diff
changeset
|
748 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
|
749 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
|
750 } |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
751 do |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
752 { |
30156
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
753 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
|
754 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
|
755 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
|
756 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
|
757 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
|
758 && 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
|
759 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
|
760 else |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
761 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
762 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
|
763 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
|
764 /* 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
|
765 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
|
766 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
|
767 { |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
768 /* 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
|
769 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
|
770 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
|
771 } |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
772 } |
f59021679260
(back_comment): Use one switch rather than a few `if's.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29835
diff
changeset
|
773 } 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
|
774 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
775 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
|
776 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
|
777 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
778 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
779 done: |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
780 *charpos_ptr = from; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
781 *bytepos_ptr = from_byte; |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
782 |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
783 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
|
784 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
785 |
163 | 786 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
|
787 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
|
788 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
|
789 (Lisp_Object object) |
163 | 790 { |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
791 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
|
792 && EQ (XCHAR_TABLE (object)->purpose, Qsyntax_table)) |
163 | 793 return Qt; |
794 return Qnil; | |
795 } | |
796 | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
797 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
798 check_syntax_table (Lisp_Object obj) |
163 | 799 { |
71843
2d05f598fa85
(check_syntax_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
71787
diff
changeset
|
800 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
|
801 Qsyntax_table_p, obj); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
802 } |
163 | 803 |
804 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
|
805 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
|
806 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
|
807 (void) |
163 | 808 { |
809 return current_buffer->syntax_table; | |
810 } | |
811 | |
812 DEFUN ("standard-syntax-table", Fstandard_syntax_table, | |
813 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
|
814 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
|
815 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
|
816 (void) |
163 | 817 { |
818 return Vstandard_syntax_table; | |
819 } | |
820 | |
821 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
|
822 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
|
823 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
|
824 (Lisp_Object table) |
163 | 825 { |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
826 Lisp_Object copy; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
827 |
485 | 828 if (!NILP (table)) |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
829 check_syntax_table (table); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
830 else |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
831 table = Vstandard_syntax_table; |
163 | 832 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
833 copy = Fcopy_sequence (table); |
14661
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
834 |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
835 /* 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
|
836 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
|
837 XCHAR_TABLE (copy)->defalt = Qnil; |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
838 |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
839 /* 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
|
840 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
|
841 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
|
842 if (NILP (XCHAR_TABLE (copy)->parent)) |
46ba65e7976c
(Fcopy_syntax_table): Set default to nil.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
843 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
|
844 return copy; |
163 | 845 } |
846 | |
847 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
|
848 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
|
849 One argument, a syntax table. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
850 (Lisp_Object table) |
163 | 851 { |
28313
cdb964ab44c3
(Fset_syntax_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
28302
diff
changeset
|
852 int idx; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
853 check_syntax_table (table); |
163 | 854 current_buffer->syntax_table = table; |
855 /* Indicate that this buffer now has a specified syntax table. */ | |
28351 | 856 idx = PER_BUFFER_VAR_IDX (syntax_table); |
857 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1); | |
163 | 858 return table; |
859 } | |
860 | |
861 /* Convert a letter which signifies a syntax code | |
862 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
|
863 This is used by modify-syntax-entry, and other things. */ |
163 | 864 |
865 unsigned char syntax_spec_code[0400] = | |
866 { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
867 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
868 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
869 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
|
870 (char) Swhitespace, (char) Scomment_fence, (char) Sstring, 0377, |
163 | 871 (char) Smath, 0377, 0377, (char) Squote, |
872 (char) Sopen, (char) Sclose, 0377, 0377, | |
873 0377, (char) Swhitespace, (char) Spunct, (char) Scharquote, | |
874 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
875 0377, 0377, 0377, 0377, | |
876 (char) Scomment, 0377, (char) Sendcomment, 0377, | |
5442
8cbae747a768
(describe_syntax): Handle Sinherit.
Richard M. Stallman <rms@gnu.org>
parents:
5339
diff
changeset
|
877 (char) Sinherit, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* @, A ... */ |
163 | 878 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, |
879 0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword, | |
880 0377, 0377, 0377, 0377, (char) Sescape, 0377, 0377, (char) Ssymbol, | |
881 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, /* `, a, ... */ | |
882 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377, | |
883 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
|
884 0377, 0377, 0377, 0377, (char) Sstring_fence, 0377, 0377, 0377 |
163 | 885 }; |
886 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
887 /* Indexed by syntax code, give the letter that describes it. */ |
163 | 888 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
889 char syntax_code_spec[16] = |
163 | 890 { |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
891 ' ', '.', 'w', '_', '(', ')', '\'', '\"', '$', '\\', '/', '<', '>', '@', |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
892 '!', '|' |
163 | 893 }; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
894 |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
895 /* 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
|
896 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
|
897 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
|
898 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
|
899 compact listing. */ |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
900 static Lisp_Object Vsyntax_code_object; |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
901 |
163 | 902 |
903 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
|
904 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
|
905 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
|
906 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
|
907 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
|
908 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
|
909 (Lisp_Object character) |
163 | 910 { |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
911 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
|
912 CHECK_CHARACTER (character); |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
913 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
|
914 SETUP_BUFFER_SYNTAX_TABLE (); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
915 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
|
916 } |
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
917 |
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
918 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
|
919 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
|
920 (Lisp_Object character) |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
921 { |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
922 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
|
923 CHECK_NUMBER (character); |
14087
1709d9f11c66
(Fsyntax_table_p, Fchar_syntax, Fmatching_paren, Fmodify_syntax_entry):
Erik Naggum <erik@naggum.no>
parents:
13513
diff
changeset
|
924 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
|
925 SETUP_BUFFER_SYNTAX_TABLE (); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
926 code = SYNTAX (char_int); |
7975
49dc4ea976a0
(Fmatching_paren): Fix typo.
Richard M. Stallman <rms@gnu.org>
parents:
7968
diff
changeset
|
927 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
|
928 return SYNTAX_MATCH (char_int); |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
929 return Qnil; |
163 | 930 } |
931 | |
32506
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
932 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
|
933 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
|
934 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
|
935 `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
|
936 \(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
|
937 text property. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
938 (Lisp_Object string) |
163 | 939 { |
46555
35e66a0949b8
(Fstring_to_syntax, skip_chars): Treat Lisp string
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
940 register const unsigned char *p; |
163 | 941 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
|
942 int val; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
943 Lisp_Object match; |
163 | 944 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
945 CHECK_STRING (string); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
946 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41598
diff
changeset
|
947 p = SDATA (string); |
163 | 948 code = (enum syntaxcode) syntax_spec_code[*p++]; |
949 if (((int) code & 0377) == 0377) | |
63703
bb4ab751a6a3
(Fstring_to_syntax): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
58897
diff
changeset
|
950 error ("Invalid syntax description letter: %c", p[-1]); |
163 | 951 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
952 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
|
953 return Qnil; |
163 | 954 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
955 if (*p) |
13513
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
956 { |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
957 int len; |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
958 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
|
959 XSETINT (match, character); |
13513
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
960 if (XFASTINT (match) == ' ') |
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
961 match = Qnil; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
962 p += len; |
13513
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
963 } |
907544cb2c7d
(check_syntax_table): Check the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
13218
diff
changeset
|
964 else |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
965 match = Qnil; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
966 |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
967 val = (int) code; |
163 | 968 while (*p) |
969 switch (*p++) | |
970 { | |
971 case '1': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
972 val |= 1 << 16; |
163 | 973 break; |
974 | |
975 case '2': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
976 val |= 1 << 17; |
163 | 977 break; |
978 | |
979 case '3': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
980 val |= 1 << 18; |
163 | 981 break; |
982 | |
983 case '4': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
984 val |= 1 << 19; |
163 | 985 break; |
986 | |
987 case 'p': | |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
988 val |= 1 << 20; |
163 | 989 break; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
990 |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
991 case 'b': |
9333
925795f1a594
(Fmodify_syntax_entry): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents:
9320
diff
changeset
|
992 val |= 1 << 21; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
993 break; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
994 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
995 case 'n': |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
996 val |= 1 << 22; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
997 break; |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
998 |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
999 case 'c': |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1000 val |= 1 << 23; |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1001 break; |
163 | 1002 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
1003 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1004 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
|
1005 return XVECTOR (Vsyntax_code_object)->contents[val]; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1006 else |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1007 /* 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
|
1008 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
|
1009 } |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1010 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1011 /* I really don't know why this is interactive |
40286
0e7059267f7e
Fix comment ending.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40205
diff
changeset
|
1012 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
|
1013 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
|
1014 "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
|
1015 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
|
1016 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
|
1017 the current buffer's syntax table. |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1018 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
|
1019 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
|
1020 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
|
1021 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
|
1022 _ symbol constituent. . punctuation. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1023 ( 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
|
1024 " string quote. \\ escape. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1025 $ 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
|
1026 < 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
|
1027 / 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
|
1028 | generic string fence. ! generic comment fence. |
163 | 1029 |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1030 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
|
1031 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
|
1032 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
|
1033 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
|
1034 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
|
1035 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
|
1036 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
|
1037 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
|
1038 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
|
1039 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
|
1040 |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1041 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
|
1042 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
|
1043 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
|
1044 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
|
1045 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
|
1046 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
|
1047 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
|
1048 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
|
1049 |
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
|
1050 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
|
1051 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
|
1052 between expressions. |
100345
b814c7996a93
* syntax.c (Fmodify_syntax_entry): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
99020
diff
changeset
|
1053 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
|
1054 (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
|
1055 { |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1056 if (CONSP (c)) |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1057 { |
89483 | 1058 CHECK_CHARACTER_CAR (c); |
1059 CHECK_CHARACTER_CDR (c); | |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1060 } |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1061 else |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1062 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
|
1063 |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1064 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
|
1065 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
|
1066 else |
a85522b7799c
(Fstring_to_syntax): New function extracted from Fmodify_syntax_entry.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32496
diff
changeset
|
1067 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
|
1068 |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1069 newentry = Fstring_to_syntax (newentry); |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1070 if (CONSP (c)) |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1071 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
|
1072 else |
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1073 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
|
1074 |
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1075 /* 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
|
1076 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
|
1077 clear_regexp_cache (); |
d4ecc69b8d2e
* search.c (clear_regexp_cache): New function.
Chong Yidong <cyd@stupidchicken.com>
parents:
71988
diff
changeset
|
1078 |
163 | 1079 return Qnil; |
1080 } | |
1081 | |
1082 /* Dump syntax table to buffer in human-readable format */ | |
1083 | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1084 DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value, |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1085 Sinternal_describe_syntax_value, 1, 1, 0, |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1086 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
|
1087 (Lisp_Object syntax) |
163 | 1088 { |
1089 register enum syntaxcode code; | |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1090 int syntax_code; |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1091 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
|
1092 comstyleb, comstylec, comnested; |
163 | 1093 char str[2]; |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1094 Lisp_Object first, match_lisp, value = syntax; |
163 | 1095 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1096 if (NILP (value)) |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1097 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1098 insert_string ("default"); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1099 return syntax; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1100 } |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1101 |
17109
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1102 if (CHAR_TABLE_P (value)) |
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1103 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1104 insert_string ("deeper char-table ..."); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1105 return syntax; |
17109
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1106 } |
dfe4f98935c4
(describe_syntax): Handle the case that the argument
Kenichi Handa <handa@m17n.org>
parents:
17044
diff
changeset
|
1107 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1108 if (!CONSP (value)) |
163 | 1109 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1110 insert_string ("invalid"); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1111 return syntax; |
163 | 1112 } |
1113 | |
25663
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25659
diff
changeset
|
1114 first = XCAR (value); |
a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25659
diff
changeset
|
1115 match_lisp = XCDR (value); |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1116 |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1117 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
|
1118 { |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1119 insert_string ("invalid"); |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1120 return syntax; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1121 } |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1122 |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1123 syntax_code = XINT (first); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1124 code = (enum syntaxcode) (syntax_code & 0377); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1125 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
|
1126 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
|
1127 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
|
1128 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
|
1129 prefix = SYNTAX_FLAGS_PREFIX (syntax_code); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1130 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
|
1131 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
|
1132 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax_code); |
163 | 1133 |
1134 if ((int) code < 0 || (int) code >= (int) Smax) | |
1135 { | |
1136 insert_string ("invalid"); | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1137 return syntax; |
163 | 1138 } |
1139 desc = syntax_code_spec[(int) code]; | |
1140 | |
1141 str[0] = desc, str[1] = 0; | |
1142 insert (str, 1); | |
1143 | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1144 if (NILP (match_lisp)) |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1145 insert (" ", 1); |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1146 else |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1147 insert_char (XINT (match_lisp)); |
163 | 1148 |
1149 if (start1) | |
1150 insert ("1", 1); | |
1151 if (start2) | |
1152 insert ("2", 1); | |
1153 | |
1154 if (end1) | |
1155 insert ("3", 1); | |
1156 if (end2) | |
1157 insert ("4", 1); | |
1158 | |
1159 if (prefix) | |
1160 insert ("p", 1); | |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1161 if (comstyleb) |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1162 insert ("b", 1); |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1163 if (comstylec) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1164 insert ("c", 1); |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1165 if (comnested) |
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1166 insert ("n", 1); |
163 | 1167 |
1168 insert_string ("\twhich means: "); | |
1169 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
9863
diff
changeset
|
1170 switch (SWITCH_ENUM_CAST (code)) |
163 | 1171 { |
1172 case Swhitespace: | |
1173 insert_string ("whitespace"); break; | |
1174 case Spunct: | |
1175 insert_string ("punctuation"); break; | |
1176 case Sword: | |
1177 insert_string ("word"); break; | |
1178 case Ssymbol: | |
1179 insert_string ("symbol"); break; | |
1180 case Sopen: | |
1181 insert_string ("open"); break; | |
1182 case Sclose: | |
1183 insert_string ("close"); break; | |
1184 case Squote: | |
32508
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1185 insert_string ("prefix"); break; |
163 | 1186 case Sstring: |
1187 insert_string ("string"); break; | |
1188 case Smath: | |
1189 insert_string ("math"); break; | |
1190 case Sescape: | |
1191 insert_string ("escape"); break; | |
1192 case Scharquote: | |
1193 insert_string ("charquote"); break; | |
1194 case Scomment: | |
1195 insert_string ("comment"); break; | |
1196 case Sendcomment: | |
1197 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
|
1198 case Sinherit: |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1199 insert_string ("inherit"); break; |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1200 case Scomment_fence: |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1201 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
|
1202 case Sstring_fence: |
d371f8c371bd
(describe_syntax): Add code for comment and string fences.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32506
diff
changeset
|
1203 insert_string ("string fence"); break; |
163 | 1204 default: |
1205 insert_string ("invalid"); | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1206 return syntax; |
163 | 1207 } |
1208 | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1209 if (!NILP (match_lisp)) |
163 | 1210 { |
1211 insert_string (", matches "); | |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
1212 insert_char (XINT (match_lisp)); |
163 | 1213 } |
1214 | |
1215 if (start1) | |
1216 insert_string (",\n\t is the first character of a comment-start sequence"); | |
1217 if (start2) | |
1218 insert_string (",\n\t is the second character of a comment-start sequence"); | |
1219 | |
1220 if (end1) | |
1221 insert_string (",\n\t is the first character of a comment-end sequence"); | |
1222 if (end2) | |
1223 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
|
1224 if (comstyleb) |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1225 insert_string (" (comment style b)"); |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1226 if (comstylec) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
1227 insert_string (" (comment style c)"); |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1228 if (comnested) |
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
1229 insert_string (" (nestable)"); |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
1230 |
163 | 1231 if (prefix) |
1232 insert_string (",\n\t is a prefix character for `backward-prefix-chars'"); | |
1233 | |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1234 return syntax; |
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
1235 } |
163 | 1236 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1237 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
|
1238 |
89483 | 1239 /* Char-table of functions that find the next or previous word |
1240 boundary. */ | |
1241 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
|
1242 |
163 | 1243 /* Return the position across COUNT words from FROM. |
1244 If that many words cannot be found before the end of the buffer, return 0. | |
1245 COUNT negative means scan backward and stop at word beginning. */ | |
1246 | |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
1247 EMACS_INT |
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
1248 scan_words (register EMACS_INT from, register EMACS_INT count) |
163 | 1249 { |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
1250 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
|
1251 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
|
1252 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
|
1253 register enum syntaxcode code; |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1254 int ch0, ch1; |
89483 | 1255 Lisp_Object func, script, pos; |
163 | 1256 |
1257 immediate_quit = 1; | |
1258 QUIT; | |
1259 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1260 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
|
1261 |
163 | 1262 while (count > 0) |
1263 { | |
1264 while (1) | |
1265 { | |
1266 if (from == end) | |
1267 { | |
1268 immediate_quit = 0; | |
1269 return 0; | |
1270 } | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1271 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
|
1272 ch0 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1273 code = SYNTAX (ch0); |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1274 INC_BOTH (from, from_byte); |
163 | 1275 if (words_include_escapes |
1276 && (code == Sescape || code == Scharquote)) | |
1277 break; | |
1278 if (code == Sword) | |
1279 break; | |
1280 } | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1281 /* 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
|
1282 position of the next character. */ |
89483 | 1283 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
|
1284 if (! NILP (Ffboundp (func))) |
163 | 1285 { |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1286 pos = call2 (func, make_number (from - 1), make_number (end)); |
89483 | 1287 if (INTEGERP (pos) && XINT (pos) > from) |
1288 { | |
1289 from = XINT (pos); | |
1290 from_byte = CHAR_TO_BYTE (from); | |
1291 } | |
163 | 1292 } |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1293 else |
163 | 1294 { |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1295 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
|
1296 while (1) |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1297 { |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1298 if (from == end) break; |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1299 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
|
1300 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
|
1301 code = SYNTAX (ch1); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1302 if ((code != Sword |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1303 && (! words_include_escapes |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1304 || (code != Sescape && code != Scharquote))) |
99020
08af05537037
(scan_words): Call word_boundary_p instead of comparing
Kenichi Handa <handa@m17n.org>
parents:
96988
diff
changeset
|
1305 || word_boundary_p (ch0, ch1)) |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1306 break; |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1307 INC_BOTH (from, from_byte); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1308 ch0 = ch1; |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1309 } |
163 | 1310 } |
1311 count--; | |
1312 } | |
1313 while (count < 0) | |
1314 { | |
1315 while (1) | |
1316 { | |
1317 if (from == beg) | |
1318 { | |
1319 immediate_quit = 0; | |
1320 return 0; | |
1321 } | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1322 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
|
1323 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
|
1324 ch1 = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1325 code = SYNTAX (ch1); |
163 | 1326 if (words_include_escapes |
1327 && (code == Sescape || code == Scharquote)) | |
1328 break; | |
1329 if (code == Sword) | |
1330 break; | |
1331 } | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
1332 /* 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
|
1333 position of it. */ |
89483 | 1334 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
|
1335 if (! NILP (Ffboundp (func))) |
89483 | 1336 { |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1337 pos = call2 (func, make_number (from), make_number (beg)); |
89483 | 1338 if (INTEGERP (pos) && XINT (pos) < from) |
1339 { | |
1340 from = XINT (pos); | |
1341 from_byte = CHAR_TO_BYTE (from); | |
1342 } | |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1343 } |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
1344 else |
163 | 1345 { |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1346 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
|
1347 while (1) |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1348 { |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1349 if (from == beg) |
77927
d15a774f9796
(scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
Chong Yidong <cyd@stupidchicken.com>
parents:
77757
diff
changeset
|
1350 break; |
90851 | 1351 DEC_BOTH (from, from_byte); |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1352 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
90851 | 1353 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
|
1354 code = SYNTAX (ch0); |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1355 if ((code != Sword |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1356 && (! words_include_escapes |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1357 || (code != Sescape && code != Scharquote))) |
99020
08af05537037
(scan_words): Call word_boundary_p instead of comparing
Kenichi Handa <handa@m17n.org>
parents:
96988
diff
changeset
|
1358 || word_boundary_p (ch0, ch1)) |
90851 | 1359 { |
1360 INC_BOTH (from, from_byte); | |
1361 break; | |
1362 } | |
89010
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1363 ch1 = ch0; |
0b75ae2e80b1
(scan_words): Don't treat characters belonging to
Kenichi Handa <handa@m17n.org>
parents:
88970
diff
changeset
|
1364 } |
163 | 1365 } |
1366 count++; | |
1367 } | |
1368 | |
1369 immediate_quit = 0; | |
1370 | |
1371 return from; | |
1372 } | |
1373 | |
93546
45896a2e7bee
(Fforward_word): Add ^ interactive spec.
Chong Yidong <cyd@stupidchicken.com>
parents:
91806
diff
changeset
|
1374 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
|
1375 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
|
1376 Normally returns t. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
1377 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
|
1378 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
|
1379 `inhibit-field-text-motion' is non-nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1380 (Lisp_Object arg) |
163 | 1381 { |
58897
98e94b29b59b
(Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57756
diff
changeset
|
1382 Lisp_Object tmp; |
26391
216416ad34fe
(Fforward_word): Handle fields even if would have hit
Richard M. Stallman <rms@gnu.org>
parents:
26272
diff
changeset
|
1383 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
|
1384 |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1385 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
|
1386 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
|
1387 else |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1388 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
|
1389 |
d8341603541c
(Fforward_word): Argument changed to optional. Set default value to 1.
Richard M. Stallman <rms@gnu.org>
parents:
51036
diff
changeset
|
1390 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
|
1391 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
|
1392 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
|
1393 |
26060
6edf64bf5e22
(Fforward_word): Supply new ESCAPE_FROM_EDGE parameter
Gerd Moellmann <gerd@gnu.org>
parents:
25771
diff
changeset
|
1394 /* 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
|
1395 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
|
1396 Qt, Qnil, Qnil); |
98e94b29b59b
(Fforward_word): Avoid non-idempotent side-effects in macro arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57756
diff
changeset
|
1397 val = XFASTINT (tmp); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
1398 |
163 | 1399 SET_PT (val); |
27079
638b309011d9
(Fforward_word): Notice field boundaries only if
Gerd Moellmann <gerd@gnu.org>
parents:
26526
diff
changeset
|
1400 return val == orig_val ? Qt : Qnil; |
163 | 1401 } |
1402 | |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1403 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
|
1404 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1405 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
|
1406 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
|
1407 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
|
1408 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
|
1409 (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
|
1410 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
|
1411 With arg "^a-zA-Z", skips nonletters stopping before first letter. |
56088 | 1412 Char classes, e.g. `[:alpha:]', are supported. |
1413 | |
1414 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
|
1415 (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
|
1416 { |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1417 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
|
1418 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1419 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1420 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
|
1421 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
|
1422 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
|
1423 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
|
1424 (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
|
1425 { |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1426 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
|
1427 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1428 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1429 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
|
1430 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
|
1431 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
|
1432 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
|
1433 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
|
1434 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
|
1435 (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
|
1436 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1437 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
|
1438 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1439 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1440 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
|
1441 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
|
1442 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
|
1443 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
|
1444 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
|
1445 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
|
1446 (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
|
1447 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1448 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
|
1449 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1450 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
1451 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1452 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
|
1453 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1454 register unsigned int c; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1455 unsigned char fastmap[0400]; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1456 /* 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
|
1457 int *char_ranges; |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1458 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
|
1459 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
|
1460 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
|
1461 /* 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
|
1462 contains non-ASCII chars. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1463 int multibyte; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1464 /* 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
|
1465 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
|
1466 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
|
1467 EMACS_INT size_byte; |
46555
35e66a0949b8
(Fstring_to_syntax, skip_chars): Treat Lisp string
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
1468 const unsigned char *str; |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1469 int len; |
56088 | 1470 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
|
1471 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
1472 CHECK_STRING (string); |
56088 | 1473 iso_classes = Qnil; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1474 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1475 if (NILP (lim)) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1476 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
|
1477 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
1478 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
|
1479 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1480 /* 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
|
1481 if (XINT (lim) > ZV) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1482 XSETFASTINT (lim, ZV); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1483 if (XINT (lim) < BEGV) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1484 XSETFASTINT (lim, BEGV); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1485 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1486 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
|
1487 && (XINT (lim) - PT != CHAR_TO_BYTE (XINT (lim)) - PT_BYTE)); |
89483 | 1488 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
|
1489 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1490 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
|
1491 |
89483 | 1492 str = SDATA (string); |
1493 size_byte = SBYTES (string); | |
89103
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1494 |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1495 i_byte = 0; |
22130
b25abff012fd
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22116
diff
changeset
|
1496 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
|
1497 && SREF (string, 0) == '^') |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1498 { |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1499 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
|
1500 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1501 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1502 /* 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
|
1503 Handle backslashes and ranges specially. |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1504 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1505 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
|
1506 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
|
1507 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1508 if (! string_multibyte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1509 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1510 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
|
1511 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1512 /* At first setup fastmap. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1513 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
|
1514 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1515 c = str[i_byte++]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1516 |
56088 | 1517 if (handle_iso_classes && c == '[' |
1518 && i_byte < size_byte | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1519 && str[i_byte] == ':') |
56088 | 1520 { |
1521 const unsigned char *class_beg = str + i_byte + 1; | |
1522 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
|
1523 const unsigned char *class_limit = str + size_byte - 2; |
74145 | 1524 /* Leave room for the null. */ |
56088 | 1525 unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1]; |
1526 re_wctype_t cc; | |
1527 | |
1528 if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH) | |
1529 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH; | |
1530 | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1531 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
|
1532 && *class_end >= 'a' && *class_end <= 'z') |
56088 | 1533 class_end++; |
1534 | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1535 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
|
1536 || *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
|
1537 goto not_a_class_name; |
56088 | 1538 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1539 memcpy (class_name, class_beg, class_end - class_beg); |
56088 | 1540 class_name[class_end - class_beg] = 0; |
1541 | |
1542 cc = re_wctype (class_name); | |
1543 if (cc == 0) | |
1544 error ("Invalid ISO C character class"); | |
1545 | |
1546 iso_classes = Fcons (make_number (cc), iso_classes); | |
1547 | |
1548 i_byte = class_end + 2 - str; | |
1549 continue; | |
1550 } | |
1551 | |
56116
6725db0f57d5
(skip_chars): Only recognize [:class:] when it has the
Kim F. Storm <storm@cua.dk>
parents:
56088
diff
changeset
|
1552 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
|
1553 if (c == '\\') |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1554 { |
22130
b25abff012fd
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
22116
diff
changeset
|
1555 if (i_byte == size_byte) |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1556 break; |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1557 |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1558 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
|
1559 } |
53508
c7553b3b3a60
(skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
1560 /* 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
|
1561 follows. */ |
c7553b3b3a60
(skip_chars): Treat '-' at end of string as ordinary
Andreas Schwab <schwab@suse.de>
parents:
52401
diff
changeset
|
1562 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
|
1563 && str[i_byte] == '-') |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1564 { |
31944
05763e780521
(skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents:
31209
diff
changeset
|
1565 unsigned int c2; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1566 |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1567 /* Skip over the dash. */ |
30596
48a9e9f4fd9d
(skip_chars): Fix handling of multibyte<->unibyte conversion.
Kenichi Handa <handa@m17n.org>
parents:
30594
diff
changeset
|
1568 i_byte++; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1569 |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1570 /* Get the end of the range. */ |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1571 c2 = str[i_byte++]; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1572 if (c2 == '\\' |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1573 && i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1574 c2 = str[i_byte++]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1575 |
89483 | 1576 if (c <= c2) |
22116
09efd6a94b4b
(skip_chars): Fix bug in handling a range which
Kenichi Handa <handa@m17n.org>
parents:
22052
diff
changeset
|
1577 { |
09efd6a94b4b
(skip_chars): Fix bug in handling a range which
Kenichi Handa <handa@m17n.org>
parents:
22052
diff
changeset
|
1578 while (c <= c2) |
89483 | 1579 fastmap[c++] = 1; |
1580 if (! ASCII_CHAR_P (c2)) | |
1581 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
|
1582 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1583 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1584 else |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1585 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1586 fastmap[c] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1587 if (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1588 string_has_eight_bit = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1589 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1590 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1591 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1592 /* 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
|
1593 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
|
1594 the corresponding multibyte chars. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1595 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
|
1596 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1597 unsigned char fastmap2[0400]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1598 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
|
1599 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1600 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
|
1601 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
|
1602 /* 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
|
1603 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
|
1604 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
|
1605 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
|
1606 range_start_byte = i; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1607 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
|
1608 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
|
1609 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
|
1610 { |
105661
bac26aa40069
Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105426
diff
changeset
|
1611 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
|
1612 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
|
1613 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
|
1614 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1615 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
|
1616 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
|
1617 + range_start_char); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1618 range_start_byte = i; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1619 range_start_char = c; |
89483 | 1620 } |
89063
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 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
|
1623 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
|
1624 + range_start_char); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1625 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1626 } |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1627 else /* STRING is multibyte */ |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1628 { |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1629 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
|
1630 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1631 while (i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1632 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1633 unsigned char leading_code; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1634 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1635 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
|
1636 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
|
1637 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1638 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1639 if (handle_iso_classes && c == '[' |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1640 && 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
|
1641 && STRING_CHAR (str + i_byte) == ':') |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1642 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1643 const unsigned char *class_beg = str + i_byte + 1; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1644 const unsigned char *class_end = class_beg; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1645 const unsigned char *class_limit = str + size_byte - 2; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1646 /* Leave room for the null. */ |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1647 unsigned char class_name[CHAR_CLASS_MAX_LENGTH + 1]; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1648 re_wctype_t cc; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1649 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1650 if (class_limit - class_beg > CHAR_CLASS_MAX_LENGTH) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1651 class_limit = class_beg + CHAR_CLASS_MAX_LENGTH; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1652 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1653 while (class_end < class_limit |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1654 && *class_end >= 'a' && *class_end <= 'z') |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1655 class_end++; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1656 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1657 if (class_end == class_beg |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1658 || *class_end != ':' || class_end[1] != ']') |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1659 goto not_a_class_name_multibyte; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1660 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1661 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>
diff
changeset
|
1662 class_name[class_end - class_beg] = 0; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1663 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1664 cc = re_wctype (class_name); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1665 if (cc == 0) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1666 error ("Invalid ISO C character class"); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1667 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1668 iso_classes = Fcons (make_number (cc), iso_classes); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1669 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1670 i_byte = class_end + 2 - str; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1671 continue; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1672 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1673 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1674 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
|
1675 if (c == '\\') |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1676 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1677 if (i_byte == size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1678 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1679 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1680 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
|
1681 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
|
1682 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1683 } |
89880 | 1684 /* Treat `-' as range character only if another character |
1685 follows. */ | |
1686 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
|
1687 && str[i_byte] == '-') |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1688 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1689 unsigned int c2; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1690 unsigned char leading_code2; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1691 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1692 /* Skip over the dash. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1693 i_byte++; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1694 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1695 /* 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
|
1696 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
|
1697 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
|
1698 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1699 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1700 if (c2 == '\\' |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1701 && i_byte < size_byte) |
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 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
|
1704 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
|
1705 i_byte += len; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1706 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1707 |
89622
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1708 if (c > c2) |
96081c0be5ca
(skip_chars): Be sure to alloca char_ranges when necessary.
Kenichi Handa <handa@m17n.org>
parents:
89483
diff
changeset
|
1709 continue; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1710 if (ASCII_CHAR_P (c)) |
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 while (c <= c2 && c < 0x80) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1713 fastmap[c++] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1714 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
|
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)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1717 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1718 while (leading_code <= leading_code2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1719 fastmap[leading_code++] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1720 if (c <= c2) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1721 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1722 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
|
1723 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
|
1724 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1725 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1726 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1727 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1728 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1729 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
|
1730 fastmap[c] = 1; |
9d47c133b357
* syntax.c (skip_chars): Fix previous change. Make the handling of
Kenichi Handa <handa@m17n.org>
parents:
30596
diff
changeset
|
1731 else |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1732 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1733 fastmap[leading_code] = 1; |
20626
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1734 char_ranges[n_char_ranges++] = c; |
a39bcf9c0e1e
(skip_chars): Handle multibyte and unibyte strings
Richard M. Stallman <rms@gnu.org>
parents:
20546
diff
changeset
|
1735 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
|
1736 } |
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
1737 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1738 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1739 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1740 /* 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
|
1741 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
|
1742 chars. */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1743 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1744 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
|
1745 { |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1746 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
|
1747 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
|
1748 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1749 int c1 = char_ranges[i]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1750 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
|
1751 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1752 for (; c1 <= c2; c1++) |
95856
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1753 { |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1754 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
|
1755 if (b >= 0) |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1756 fastmap[b] = 1; |
f13a77e0e34f
* character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
1757 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1758 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1759 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1760 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1761 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1762 /* 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
|
1763 if (negate) |
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 if (! multibyte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1766 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
|
1767 fastmap[i] ^= 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1768 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1769 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1770 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
|
1771 fastmap[i] ^= 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1772 /* 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
|
1773 for (; i < sizeof fastmap; i++) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1774 fastmap[i] = 1; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1775 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1776 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1777 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1778 { |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
1779 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
|
1780 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
|
1781 EMACS_INT pos_byte = PT_BYTE; |
89483 | 1782 unsigned char *p = PT_ADDR, *endp, *stop; |
1783 | |
1784 if (forwardp) | |
1785 { | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1786 endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim)); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1787 stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp; |
89483 | 1788 } |
1789 else | |
1790 { | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1791 endp = CHAR_POS_ADDR (XINT (lim)); |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1792 stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp; |
89483 | 1793 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1794 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1795 immediate_quit = 1; |
107335
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1796 /* 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
|
1797 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
|
1798 let's initialize it manually. |
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
1799 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
|
1800 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
|
1801 SETUP_BUFFER_SYNTAX_TABLE (); |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1802 if (forwardp) |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1803 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1804 if (multibyte) |
89483 | 1805 while (1) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1806 { |
89483 | 1807 int nbytes; |
1808 | |
1809 if (p >= stop) | |
1810 { | |
1811 if (p >= endp) | |
1812 break; | |
1813 p = GAP_END_ADDR; | |
1814 stop = endp; | |
1815 } | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
1816 c = STRING_CHAR_AND_LENGTH (p, nbytes); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1817 if (! NILP (iso_classes) && in_classes (c, iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1818 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1819 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1820 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1821 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1822 goto fwd_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1823 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1824 |
89483 | 1825 if (! fastmap[*p]) |
89063
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 (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1828 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1829 /* 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
|
1830 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
|
1831 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
|
1832 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
|
1833 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1834 /* 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
|
1835 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
|
1836 CHAR_RANGES). */ |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1837 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
|
1838 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
|
1839 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1840 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
|
1841 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1842 } |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1843 fwd_ok: |
89483 | 1844 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
|
1845 } |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1846 else |
89483 | 1847 while (1) |
1848 { | |
1849 if (p >= stop) | |
1850 { | |
1851 if (p >= endp) | |
1852 break; | |
1853 p = GAP_END_ADDR; | |
1854 stop = endp; | |
1855 } | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1856 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1857 if (!NILP (iso_classes) && in_classes (*p, iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1858 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1859 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1860 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1861 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1862 goto fwd_unibyte_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1863 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1864 |
89483 | 1865 if (!fastmap[*p]) |
1866 break; | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1867 fwd_unibyte_ok: |
89483 | 1868 p++, pos++, pos_byte++; |
1869 } | |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1870 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1871 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1872 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1873 if (multibyte) |
89483 | 1874 while (1) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1875 { |
89483 | 1876 unsigned char *prev_p; |
1877 | |
1878 if (p <= stop) | |
1879 { | |
1880 if (p <= endp) | |
1881 break; | |
1882 p = GPT_ADDR; | |
1883 stop = endp; | |
1884 } | |
1885 prev_p = p; | |
1886 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
|
1887 c = STRING_CHAR (p); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1888 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1889 if (! NILP (iso_classes) && in_classes (c, iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1890 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1891 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1892 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1893 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1894 goto back_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1895 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1896 |
89483 | 1897 if (! fastmap[*p]) |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1898 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1899 if (! ASCII_CHAR_P (c)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1900 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1901 /* 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
|
1902 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
|
1903 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
|
1904 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1905 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
|
1906 break; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1907 } |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1908 back_ok: |
89483 | 1909 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
|
1910 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1911 else |
89483 | 1912 while (1) |
1913 { | |
1914 if (p <= stop) | |
1915 { | |
1916 if (p <= endp) | |
1917 break; | |
1918 p = GPT_ADDR; | |
1919 stop = endp; | |
1920 } | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1921 |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1922 if (! NILP (iso_classes) && in_classes (p[-1], iso_classes)) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1923 { |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1924 if (negate) |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1925 break; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1926 else |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1927 goto back_unibyte_ok; |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1928 } |
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1929 |
89483 | 1930 if (!fastmap[p[-1]]) |
1931 break; | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1932 back_unibyte_ok: |
89483 | 1933 p--, pos--, pos_byte--; |
1934 } | |
88389
39b2b971cdb3
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
41598
diff
changeset
|
1935 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1936 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1937 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
|
1938 immediate_quit = 0; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1939 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1940 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
|
1941 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1942 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1943 |
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 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1946 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
|
1947 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1948 register unsigned int c; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1949 unsigned char fastmap[0400]; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1950 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
|
1951 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
|
1952 int multibyte; |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
1953 EMACS_INT size_byte; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1954 unsigned char *str; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1955 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1956 CHECK_STRING (string); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1957 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1958 if (NILP (lim)) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1959 XSETINT (lim, forwardp ? ZV : BEGV); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1960 else |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1961 CHECK_NUMBER_COERCE_MARKER (lim); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1962 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1963 /* 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
|
1964 if (XINT (lim) > ZV) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1965 XSETFASTINT (lim, ZV); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1966 if (XINT (lim) < BEGV) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1967 XSETFASTINT (lim, BEGV); |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1968 |
89114 | 1969 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
|
1970 return make_number (0); |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
1971 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1972 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
|
1973 && (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
|
1974 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1975 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
|
1976 |
89483 | 1977 if (SBYTES (string) > SCHARS (string)) |
1978 /* As this is very rare case (syntax spec is ASCII only), don't | |
1979 consider efficiency. */ | |
89103
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1980 string = string_make_unibyte (string); |
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1981 |
89483 | 1982 str = SDATA (string); |
1983 size_byte = SBYTES (string); | |
89103
c4712a200dcb
(skip_chars): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89072
diff
changeset
|
1984 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1985 i_byte = 0; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1986 if (i_byte < size_byte |
89483 | 1987 && SREF (string, 0) == '^') |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1988 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1989 negate = 1; i_byte++; |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1990 } |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1991 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1992 /* 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
|
1993 |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1994 while (i_byte < size_byte) |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1995 { |
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
1996 c = str[i_byte++]; |
89483 | 1997 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
|
1998 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
1999 |
31944
05763e780521
(skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents:
31209
diff
changeset
|
2000 /* 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
|
2001 if (negate) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2002 for (i = 0; i < sizeof fastmap; i++) |
31944
05763e780521
(skip_chars): Handle negation correctly.
Kenichi Handa <handa@m17n.org>
parents:
31209
diff
changeset
|
2003 fastmap[i] ^= 1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2004 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2005 { |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
2006 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
|
2007 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
|
2008 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
|
2009 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
|
2010 |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2011 if (forwardp) |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2012 { |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2013 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
|
2014 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
|
2015 } |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2016 else |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2017 { |
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2018 endp = CHAR_POS_ADDR (XINT (lim)); |
55423
a9e10b866486
(Fmodify_syntax_entry): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54849
diff
changeset
|
2019 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
|
2020 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2021 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2022 immediate_quit = 1; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2023 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
|
2024 if (forwardp) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2025 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2026 if (multibyte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2027 { |
89483 | 2028 while (1) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2029 { |
89483 | 2030 int nbytes; |
2031 | |
2032 if (p >= stop) | |
2033 { | |
2034 if (p >= endp) | |
2035 break; | |
2036 p = GAP_END_ADDR; | |
2037 stop = endp; | |
2038 } | |
106185
f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents:
105877
diff
changeset
|
2039 c = STRING_CHAR_AND_LENGTH (p, nbytes); |
89483 | 2040 if (! fastmap[(int) SYNTAX (c)]) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2041 break; |
89483 | 2042 p += nbytes, pos++, pos_byte += nbytes; |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2043 UPDATE_SYNTAX_TABLE_FORWARD (pos); |
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2044 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2045 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2046 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2047 { |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2048 while (1) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2049 { |
89483 | 2050 if (p >= stop) |
2051 { | |
2052 if (p >= endp) | |
50675
96dc22fa49d3
(skip_chars): Make the code faster by using the common
Kenichi Handa <handa@m17n.org>
parents:
49971
diff
changeset
|
2053 break; |
89483 | 2054 p = GAP_END_ADDR; |
2055 stop = endp; | |
2056 } | |
2057 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
|
2058 break; |
89483 | 2059 p++, pos++, pos_byte++; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2060 UPDATE_SYNTAX_TABLE_FORWARD (pos); |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
2061 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2062 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2063 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2064 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2065 { |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2066 if (multibyte) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2067 { |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2068 while (1) |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
2069 { |
89483 | 2070 unsigned char *prev_p; |
2071 | |
2072 if (p <= stop) | |
2073 { | |
2074 if (p <= endp) | |
2075 break; | |
2076 p = GPT_ADDR; | |
2077 stop = endp; | |
2078 } | |
90851 | 2079 UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1); |
89483 | 2080 prev_p = p; |
2081 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
|
2082 c = STRING_CHAR (p); |
89483 | 2083 if (! fastmap[(int) SYNTAX (c)]) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2084 break; |
89483 | 2085 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
|
2086 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2087 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2088 else |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2089 { |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2090 while (1) |
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2091 { |
89483 | 2092 if (p <= stop) |
2093 { | |
2094 if (p <= endp) | |
2095 break; | |
2096 p = GPT_ADDR; | |
2097 stop = endp; | |
2098 } | |
90846
c035421fe210
(skip_syntaxes): Synch with the trunk.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2099 UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1); |
89483 | 2100 if (! fastmap[(int) SYNTAX (p[-1])]) |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2101 break; |
89483 | 2102 p--, pos--, pos_byte--; |
89113
326caaedbfef
(skip_syntaxes): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89112
diff
changeset
|
2103 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2104 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2105 } |
17564
050f15e0b948
(skip_chars): Merge mule changes back in.
Richard M. Stallman <rms@gnu.org>
parents:
17466
diff
changeset
|
2106 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2107 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
|
2108 immediate_quit = 0; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2109 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2110 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
|
2111 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2112 } |
56088 | 2113 |
2114 /* Return 1 if character C belongs to one of the ISO classes | |
2115 in the list ISO_CLASSES. Each class is represented by an | |
2116 integer which is its type according to re_wctype. */ | |
2117 | |
2118 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2119 in_classes (int c, Lisp_Object iso_classes) |
56088 | 2120 { |
2121 int fits_class = 0; | |
2122 | |
107335
230cb6c59526
(skip_chars): Setup gl_state (bug#3823).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2123 while (CONSP (iso_classes)) |
56088 | 2124 { |
2125 Lisp_Object elt; | |
2126 elt = XCAR (iso_classes); | |
2127 iso_classes = XCDR (iso_classes); | |
2128 | |
2129 if (re_iswctype (c, XFASTINT (elt))) | |
2130 fits_class = 1; | |
2131 } | |
2132 | |
2133 return fits_class; | |
2134 } | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2135 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2136 /* 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
|
2137 FROM is the current position. |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2138 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
|
2139 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
|
2140 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
|
2141 (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
|
2142 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
|
2143 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
|
2144 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
|
2145 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
|
2146 (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
|
2147 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2148 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
|
2149 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
|
2150 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
|
2151 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
|
2152 (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
|
2153 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2154 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
|
2155 character just after the comment. |
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 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
|
2158 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
|
2159 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2160 static int |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2161 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
|
2162 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
|
2163 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
|
2164 int *incomment_ptr) |
25445
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 register int c, c1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2167 register enum syntaxcode code; |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2168 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
|
2169 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2170 if (nesting <= 0) nesting = -1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2171 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2172 /* 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
|
2173 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
|
2174 syntax = prev_syntax; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2175 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
|
2176 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2177 while (1) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2178 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2179 if (from == stop) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2180 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2181 *incomment_ptr = nesting; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2182 *charpos_ptr = from; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2183 *bytepos_ptr = from_byte; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2184 return 0; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2185 } |
89483 | 2186 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
|
2187 syntax = SYNTAX_WITH_FLAGS (c); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2188 code = syntax & 0xff; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2189 if (code == Sendcomment |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2190 && 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
|
2191 && (SYNTAX_FLAGS_COMMENT_NESTED (syntax) ? |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2192 (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
|
2193 /* 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
|
2194 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
|
2195 section */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2196 break; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2197 if (code == Scomment_fence |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2198 && style == ST_COMMENT_STYLE) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2199 /* 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
|
2200 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
|
2201 section. */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2202 break; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2203 if (nesting > 0 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2204 && code == Scomment |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2205 && SYNTAX_FLAGS_COMMENT_NESTED (syntax) |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2206 && 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
|
2207 /* 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
|
2208 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
|
2209 nesting++; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2210 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2211 UPDATE_SYNTAX_TABLE_FORWARD (from); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2212 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2213 forw_incomment: |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2214 if (from < stop && SYNTAX_FLAGS_COMEND_FIRST (syntax) |
89483 | 2215 && (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
|
2216 other_syntax = SYNTAX_WITH_FLAGS (c1), |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2217 SYNTAX_FLAGS_COMEND_SECOND (other_syntax)) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2218 && 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
|
2219 && ((SYNTAX_FLAGS_COMMENT_NESTED (syntax) || |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2220 SYNTAX_FLAGS_COMMENT_NESTED (other_syntax)) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2221 ? nesting > 0 : nesting < 0)) |
25771
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2222 { |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2223 if (--nesting <= 0) |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2224 /* 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
|
2225 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
|
2226 section */ |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2227 break; |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2228 else |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2229 { |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2230 INC_BOTH (from, from_byte); |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2231 UPDATE_SYNTAX_TABLE_FORWARD (from); |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2232 } |
21925339c7d2
(update_syntax_table, find_defun_start, back_comment,
Gerd Moellmann <gerd@gnu.org>
parents:
25663
diff
changeset
|
2233 } |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2234 if (nesting > 0 |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2235 && from < stop |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2236 && SYNTAX_FLAGS_COMSTART_FIRST (syntax) |
89483 | 2237 && (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
|
2238 other_syntax = SYNTAX_WITH_FLAGS (c1), |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2239 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
|
2240 && 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
|
2241 && (SYNTAX_FLAGS_COMMENT_NESTED (syntax) || |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2242 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
|
2243 /* 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
|
2244 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
|
2245 section */ |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2246 { |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2247 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2248 UPDATE_SYNTAX_TABLE_FORWARD (from); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2249 nesting++; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2250 } |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2251 } |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2252 *charpos_ptr = from; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2253 *bytepos_ptr = from_byte; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2254 return 1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2255 } |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2256 |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2257 DEFUN ("forward-comment", Fforward_comment, Sforward_comment, 1, 1, 0, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49551
diff
changeset
|
2258 doc: /* |
48089 | 2259 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
|
2260 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
|
2261 Set point to where scanning stops. |
48089 | 2262 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
|
2263 between them, return t; otherwise return nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2264 (Lisp_Object count) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2265 { |
71739
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2266 register EMACS_INT from; |
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2267 EMACS_INT from_byte; |
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2268 register EMACS_INT stop; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
2269 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
|
2270 register enum syntaxcode code; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2271 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
|
2272 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
|
2273 int found; |
71739
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2274 EMACS_INT count1; |
a5eb5d8b1eca
(Fforward_comment): Revert the reversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71734
diff
changeset
|
2275 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
|
2276 int dummy; |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2277 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2278 CHECK_NUMBER (count); |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2279 count1 = XINT (count); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2280 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
|
2281 |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2282 immediate_quit = 1; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2283 QUIT; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2284 |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2285 from = PT; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2286 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
|
2287 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2288 SETUP_SYNTAX_TABLE (from, count1); |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2289 while (count1 > 0) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2290 { |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2291 do |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2292 { |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2293 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
|
2294 |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2295 if (from == stop) |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2296 { |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2297 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
|
2298 immediate_quit = 0; |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2299 return Qnil; |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2300 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2301 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
|
2302 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
|
2303 code = SYNTAX (c); |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2304 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
|
2305 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2306 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
|
2307 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
|
2308 UPDATE_SYNTAX_TABLE_FORWARD (from); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2309 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
|
2310 && (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
|
2311 other_syntax = SYNTAX_WITH_FLAGS (c1), |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2312 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
|
2313 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2314 /* 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
|
2315 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
|
2316 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
|
2317 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
|
2318 the comment section. */ |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2319 code = Scomment; |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2320 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
|
2321 comnested |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2322 = 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
|
2323 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
|
2324 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
|
2325 } |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2326 } |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2327 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
|
2328 |
25290
a80acb2a8273
(Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents:
24728
diff
changeset
|
2329 if (code == Scomment_fence) |
a80acb2a8273
(Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents:
24728
diff
changeset
|
2330 comstyle = ST_COMMENT_STYLE; |
a80acb2a8273
(Fforward_comment): Set comstyle for Scomment_fence.
Karl Heuer <kwzh@gnu.org>
parents:
24728
diff
changeset
|
2331 else if (code != Scomment) |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2332 { |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2333 immediate_quit = 0; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2334 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
|
2335 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
|
2336 return Qnil; |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2337 } |
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2338 /* 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
|
2339 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
|
2340 &out_charpos, &out_bytepos, &dummy); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2341 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
|
2342 if (!found) |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2343 { |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2344 immediate_quit = 0; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2345 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
|
2346 return Qnil; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2347 } |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2348 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2349 UPDATE_SYNTAX_TABLE_FORWARD (from); |
6142
2dbc79d01191
(Fforward_comment): Do the right thing at eob.
Karl Heuer <kwzh@gnu.org>
parents:
5755
diff
changeset
|
2350 /* We have skipped one comment. */ |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2351 count1--; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2352 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2353 |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2354 while (count1 < 0) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2355 { |
18938
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2356 while (1) |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2357 { |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2358 int quoted, syntax; |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2359 |
18938
444939f3c18f
(Fforward_comment): When count1 is negative, return nil if FROM reaches STOP.
Richard M. Stallman <rms@gnu.org>
parents:
18738
diff
changeset
|
2360 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
|
2361 { |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2362 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
|
2363 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
|
2364 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
|
2365 } |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2366 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2367 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
|
2368 /* 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
|
2369 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
|
2370 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
|
2371 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
|
2372 code = SYNTAX (c); |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2373 comstyle = 0; |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2374 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
|
2375 if (code == Sendcomment) |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2376 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
|
2377 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
|
2378 && 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
|
2379 && !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
|
2380 { |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2381 int other_syntax; |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2382 /* 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
|
2383 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
|
2384 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
|
2385 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
|
2386 code = Sendcomment; |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2387 /* 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
|
2388 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
|
2389 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
|
2390 other_syntax = SYNTAX_WITH_FLAGS (c1); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2391 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
|
2392 comnested |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2393 = 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
|
2394 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2395 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2396 if (code == Scomment_fence) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2397 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2398 /* 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
|
2399 int found = 0; |
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
2400 EMACS_INT ini = from, ini_byte = from_byte; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2401 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2402 while (1) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2403 { |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2404 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
|
2405 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
|
2406 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
|
2407 if (SYNTAX (c) == Scomment_fence |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2408 && !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
|
2409 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2410 found = 1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2411 break; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2412 } |
70317
48f9beb0cfdc
(Fforward_comment): Detect generic comment at beginning of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70291
diff
changeset
|
2413 else if (from == stop) |
48f9beb0cfdc
(Fforward_comment): Detect generic comment at beginning of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70291
diff
changeset
|
2414 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2415 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2416 if (found == 0) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2417 { |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2418 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
|
2419 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
|
2420 goto leave; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2421 } |
70291
e4dbfbc6b5c6
(Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
2422 else |
e4dbfbc6b5c6
(Fforward_comment): Don't forget to break out of the loop
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
2423 /* 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
|
2424 break; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2425 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2426 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
|
2427 { |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2428 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
|
2429 &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
|
2430 if (found == -1) |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2431 { |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2432 if (c == '\n') |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2433 /* 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
|
2434 Treat it like a whitespace. |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2435 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
|
2436 ; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2437 else |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2438 { |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2439 /* 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
|
2440 not-quite-endcomment. */ |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2441 if (SYNTAX (c) != code) |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2442 /* It was a two-char Sendcomment. */ |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2443 INC_BOTH (from, from_byte); |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2444 goto leave; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2445 } |
27698
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2446 } |
27719
73926d5a4d9f
(Fforward_comment): Undo the previous change, since cc-mode
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27698
diff
changeset
|
2447 else |
32086
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2448 { |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2449 /* We have skipped one comment. */ |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2450 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
|
2451 break; |
73d18e25e303
(forw_comment): Match nestedness of ender/starter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31944
diff
changeset
|
2452 } |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2453 } |
39796
dcc6aae53ac8
(update_syntax_table): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39748
diff
changeset
|
2454 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
|
2455 { |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2456 leave: |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2457 immediate_quit = 0; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2458 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
|
2459 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
|
2460 return Qnil; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2461 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2462 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2463 |
3095
ef7d99920f81
(Fforward_comment): Arg is a Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
3087
diff
changeset
|
2464 count1++; |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2465 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2466 |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2467 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
|
2468 immediate_quit = 0; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2469 return Qt; |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2470 } |
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
2471 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2472 /* Return syntax code of character C if C is an ASCII character |
38047 | 2473 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
|
2474 |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2475 #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
|
2476 ((ASCII_CHAR_P (c) || !multibyte_symbol_p) \ |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2477 ? SYNTAX (c) : Ssymbol) |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2478 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2479 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2480 scan_lists (register EMACS_INT from, EMACS_INT count, EMACS_INT depth, int sexpflag) |
163 | 2481 { |
2482 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
|
2483 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
|
2484 register int c, c1; |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2485 int stringterm; |
163 | 2486 int quoted; |
2487 int mathexit = 0; | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2488 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
|
2489 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
|
2490 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
|
2491 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
|
2492 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
|
2493 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
|
2494 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
|
2495 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
|
2496 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
|
2497 int temp, dummy; |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2498 int multibyte_symbol_p = sexpflag && multibyte_syntax_as_symbol; |
163 | 2499 |
2500 if (depth > 0) min_depth = 0; | |
2501 | |
23404
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2502 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
|
2503 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
|
2504 |
529689c4a32c
(scan_lists): Bring FROM back into range BEGV...ZV.
Richard M. Stallman <rms@gnu.org>
parents:
22994
diff
changeset
|
2505 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
|
2506 |
163 | 2507 immediate_quit = 1; |
2508 QUIT; | |
2509 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2510 SETUP_SYNTAX_TABLE (from, count); |
163 | 2511 while (count > 0) |
2512 { | |
2513 while (from < stop) | |
2514 { | |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2515 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
|
2516 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
|
2517 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
|
2518 syntax = SYNTAX_WITH_FLAGS (c); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2519 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
|
2520 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
|
2521 comnested = SYNTAX_FLAGS_COMMENT_NESTED (syntax); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2522 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
|
2523 prefix = SYNTAX_FLAGS_PREFIX (syntax); |
16992
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2524 if (depth == min_depth) |
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2525 last_good = from; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2526 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
|
2527 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
|
2528 if (from < stop && comstart_first |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2529 && (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
|
2530 other_syntax = SYNTAX_WITH_FLAGS (c), |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2531 SYNTAX_FLAGS_COMSTART_SECOND (other_syntax)) |
163 | 2532 && 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
|
2533 { |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2534 /* 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
|
2535 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
|
2536 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
|
2537 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
|
2538 the comment section */ |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
2539 code = Scomment; |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2540 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
|
2541 comnested |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2542 = 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
|
2543 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
|
2544 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
|
2545 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2546 |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2547 if (prefix) |
163 | 2548 continue; |
2549 | |
10457
2ab3bd0288a9
Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents:
9863
diff
changeset
|
2550 switch (SWITCH_ENUM_CAST (code)) |
163 | 2551 { |
2552 case Sescape: | |
2553 case Scharquote: | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2554 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2555 goto lose; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2556 INC_BOTH (from, from_byte); |
163 | 2557 /* treat following character as a word constituent */ |
2558 case Sword: | |
2559 case Ssymbol: | |
2560 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
|
2561 /* This word counts as a sexp; return at end of it. */ |
163 | 2562 while (from < stop) |
2563 { | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2564 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
|
2565 |
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2566 /* 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
|
2567 c = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2568 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
|
2569 switch (temp) |
163 | 2570 { |
2571 case Scharquote: | |
2572 case Sescape: | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2573 INC_BOTH (from, from_byte); |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2574 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2575 goto lose; |
163 | 2576 break; |
2577 case Sword: | |
2578 case Ssymbol: | |
2579 case Squote: | |
2580 break; | |
2581 default: | |
2582 goto done; | |
2583 } | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2584 INC_BOTH (from, from_byte); |
163 | 2585 } |
2586 goto done; | |
2587 | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2588 case Scomment_fence: |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2589 comstyle = ST_COMMENT_STYLE; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2590 /* FALLTHROUGH */ |
163 | 2591 case Scomment: |
2592 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
|
2593 UPDATE_SYNTAX_TABLE_FORWARD (from); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2594 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
|
2595 comnested, comstyle, 0, |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2596 &out_charpos, &out_bytepos, &dummy); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2597 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
|
2598 if (!found) |
163 | 2599 { |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2600 if (depth == 0) |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2601 goto done; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2602 goto lose; |
163 | 2603 } |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2604 INC_BOTH (from, from_byte); |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2605 UPDATE_SYNTAX_TABLE_FORWARD (from); |
163 | 2606 break; |
2607 | |
2608 case Smath: | |
2609 if (!sexpflag) | |
2610 break; | |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2611 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
|
2612 { |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2613 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
|
2614 } |
163 | 2615 if (mathexit) |
2616 { | |
2617 mathexit = 0; | |
2618 goto close1; | |
2619 } | |
2620 mathexit = 1; | |
2621 | |
2622 case Sopen: | |
2623 if (!++depth) goto done; | |
2624 break; | |
2625 | |
2626 case Sclose: | |
2627 close1: | |
2628 if (!--depth) goto done; | |
2629 if (depth < min_depth) | |
71988 | 2630 xsignal3 (Qscan_error, |
2631 build_string ("Containing expression ends prematurely"), | |
2632 make_number (last_good), make_number (from)); | |
163 | 2633 break; |
2634 | |
2635 case Sstring: | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2636 case Sstring_fence: |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2637 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
|
2638 stringterm = FETCH_CHAR_AS_MULTIBYTE (temp_pos); |
163 | 2639 while (1) |
2640 { | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2641 if (from >= stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2642 goto lose; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2643 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
|
2644 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
|
2645 if (code == Sstring |
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
2646 ? (c == stringterm |
945b3e6bf3e7
(scan_lists): Check that the right quote char has the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32794
diff
changeset
|
2647 && SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring) |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2648 : 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
|
2649 break; |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2650 |
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
2651 /* 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
|
2652 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
|
2653 switch (temp) |
163 | 2654 { |
2655 case Scharquote: | |
2656 case Sescape: | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2657 INC_BOTH (from, from_byte); |
163 | 2658 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2659 INC_BOTH (from, from_byte); |
163 | 2660 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2661 INC_BOTH (from, from_byte); |
163 | 2662 if (!depth && sexpflag) goto done; |
2663 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
|
2664 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
|
2665 /* 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
|
2666 break; |
163 | 2667 } |
2668 } | |
2669 | |
2670 /* 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
|
2671 if (depth) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2672 goto lose; |
163 | 2673 |
2674 immediate_quit = 0; | |
2675 return Qnil; | |
2676 | |
2677 /* End of object reached */ | |
2678 done: | |
2679 count--; | |
2680 } | |
2681 | |
2682 while (count < 0) | |
2683 { | |
2684 while (from > stop) | |
2685 { | |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2686 int syntax; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2687 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
|
2688 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
|
2689 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
|
2690 syntax= SYNTAX_WITH_FLAGS (c); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2691 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
|
2692 if (depth == min_depth) |
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
2693 last_good = from; |
4953
7545290052bf
(Fforward_comment): On backward scan, exit inner loop
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
2694 comstyle = 0; |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2695 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
|
2696 if (code == Sendcomment) |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2697 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
|
2698 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
|
2699 && prev_char_comend_first (from, from_byte) |
163 | 2700 && 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
|
2701 { |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2702 /* 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
|
2703 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
|
2704 sequence of the same style. */ |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2705 int c1, other_syntax; |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2706 DEC_BOTH (from, from_byte); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2707 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
|
2708 code = Sendcomment; |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2709 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
|
2710 other_syntax = SYNTAX_WITH_FLAGS (c1); |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2711 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
|
2712 comnested |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2713 = 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
|
2714 } |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2715 |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2716 /* 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
|
2717 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
|
2718 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
|
2719 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
|
2720 { |
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
|
2721 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
|
2722 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
|
2723 } |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
2724 else if (SYNTAX_FLAGS_PREFIX (syntax)) |
163 | 2725 continue; |
2726 | |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2727 switch (SWITCH_ENUM_CAST (code)) |
163 | 2728 { |
2729 case Sword: | |
2730 case Ssymbol: | |
20674
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2731 case Sescape: |
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
diff
changeset
|
2732 case Scharquote: |
163 | 2733 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
|
2734 /* 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
|
2735 after passing it. */ |
163 | 2736 while (from > stop) |
2737 { | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2738 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
|
2739 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
|
2740 DEC_POS (temp_pos); |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2741 else |
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2742 temp_pos--; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2743 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
|
2744 c1 = FETCH_CHAR_AS_MULTIBYTE (temp_pos); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2745 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
|
2746 /* 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
|
2747 if (temp_code == Sendcomment) |
fa7d4c0ee36c
(skip_chars): Fix test for end of string, looking for `-'.
Karl Heuer <kwzh@gnu.org>
parents:
20626
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 quoted = char_quoted (from - 1, temp_pos); |
163 | 2750 if (quoted) |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2751 { |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2752 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
|
2753 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
|
2754 UPDATE_SYNTAX_TABLE_BACKWARD (from - 1); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2755 } |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2756 c1 = FETCH_CHAR_AS_MULTIBYTE (temp_pos); |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2757 temp_code = SYNTAX_WITH_MULTIBYTE_CHECK (c1); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2758 if (! (quoted || temp_code == Sword |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2759 || temp_code == Ssymbol |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2760 || temp_code == Squote)) |
163 | 2761 goto done2; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2762 DEC_BOTH (from, from_byte); |
163 | 2763 } |
2764 goto done2; | |
2765 | |
2766 case Smath: | |
2767 if (!sexpflag) | |
2768 break; | |
20905
e646a6ae42cd
(skip_chars): Use INC_POS instead of INC_BOTH.
Richard M. Stallman <rms@gnu.org>
parents:
20766
diff
changeset
|
2769 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
|
2770 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
|
2771 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
|
2772 DEC_BOTH (from, from_byte); |
163 | 2773 if (mathexit) |
2774 { | |
2775 mathexit = 0; | |
2776 goto open2; | |
2777 } | |
2778 mathexit = 1; | |
2779 | |
2780 case Sclose: | |
2781 if (!++depth) goto done2; | |
2782 break; | |
2783 | |
2784 case Sopen: | |
2785 open2: | |
2786 if (!--depth) goto done2; | |
2787 if (depth < min_depth) | |
71988 | 2788 xsignal3 (Qscan_error, |
2789 build_string ("Containing expression ends prematurely"), | |
2790 make_number (last_good), make_number (from)); | |
163 | 2791 break; |
2792 | |
2793 case Sendcomment: | |
2794 if (!parse_sexp_ignore_comments) | |
2795 break; | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2796 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
|
2797 &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
|
2798 /* 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
|
2799 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
|
2800 from skipping the char. |
9c61956399b2
(back_comment): Make sure we only consider comment-starters
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27080
diff
changeset
|
2801 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
|
2802 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
|
2803 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
|
2804 if (found != -1) |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2805 from = out_charpos, from_byte = out_bytepos; |
163 | 2806 break; |
2807 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2808 case Scomment_fence: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2809 case Sstring_fence: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2810 while (1) |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2811 { |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2812 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2813 goto lose; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2814 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
|
2815 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2816 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
|
2817 && (c = FETCH_CHAR_AS_MULTIBYTE (from_byte), |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
2818 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
|
2819 break; |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2820 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2821 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
|
2822 break; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2823 |
163 | 2824 case Sstring: |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
2825 stringterm = FETCH_CHAR_AS_MULTIBYTE (from_byte); |
163 | 2826 while (1) |
2827 { | |
91806
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2828 if (from == stop) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2829 goto lose; |
54849
3f107190e71f
(scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53508
diff
changeset
|
2830 DEC_BOTH (from, from_byte); |
3f107190e71f
(scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53508
diff
changeset
|
2831 UPDATE_SYNTAX_TABLE_BACKWARD (from); |
3f107190e71f
(scan_lists): Simplify backward string scan.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53508
diff
changeset
|
2832 if (!char_quoted (from, from_byte) |
89909 | 2833 && (stringterm |
2834 == (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
|
2835 && SYNTAX_WITH_MULTIBYTE_CHECK (c) == Sstring) |
163 | 2836 break; |
2837 } | |
2838 if (!depth && sexpflag) goto done2; | |
2839 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
|
2840 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
|
2841 /* 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
|
2842 break; |
163 | 2843 } |
2844 } | |
2845 | |
2846 /* 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
|
2847 if (depth) |
6c0a55931b1c
(scan_lists): Follow coding convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2848 goto lose; |
163 | 2849 |
2850 immediate_quit = 0; | |
2851 return Qnil; | |
2852 | |
2853 done2: | |
2854 count++; | |
2855 } | |
2856 | |
2857 | |
2858 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
|
2859 XSETFASTINT (val, from); |
163 | 2860 return val; |
2861 | |
2862 lose: | |
71988 | 2863 xsignal3 (Qscan_error, |
2864 build_string ("Unbalanced parentheses"), | |
2865 make_number (last_good), make_number (from)); | |
163 | 2866 } |
2867 | |
2868 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
|
2869 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
|
2870 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
|
2871 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2872 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
|
2873 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
|
2874 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
|
2875 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
|
2876 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2877 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
|
2878 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2879 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
|
2880 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
|
2881 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
|
2882 (Lisp_Object from, Lisp_Object count, Lisp_Object depth) |
163 | 2883 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2884 CHECK_NUMBER (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2885 CHECK_NUMBER (count); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2886 CHECK_NUMBER (depth); |
163 | 2887 |
2888 return scan_lists (XINT (from), XINT (count), XINT (depth), 0); | |
2889 } | |
2890 | |
2891 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
|
2892 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
|
2893 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
|
2894 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
|
2895 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2896 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
|
2897 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2898 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
|
2899 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
|
2900 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
|
2901 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
|
2902 (Lisp_Object from, Lisp_Object count) |
163 | 2903 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2904 CHECK_NUMBER (from); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
2905 CHECK_NUMBER (count); |
163 | 2906 |
2907 return scan_lists (XINT (from), XINT (count), 0, 1); | |
2908 } | |
2909 | |
2910 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
|
2911 0, 0, 0, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39796
diff
changeset
|
2912 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
|
2913 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
|
2914 (void) |
163 | 2915 { |
110551
f28cc7ff91f9
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
Eli Zaretskii <eliz@gnu.org>
parents:
110533
diff
changeset
|
2916 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
|
2917 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
|
2918 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
|
2919 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
|
2920 EMACS_INT pos_byte = PT_BYTE; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2921 int c; |
163 | 2922 |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
2923 if (pos <= beg) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2924 { |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2925 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
|
2926 |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2927 return Qnil; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
2928 } |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2929 |
22370
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2930 SETUP_SYNTAX_TABLE (pos, -1); |
1f0dc0251be3
(scan_lists): Properly skip the comment-fence character
Richard M. Stallman <rms@gnu.org>
parents:
22130
diff
changeset
|
2931 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2932 DEC_BOTH (pos, pos_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2933 |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2934 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
|
2935 /* 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
|
2936 && ((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
|
2937 || SYNTAX_PREFIX (c))) |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2938 { |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2939 opoint = pos; |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2940 opoint_byte = pos_byte; |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2941 |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2942 if (pos + 1 > beg) |
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
2943 DEC_BOTH (pos, pos_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2944 } |
163 | 2945 |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2946 SET_PT_BOTH (opoint, opoint_byte); |
163 | 2947 |
2948 return Qnil; | |
2949 } | |
2950 | |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2951 /* 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
|
2952 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
|
2953 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
|
2954 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
|
2955 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
|
2956 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
|
2957 after the beginning of a string, or after the end of a string. */ |
163 | 2958 |
3720
408c7ee69be7
(scan_lists, Fforward_comment): Pass 0 as commentstop arg
Richard M. Stallman <rms@gnu.org>
parents:
3684
diff
changeset
|
2959 static void |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109179
diff
changeset
|
2960 scan_sexps_forward (struct lisp_parse_state *stateptr, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109179
diff
changeset
|
2961 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
|
2962 int targetdepth, int stopbefore, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109179
diff
changeset
|
2963 Lisp_Object oldstate, int commentstop) |
163 | 2964 { |
2965 struct lisp_parse_state state; | |
2966 | |
2967 register enum syntaxcode code; | |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2968 int c1; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2969 int comnested; |
163 | 2970 struct level { int last, prev; }; |
2971 struct level levelstart[100]; | |
2972 register struct level *curlevel = levelstart; | |
2973 struct level *endlevel = levelstart + 100; | |
2974 register int depth; /* Paren depth of current scanning location. | |
2975 level - levelstart equals this except | |
2976 when the depth becomes negative. */ | |
2977 int mindepth; /* Lowest DEPTH value seen. */ | |
2978 int start_quoted = 0; /* Nonzero means starting after a char quote */ | |
2979 Lisp_Object tem; | |
96838
e39a36c3dcc3
(find_start_pos, find_start_value)
Andreas Schwab <schwab@suse.de>
parents:
96752
diff
changeset
|
2980 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
|
2981 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
|
2982 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
|
2983 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
|
2984 int nofence; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
2985 int found; |
71867
c8c21ddb276e
(scan_sexps_forward): Use EMACS_INT for out_bytepos and
Andreas Schwab <schwab@suse.de>
parents:
71843
diff
changeset
|
2986 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
|
2987 int temp; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2988 |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2989 prev_from = from; |
20546
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2990 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
|
2991 if (from != BEGV) |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2992 DEC_BOTH (prev_from, prev_from_byte); |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2993 |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
2994 /* 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
|
2995 #define INC_FROM \ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2996 do { prev_from = from; \ |
a475efff810e
(scan_sexps_forward): Additional arg FROM_BYTE. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
20486
diff
changeset
|
2997 prev_from_byte = from_byte; \ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
2998 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
|
2999 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
|
3000 INC_BOTH (from, from_byte); \ |
48266
a404c0056619
(scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48236
diff
changeset
|
3001 if (from < end) \ |
a404c0056619
(scan_sexps_forward): Undo last patch.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48236
diff
changeset
|
3002 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
|
3003 } while (0) |
163 | 3004 |
3005 immediate_quit = 1; | |
3006 QUIT; | |
3007 | |
485 | 3008 if (NILP (oldstate)) |
163 | 3009 { |
3010 depth = 0; | |
3011 state.instring = -1; | |
3012 state.incomment = 0; | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3013 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
|
3014 state.comstr_start = -1; /* no comment/string seen. */ |
163 | 3015 } |
3016 else | |
3017 { | |
3018 tem = Fcar (oldstate); | |
485 | 3019 if (!NILP (tem)) |
163 | 3020 depth = XINT (tem); |
3021 else | |
3022 depth = 0; | |
3023 | |
3024 oldstate = Fcdr (oldstate); | |
3025 oldstate = Fcdr (oldstate); | |
3026 oldstate = Fcdr (oldstate); | |
3027 tem = Fcar (oldstate); | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3028 /* Check whether we are inside string_fence-style string: */ |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3029 state.instring = (!NILP (tem) |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3030 ? (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
|
3031 : -1); |
163 | 3032 |
3033 oldstate = Fcdr (oldstate); | |
3034 tem = Fcar (oldstate); | |
26272
1cbb1b30793d
Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents:
26060
diff
changeset
|
3035 state.incomment = (!NILP (tem) |
1cbb1b30793d
Remove whitespace after open or in front of closing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents:
26060
diff
changeset
|
3036 ? (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
|
3037 : 0); |
163 | 3038 |
3039 oldstate = Fcdr (oldstate); | |
3040 tem = Fcar (oldstate); | |
485 | 3041 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
|
3042 |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3043 /* 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
|
3044 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
|
3045 oldstate = Fcdr (oldstate); |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3046 oldstate = Fcdr (oldstate); |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3047 tem = Fcar (oldstate); |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3048 state.comstyle = (NILP (tem) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3049 ? 0 |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3050 : (EQ (tem, Qsyntax_table) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3051 ? ST_COMMENT_STYLE |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3052 : 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
|
3053 |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3054 oldstate = Fcdr (oldstate); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3055 tem = Fcar (oldstate); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3056 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
|
3057 oldstate = Fcdr (oldstate); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3058 tem = Fcar (oldstate); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3059 while (!NILP (tem)) /* >= second enclosing sexps. */ |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3060 { |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3061 /* 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
|
3062 curlevel->last = XINT (Fcar (tem)); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3063 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
|
3064 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
|
3065 curlevel->prev = -1; |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3066 curlevel->last = -1; |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3067 tem = Fcdr (tem); |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3068 } |
163 | 3069 } |
3070 state.quoted = 0; | |
3071 mindepth = depth; | |
3072 | |
3073 curlevel->prev = -1; | |
3074 curlevel->last = -1; | |
3075 | |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3076 SETUP_SYNTAX_TABLE (prev_from, 1); |
56067
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
3077 temp = FETCH_CHAR (prev_from_byte); |
c1e92ca4c785
(char_quoted): Avoid warning about undefined operation.
Andreas Schwab <schwab@suse.de>
parents:
55423
diff
changeset
|
3078 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
|
3079 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
|
3080 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3081 /* Enter the loop at a place appropriate for initial state. */ |
163 | 3082 |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3083 if (state.incomment) |
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3084 goto startincomment; |
163 | 3085 if (state.instring >= 0) |
3086 { | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3087 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
|
3088 if (start_quoted) |
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3089 goto startquotedinstring; |
163 | 3090 goto startinstring; |
3091 } | |
22994
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3092 else if (start_quoted) |
85f64bf341c3
(scan_sexps_forward): Set up the syntax table scanning
Richard M. Stallman <rms@gnu.org>
parents:
22547
diff
changeset
|
3093 goto startquoted; |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
3094 |
163 | 3095 while (from < end) |
3096 { | |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3097 int syntax; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3098 INC_FROM; |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
3099 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
|
3100 |
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 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
|
3102 && 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
|
3103 && (c1 = FETCH_CHAR (from_byte), |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3104 syntax = SYNTAX_WITH_FLAGS (c1), |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3105 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
|
3106 /* 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
|
3107 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
|
3108 { |
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
|
3109 /* 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
|
3110 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
|
3111 terminates the comment section. */ |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3112 state.comstyle |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3113 = 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
|
3114 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
|
3115 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
|
3116 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
|
3117 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
|
3118 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
|
3119 code = Scomment; |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3120 } |
18491
bf0d449581c8
(scan_sexps_forward): Split up a complex if-test.
Richard M. Stallman <rms@gnu.org>
parents:
18113
diff
changeset
|
3121 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
|
3122 { |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3123 /* 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
|
3124 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
|
3125 terminates the comment section. */ |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3126 state.comstyle = ST_COMMENT_STYLE; |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3127 state.incomment = -1; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3128 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
|
3129 code = Scomment; |
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3130 } |
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
|
3131 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
|
3132 { |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3133 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
|
3134 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
|
3135 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
|
3136 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
|
3137 } |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3138 |
21207
390b39d69836
(Fbackward_prefix_chars): Set point properly while scanning.
Richard M. Stallman <rms@gnu.org>
parents:
21011
diff
changeset
|
3139 if (SYNTAX_FLAGS_PREFIX (prev_from_syntax)) |
163 | 3140 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
|
3141 switch (SWITCH_ENUM_CAST (code)) |
163 | 3142 { |
3143 case Sescape: | |
3144 case Scharquote: | |
3145 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
|
3146 curlevel->last = prev_from; |
163 | 3147 startquoted: |
3148 if (from == end) goto endquoted; | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3149 INC_FROM; |
163 | 3150 goto symstarted; |
3151 /* treat following character as a word constituent */ | |
3152 case Sword: | |
3153 case Ssymbol: | |
3154 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
|
3155 curlevel->last = prev_from; |
163 | 3156 symstarted: |
3157 while (from < end) | |
3158 { | |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3159 /* Some compilers can't handle this inside the switch. */ |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
3160 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
|
3161 temp = SYNTAX (temp); |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3162 switch (temp) |
163 | 3163 { |
3164 case Scharquote: | |
3165 case Sescape: | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3166 INC_FROM; |
163 | 3167 if (from == end) goto endquoted; |
3168 break; | |
3169 case Sword: | |
3170 case Ssymbol: | |
3171 case Squote: | |
3172 break; | |
3173 default: | |
3174 goto symdone; | |
3175 } | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3176 INC_FROM; |
163 | 3177 } |
3178 symdone: | |
3179 curlevel->prev = curlevel->last; | |
3180 break; | |
3181 | |
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
|
3182 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
|
3183 case Scomment: |
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3184 if (commentstop || boundary_stop) goto done; |
9475
c15caadae3c4
(scan_sexps_forward): At startincomment,
Richard M. Stallman <rms@gnu.org>
parents:
9411
diff
changeset
|
3185 startincomment: |
29823
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3186 /* 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
|
3187 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
|
3188 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
|
3189 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
|
3190 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
|
3191 state.incomment, state.comstyle, |
29821
819dfcbd36c7
(describe_syntax): Recognize the `n'estable bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29757
diff
changeset
|
3192 (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
|
3193 ? 0 : prev_from_syntax, |
25445
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3194 &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
|
3195 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
|
3196 /* 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
|
3197 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
|
3198 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
|
3199 if (!found) goto done; |
29823
5a736b07dbf2
(scan_sexps_forward):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29821
diff
changeset
|
3200 INC_FROM; |
163 | 3201 state.incomment = 0; |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3202 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
|
3203 if (boundary_stop) goto done; |
163 | 3204 break; |
3205 | |
3206 case Sopen: | |
3207 if (stopbefore) goto stop; /* this arg means stop at sexp start */ | |
3208 depth++; | |
3209 /* 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
|
3210 curlevel->last = prev_from; |
163 | 3211 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
|
3212 curlevel--; /* error ("Nesting too deep for parser"); */ |
163 | 3213 curlevel->prev = -1; |
3214 curlevel->last = -1; | |
12894
b2a75405de3c
(scan_sexps_forward): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
12870
diff
changeset
|
3215 if (targetdepth == depth) goto done; |
163 | 3216 break; |
3217 | |
3218 case Sclose: | |
3219 depth--; | |
3220 if (depth < mindepth) | |
3221 mindepth = depth; | |
3222 if (curlevel != levelstart) | |
3223 curlevel--; | |
3224 curlevel->prev = curlevel->last; | |
12894
b2a75405de3c
(scan_sexps_forward): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
12870
diff
changeset
|
3225 if (targetdepth == depth) goto done; |
163 | 3226 break; |
3227 | |
3228 case Sstring: | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3229 case Sstring_fence: |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3230 state.comstr_start = from - 1; |
163 | 3231 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
|
3232 curlevel->last = prev_from; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3233 state.instring = (code == Sstring |
89063
2054397a36be
(char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
Kenichi Handa <handa@m17n.org>
parents:
89010
diff
changeset
|
3234 ? (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
|
3235 : ST_STRING_STYLE); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3236 if (boundary_stop) goto done; |
163 | 3237 startinstring: |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3238 { |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3239 nofence = state.instring != ST_STRING_STYLE; |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3240 |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3241 while (1) |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3242 { |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3243 int c; |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3244 |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3245 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
|
3246 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
|
3247 /* 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
|
3248 temp = SYNTAX (c); |
24148
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3249 |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3250 /* 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
|
3251 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
|
3252 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
|
3253 if (nofence && c == state.instring && temp == Sstring) |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3254 break; |
b69751ec40fe
(scan_sexps_forward): Delete duplicate code
Karl Heuer <kwzh@gnu.org>
parents:
23503
diff
changeset
|
3255 |
22006
31c39cdc9e11
(scan_lists, scan_sexps_forward): Move complex expressions
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
3256 switch (temp) |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3257 { |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3258 case Sstring_fence: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3259 if (!nofence) goto string_end; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3260 break; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3261 case Scharquote: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3262 case Sescape: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3263 INC_FROM; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3264 startquotedinstring: |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3265 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
|
3266 } |
20475
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3267 INC_FROM; |
efbebc38e077
Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents:
20330
diff
changeset
|
3268 } |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3269 } |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3270 string_end: |
163 | 3271 state.instring = -1; |
3272 curlevel->prev = curlevel->last; | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3273 INC_FROM; |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3274 if (boundary_stop) goto done; |
163 | 3275 break; |
3276 | |
3277 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
|
3278 /* 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
|
3279 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
|
3280 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
|
3281 /* Ignore whitespace, punctuation, quote, endcomment. */ |
163 | 3282 break; |
3283 } | |
3284 } | |
3285 goto done; | |
3286 | |
3287 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
|
3288 from = prev_from; /* We have just fetched the char that starts it; */ |
163 | 3289 goto done; /* but return the position before it. */ |
3290 | |
3291 endquoted: | |
3292 state.quoted = 1; | |
3293 done: | |
3294 state.depth = depth; | |
3295 state.mindepth = mindepth; | |
3296 state.thislevelstart = curlevel->prev; | |
3297 state.prevlevelstart | |
3298 = (curlevel == levelstart) ? -1 : (curlevel - 1)->last; | |
3299 state.location = from; | |
22394
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3300 state.levelstarts = Qnil; |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3301 while (--curlevel >= levelstart) |
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3302 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
|
3303 state.levelstarts); |
163 | 3304 immediate_quit = 0; |
3305 | |
1085
91a456e52db1
(scan_lists): Improve smarts for backwards scan of comments.
Richard M. Stallman <rms@gnu.org>
parents:
726
diff
changeset
|
3306 *stateptr = state; |
163 | 3307 } |
3308 | |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
3309 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
|
3310 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
|
3311 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
|
3312 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
|
3313 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
|
3314 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
|
3315 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
|
3316 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
|
3317 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
|
3318 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
|
3319 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
|
3320 (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
|
3321 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
|
3322 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
|
3323 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
|
3324 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
|
3325 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
|
3326 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
|
3327 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
|
3328 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
|
3329 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
|
3330 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
|
3331 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
|
3332 any character that starts a sexp. |
66525
aaac09f838e0
(Fparse_partial_sexp): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65215
diff
changeset
|
3333 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
|
3334 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
|
3335 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
|
3336 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
|
3337 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
|
3338 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
|
3339 (Lisp_Object from, Lisp_Object to, Lisp_Object targetdepth, Lisp_Object stopbefore, Lisp_Object oldstate, Lisp_Object commentstop) |
163 | 3340 { |
3341 struct lisp_parse_state state; | |
3342 int target; | |
3343 | |
485 | 3344 if (!NILP (targetdepth)) |
163 | 3345 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40286
diff
changeset
|
3346 CHECK_NUMBER (targetdepth); |
163 | 3347 target = XINT (targetdepth); |
3348 } | |
3349 else | |
3350 target = -100000; /* We won't reach this depth */ | |
3351 | |
3352 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
|
3353 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
|
3354 XINT (to), |
3568
3ee951a22a80
(Fforward_comment): Set point to where scan stops,
Richard M. Stallman <rms@gnu.org>
parents:
3095
diff
changeset
|
3355 target, !NILP (stopbefore), oldstate, |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3356 (NILP (commentstop) |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3357 ? 0 : (EQ (commentstop, Qsyntax_table) ? -1 : 1))); |
163 | 3358 |
3359 SET_PT (state.location); | |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3360 |
163 | 3361 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
|
3362 Fcons (state.prevlevelstart < 0 |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3363 ? Qnil : make_number (state.prevlevelstart), |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3364 Fcons (state.thislevelstart < 0 |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3365 ? Qnil : make_number (state.thislevelstart), |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3366 Fcons (state.instring >= 0 |
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3367 ? (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
|
3368 ? 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
|
3369 Fcons (state.incomment < 0 ? Qt : |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3370 (state.incomment == 0 ? Qnil : |
d678b229c05a
(lisp_parse_state, back_comment, Fmodify_syntax_entry)
Richard M. Stallman <rms@gnu.org>
parents:
25401
diff
changeset
|
3371 make_number (state.incomment)), |
163 | 3372 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
|
3373 Fcons (make_number (state.mindepth), |
47942
080b4586492b
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
47872
diff
changeset
|
3374 Fcons ((state.comstyle |
20486
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3375 ? (state.comstyle == ST_COMMENT_STYLE |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3376 ? Qsyntax_table |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3377 : make_number (state.comstyle)) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109364
diff
changeset
|
3378 : Qnil), |
24728
e94104cf5891
(Fparse_partial_sexp): Correct test for element 8 to be
Dave Love <fx@gnu.org>
parents:
24148
diff
changeset
|
3379 Fcons (((state.incomment |
e94104cf5891
(Fparse_partial_sexp): Correct test for element 8 to be
Dave Love <fx@gnu.org>
parents:
24148
diff
changeset
|
3380 || (state.instring >= 0)) |
20486
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3381 ? make_number (state.comstr_start) |
26d12c66acc1
(Fparse_partial_sexp): Return nil for 9th element
Richard M. Stallman <rms@gnu.org>
parents:
20475
diff
changeset
|
3382 : Qnil), |
22394
5e1f0caf1873
(struct lisp_parse_state): New field, levelstarts.
Richard M. Stallman <rms@gnu.org>
parents:
22370
diff
changeset
|
3383 Fcons (state.levelstarts, Qnil)))))))))); |
163 | 3384 } |
3385 | |
21514 | 3386 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3387 init_syntax_once (void) |
163 | 3388 { |
17126
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3389 register int i, c; |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3390 Lisp_Object temp; |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3391 |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3392 /* 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
|
3393 Qsyntax_table = intern_c_string ("syntax-table"); |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3394 staticpro (&Qsyntax_table); |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3395 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3396 /* 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
|
3397 Setting this variable twice is harmless. |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3398 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
|
3399 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
|
3400 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3401 /* 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
|
3402 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
|
3403 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
|
3404 XVECTOR (Vsyntax_code_object)->contents[i] |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3405 = Fcons (make_number (i), Qnil); |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3406 |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3407 /* 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
|
3408 create syntax tables. */ |
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3409 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
|
3410 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3411 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
|
3412 |
13218
d2fc560c7740
(Qsyntax_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13144
diff
changeset
|
3413 Vstandard_syntax_table = Fmake_char_table (Qsyntax_table, temp); |
163 | 3414 |
71395
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3415 /* 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
|
3416 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
|
3417 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
|
3418 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
|
3419 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
|
3420 |
923b7f99b0d7
(init_syntax_once): Give most control chars' syntax Spunct.
Richard M. Stallman <rms@gnu.org>
parents:
70317
diff
changeset
|
3421 /* 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
|
3422 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
|
3423 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
|
3424 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
|
3425 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
|
3426 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
|
3427 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
|
3428 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3429 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword]; |
163 | 3430 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
|
3431 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); |
163 | 3432 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
|
3433 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); |
163 | 3434 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
|
3435 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
|
3436 |
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, '$', temp); |
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3438 SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '%', temp); |
163 | 3439 |
13144
fd14ccddb85a
(describe_syntax): Handle new syntax-table data format.
Richard M. Stallman <rms@gnu.org>
parents:
12894
diff
changeset
|
3440 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
|
3441 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
|
3442 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
|
3443 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
|
3444 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
|
3445 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
|
3446 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
|
3447 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
|
3448 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
|
3449 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
|
3450 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
|
3451 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
|
3452 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
|
3453 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
|
3454 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
|
3455 Fcons (make_number ((int) Sescape), Qnil)); |
163 | 3456 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3457 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Ssymbol]; |
163 | 3458 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
|
3459 { |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3460 c = "_-+*/&|<>="[i]; |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3461 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
|
3462 } |
163 | 3463 |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3464 temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct]; |
163 | 3465 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
|
3466 { |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3467 c = ".,;:?!#@~^'`"[i]; |
f8d7263cce09
(init_syntax_once): Add trick to avoid compiler warning
Kenichi Handa <handa@m17n.org>
parents:
17109
diff
changeset
|
3468 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
|
3469 } |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3470 |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3471 /* All multibyte characters have syntax `word' by default. */ |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3472 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
|
3473 char_table_set_range (Vstandard_syntax_table, 0x80, MAX_CHAR, temp); |
163 | 3474 } |
3475 | |
21514 | 3476 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3477 syms_of_syntax (void) |
163 | 3478 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3479 Qsyntax_table_p = intern_c_string ("syntax-table-p"); |
163 | 3480 staticpro (&Qsyntax_table_p); |
3481 | |
17044
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3482 staticpro (&Vsyntax_code_object); |
f07c36097f33
Include charset.h and category.h.
Karl Heuer <kwzh@gnu.org>
parents:
16992
diff
changeset
|
3483 |
64319
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3484 staticpro (&gl_state.object); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3485 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
|
3486 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
|
3487 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
|
3488 |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3489 /* Defined in regex.c */ |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3490 staticpro (&re_match_object); |
6ba9b52e77fc
(syms_of_syntax): Staticpro lisp objects in gl_state.
Kim F. Storm <storm@cua.dk>
parents:
64084
diff
changeset
|
3491 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3492 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
|
3493 staticpro (&Qscan_error); |
ff7346c31184
(scan_lists): Signal errors using scan-error.
Richard M. Stallman <rms@gnu.org>
parents:
16039
diff
changeset
|
3494 Fput (Qscan_error, Qerror_conditions, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3495 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
|
3496 Fput (Qscan_error, Qerror_message, |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
3497 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
|
3498 |
163 | 3499 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
|
3500 doc: /* Non-nil means `forward-sexp', etc., should treat comments as whitespace. */); |
163 | 3501 |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3502 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
|
3503 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
|
3504 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
|
3505 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
|
3506 `syntax-table' property. */); |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3507 |
163 | 3508 words_include_escapes = 0; |
3509 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
|
3510 doc: /* Non-nil means `forward-word', etc., should treat escape chars part of words. */); |
163 | 3511 |
27812
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3512 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
|
3513 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
|
3514 multibyte_syntax_as_symbol = 0; |
e2216823484d
(multibyte_syntax_as_symbol): New variable.
Kenichi Handa <handa@m17n.org>
parents:
27719
diff
changeset
|
3515 |
28302
27ffe1e3b06d
(open_paren_in_column_0_is_defun_start): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
28269
diff
changeset
|
3516 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
|
3517 &open_paren_in_column_0_is_defun_start, |
49551 | 3518 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
|
3519 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
|
3520 |
89483 | 3521 |
3522 DEFVAR_LISP ("find-word-boundary-function-table", | |
3523 &Vfind_word_boundary_function_table, | |
88970
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3524 doc: /* |
89483 | 3525 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
|
3526 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
|
3527 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
|
3528 |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3529 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
|
3530 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
|
3531 character of that word. |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3532 |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3533 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
|
3534 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
|
3535 character of that word. |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3536 |
a65b3bd9379c
(Vnext_word_boundary_function_table): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88935
diff
changeset
|
3537 In both cases, LIMIT bounds the search. */); |
89483 | 3538 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
|
3539 |
163 | 3540 defsubr (&Ssyntax_table_p); |
3541 defsubr (&Ssyntax_table); | |
3542 defsubr (&Sstandard_syntax_table); | |
3543 defsubr (&Scopy_syntax_table); | |
3544 defsubr (&Sset_syntax_table); | |
3545 defsubr (&Schar_syntax); | |
7968
a6372621abd9
(Fmatching_paren): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7924
diff
changeset
|
3546 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
|
3547 defsubr (&Sstring_to_syntax); |
163 | 3548 defsubr (&Smodify_syntax_entry); |
40663
046e69b1b128
(describe_syntax): New wrapper.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40656
diff
changeset
|
3549 defsubr (&Sinternal_describe_syntax_value); |
163 | 3550 |
3551 defsubr (&Sforward_word); | |
3552 | |
17464
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3553 defsubr (&Sskip_chars_forward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3554 defsubr (&Sskip_chars_backward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3555 defsubr (&Sskip_syntax_forward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3556 defsubr (&Sskip_syntax_backward); |
36483a1ada24
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table'
Richard M. Stallman <rms@gnu.org>
parents:
17126
diff
changeset
|
3557 |
1998
656f4297962e
(describe_syntax_1): Delete excess arg to describe_vector.
Richard M. Stallman <rms@gnu.org>
parents:
1394
diff
changeset
|
3558 defsubr (&Sforward_comment); |
163 | 3559 defsubr (&Sscan_lists); |
3560 defsubr (&Sscan_sexps); | |
3561 defsubr (&Sbackward_prefix_chars); | |
3562 defsubr (&Sparse_partial_sexp); | |
3563 } | |
52401 | 3564 |
3565 /* arch-tag: 3e297b9f-088e-4b64-8f4c-fb0b3443e412 | |
3566 (do not change this comment) */ |