Mercurial > vim
view src/GvimExt/Make_ming.mak @ 34854:97b5457962ed v9.1.0296
patch 9.1.0296: regexp: engines do not handle case-folding well
Commit: https://github.com/vim/vim/commit/7a27c108e0509f3255ebdcb6558e896c223e4d23
Author: Christian Brabandt <cb@256bit.org>
Date: Tue Apr 9 22:53:19 2024 +0200
patch 9.1.0296: regexp: engines do not handle case-folding well
Problem: Regex engines do not handle case-folding well
Solution: Correctly calculate byte length of characters to skip
When the regexp engine compares two utf-8 codepoints case insensitively
it may match an adjacent character, because it assumes it can step over
as many bytes as the pattern contains.
This however is not necessarily true because of case-folding, a
multi-byte UTF-8 character can be considered equal to some single-byte
value.
Let's consider the pattern '?' and the string 's'. When comparing and
ignoring case, the single character 's' matches, and since it matches
Vim will try to step over the match (by the amount of bytes of the
pattern), assuming that since it matches, the length of both strings is
the same.
However in that case, it should only step over the single byte
value 's' so by 1 byte and try to start matching after it again. So for the
backtracking engine we need to ensure:
- we try to match the correct length for the pattern and the text
- in case of a match, we step over it correctly
The same thing can happen for the NFA engine, when skipping to the next
character to test for a match. We are skipping over the regstart
pointer, however we do not consider the case that because of
case-folding we may need to adjust the number of bytes to skip over. So
this needs to be adjusted in find_match_text() as well.
A related issue turned out, when prog->match_text is actually empty. In
that case we should try to find the next match and skip this condition.
fixes: #14294
closes: #14433
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 09 Apr 2024 23:00:08 +0200 |
| parents | 695b50472e85 |
| children |
line wrap: on
line source
# Project: gvimext # Generates gvimext.dll with gcc. # To be used with MingW and Cygwin. # # Originally, the DLL base address was fixed: -Wl,--image-base=0x1C000000 # Now it is allocated dynamically by the linker by evaluating all DLLs # already loaded in memory. The binary image contains as well information # for automatic pseudo-rebasing, if needed by the system. ALV 2004-02-29 # If cross-compiling set this to yes, else set it to no CROSS = no #CROSS = yes # For the old MinGW 2.95 (the one you get e.g. with debian woody) # set the following variable to yes and check if the executables are # really named that way. # If you have a newer MinGW or you are using cygwin set it to no and # check also the executables MINGWOLD = no # Link against the shared versions of libgcc/libstdc++ by default. Set # STATIC_STDCPLUS to "yes" to link against static versions instead. STATIC_STDCPLUS=no #STATIC_STDCPLUS=yes # Note: -static-libstdc++ is not available until gcc 4.5.x. LDFLAGS += -shared ifeq (yes, $(STATIC_STDCPLUS)) LDFLAGS += -static-libgcc -static-libstdc++ endif ifeq ($(CROSS),yes) DEL = rm ifeq ($(MINGWOLD),yes) CXXFLAGS := -O2 -fvtable-thunks else CXXFLAGS := -O2 endif else CXXFLAGS := -O2 ifneq (sh.exe, $(SHELL)) DEL = rm else DEL = del endif endif # Set the default $(WINVER) to make it work with Windows 7. ifndef WINVER WINVER = 0x0601 endif CXX := $(CROSS_COMPILE)g++ WINDRES := $(CROSS_COMPILE)windres # this used to have --preprocessor, but it's no longer supported WINDRES_FLAGS = LIBS := -luuid -lgdi32 RES := gvimext.res ifeq ($(findstring clang++,$(CXX)),) DEFFILE = gvimext_ming.def endif OBJ := gvimext.o DLL := gvimext.dll .PHONY: all all-before all-after clean clean-custom all: all-before $(DLL) all-after $(DLL): $(OBJ) $(RES) $(DEFFILE) $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \ -Wl,--enable-auto-image-base \ -Wl,--enable-auto-import \ -Wl,--whole-archive \ $^ \ -Wl,--no-whole-archive \ $(LIBS) gvimext.o: gvimext.cpp $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) -c $? -o $@ $(RES): gvimext_ming.rc $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@ clean: clean-custom -$(DEL) $(OBJ) $(RES) $(DLL)