Bram,
this patch fixes this item from the todo list:
/[^\n] does match at a line break. Expected to do the same as /.
Vim now handles /[^\n] exactly like matching the '.'
While making this patch, I noticed, that currently echo match("\n", '.')
returns true. This might be unexpected, since '.' shouldn't match
newlines I guess. But changing this would be an incomptabile change,
since otherwise A^@A or A^MA wouldn't match anymore and I guess, this
wouldn't not be intended. So I left it untouched.
But it should probably be documented somewhere.
BTW, hg seems to handle the testfiles as binary files (probably because
of the NUL in there). I hope this doesn't cause problems applying it,
but if it does, I can mail you the 2 complete files.
regards,
Christian
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
diff --git a/src/regexp.c b/src/regexp.c
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2397,13 +2397,20 @@
/* '\n' in range: also match NL */
if (ret != JUST_CALC_SIZE)
{
+ /* default for RE is to not match newlines, so
+ * handle it like '.' */
if (*ret == ANYBUT)
- *ret = ANYBUT + ADD_NL;
+ {
+ *ret = ANY + extra;
+ *flagp |= HASWIDTH | SIMPLE;
+ }
else if (*ret == ANYOF)
+ {
*ret = ANYOF + ADD_NL;
+ *flagp |= HASNL;
+ }
/* else: must have had a \n already */
}
- *flagp |= HASNL;
regparse++;
startc = -1;
}
@@ -4346,6 +4353,10 @@
break; /* Matched with EOW */
case ANY:
+ /* ANY does not match new lines,
+ * Is '.' allowed to match \n ?
+ * /A.B matches A
B but also matches match("\n", '.')
+ * it would break test79 so, only skip NUL */
if (c == NUL)
status = RA_NOMATCH;
else
diff --git a/src/testdir/test79.in b/src/testdir/test79.in
index 8fa11d9ad79cd389169051166babb22d8e1f4041..5bc9fd23bbdd6df8ee7057d44383fe9f29f4f1f1
GIT binary patch
literal 2571
zc%1E4OLv+;6n1^j$u?`6(@3-lH@*{lTo}Z6UP@QJwFeO&5y1eqUG=vY96={G2VHd6
z&7AL>`R;J%yUYdEa6MscJ3`uB4X+$yX==K0<t`0<rkQC$vqt=i@oVWAt~;}>v|w98
z*<W+LnYZ!`3Dj^ee{!LD`t%~jX?7*)vU|S21N7BuPgRw^3T4+8+=XVE(vR5!l!w}S
z7J7!eGCfzY$AahYRmzn4Aj1<D+GM6Ps4wj#;2>B-cqzMB#blD9JERSg=|ZB^p##!2
z-O>$}s7M9MQ;xEfVH?$O#DIdo8K@&|Py=Z-nK0Z$`Z6VD%2*4@Y_%9}BX!%Pv>EI8
zx;Yth#=3ZV!q7dE!_Wg#IQfWVG4zBqWat^mW2lEj4E2$8hEzOF;MUn-{O;RXg*%Wl
z*<8L*EZy8f4HT$D1Deo+Hgv%3ny|QEfc0R3{b<ATX$h~-ui*3?aQiNJs<&4W%RaUy
zwD@0@ZB?@Wq$=y0B;PFxRYVe_y7(kya==bc#L(VgEuspOM!de}ju`pvhbF|x@gOv$
ztxagi+iPx#k?oZ;a?V2A17@AQbt+c|t*XKBZV0-p!>Bd_Lor}nAH$?EfoXFJv(^k=
z+AlEg%-6OZZOgV{T||xUI&~?ClIRZ<3}R|)T#TI4%dvXj*d2W>et$kdIUpfEq8=aN
z?CKlwM@a1In+F_$3uqm31TLZ-A7Sn4J8}BpJ>1cE<Mmdk=U><SzkXehY@(H&+y!a-
z9lzz+4aZ6xD{`#Bu{_6e9LsVnv*%R7Z-LwP_l^nS(L*ynRl-}Vh4=A%yLwd#FP$FV
zrt`OtEp9rm-*AsJUgFK%JpQk<^49@b-(-GCIvd;eP;>S=T*=Sq#Lp=aWF>Q1O>ht~
hlrC|wiNq0<GoNv=`FFz0k3U~Otbd;*d*wy@{{fqA$5Q|R
diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 6685b44f9ad2366519b66ddc20078429269f7e43..a72d5a36afae126632f55d5f3003a8e55714d212
GIT binary patch
literal 401
zc$}q>y>7xl5C$p9NW240-1{HgK@>qk2b3#CU~Iq;8+@0RXU`h!DoGVhv)bElR=3N{
ze4VWsR{79o#>Q>}tY25_53ME>99~?{55g!OjmM)n3IpGB*(o<>d*%m@Zxrt=PMnob
zr5u!0y^2f!!u9D&Ej1=J*q-g&UV`H={lk6xm)lR+$cC-RmQ>k^Dl-u>a;bCn%0W=M
y_Kp-%7MysjXca-HXbpEklc$Z}(@mHk*-+2+%dgtkNX<&hbJvM=UYR!6Q1}K?)?Nkx
