diff --git a/ChangeLog b/ChangeLog index 217bbdd..b719535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-08-30 Paolo Bonzini + + * sed/execute.c (reset_addresses): Never activate ADDR_IS_NUM_MOD + addresses. + * testsuite/modulo.good, testsuite/modulo.inp, testsuite/modulo.sed: + New. + * testsuite/Makefile.tests: Add new testcase. + * testsuite/Makefile.am: Add new testcase. + * testsuite/Makefile.in: Regenerate. + 2005-05-18 Maciej W. Rozycki * configure.ac: Use a cache variable for the libcP test. @@ -15,6 +25,9 @@ 2005-02-10 Paolo Bonzini + * testsuite/Makefile.tests: Add new testcase. + * testsuite/Makefile.am: Add new testcase. + * testsuite/Makefile.in: Regenerate. * testsuite/appquit.good, testsuite/appquit.inp, testsuite/appquit.sed: New testcase. * testsuite/readin.sed: Quit after the last r command. diff --git a/doc/Makefile.am b/doc/Makefile.am index 2eee3a7..c5ebd34 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -26,7 +26,8 @@ dist-hook: # This rule is used if --enable-html is passed if BUILD_HTML docdir = $(datadir)/doc -doc_DATA = sed.html +pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +pkgdoc_DATA = sed.html all: html diff --git a/sed/execute.c b/sed/execute.c index a31a68d..195604b 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -738,8 +738,7 @@ reset_addresses(vec) for (cur_cmd = vec->v, n = vec->v_length; n--; cur_cmd++) if (cur_cmd->a1 - && (cur_cmd->a1->addr_type == ADDR_IS_NUM - || cur_cmd->a1->addr_type == ADDR_IS_NUM_MOD) + && cur_cmd->a1->addr_type == ADDR_IS_NUM && cur_cmd->a1->addr_number == 0) cur_cmd->range_state = RANGE_ACTIVE; else diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index febb928..b53abe1 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -18,7 +18,7 @@ endif SEDTESTS += \ appquit enable sep inclib 8bit newjis xabcx dollar noeol noeolw \ - numsub numsub2 numsub3 numsub4 numsub5 0range bkslashes \ + modulo numsub numsub2 numsub3 numsub4 numsub5 0range bkslashes \ head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \ fasts uniq manis khadafy linecnt eval distrib 8to7 \ allsub cv-vars classes middle bsd stdin flipcase \ @@ -60,6 +60,7 @@ EXTRA_DIST = \ madding.good madding.inp madding.sed \ manis.good manis.inp manis.sed \ middle.good middle.sed middle.inp \ + modulo.good modulo.sed modulo.inp \ newjis.good newjis.inp newjis.sed \ noeol.good noeol.inp noeol.sed \ noeolw.good noeolw.1good noeolw.2good noeolw.sed \ diff --git a/testsuite/Makefile.tests b/testsuite/Makefile.tests index 3ff8590..c82d629 100644 --- a/testsuite/Makefile.tests +++ b/testsuite/Makefile.tests @@ -13,7 +13,7 @@ RM=rm -f enable sep inclib 8bit 8to7 newjis xabcx dollar noeol bkslashes \ numsub head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \ -appquit fasts uniq manis linecnt khadafy allsub flipcase space:: +appquit fasts uniq manis linecnt khadafy allsub flipcase space modulo:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ < $(srcdir)/$@.inp > $@.out $(CMP) $(srcdir)/$@.good $@.out diff --git a/testsuite/dc.good b/testsuite/dc.good index bfdc330..7604d56 100644 --- a/testsuite/dc.good +++ b/testsuite/dc.good @@ -1,3 +1,3 @@ 31 March 2002 -1.6A09E667A \ No newline at end of file +1.6A09E667A diff --git a/testsuite/modulo.good b/testsuite/modulo.good new file mode 100644 index 0000000..b42f1ab --- /dev/null +++ b/testsuite/modulo.good @@ -0,0 +1,22 @@ +1 +s%@CFLAGS@%%g +3 +s%@CXXFLAGS@%-x c++%g +5 +s%@LDFLAGS@%-L/usr/lib%g +7 +s%@exec_prefix@%%g +9 +s%@RANLIB@%$RANLIB%g +11 +s%@CPP@%$CPP%g +13 +s%@XINCLUDES@%$XINCLUDES%g +15 +s%@XPROGS@%$XPROGS%g +17 +s%@TCLLIB@%$TCLLIB%g +19 +s%@TKLIB@%$TKLIB%g +21 +s%@EVENT_TYPE@%$EVENT_TYPE%g diff --git a/testsuite/modulo.inp b/testsuite/modulo.inp new file mode 100644 index 0000000..f349b76 --- /dev/null +++ b/testsuite/modulo.inp @@ -0,0 +1,22 @@ +s%@CFLAGS@%%g +s%@CPPFLAGS@%-I/%g +s%@CXXFLAGS@%-x c++%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%-L/usr/lib%g +s%@LIBS@%-lgnu -lbfd%g +s%@exec_prefix@%%g +s%@prefix@%$prefix%g +s%@RANLIB@%$RANLIB%g +s%@CC@%/usr/local/bin/gcc%g +s%@CPP@%$CPP%g +s%@XCFLAGS@%$XCFLAGS%g +s%@XINCLUDES@%$XINCLUDES%g +s%@XLIBS@%$XLIBS%g +s%@XPROGS@%$XPROGS%g +s%@TCLHDIR@%$TCLHDIR%g +s%@TCLLIB@%$TCLLIB%g +s%@TKHDIR@%$TKHDIR%g +s%@TKLIB@%$TKLIB%g +s%@PTY_TYPE@%$PTY_TYPE%g +s%@EVENT_TYPE@%$EVENT_TYPE%g +s%@SETUID@%$SETUID%g diff --git a/testsuite/modulo.sed b/testsuite/modulo.sed new file mode 100644 index 0000000..68b4930 --- /dev/null +++ b/testsuite/modulo.sed @@ -0,0 +1 @@ +0~2d;=