|
 |
dc71587 |
To: vim_dev@googlegroups.com
|
|
|
dc71587 |
Subject: Patch 7.4.100
|
|
|
dc71587 |
Fcc: outbox
|
|
|
dc71587 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
dc71587 |
Mime-Version: 1.0
|
|
|
dc71587 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dc71587 |
Content-Transfer-Encoding: 8bit
|
|
|
dc71587 |
------------
|
|
|
dc71587 |
|
|
|
dc71587 |
Patch 7.4.100
|
|
|
dc71587 |
Problem: NFA regexp doesn't handle backreference correctly. (Ryuichi
|
|
|
dc71587 |
Hayashida, Urtica Dioica)
|
|
|
dc71587 |
Solution: Always add NFA_SKIP, also when it already exists at the start
|
|
|
dc71587 |
position.
|
|
|
dc71587 |
Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
|
|
|
dc71587 |
|
|
|
dc71587 |
|
|
|
dc71587 |
*** ../vim-7.4.099/src/regexp_nfa.c 2013-10-06 15:46:06.000000000 +0200
|
|
|
dc71587 |
--- src/regexp_nfa.c 2013-11-21 15:58:58.000000000 +0100
|
|
|
dc71587 |
***************
|
|
|
dc71587 |
*** 4278,4284 ****
|
|
|
dc71587 |
* endless loop for "\(\)*" */
|
|
|
dc71587 |
|
|
|
dc71587 |
default:
|
|
|
dc71587 |
! if (state->lastlist[nfa_ll_index] == l->id)
|
|
|
dc71587 |
{
|
|
|
dc71587 |
/* This state is already in the list, don't add it again,
|
|
|
dc71587 |
* unless it is an MOPEN that is used for a backreference or
|
|
|
dc71587 |
--- 4278,4284 ----
|
|
|
dc71587 |
* endless loop for "\(\)*" */
|
|
|
dc71587 |
|
|
|
dc71587 |
default:
|
|
|
dc71587 |
! if (state->lastlist[nfa_ll_index] == l->id && state->c != NFA_SKIP)
|
|
|
dc71587 |
{
|
|
|
dc71587 |
/* This state is already in the list, don't add it again,
|
|
|
dc71587 |
* unless it is an MOPEN that is used for a backreference or
|
|
|
dc71587 |
*** ../vim-7.4.099/src/testdir/test64.in 2013-09-25 18:16:34.000000000 +0200
|
|
|
dc71587 |
--- src/testdir/test64.in 2013-11-21 15:58:19.000000000 +0100
|
|
|
dc71587 |
***************
|
|
|
dc71587 |
*** 406,411 ****
|
|
|
dc71587 |
--- 406,412 ----
|
|
|
dc71587 |
:call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@
|
|
|
dc71587 |
:call add(tl, [2, '^.*\.\(.*\)/.\+\(\1\)\@<=$', 'foo.bat/foo.bat', 'foo.bat/foo.bat', 'bat', 'bat'])
|
|
|
dc71587 |
:call add(tl, [2, '\\\@
|
|
|
dc71587 |
+ :call add(tl, [2, '^\(a*\)\1$', 'aaaaaaaa', 'aaaaaaaa', 'aaaa'])
|
|
|
dc71587 |
:"
|
|
|
dc71587 |
:"""" Look-behind with limit
|
|
|
dc71587 |
:call add(tl, [2, '<\@<=span.', 'xxspanxx
|
|
|
dc71587 |
*** ../vim-7.4.099/src/testdir/test64.ok 2013-09-25 18:16:34.000000000 +0200
|
|
|
dc71587 |
--- src/testdir/test64.ok 2013-11-21 15:59:04.000000000 +0100
|
|
|
dc71587 |
***************
|
|
|
dc71587 |
*** 944,949 ****
|
|
|
dc71587 |
--- 944,952 ----
|
|
|
dc71587 |
OK 0 - \\\@
|
|
|
dc71587 |
OK 1 - \\\@
|
|
|
dc71587 |
OK 2 - \\\@
|
|
|
dc71587 |
+ OK 0 - ^\(a*\)\1$
|
|
|
dc71587 |
+ OK 1 - ^\(a*\)\1$
|
|
|
dc71587 |
+ OK 2 - ^\(a*\)\1$
|
|
|
dc71587 |
OK 0 - <\@<=span.
|
|
|
dc71587 |
OK 1 - <\@<=span.
|
|
|
dc71587 |
OK 2 - <\@<=span.
|
|
|
dc71587 |
*** ../vim-7.4.099/src/version.c 2013-11-21 14:39:58.000000000 +0100
|
|
|
dc71587 |
--- src/version.c 2013-11-21 16:02:27.000000000 +0100
|
|
|
dc71587 |
***************
|
|
|
dc71587 |
*** 740,741 ****
|
|
|
dc71587 |
--- 740,743 ----
|
|
|
dc71587 |
{ /* Add new patch number below this line */
|
|
|
dc71587 |
+ /**/
|
|
|
dc71587 |
+ 100,
|
|
|
dc71587 |
/**/
|
|
|
dc71587 |
|
|
|
dc71587 |
--
|
|
|
dc71587 |
Sometimes you can protect millions of dollars in your budget simply by buying
|
|
|
dc71587 |
a bag of cookies, dropping it on the budget anylyst's desk, and saying
|
|
|
dc71587 |
something deeply personal such as "How was your weekend, big guy?"
|
|
|
dc71587 |
(Scott Adams - The Dilbert principle)
|
|
|
dc71587 |
|
|
|
dc71587 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
dc71587 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
dc71587 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
dc71587 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|