diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 10 | ||||
| -rw-r--r-- | test/Makefile.in | 10 | ||||
| -rw-r--r-- | test/rscompat.awk | 2 | ||||
| -rw-r--r-- | test/rscompat.in | 2 | ||||
| -rw-r--r-- | test/rscompat.ok | 3 |
8 files changed, 36 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2016-04-27 Arnold D. Robbins <arnold@skeeve.com> + + * io.c (set_RS): Use rs1scan if do_traditional, even if length + of RS is > 1. + 2016-04-24 Arnold D. Robbins <arnold@skeeve.com> * dfa.c: Sync with GNU grep. @@ -3668,7 +3668,7 @@ set_RS() if (RS->stlen == 0) { RS_is_null = true; matchrec = rsnullscan; - } else if (RS->stlen > 1) { + } else if (RS->stlen > 1 && ! do_traditional) { static bool warned = false; RS_re_yes_case = make_regexp(RS->stptr, RS->stlen, false, true, true); diff --git a/test/ChangeLog b/test/ChangeLog index be9eb7db..11908b40 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2016-04-27 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (rscompat): New test. + * rscompat.awk, rscompat.in, rscompat.ok: New files. + 2016-04-24 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (pty1): Ignore errors. diff --git a/test/Makefile.am b/test/Makefile.am index be25403e..844c87fb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -841,6 +841,9 @@ EXTRA_DIST = \ rs.awk \ rs.in \ rs.ok \ + rscompat.awk \ + rscompat.in \ + rscompat.ok \ rsgetline.awk \ rsgetline.in \ rsgetline.ok \ @@ -1068,7 +1071,7 @@ BASIC_TESTS = \ rand range1 readbuf rebrackloc rebt8b1 redfilnm \ regeq regexpbrack regexpbrack2 \ regexprange regrange reindops \ - reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ + reparse resplit rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ rstest3 rstest4 rstest5 rswhite \ scalar sclforin sclifin sortempty sortglos splitargv splitarr splitdef \ splitvar splitwht strcat1 strnum1 strtod subamp subi18n \ @@ -2140,6 +2143,11 @@ pty1: $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \ esac +rscompat: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) --traditional -f $@.awk "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index 9346064c..5e55b1b6 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1098,6 +1098,9 @@ EXTRA_DIST = \ rs.awk \ rs.in \ rs.ok \ + rscompat.awk \ + rscompat.in \ + rscompat.ok \ rsgetline.awk \ rsgetline.in \ rsgetline.ok \ @@ -1324,7 +1327,7 @@ BASIC_TESTS = \ rand range1 readbuf rebrackloc rebt8b1 redfilnm \ regeq regexpbrack regexpbrack2 \ regexprange regrange reindops \ - reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ + reparse resplit rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ rstest3 rstest4 rstest5 rswhite \ scalar sclforin sclifin sortempty sortglos splitargv splitarr splitdef \ splitvar splitwht strcat1 strnum1 strtod subamp subi18n \ @@ -2578,6 +2581,11 @@ pty1: *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \ esac + +rscompat: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) --traditional -f $@.awk "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: diff --git a/test/rscompat.awk b/test/rscompat.awk new file mode 100644 index 00000000..9415c704 --- /dev/null +++ b/test/rscompat.awk @@ -0,0 +1,2 @@ +BEGIN { RS = "bar" } +{ print $1, $2 } diff --git a/test/rscompat.in b/test/rscompat.in new file mode 100644 index 00000000..eb337e58 --- /dev/null +++ b/test/rscompat.in @@ -0,0 +1,2 @@ +0foobar0faz +1foobar1faz diff --git a/test/rscompat.ok b/test/rscompat.ok new file mode 100644 index 00000000..19cd9fbe --- /dev/null +++ b/test/rscompat.ok @@ -0,0 +1,3 @@ +0foo +ar0faz 1foo +ar1faz |