|
ef7682a4
|
2000-08-11T01:56:59
|
|
(regex_compile) <normal_char>: Pay attention to multibyteness.
(analyse_first) <exactn>: Setup fastmap correctly for
eight-bit-control characters.
|
|
1d7122be
|
2000-06-20T16:48:05
|
|
(re_match, re_match_2): Protect calls to alloca (0).
(re_comp): Cast gettext return value to avoid complaints when
!HAVE_LIBINTL.
|
|
|
da455340
|
2000-06-10T08:04:33
|
|
(MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
(regex_compile): Fix the code for handling the case of single byte
char and multibyte char being mixed in a range within [...].
|
|
|
9be66ab4
|
2000-05-30T02:58:58
|
|
(PREFETCH_NOLIMIT): New function.
(re_match_2_internal): Use it and adjust the end_match_2 logic.
|
|
|
768ec972
|
2000-05-25T16:30:40
|
|
(at_begline_loc_p): Also recognize the \\(?:^ case
of an anchor at the beginning of a shy-group.
|
|
|
6a4fc8be
|
2000-04-19T21:39:18
|
|
(re_match_2_internal): Don't shorten the strings anymore,
instead define end_match(1|2) more carefully.
Use GET_CHAR_BEFORE_2 for `begline'.
|
|
|
ecd70598
|
2000-04-02T23:56:45
|
|
* regex.c (PTR_TO_OFFSET) [!emacs]: Remove.
(RE_MULTIBYTE_P, RE_STRING_CHAR_AND_LENGTH): New macros.
(GET_CHAR_BEFORE_2): Moved from charset.h plus fixed minor bug when
we are between str1 and str2.
(MAX_MULTIBYTE_LENGTH, CHAR_STRING) [!emacs]: Provide trivial default.
(PATFETCH): Use `TRANSLATE'.
(PATFETCH_RAW): Fetch multibyte char if applicable.
(PATUNFETCH): Remove.
(regex_compile): Rely on PATFETCH to do most of the multibyte magic.
When writing a char, write it directly into the pattern buffer rather
than going needlessly through a temp char-array.
(re_match_2_internal): Similarly, rely on RE_STRING_CHAR to do the
multibyte magic and remove the useless `#ifdef emacs'.
(bcmp_translate): Don't compare as multibyte chars when in a unibyte
buffer.
* regex.h (struct re_pattern_buffer): Make field `multibyte'
conditional on `emacs'.
* charset.h (GET_CHAR_BEFORE_2): Moved to regex.c.
|
|
|
0be3fccc
|
2000-03-29T04:01:25
|
|
(analyse_first): New function obtained by ripping out most
of re_compile_fastmap and generalizing it a little bit so that it
can also just return whether a given (sub)pattern can match the empty
string or not.
(regex_compile): Use `analyse_first' to decide whether the loop-check
needs to be done or not for *, +, *? and +? (the loop check is costly
for non-greedy repetition).
(re_compile_fastmap): Delegate the actual work to `analyse_first'.
|
|
|
1570cc6b
|
2000-03-27T22:26:37
|
|
(REGEX_FREE_STACK, RESET_FAIL_STACK): Make them usable as an expression.
(enum re_opcode_t): Update description of succeed_n.
(PATFETCH): Always define.
(regex_compile): Use lookahead rather than PATUNFETCH (for repetition
operators, char classes, shy-groups and intervals).
Optimize special cases of intervals so as to only use succeed_n and
jump_n when really needed.
(re_compile_fastmap): Simplify handling of jump_n and succeed_n now
that we don't have to handle the special cases any more.
Simplify on_failure_jump handling as well.
|
|
|
aeb359a7
|
2000-03-26T23:05:51
|
|
(enum re_opcode_t): New opcode on_failure_jump_nastyloop.
(print_partial_compiled_pattern, re_compile_fastmap): Handle new opcode.
(regex_compile): Use on_failure_jump_nastyloop for non-greedy loops.
(re_match_2_internal): Add code for on_failure_jump_nastyloop when
executing it as well as when popping it off the stack to find infinite
loops in non-greedy repetition operators.
|
|
|
4918e100
|
2000-03-23T04:36:14
|
|
(enum syntaxcode): Provide default for non-Emacs.
(re_compile_fastmap, re_match_2_internal): Undo Dave's previous fix.
|
|
017e46a8
|
2000-03-22T14:25:38
|
|
(re_compile_fastmap, re_match_2_internal): Fix cast to re_opcode_t.
|
|
|
27d8e5f0
|
2000-03-22T04:17:32
|
|
(CHAR_CHARSET, CHARSET_LEADING_CODE_BASE): Add default
definitions for non-Emacs compilation.
(enum re_opcode_t): Remove (not)wordchar and move (not)syntaxspec
outside of `#ifdef emacs'.
(print_partial_compiled_pattern): Update.
(regex_compile): Use (not)syntaxspec(Sword) instead of (not)wordchar.
(re_compile_fastmap): Merge handling of charset and charset_not (for
emacs and non-emacs compilation as well).
Similarly for (not)categoryspec and (not)syntaxspec.
Don't use the fastmap when reaching `anychar' since the added
complexity is not justified.
(re_match_2_internal): Merge (not)wordchar (emacs and non-emacs)
and (not)syntaxspec. Merge (not)categoryspec.
|
|
|
7540e140
|
2000-03-19T23:22:06
|
|
(RE_STRING_CHAR): New macro.
(GET_CHAR_AFER_2): Remove.
(RE_TRANSLATE, RE_TRANSLATE_P): New macros moved from regex.h.
(enum re_opcode_t): Remove on_failure_jump_exclusive.
(print_partial_compiled_pattern, re_compile_fastmap)
(re_match_2_internal): Remove on_failure_jump_exclusive.
(regex_compile): Turn optimizable P+ loops into PP*, so that the
optimization only need to work for * (ie. can use of_keep_string_jump).
Remove the special case for .*\n since it is now covered by the general
optimization.
(re_search_2): Don't bother with `room'.
(skip_one_char): New function.
(skip_noops): Simplify since `memory' is not needed any more.
(mutually_exclusive_p): Restructure slightly to use `switch' and
add handling for "all" remaining cases.
(re_match_2_internal): Change on_failure_jump_smart to use
on_failure_keep_string_jump (and redirect the end-of-loop jump)
rather than on_failure_jump_exclusive.
|
|
|
5f5a55d6
|
2000-03-16T02:53:38
|
|
(re_match_2): Fix string shortening (to fit `stop') to make sure
POINTER_TO_OFFSET gives the same value before and after PREFETCH.
Use `dfail' to guarantee "atomic" matching.
(PTR_TO_OFFSET): Use POINTER_TO_OFFSET.
(debug): Now only active if > 0 rather than if != 0.
(DEBUG_*): Update for the new meaning of `debug'.
(print_partial_compiled_pattern): Add missing `succeed' case.
Use CHARSET_* macros in the charset(_not) branch.
Fix off-by-two bugs in `succeed_n', `jump_n' and `set_number_at'.
(store_op1, store_op2, insert_op1, insert_op2)
(at_begline_loc_p, at_endline_loc_p): Add prototype.
(group_in_compile_stack): Move to after its arg's types are declared
and add a prototype.
(PATFETCH): Define in terms of PATFETCH_RAW.
(GET_UNSIGNED_NUMBER): Add the usual `do { ... } while(0)' wrapper.
(QUIT): Redefine as a nop except for NTemacs.
(regex_compile): Handle intervals {,M} as if it was {0,M}.
Fix indentation of the greedy-op and shy-group code.
(at_(beg|end)line_loc_p): Fix argument's types.
(re_compile_fastmap): Ifdef out failure_stack_ptr to shut up gcc.
(re_search_2): Use POS_AS_IN_BUFFER. Simplify `room' computation.
(MATCHING_IN_FIRST_STRING): Remove.
(re_match_2): Use POS_AS_IN_BUFFER.
Ifdef out failure_stack_ptr to shut up gcc.
Use FIRST_STRING_P and POINTER_TO_OFFSET.
Use QUIT unconditionally.
|
|
|
c0b1cf90
|
2000-03-14T00:27:57
|
|
* regex.c: Declare a new type `re_char' used throughout the code for the
string char type. It's `const unsigned char' to match the rest of Emacs.
Consistently make sure all pointers to strings use it and make sure all
pointers into the pattern use `unsigned char'.
(re_match_2_internal): Use `PREFETCH+STRING_CHAR' instead of
GET_CHAR_AFTER_2.
Also merge wordbound and notwordbound to reduce code duplication.
* charset.h (GET_CHAR_AFTER_2): Remove.
(GET_CHAR_BEFORE_2): Use unsigned chars, like everywhere else.
|
|
|
9ff01e71
|
2000-03-08T23:25:41
|
|
This is a big redesign of failure-stack and register handling, prompted
by bugs revealed when trying to add shy-groups. Overall, what happened
is that loops are now structured a little differently, groups can be
shy and the code is a little simpler.
(enum re_opcode_t): Remove jump_past_alt, maybe_pop_jump,
push_dummy_failure and dumy_failure_jump.
Add on_failure_jump_(exclusive, loop and smart).
Also fix the comment for (start|stop)_memory since they now only take
one argument (the second has becomes unnecessary).
(print_partial_compiled_pattern): Adjust for changes in re_opcode_t.
(print_compiled_pattern): Use %ld to printf long ints and flush to make
debugging a little easier.
(union fail_stack_elt): Make the integer unsigned.
(struct fail_stack_type): Add a `frame' element.
(INIT_FAIL_STACK): Init `frame' as well.
(POP_PATTERN_OP): New macro for re_compile_fastmap.
(DEBUG_PUSH, DEBUG_POP): Remove.
(NUM_REG_ITEMS): Remove.
(NUM_NONREG_ITEMS): Adjust.
(FAILURE_PAT, FAILURE_STR, NEXT_FAILURE_HANDLE, TOP_FAILURE_HANDLE):
New macros for the cycle detection.
(ENSURE_FAIL_STACK): New macro for PUSH_FAILURE_(REG|POINT).
(PUSH_FAILURE_REG, POP_FAILURE_REG, CHECK_INFINITE_LOOP): New macros.
(PUSH_FAILURE_POINT): Don't push registers any more.
The pattern address pushed is not the destination of the jump
but the source of it instead.
(NUM_FAILURE_ITEMS): Remove.
(POP_FAILURE_POINT): Adapt to the new stack structure (i.e. pop
registers before the actual failure point).
Don't hardcode any meaning for str==NULL anymore.
(union register_info_type, REG_MATCH_NULL_STRING_P, IS_ACTIVE)
(MATCHED_SOMETHING, EVER_MATCHED_SOMETHING, SET_REGS_MATCHED): Remove.
(REG_UNSET_VALUE): Use NULL (why not?).
(compile_range): Remove declaration since it doesn't exist.
(struct compile_stack_elt_t): Remove inner_group_offset.
(old_reg(start|end), reg_info, reg_dummy, reg_info_dummy): Remove.
(regex_grow_registers): Remove dead code.
(FIXUP_ALT_JUMP): New macro.
(regex_compile): Add shy-groups
Change loops to use on_failure_jump_smart&jump instead of
on_failure_jump&maybe_pop_jump.
Change + loops to eliminate the initial (dummy_failure_)jump.
Remove c1_base (looks like unused variable to me).
Use `jump' instead of `jump_past_alt' and don't bother with
push_dummy_failure in alternatives since it is now unnecessary.
Use FIXUP_ALT_JUMP.
Eliminate a useless `#ifdef emacs' for (re)allocating the stack.
(re_compile_fastmap): Remove dead variables i and num_regs.
Exit from loop when bufp->can_be_null rather than jumping to `done'.
Avoid jumping backwards so as to ensure termination.
Use PATTERN_STACK_EMPTY and POP_PATTERN_OP.
Improved handling of backreferences.
Remove dead code in handling of `anychar'.
(skip_noops, mutually_exclusive_p): New functions taken from the
handling of `maybe_pop_jump' in re_match_2_internal.
Slightly improve mutually_exclusive_p to handle ".+\n".
((lowest|highest)_active_reg, NO_(LOWEST|HIGHEST)_ACTIVE_REG)
Remove.
(re_match_2_internal): Use %p instead of 0x%x when printf'ing ptrs.
Don't SET_REGS_MATCHED anymore. Remove many dead variables.
Push register (in `start_memory') on the stack rather than storing it
in old_reg(start|end).
Remove the cycle detection from `stop_memory', replaced by the use
of on_failure_jump_loop for greedy loops.
Add code for the new on_failure_jump_<foo>.
Remove ad-hoc code in `on_failure_jump' to push more registers
in the case of a loop.
Take out code from `maybe_pop_jump' into separate functions and
adapt it to the semantics of `on_failure_jump_smart'.
Remove jump_past_alt, dummy_failure_jump and push_dummy_failure.
Remove dummy_failure handling and handling of `failures to jump
to on_failure_jump' (this last one was already dead code, it seems).
((group|alt|common_op)_match_null_string_p): Remove.
|
|
33394ab9
|
2000-01-18T20:11:41
|
|
(re_compile_fastmap): While checking a range table for
`charset', skip flag bits for a character class correctly.
|
|
|
b8d882a7
|
1999-12-15T15:18:34
|
|
Copyright up-date.
|
|
|
d6156acf
|
1999-12-15T15:15:29
|
|
1999-12-15 Kenichi Handa <handa@etl.go.jp>
* regex.c (regex_compile): Adjusted for the change of CHAR_STRING.
1999-12-04 Stefan Monnier <monnier@cs.yale.edu>
* regex.c (regex_compile): Recognize *?, +? and ?? as non-greedy
operators and handle them properly.
* regex.h (RE_ALL_GREEDY): New option.
(RE_UNMATCHED_RIGHT_PAREN_ORD): Moved to the end where alphabetic
sorting would put it.
(RE_SYNTAX_AWK, RE_SYNTAX_GREP, RE_SYNTAX_EGREP)
(_RE_SYNTAX_POSIX_COMMON): Use the new option to keep old behavior.
|
|
0c82451f
|
1999-10-28T21:16:22
|
|
(POP_FAILURE_POINT): Use failure_id.integer
as arg to DEBUG_POP and DEBUG_PRINT.
|
|
|
0000c41d
|
1999-10-25T12:31:55
|
|
(POP_FAILURE_POINT): Extract failure_id as an integer.
|
|
|
23fe33a2
|
1999-10-06T18:25:22
|
|
1999-09-04 Richard Stallman <rms@gnu.org>
* regex.c [emacs] (ISALNUM, ISALPHA, ISPUNCT): Don't depend on locale
[emacs] (ISASCII): Don't define ISASCII in this case.
(IS_REAL_ASCII): New macro, 2 alternate definitions.
(ISUNIBYTE): Likewise.
[emacs] (ISDIGIT, ISCNTRL, ISXDIGIT, ISGRAPH, ISPRINT):
Don't use ISASCII.
* regex.c: Handle new class names `ascii', `nonascii',
`unibyte, `multibyte'.
(BIT_ASCII, BIT_NONASCII, BIT_UNIBYTE, BIT_MULTIBYTE): New macros.
(IS_CHAR_CLASS): Accept new class names.
(regex_compile, re_match_2_internal): Handle the new classes.
|
|
|
7d4daee6
|
1999-08-29T20:38:11
|
|
[emacs]: Handle character classes for multibyte chars:
(ISBLANK, ISGRAPH, ISPRINT, ISALNUM, ISALPHA, ISLOWER)
(ISPUNCT, ISSPACE, ISUPPER): New definitions for emacs only.
(ISWORD): New macro.
(re_opcode_t): Add 2 bytes of flag bits to charset and charset_not.
(CHARSET_RANGE_TABLE): Update definition.
(CHARSET_RANGE_TABLE_BITS): New macro.
(print_partial_compiled_pattern): Skip charset's range table.
(struct range_table_work_area): New field `bits'.
(SET_RANGE_TABLE_WORK_AREA_BIT): New macro.
(BIT_ALNUM, BIT_ALPHA, BIT_WORD, BIT_GRAPH, BIT_LOWER, BIT_PRINT)
(BIT_PUNCT, BIT_SPACE, BIT_UPPER): New macros.
(CLEAR_RANGE_TABLE_WORK_USED): Clear field `bits'.
(RANGE_TABLE_WORK_BITS): New macro.
(IS_CHAR_CLASS): Check for "word".
(regex_compile): Set the `bits' field for some character classes.
Handle the `word' class. Store the `bits' field into the range table.
(re_compile_fastmap): Handle flag bits in range table.
(re_match_2_internal): For charset and charset_not,
handle flag bits in the range table.
|
|
|
34755e3a
|
1999-01-19T03:24:03
|
|
(re_match_2_internal) [WINDOWSNT & emacs]: Insert QUIT at various places.
|
|
|
139214a5
|
1998-12-30T20:44:39
|
|
(re_compile_fastmap): Do something similar to the
previous change, for charset_not, wordchar, notwordchar,
categoryspec, notcategoryspec.
|
|
2f425990
|
1998-12-10T03:09:12
|
|
(re_compile_fastmap): For anychar, set all fastmap
elements for all possible unibyte chars (except newline).
|
|
|
c62520bb
|
1998-11-10T07:03:05
|
|
(regex_compile): Handle translation of multibyte
exact-match characters.
|
|
|
19668ec8
|
1998-07-25T06:40:50
|
|
(regex_compile): Declare p with non-const type on AIX.
|
|
|
47f34bb6
|
1998-06-09T20:12:44
|
|
(PTR_TO_OFFSET): Alternate definition if not `emacs'.
|
|
|
f78b8d0d
|
1998-06-06T21:59:21
|
|
(POS_AS_IN_BUFFER): Add 1 only if operating on a buffer.
(re_match_2, re_search_2): Adjust startpos or pos by 1
only if acting on a buffer.
nil for re_match_object means a buffer.
(re_match_2_internal <notwordbeg>): Assume POS1 is positive.
|
|
|
f6fc39af
|
1998-05-25T20:14:54
|
|
(re_search_2): Don't use ++ inside RE_TRANSLATE.
(re_match_2_internal): Likewise.
|
|
|
393454fb
|
1998-05-06T20:46:35
|
|
(regex_compile): When checking after exactn
for a repetition operator, don't look beyond end of pattern arg.
|
|
6f65addf
|
1998-04-29T09:23:15
|
|
(re_search_2): Fix indentation.
|
|
|
a12e40eb
|
1998-04-25T03:37:36
|
|
(re_search_2): Fix handling of at_dot.
Fix the way RANGE is set when handling begbuf.
|
|
|
213afad1
|
1998-04-15T10:33:18
|
|
Use RE_TRANSLATE_P to check whether translation is
needed.
|
|
|
7a847ad3
|
1998-04-15T09:39:40
|
|
(realloc) <emacs>: Define to xrealloc.
|
|
|
64af85fe
|
1998-04-12T06:57:47
|
|
(re_match_2, re_search_2): Convert position to a charpos,
before calling SETUP_SYNTAX_TABLE_FOR_OBJECT.
|
|
|
2d79084e
|
1998-04-07T04:07:58
|
|
(re_match_2) <anychar>: In unibyte case, set buf_ch as unsigned.
|
|
|
5e47a7f0
|
1998-04-07T03:21:46
|
|
(re_match_2_internal): Declare buf_ch unsigned int.
|
|
|
f4b339a2
|
1998-04-04T00:00:06
|
|
(regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.
|
|
|
42f97e3f
|
1998-04-03T07:33:13
|
|
(compile_range): Unused function deleted.
(regex_compile): Special handling for range \177-\377.
(regex_compile): Cast args to TRANSLATE to unsigned char.
(re_search_2): Fix forward scan handling multibyte.
Recognize that nonascii characters are not in the fastmap.
Handle fetching multibyte characters for backward scan,
(re_match_2_internal): Handle multibyte and translation
in exactn and anychar.
(bcmp_translate): Handle multibyte chars for translation.
(TRANSLATE): Don't cast to unsigned char.
(PATFETCH): Use RE_TRANSLATE to translate.
|
|
|
02c33167
|
1998-01-16T17:56:40
|
|
(re_match_2_internal): Use SYNTAX_TABLE_BYTE_TO_CHAR.
(re_match_2_internal) <wordbeg, wordend>:
Call UPDATE_SYNTAX_TABLE properly with a charpos.
|
|
|
7bb256f0
|
1998-01-09T23:24:24
|
|
(re_search_2): Fix call to CHAR_HEAD_P.
(re_match_2_internal): Use PTR_BYTE_POS and PT_BYTE.
|
|
|
6362f299
|
1997-12-11T07:21:05
|
|
(GROW_FAIL_STACK): Fix test for stack size at max.
|
|
|
fbbc28d1
|
1997-12-09T23:04:38
|
|
(GROW_FAIL_STACK): Fix previous change:
update (fail_stack).size properly.
|
|
|
9a15e12b
|
1997-12-09T23:01:27
|
|
(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Define it simply as a number.
(DOUBLE_FAIL_STACK, regex_compile): Set the limit at the size
TYPICAL_FAILURE_SIZE specifies, rather than at twice that much.
(re_max_failures): Double the initial values.
(INIT_FAIL_STACK): Use TYPICAL_FAILURE_SIZE so that INIT_FAILURE_ALLOC
counts in the proper units.
(INIT_FAILURE_ALLOC): Increase to 20.
(FAIL_STACK_GROWTH_FACTOR): New macro.
(GROW_FAIL_STACK): Renamed from DOUBLE_FAIL_STACK.
FAIL_STACK_GROWTH_FACTOR controls what ratio to increase size by.
|
|
|
f5edf8ad
|
1997-08-06T06:31:13
|
|
Whitespace change.
|
|
|
dfa8d626
|
1997-07-04T20:46:22
|
|
(TRANSLATE, re_search_2, re_match_2_internal,bcmp_translate):
Use RE_TRANSLATE instead of accessing translate array directly.
|
|
|
837c5301
|
1997-07-02T06:25:00
|
|
(re_search_2): Cast result of POS_ADDR_VSTRING.
|
|
|
3f8c9c6b
|
1997-06-15T19:43:01
|
|
Fix previous change.
|
|
|
2d876c4b
|
1997-06-15T19:05:59
|
|
Fix up whitespace.
|
|
|
e074b658
|
1997-06-15T19:00:12
|
|
(PTR_TO_OFFSET): New macro.
(POS_AS_IN_BUFFER): New macro.
(SYNTAX_ENTRY_VIA_PROPERTY): Set to take `syntax-table' text
property into account when doing SYNTAX (c).
(re_compile_fastmap): disable fastmap if any of wordbound
notwordbound wordbeg wordend notsyntaxspec syntaxspec are seen.
(re_search_2): SETUP_SYNTAX_TABLE_FOR_OBJECT at the start.
(re_match_object): New variable.
(re_match_2): SETUP_SYNTAX_TABLE_FOR_OBJECT at the start.
(re_match_2_internal): For any of wordbound notwordbound wordbeg
wordend notsyntaxspec syntaxspec call UPDATE_SYNTAX_TABLE before
doing SYNTAX (c).
[emacs]: Include charset.h and category.h
[!emacs] (BASE_LEADING_CODE_P, WORD_BOUNDARY_P, CHAR_HEAD_P,
SINGLE_BYTE_CHAR_P, SAME_CHARSET_P, MULTIBYTE_FORM_LENGTH,
STRING_CHAR_AND_LENGTH, GET_CHAR_AFTER_2, GET_CHAR_BEFORE_2):
New dummy macros.
(enum re_opcode_t): New member categoryspec and notcategoryspec.
(STORE_CHARACTER_AND_INCR, EXTRACT_CHARACTER,
CHARSET_LOOKUP_RANGE_TABLE_WITH_COUNT,
CHARSET_LOOKUP_RANGE_TABLE, CHARSET_BITMAP_SIZE,
CHARSET_RANGE_TABLE_EXISTS_P, CHARSET_RANGE_TABLE
CHARSET_PAST_RANGE_TABLE): New macros.
(TRANSLATE): Cast return value to unsigned char, not char.
(struct range_table_work_area): New structure.
(EXTEND_RANGE_TABLE_WORK_AREA, SET_RANGE_TABLE_WORK_AREA,
FREE_RANGE_TABLE_WORK_AREA, CLEAR_RANGE_TABLE_WORK_USED,
RANGE_TABLE_WORK_USED, RANGE_TABLE_WORK_ELT): New macros.
(FREE_STACK_RETURN): Call FREE_RANGE_TABLE_WORK_AREA.
(regex_compile): Declare `c' and `c1' as int to store multibyte characters.
Declare range_table_work and initialize it.
Initialize bufp->multibyte to 0 if not emacs.
For case '[' and `default', code re-written to handle multibyte characters.
Add code for case 'c' and 'C' to handle category spec.
(re_compile_fastmap): New local variables k, simple_char_max,
and match_any_multibyte_characters.
Use macro CHARSET_BITMAP_SIZE.
Handle multibyte characters in cases charset, charset_not,
wordchar, notwordchar, anychar, syntaxspec, notsyntaxspec,
categoryspec, notcategoryspec.
(STOP_ADDR_VSTRING, POS_ADDR_VSTRING): New macros.
(re_search_2): Code re-written to handle multibyte characters.
(AT_WORD_BOUNDARY): Macro disabled.
(re_match_2_internal): New local variable multibyte. `d' is
incremented while paying attention to multibyte characters if necessary.
For case charset, charsetnot, wordbound, notwordbound,
wordbeg, wordend, matchsyntax, and matchnotsyntax, code
re-written to handle multibyte characters.
Add code for case categoryspec and notcategoryspec.
Declare c, c1 as unsigned int, not unsigned char.
|
|
|
c90c4710
|
1996-11-07T21:13:22
|
|
[emacs] (malloc, free): Define as xmalloc, and xfree.
|
|
|
c38e8a15
|
1996-09-19T03:00:06
|
|
(regex_compile): Use TRANSLATE before calling SET_LIST_BIT.
|
|
|
e09c3726
|
1996-09-01T19:02:26
|
|
(re_match_2_internal) [emacs]: Use PT, not point.
|
|
|
2f647319
|
1996-08-31T23:41:26
|
|
Clean up whitespace.
|
|
|
414709cd
|
1996-08-31T23:40:19
|
|
(re_search_2): Optimize regexp that starts with ^.
|
|
|
69897078
|
1996-08-31T22:29:12
|
|
(FREE_VAR): Clean up C syntax.
|
|
|
83ad3d8c
|
1996-08-09T10:44:37
|
|
(re_max_failures): Increase to 20000 again.
|
|
301bba0b
|
1996-07-09T09:10:39
|
|
[_LIBC] (re_comp, re_exec): Use `weak_function' keyword in defn instead of
weak_symbol macro after.
|
|
|
93f802eb
|
1996-06-26T18:00:52
|
|
(re_max_failures): Reduce to 4000.
|
|
|
9fd34984
|
1996-06-02T21:33:01
|
|
(re_max_failures): Reduce to 8000.
|
|
|
0b53893b
|
1996-05-24T18:33:30
|
|
Tue May 21 19:18:05 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* regex.c [_LIBC] (re_comp, re_exec): Define these, but weakly.
|
|
|
49fb692d
|
1996-05-12T22:19:55
|
|
Delete the Emacs local variables spec.
|
|
|
23c946d6
|
1996-05-11T18:05:52
|
|
(re_match_2_internal): Fix off-by-one error; don't use
length of exactn as character, and don't use length of bitmap of
charset as bitmap.
|
|
|
41bedd57
|
1996-04-12T22:57:28
|
|
(MAX_FAILURE_ITEMS): Use 5 instead of actual number of regs.
|
|
|
df2594c7
|
1996-01-29T22:25:51
|
|
Update FSF address in comment.
|
|
|
d8e9ddab
|
1995-12-13T02:52:23
|
|
(AT_WORD_BOUNDARY): Disable macro.
(re_match_2_internal): Work around compiler bug.
|
|
|
b15e81ad
|
1995-11-16T02:51:19
|
|
(gettext_noop): New macro, identity fn.
(re_error_msgid): Mark strings with that, to ease message catalog creation.
|
|
|
c26fc754
|
1995-11-11T20:51:37
|
|
(NUM_FAILURE_ITEMS, POP_FAILURE_POINT, PUSH_FAILURE_POINT):
Do not test for backtracking--do the same thing with or without.
(_GNU_SOURCE): Undef before defining.
(re_max_failures): Initialize to just 20000.
|
|
|
bacf0a7d
|
1995-10-29T19:36:39
|
|
(POP_FAILURE_POINT): Use .word.integer.
|
|
|
3bb6a39f
|
1995-10-22T17:47:13
|
|
Don't declare alloca.
|
|
|
b28e3978
|
1995-10-19T00:50:51
|
|
(TRANSLATE, PATFETCH): Cast elt of `translate'.
Don't define if already defined.
(regex_compile): Use RE_TRANSLATE_TYPE for `translate'.
(compile_range, re_search_2, re_match_2_internal, bcmp_translate)
(regcomp): Use RE_TRANSLATE_TYPE for `translate'.
|
|
|
58d50470
|
1995-10-01T20:17:02
|
|
(re_search_2): Use 0, not -1, as the lower bound
for the match position when we adjust RANGE.
|
|
|
38f1379d
|
1995-09-01T18:43:30
|
|
(re_search_2): If pattern starts with \=, optimize search.
|
|
|
dcfe0405
|
1995-08-22T19:44:26
|
|
(PUSH_FAILURE_POINT, POP_FAILURE_POINT): Don't push or pop
register values if POSIX backtracking is turned off.
(NUM_FAILURE_ITEMS): Value is 0 if no POSIX backtracking.
|
|
|
f4a6f048
|
1995-07-17T23:24:57
|
|
Fix conditional.
|
|
|
2db486e1
|
1995-07-07T13:20:16
|
|
Don't use relocatable allocator.
|
|
|
f5480e4a
|
1995-06-20T03:11:14
|
|
Use `defined' to test HAVE_STRING_H and STDC_HEADERS.
|
|
|
0424b458
|
1995-06-03T17:32:10
|
|
Undefined INHIBIT_STRING_HEADER when we have no
other way of getting a bcopy and a bzero.
|
|
|
19a3ecee
|
1995-05-29T06:15:30
|
|
(at_endline_loc_p): Use 0, not NULL, in ?: for next_next.
|
|
|
4ab0903a
|
1995-05-26T22:35:10
|
|
(NULL): Use explicit cast.
|
|
03f2d7c0
|
1995-05-21T06:19:05
|
|
[REGEX_FREE]: Use ((void)0) instead of just (0).
|
|
|
72d7735e
|
1995-05-20T16:40:11
|
|
Add `#ifdef _LIBC' in a few places, so this can be compiled in libc.
|
|
|
024d33aa
|
1995-05-17T20:54:49
|
|
Updated from ../gpl2lgpl.sed /home/gd/gnu/lib/regex.c
|
|
|
65b12a92
|
1995-05-17T20:29:52
|
|
(re_compile_fastmap): Undo previous change.
(RESET_FAIL_STACK): New macro.
(re_compile_fastmap): Use RESET_FAIL_STACK, not REGEX_FREE_STACK
directly.
|
|
|
d5dda417
|
1995-05-15T23:30:28
|
|
(re_compile_fastmap): Don't free stack if it's empty.
(re_match_failures): Reduce the larger value to 200000,
and use whenever if MATCH_MAY_ALLOCATE.
(MATCH_MAY_ALLOCATE): Don't consider REL_ALLOC when deciding
whether to undef this.
|
|
|
372b6ed4
|
1995-05-06T20:14:52
|
|
[! emacs]: #undef REL_ALLOC.
|
|
|
079ec867
|
1995-05-02T16:27:24
|
|
(union fail_stack_elt): New union.
(fail_stack_elt_t): Use that union.
(PUSH_PATTERN_OP, PUSH_FAILURE_POINTER, PUSH_FAILURE_INT)
(POP_FAILURE_POINTER, POP_FAILURE_INT): Corresponding changes.
(re_compile_fastmap): Corresponding changes.
(PUSH_FAILURE_ELT): New macro.
(FAIL_STACK_TOP): Macro deleted.
(WIDE_INT): Macro deleted.
(PUSH_FAILURE_POINT): Use PUSH_FAILURE_ELT.
(POP_FAILURE_ELT): New macro.
(POP_FAILURE_POINT): Use POP_FAILURE_ELT.
|
|
|
b634689f
|
1995-04-29T20:21:41
|
|
(PUSH_FAILURE_INT, POP_FAILURE_INT): Use WIDE_INT.
(WIDE_INT): Defined (two alternate definitions).
(C_ALLOCA): Undef it, if __GNUC__.
(REGEX_ALLOCATE_STACK, REGEX_REALLOCATE_STACK)
(REGEX_FREE_STACK): New macros.
(INIT_FAIL_STACK, DOUBLE_FAIL_STACK, FREE_VARIABLES): Use them.
(re_max_failures) [REL_ALLOC]: Alternative larger initial value.
(re_compile_fastmap): Use REGEX_FREE_STACK.
(re_match_2_internal): Always call FREE_VARIABLES before returning.
Always init regstart, old_regstart, etc. whenever MATCH_MAY_ALLOCATE
is defined.
(FREE_VARIABLES) [REL_ALLOC]: Define non-trivially.
|
|
|
8bd7f00f
|
1995-04-09T19:14:40
|
|
(re_match_2_internal): Eliminate cast of ptr to int.
(PUSH_FAILURE_ITEM, POP_FAILURE_ITEM): Macros deleted.
(PUSH_FAILURE_INT, POP_FAILURE_INT): New macros.
(PUSH_FAILURE_POINTER, POP_FAILURE_POINTER): New macros.
(re_match_2_internal): Rename label `succeed' to `succeed_label'.
|
|
|
993d006a
|
1995-02-28T13:46:40
|
|
(SET_REGS_MATCHED): Enclose if-stmt in `do {...} while(0)'
instead of using trailing `else' -- otherwise, gcc -Wall complains
of `empty body in an else-statement'.
|
|
|
29052bf0
|
1995-01-18T20:47:36
|
|
[!emacs] (SWITCH_ENUM_CAST): New macro, from emacs/lisp.h
(re_compile_fastmap, re_match_2_internal): Use that macro instead of testing
SWITCH_ENUM_BUG.
|
|
|
a151c685
|
1994-12-30T23:28:45
|
|
(regex_compile): Use putchar, not printchar.
|
|
|
2a3ec5ac
|
1994-12-24T23:40:43
|
|
(SET_REGS_MATCHED): Do nothing if set_regs_matched_done is 1.
Set set_regs_matched_done to 1.
(re_match_2_internal): New local var set_regs_matched_done.
Set it to 0 when appropriate.
(POP_FAILURE_POINT): Set set_regs_matched_done to 0.
(re_match_2_internal, case duplicate): Call SET_REGS_MATCHED.
|
|
|
3a78e396
|
1994-12-11T23:16:11
|
|
[REG_UNSET_VALUE]: Define to the address of a static variable rather than to
((char *) -1). The latter got a warning on IRIX64.
|
|
|
f691792f
|
1994-12-01T22:59:35
|
|
(gettext): Make sure this is always defined, even #if emacs.
(NULL): No need to #undef this anymore; Emacs uses NILP now.
|
|
47386749
|
1994-11-29T16:25:39
|
|
(re_compile_pattern, re_comp, regerror): Add gettext wrapper.
(re_error_msgid): Renamed from `re_error_msg', for consistency
with other source files that declare arrays of message ids.
Identifiers ending in `msgid' are special to to some prototype
message-extracting utilities.
Make "Success" be the 0th entry, so it can be extracted too.
(re_comp): Replace "Memory exhausted" with
re_error_msgid[REG_ESPACE], to aid message consistency.
|
|
|
ef355703
|
1994-11-19T13:57:27
|
|
(re_compile_fastmap): Really, really treat `succeed' like end.
|