# HG changeset patch # User Bram Moolenaar # Date 1308450735 -7200 # Node ID c249d9aa60f759286f54781829c1e3da8680c4a7 # Parent df5d2e1bff3486c3e8a65d10c728377d92a5e9de updated for version 7.3.225 Problem: Using "\n" in a substitute inside ":s" does not result in a line break. Solution: Change behavior inside vim_regexec_nl(). Add tests. (Motoya Kurotsu) diff --git a/src/regexp.c b/src/regexp.c --- a/src/regexp.c +++ b/src/regexp.c @@ -6872,6 +6872,7 @@ static regmatch_T *submatch_match; static regmmatch_T *submatch_mmatch; static linenr_T submatch_firstlnum; static linenr_T submatch_maxline; +static int submatch_line_lbr; #endif #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO) @@ -6998,6 +6999,7 @@ vim_regsub_both(source, dest, copy, magi submatch_mmatch = reg_mmatch; submatch_firstlnum = reg_firstlnum; submatch_maxline = reg_maxline; + submatch_line_lbr = reg_line_lbr; save_reg_win = reg_win; save_ireg_ic = ireg_ic; can_f_submatch = TRUE; @@ -7009,9 +7011,10 @@ vim_regsub_both(source, dest, copy, magi for (s = eval_result; *s != NUL; mb_ptr_adv(s)) { - /* Change NL to CR, so that it becomes a line break. + /* Change NL to CR, so that it becomes a line break, + * unless called from vim_regexec_nl(). * Skip over a backslashed character. */ - if (*s == NL) + if (*s == NL && !submatch_line_lbr) *s = CAR; else if (*s == '\\' && s[1] != NUL) { @@ -7020,8 +7023,9 @@ vim_regsub_both(source, dest, copy, magi * :s/abc\\\ndef/\="aaa\\\nbbb"/ on text: * abc\ * def + * Not when called from vim_regexec_nl(). */ - if (*s == NL) + if (*s == NL && !submatch_line_lbr) *s = CAR; had_backslash = TRUE; } @@ -7044,6 +7048,7 @@ vim_regsub_both(source, dest, copy, magi reg_mmatch = submatch_mmatch; reg_firstlnum = submatch_firstlnum; reg_maxline = submatch_maxline; + reg_line_lbr = submatch_line_lbr; reg_win = save_reg_win; ireg_ic = save_ireg_ic; can_f_submatch = FALSE; diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak --- a/src/testdir/Make_amiga.mak +++ b/src/testdir/Make_amiga.mak @@ -28,7 +28,7 @@ SCRIPTS = test1.out test3.out test4.out test61.out test62.out test63.out test64.out test65.out \ test66.out test67.out test68.out test69.out test70.out \ test71.out test72.out test73.out test74.out test75.out \ - test76.out test77.out test78.out + test76.out test77.out test78.out test79.out test80.out .SUFFIXES: .in .out @@ -126,3 +126,5 @@ test75.out: test75.in test76.out: test76.in test77.out: test77.in test78.out: test78.in +test79.out: test79.in +test80.out: test80.in diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -28,7 +28,8 @@ SCRIPTS = test3.out test4.out test5.out test37.out test38.out test39.out test40.out test41.out \ test42.out test52.out test65.out test66.out test67.out \ test68.out test69.out test71.out test72.out test73.out \ - test74.out test75.out test76.out test77.out test78.out + test74.out test75.out test76.out test77.out test78.out \ + test79.out test80.out SCRIPTS32 = test50.out test70.out diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -48,7 +48,8 @@ SCRIPTS = test3.out test4.out test5.out test37.out test38.out test39.out test40.out test41.out \ test42.out test52.out test65.out test66.out test67.out \ test68.out test69.out test71.out test72.out test73.out \ - test74.out test75.out test76.out test77.out test78.out + test74.out test75.out test76.out test77.out test78.out \ + test79.out test80.out SCRIPTS32 = test50.out test70.out diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak --- a/src/testdir/Make_os2.mak +++ b/src/testdir/Make_os2.mak @@ -28,7 +28,7 @@ SCRIPTS = test1.out test3.out test4.out test61.out test62.out test63.out test64.out test65.out \ test66.out test67.out test68.out test69.out test70.out \ test71.out test72.out test73.out test74.out test75.out \ - test76.out test77.out test78.out + test76.out test77.out test78.out test79.out test80.out .SUFFIXES: .in .out diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms --- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, # Sandor Kopanyi, # -# Last change: 2011 Jun 13 +# Last change: 2011 Jun 19 # # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. # Edit the lines in the Configuration section below to select. @@ -75,7 +75,7 @@ SCRIPT = test1.out test2.out test3.out test61.out test62.out test63.out test64.out test65.out \ test66.out test67.out test68.out test69.out \ test71.out test72.out test74.out test75.out test76.out \ - test77.out test78.out + test77.out test78.out test79.out test80.out # Known problems: # Test 30: a problem around mac format - unknown reason diff --git a/src/testdir/Makefile b/src/testdir/Makefile --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -25,7 +25,8 @@ SCRIPTS = test1.out test2.out test3.out test59.out test60.out test61.out test62.out test63.out \ test64.out test65.out test66.out test67.out test68.out \ test69.out test70.out test71.out test72.out test73.out \ - test74.out test75.out test76.out test77.out test78.out + test74.out test75.out test76.out test77.out test78.out \ + test79.out test80.out SCRIPTS_GUI = test16.out diff --git a/src/testdir/test79.in b/src/testdir/test79.in new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8fa11d9ad79cd389169051166babb22d8e1f4041 GIT binary patch literal 2531 zc%1E4$#U925arxezWS`VVq}P|HoHxV1B=+bfpY62C4^Xv7A%P*r+j-P1_{QLOK|Wl zm#Oz=UiWBTYg$rt*Au3;Bc$E+_{Py!hN|f|?n>7ds*x5{Yr?PSe^!p}x(nM%3$`Vc z{WaHHcxz9WKnZjClcwrv^Q#o6*_Wit?&V!Si#KGG#tU_XJa&Ei?wTm7N3}1#1YeWf!ZMOfpnM+M+sLNt8NvK)R)S zx}y>msX%$kQI;|+Q3EFo$oQ9mCejwQkk+#q!)>G=bCTzbb&!lshv6<#ze{qLv7WD6 zlD=fDkLPC$Js>#@JtBpZPe>L+&q!m2UXVP721vxv5J_W5!Se*}oDIgGzMWO5K|Pbr zUWhRYybHg1m^4kwhh>_z#Xh=KT z(2#dG+!7<(D;MNkgtiCFx_IwYt_*5bg>h{RT3v%lV*V0GP^o{uZe1Lq!1Mv~f_y}iT z--Lobv?0(R`#AJ#WG=6aX39llTuT&7N<_1_;rXjWRw7K}diA3B>NoZ|{R9Q_F;Iv7UWr+4IbN zAFb(CdCz9X#%=;ECSQxCu7*P##;)fFVHEcVgMJ)^f$zC&lq=IM?>qJ%6raov9F>z& zc1x;G#rfsT<@G`>H6}IKj&0jsg5xlH(7ry^_7hgJVlA>JRW_o@OoWVF>YS~z6Ev=~ vJ%yA72Y#<;5<#123irUxr_t~BP3Dgq>bL##s%AIRvXb)FPGUW;j1+zV+T2}i diff --git a/src/testdir/test80.in b/src/testdir/test80.in new file mode 100644 --- /dev/null +++ b/src/testdir/test80.in @@ -0,0 +1,150 @@ +Test for *sub-replace-special* and *sub-replace-expression* on substitue(). +Test for submatch() on substitue(). +Test for *:s%* on :substitute. + +STARTTEST +:so small.vim +ENDTEST + +TEST_1: + +STARTTEST +:set magic +:set cpo& +:$put =\"\n\nTEST_1:\" +:$put =substitute('A', 'A', '&&', '') +:$put =substitute('B', 'B', '\&', '') +:$put =substitute('C123456789', 'C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\0\9\8\7\6\5\4\3\2\1', '') +:$put =substitute('D', 'D', 'd', '') +:$put =substitute('E', 'E', '~', '') +:$put =substitute('F', 'F', '\~', '') +:$put =substitute('G', 'G', '\ugg', '') +:$put =substitute('H', 'H', '\Uh\Eh', '') +:$put =substitute('I', 'I', '\lII', '') +:$put =substitute('J', 'J', '\LJ\EJ', '') +:$put =substitute('K', 'K', '\Uk\ek', '') +:$put =substitute('lLl', 'L', ' ', '') +:$put =substitute('mMm', 'M', '\r', '') +:$put =substitute('nNn', 'N', '\ ', '') +:$put =substitute('oOo', 'O', '\n', '') +:$put =substitute('pPp', 'P', '\b', '') +:$put =substitute('qQq', 'Q', '\t', '') +:$put =substitute('rRr', 'R', '\\', '') +:$put =substitute('sSs', 'S', '\c', '') +:$put =substitute('uUu', 'U', \"\n\", '') +:$put =substitute('vVv', 'V', \"\b\", '') +:$put =substitute('wWw', 'W', \"\\\", '') +:$put =substitute('xXx', 'X', \"\r\", '') +/^TEST_2 +ENDTEST + +TEST_2: + +STARTTEST +:set nomagic +:set cpo& +:$put =\"\n\nTEST_2:\" +:$put =substitute('A', 'A', '&&', '') +:$put =substitute('B', 'B', '\&', '') +:$put =substitute('C123456789', 'C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\0\9\8\7\6\5\4\3\2\1', '') +:$put =substitute('D', 'D', 'd', '') +:$put =substitute('E', 'E', '~', '') +:$put =substitute('F', 'F', '\~', '') +:$put =substitute('G', 'G', '\ugg', '') +:$put =substitute('H', 'H', '\Uh\Eh', '') +:$put =substitute('I', 'I', '\lII', '') +:$put =substitute('J', 'J', '\LJ\EJ', '') +:$put =substitute('K', 'K', '\Uk\ek', '') +:$put =substitute('lLl', 'L', ' ', '') +:$put =substitute('mMm', 'M', '\r', '') +:$put =substitute('nNn', 'N', '\ ', '') +:$put =substitute('oOo', 'O', '\n', '') +:$put =substitute('pPp', 'P', '\b', '') +:$put =substitute('qQq', 'Q', '\t', '') +:$put =substitute('rRr', 'R', '\\', '') +:$put =substitute('sSs', 'S', '\c', '') +:$put =substitute('tTt', 'T', \"\r\", '') +:$put =substitute('uUu', 'U', \"\n\", '') +:$put =substitute('vVv', 'V', \"\b\", '') +:$put =substitute('wWw', 'W', \"\\\", '') +/^TEST_3 +ENDTEST + +TEST_3: + +STARTTEST +:set magic& +:set cpo& +:$put =\"\n\nTEST_3:\" +:let y = substitute('aAa', 'A', '\="\\"', '') | $put =y +:let y = substitute('bBb', 'B', '\="\\\\"', '') | $put =y +:let y = substitute('cCc', 'C', '\=" "', '') | $put =y +:let y = substitute('dDd', 'D', '\="\\ "', '') | $put =y +:let y = substitute('eEe', 'E', '\="\\\\ "', '') | $put =y +:let y = substitute('fFf', 'F', '\="\\r"', '') | $put =y +:let y = substitute('jJj', 'J', '\="\\n"', '') | $put =y +:let y = substitute('kKk', 'K', '\="\r"', '') | $put =y +:let y = substitute('lLl', 'L', '\="\n"', '') | $put =y +/^TEST_4 +ENDTEST + +TEST_4: + +STARTTEST +:set magic& +:set cpo& +:$put =\"\n\nTEST_4:\" +:let y = substitute('aAa', 'A', '\=substitute(submatch(0), ".", "\\", "")', '') | $put =y +:let y = substitute('bBb', 'B', '\=substitute(submatch(0), ".", "\\\\", "")', '') | $put =y +:let y = substitute('cCc', 'C', '\=substitute(submatch(0), ".", " ", "")', '') | $put =y +:let y = substitute('dDd', 'D', '\=substitute(submatch(0), ".", "\\ ", "")', '') | $put =y +:let y = substitute('eEe', 'E', '\=substitute(submatch(0), ".", "\\\\ ", "")', '') | $put =y +:let y = substitute('fFf', 'F', '\=substitute(submatch(0), ".", "\\r", "")', '') | $put =y +:let y = substitute('jJj', 'J', '\=substitute(submatch(0), ".", "\\n", "")', '') | $put =y +:let y = substitute('kKk', 'K', '\=substitute(submatch(0), ".", "\r", "")', '') | $put =y +:let y = substitute('lLl', 'L', '\=substitute(submatch(0), ".", "\n", "")', '') | $put =y +/^TEST_5 +ENDTEST + +TEST_5: + +STARTTEST +:set magic& +:set cpo& +:$put =\"\n\nTEST_5:\" +:$put =substitute('A123456789', 'A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . submatch(6) . submatch(5) . submatch(4) . submatch(3) . submatch(2) . submatch(1)', '') +/^TEST_6 +ENDTEST + +TEST_6: + +STARTTEST +:set magic& +:$put =\"\n\nTEST_6:\" +:set cpo+=/ +:$put =substitute('A', 'A', 'a', '') +:$put =substitute('B', 'B', '%', '') +:set cpo-=/ +:$put =substitute('C', 'C', 'c', '') +:$put =substitute('D', 'D', '%', '') +/^TEST_7 +ENDTEST + +TEST_7: + +STARTTEST +:set magic& +:set cpo& +:$put =\"\n\nTEST_7:\" +:$put =substitute('A A', 'A.', '\=submatch(0)', '') +:$put =substitute(\"B\nB\", 'B.', '\=submatch(0)', '') +/^TEST_8 +ENDTEST + +TEST_8: + +STARTTEST +:/^Results/,$wq! test.out +ENDTEST + +Results of test72: diff --git a/src/testdir/test80.ok b/src/testdir/test80.ok new file mode 100644 --- /dev/null +++ b/src/testdir/test80.ok @@ -0,0 +1,101 @@ +Results of test72: + + +TEST_1: +AA +& +C123456789987654321 +d +~ +~ +Gg +Hh +iI +jJ +Kk +l l +m m +n n +o +o +pp +q q +r\r +scs +u +u +vv +w\w +x x + + +TEST_2: +AA +& +C123456789987654321 +d +~ +~ +Gg +Hh +iI +jJ +Kk +l l +m m +n n +o +o +pp +q q +r\r +scs +t t +u +u +vv +w\w + + +TEST_3: +a\a +b\\b +c c +d\ d +e\\ e +f\rf +j\nj +k k +l +l + + +TEST_4: +a\a +b\b +c c +d d +e\ e +f f +j +j +k k +l +l + + +TEST_5: +A123456789987654321 + + +TEST_6: +a +% +c +% + + +TEST_7: +A A +B +B diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 225, +/**/ 224, /**/ 223,