diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2011-06-03 11:05:56 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2011-06-03 11:05:56 +0300 |
| commit | fed9a3413cd653aae742452f9bfa83319802fb3c (patch) | |
| tree | c3db2ef89da90b310e87fd8380a7b8135b169f94 | |
| parent | 16ef5c1f94f874b4ee235ac7b7d1f0bedf07621d (diff) | |
| download | egawk-fed9a3413cd653aae742452f9bfa83319802fb3c.tar.gz egawk-fed9a3413cd653aae742452f9bfa83319802fb3c.tar.bz2 egawk-fed9a3413cd653aae742452f9bfa83319802fb3c.zip | |
Make regcomp.c closer to GNULIB.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regcomp.c | 19 |
2 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Fri Jun 3 10:39:17 2011 Arnold D. Robbins <arnold@skeeve.com> + + * regcomp.c (build_range_exp): Make syntax the first argument, + for compatibility with gnulib version of the file. + Wed Jun 1 06:29:27 2011 Pat Rankin <rankin@pactechdata.com> * re.c (check_bracket_exp): Fix typo. @@ -2642,11 +2642,12 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, static reg_errcode_t internal_function # ifdef RE_ENABLE_I18N -build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, - bracket_elem_t *start_elem, bracket_elem_t *end_elem, reg_syntax_t syntax) +build_range_exp (reg_syntax_t syntax, bitset_t sbcset, re_charset_t *mbcset, + int *range_alloc, bracket_elem_t *start_elem, + bracket_elem_t *end_elem) # else /* not RE_ENABLE_I18N */ -build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem, - bracket_elem_t *end_elem, reg_syntax_t syntax) +build_range_exp (reg_syntax_t syntax, bitset_t sbcset, + bracket_elem_t *start_elem, bracket_elem_t *end_elem) # endif /* not RE_ENABLE_I18N */ { unsigned int start_ch, end_ch; @@ -3215,15 +3216,15 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, token_len = peek_token_bracket (token, regexp, syntax); #ifdef _LIBC - *err = build_range_exp (sbcset, mbcset, &range_alloc, - &start_elem, &end_elem, syntax); + *err = build_range_exp (syntax, sbcset, mbcset, &range_alloc, + &start_elem, &end_elem); #else # ifdef RE_ENABLE_I18N - *err = build_range_exp (sbcset, + *err = build_range_exp (syntax, sbcset, dfa->mb_cur_max > 1 ? mbcset : NULL, - &range_alloc, &start_elem, &end_elem, syntax); + &range_alloc, &start_elem, &end_elem); # else - *err = build_range_exp (sbcset, &start_elem, &end_elem, syntax); + *err = build_range_exp (syntax, sbcset, &start_elem, &end_elem); # endif #endif /* RE_ENABLE_I18N */ if (BE (*err != REG_NOERROR, 0)) |