comparison src/regex.h @ 502:7039e6323819

[xemacs-hg @ 2001-05-04 22:41:46 by ben] ----------------------- byte-comp warning fixes ----------------- New functions for cleanly eliminating byte-compiler warnings. Their definitions require no changes at all in bytecomp.el, meaning that any package that wants to use them and be compatible with older versions of XEmacs need only copy the code and rename the functions (i.e. prefix them with the package name). Eliminate byte-compiler warnings using the new functions in bytecomp-runtime.el. Move coding-system-put,get,category, since they're not Mule-specific and are used in prefer-coding-system. font.el was incredibly ugly. Clean it up. Avoid using defsubst for any exported functions, to avoid possible compatibility problems if we later change the internal interface. (It happened before, with face accessors, between 19.8 and 19.9). Fix tons of warnings. Clean up (new function gpm-is-supported-p eliminates duplicate code in gpm-create/delete-device-hook) and eliminate warnings. ---------- make byte-recompile-directory work in the --------- core `lisp' dir, even in the absence of a Mule XEmacs (i.e. make it skip the Mule files rather than trying to compile them). now you should be able to do `touch *.el' in the `lisp' dir, then M-x byte-recompile-directory, and get no warnings. Avoid trying to compile Mule files in byte-recompile-directory when we're not in a Mule XEmacs, since we're highly likely to get syntax errors. Add a coding-system cookie to all Mule files so that byte-recompile-directory ignores them. Magic cookie function moved to files.el from code-files.el (for use by bytecomp even in a non-coding-system XEmacs), and changed names and semantics for use by bytecomp. NOTE: IMO this is an internal function that we can change as we like (and there is absolutely no code anywhere else using the function). ---------------- GUI improvements: menus, help ------------------- Rearrange order of keymap declarations to be alphabetical. Improve help on help to include all bindings, and group by category. Add bindings for new Info commands. Remove warnings. Use command-hyper-apropos in place of command-apropos. Add a function to do the equivalent of command-apropos. Evals its help-text argument so you can put expressions there. Used now by help-for-help. Add binding to continue text searches. Expand index searches to work over multiple info documents. Add commands to search text/index in User and Lispref. Add new entry, "Uncomment Region" (parallels "Comment Out Region"). Redo Help menu; add bindings for new Info commands to search the index or text of the User and Lispref manuals. Add command for mark-paragraph, activate-region. Make Edit->R accelerator be rectangle, not register (more commonly used), and put rectangle first. Fix the Edit Init File entry to never load the .elc file. Simplify the default-popup-menu. Add Cmds->Tabs menu. Use kp-left not kp_left, etc. ---------------- Miscellaneous bug fixes/cleanup ------------------- byte-compiler-options: Correct doc string. easy-menu-do-define: fix extra quote. fill-paragraph-or-region:Rewrite to be more correct -- use call-interactively so that we always get exactly the same behavior as if the functions were called directly. No need to fiddle with zmacs-region-stays, now that bogus clearing of it (2001-04-28 src/ChangeLog) is removed. Put dialog titles back in -- this time correctly. Fix various other problems with leaks and such. key-sequence-list-description: Clean up fun to always correctly canonicalize. Clean up Kinsoku comments, synch comment-region with FSF 20.7. * simple.el (region-exists-p): * simple.el (region-active-p): Add comment about which one is correct to use in menu specs. * sound.el (load-sound-file): Minor code clean up. * startup.el: * startup.el (command-line-early): * startup.el (initial-scratch-message): Comment changes. Add info about sample.init.el to splash screen. Improve initial-scratch-message and clarify purpose of Scratch buffer. Fix byte-compile warning. ------------------------ Added features ------------------------- Add new variable to control whether etags checks all parent directories for tag files. (On by default.) * hash-table.el: New file, useful utility functions. * dumped-lisp.el (preloaded-file-list): Dump hash-table.el. ------------ notable bug fix: Windows event code -------------- Get critical quit working. ------------ notable bug fix and new feature: regex code -------------- Shy groups were implemented in a horrible, half-assed way that would cause them to screw up regex searching in most cases. Fixed to work correctly. Also extended back-reference syntax past 9. Only is recognized as such if there are at least that many non-shy groups; and optionally will warn about such uses, to catch old code that might be using them differently. (Added variable to control this in search.c -- `warn-about-possibly-incompatible-back- references', on by default for the moment. Declared in lisp.h. ---------------- process/SIGIO improvements ------------------- define USE_GETADDRINFO to replace more complex conditional, and use it. the code conditionalized on this in unix_open_network_stream had *serious* problems handling errors. it's now fixed, and major amounts of duplicate code between the two versions were combined. don't disable SIGIO and other interrupts unless CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's without bugs. similarly for a freebsd bug that was affecting all OS's. * s\ultrix.h: define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS mentioned as having a kernel bug. * sysdep.c (request_sigio_on_device): * sysdep.c (unrequest_sigio_on_device): fix SIGIO problems on Linux. add check for O_ASYNC in case it's defined and FASYNC isn't. add comment about other ways to do SIGIO on Linux. * callproc.c (Fold_call_process_internal): * process.c (Fstart_process_internal): Deal with the possibility that `default-directory' doesn't have terminating slash. Correct comments about vfork. ---------------- Miscellaneous bug fixes/cleanup ------------------- * callint.c (Finteractive): Add lots of documentation -- exactly what the Lisp equivalents of all the interactive specs are. * console.h (struct console): change type of quit_char to Emchar. * event-msw.c (lstream_type_create_mswindows_selectable): spacing change. Eliminate events-mod.h and combine into events.h. * emacs.c: * emacs.c (make_arg_list_1): * emacs.c (main_1): A couple of char->Extbyte changes, add a comment. * glyphs-msw.c: Correct indentation of function defns to not exceed 80 cols. Try (sort of) to fix some code that sets the colors of the progress gauge. (Commented out) * keymap.c (syms_of_keymap): use DEFSYMBOL. * process.c (read_process_output): No need to fiddle with zmacs_region_stays, now that bogus clearing of it (see below) is removed. * search.c (Freplace_match): warning fix.
author ben
date Fri, 04 May 2001 22:42:35 +0000
parents 1ccc32a20af4
children b39c14581166
comparison
equal deleted inserted replaced
501:0a255b32b157 502:7039e6323819
150 #define RE_NO_SHY_GROUPS (RE_NO_POSIX_BACKTRACKING << 1) 150 #define RE_NO_SHY_GROUPS (RE_NO_POSIX_BACKTRACKING << 1)
151 151
152 /* If this bit is set, then an unmatched ) is ordinary. 152 /* If this bit is set, then an unmatched ) is ordinary.
153 If not set, then an unmatched ) is invalid. */ 153 If not set, then an unmatched ) is invalid. */
154 #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_SHY_GROUPS << 1) 154 #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_SHY_GROUPS << 1)
155
156 /* If this bit is set, then \22 will read as a back reference,
157 provided at least 22 non-shy groups have been seen so far. In all
158 other cases (bit not set, not 22 non-shy groups seen so far), it
159 reads as a back reference \2 followed by a digit 2. */
160 #define RE_NO_MULTI_DIGIT_BK_REFS (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
155 161
156 /* This global variable defines the particular regexp syntax to use (for 162 /* This global variable defines the particular regexp syntax to use (for
157 some interfaces). When a regexp is compiled, the syntax used is 163 some interfaces). When a regexp is compiled, the syntax used is
158 stored in the pattern buffer, so changing this does not affect 164 stored in the pattern buffer, so changing this does not affect
159 already-compiled regexps. */ 165 already-compiled regexps. */
168 #define RE_SYNTAX_AWK \ 174 #define RE_SYNTAX_AWK \
169 (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ 175 (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \
170 | RE_NO_BK_PARENS | RE_NO_BK_REFS \ 176 | RE_NO_BK_PARENS | RE_NO_BK_REFS \
171 | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ 177 | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \
172 | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_SHY_GROUPS \ 178 | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_SHY_GROUPS \
173 | RE_NO_MINIMAL_MATCHING) 179 | RE_NO_MINIMAL_MATCHING | RE_NO_MULTI_DIGIT_BK_REFS)
174 180
175 #define RE_SYNTAX_POSIX_AWK \ 181 #define RE_SYNTAX_POSIX_AWK \
176 (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS) 182 (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS)
177 183
178 #define RE_SYNTAX_GREP \ 184 #define RE_SYNTAX_GREP \
179 (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ 185 (RE_BK_PLUS_QM | RE_CHAR_CLASSES \
180 | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ 186 | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \
181 | RE_NEWLINE_ALT | RE_NO_SHY_GROUPS \ 187 | RE_NEWLINE_ALT | RE_NO_SHY_GROUPS \
182 | RE_NO_MINIMAL_MATCHING) 188 | RE_NO_MINIMAL_MATCHING | RE_NO_MULTI_DIGIT_BK_REFS)
183 189
184 #define RE_SYNTAX_EGREP \ 190 #define RE_SYNTAX_EGREP \
185 (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ 191 (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \
186 | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ 192 | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \
187 | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ 193 | RE_NEWLINE_ALT | RE_NO_BK_PARENS \
188 | RE_NO_BK_VBAR | RE_NO_SHY_GROUPS \ 194 | RE_NO_BK_VBAR | RE_NO_SHY_GROUPS \
189 | RE_NO_MINIMAL_MATCHING) 195 | RE_NO_MINIMAL_MATCHING | RE_NO_MULTI_DIGIT_BK_REFS)
190 196
191 #define RE_SYNTAX_POSIX_EGREP \ 197 #define RE_SYNTAX_POSIX_EGREP \
192 (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) 198 (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES | \
199 RE_NO_MULTI_DIGIT_BK_REFS)
193 200
194 /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ 201 /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */
195 #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC 202 #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
196 203
197 #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC 204 #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
198 205
199 /* Syntax bits common to both basic and extended POSIX regex syntax. */ 206 /* Syntax bits common to both basic and extended POSIX regex syntax. */
200 #define _RE_SYNTAX_POSIX_COMMON \ 207 #define _RE_SYNTAX_POSIX_COMMON \
201 (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ 208 (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \
202 | RE_INTERVALS | RE_NO_EMPTY_RANGES | RE_NO_SHY_GROUPS \ 209 | RE_INTERVALS | RE_NO_EMPTY_RANGES | RE_NO_SHY_GROUPS \
203 | RE_NO_MINIMAL_MATCHING) 210 | RE_NO_MINIMAL_MATCHING | RE_NO_MULTI_DIGIT_BK_REFS)
204 211
205 #define RE_SYNTAX_POSIX_BASIC \ 212 #define RE_SYNTAX_POSIX_BASIC \
206 (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) 213 (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
207 214
208 /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes 215 /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
335 comparing them, or zero for no translation. The translation 342 comparing them, or zero for no translation. The translation
336 is applied to a pattern when it is compiled and to a string 343 is applied to a pattern when it is compiled and to a string
337 when it is matched. */ 344 when it is matched. */
338 RE_TRANSLATE_TYPE translate; 345 RE_TRANSLATE_TYPE translate;
339 346
340 /* Number of subexpressions found by the compiler. */ 347 /* Number of returnable groups found by the compiler. (This does
348 not count shy groups.) */
341 size_t re_nsub; 349 size_t re_nsub;
350
351 /* Total number of groups found by the compiler. (Including
352 shy ones.) */
353 int re_ngroups;
342 354
343 /* Zero if this pattern cannot match the empty string, one else. 355 /* Zero if this pattern cannot match the empty string, one else.
344 Well, in truth it's used only in `re_search_2', to see 356 Well, in truth it's used only in `re_search_2', to see
345 whether or not we should use the fastmap, so we don't set 357 whether or not we should use the fastmap, so we don't set
346 this absolutely perfectly; see `re_compile_fastmap' (the 358 this absolutely perfectly; see `re_compile_fastmap' (the
371 /* Similarly for an end-of-line anchor. */ 383 /* Similarly for an end-of-line anchor. */
372 unsigned not_eol : 1; 384 unsigned not_eol : 1;
373 385
374 /* If true, an anchor at a newline matches. */ 386 /* If true, an anchor at a newline matches. */
375 unsigned newline_anchor : 1; 387 unsigned newline_anchor : 1;
388
389 unsigned warned_about_incompatible_back_references : 1;
390
391 /* Mapping between back references and groups (may not be
392 equivalent with shy groups). */
393 int *external_to_internal_register;
394
395 int external_to_internal_register_size;
376 396
377 /* [[[end pattern_buffer]]] */ 397 /* [[[end pattern_buffer]]] */
378 }; 398 };
379 399
380 typedef struct re_pattern_buffer regex_t; 400 typedef struct re_pattern_buffer regex_t;