IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.527

Browse Source 
Problem:    Still confusing regexp failure and NFA_TOO_EXPENSIVE.
Solution:   NFA changes equivalent of 7.4.526.

https://code.google.com/p/vim/source/detail?r=v7-4-527
This commit is contained in:
Florian Walch 2014-12-24 14:19:43 +01:00
parent 59985523b8
commit fe0801d51d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/regexp_nfa.c
View File

@ -6011,7 +6011,7 @@ nextchar:
/* /*
* Try match of "prog" with at regline["col"]. * Try match of "prog" with at regline["col"].
* Returns 0 for failure, number of lines contained in the match otherwise. * Returns <= 0 for failure, number of lines contained in the match otherwise.
*/ */
static long nfa_regtry(nfa_regprog_T *prog, colnr_T col) static long nfa_regtry(nfa_regprog_T *prog, colnr_T col)
{ {
@ -6116,7 +6116,7 @@ static long nfa_regtry(nfa_regprog_T *prog, colnr_T col)
* Match a regexp against a string ("line" points to the string) or multiple * Match a regexp against a string ("line" points to the string) or multiple
* lines ("line" is NULL, use reg_getline()). * lines ("line" is NULL, use reg_getline()).
* *
* Returns 0 for failure, number of lines contained in the match otherwise. * Returns <= 0 for failure, number of lines contained in the match otherwise.
*/ */
static long static long
nfa_regexec_both ( nfa_regexec_both (
@ -6346,7 +6346,7 @@ static void nfa_regfree(regprog_T *prog)
* Uses curbuf for line count and 'iskeyword'. * Uses curbuf for line count and 'iskeyword'.
* If "line_lbr" is true, consider a "\n" in "line" to be a line break. * If "line_lbr" is true, consider a "\n" in "line" to be a line break.
* *
* Return TRUE if there is a match, FALSE if not. * Returns <= 0 for failure, number of lines contained in the match otherwise.
*/ */
static int static int
nfa_regexec_nl ( nfa_regexec_nl (
@ -6365,7 +6365,7 @@ nfa_regexec_nl (
ireg_ic = rmp->rm_ic; ireg_ic = rmp->rm_ic;
ireg_icombine = FALSE; ireg_icombine = FALSE;
ireg_maxcol = 0; ireg_maxcol = 0;
return nfa_regexec_both(line, col) != 0; return nfa_regexec_both(line, col);
} }
/// Matches a regexp against multiple lines. /// Matches a regexp against multiple lines.
@ -6378,7 +6378,7 @@ nfa_regexec_nl (
/// @param col Column to start looking for match /// @param col Column to start looking for match
/// @param tm Timeout limit or NULL /// @param tm Timeout limit or NULL
/// ///
/// @return Zero if there is no match and number of lines contained in the match /// @return <= 0 if there is no match and number of lines contained in the match
/// otherwise. /// otherwise.
/// ///
/// @note The body is the same as bt_regexec() except for nfa_regexec_both() /// @note The body is the same as bt_regexec() except for nfa_regexec_both()

2
src/nvim/version.c
View File

@ -211,7 +211,7 @@ static int included_patches[] = {
//530, //530,
//529, //529,
//528, //528,
//527, 527,
//526, //526,
//525, //525,
//524, //524,