From ff5bb63fed71c336fe170ce86e71b286edeab134 Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 24 Feb 2018 17:19:43 +0000 Subject: [PATCH] plugin/pcre: Replace now correctly works with \n git-svn-id: svn://ultimatepp.org/upp/trunk@11799 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/plugin/pcre/RegExp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/plugin/pcre/RegExp.cpp b/uppsrc/plugin/pcre/RegExp.cpp index b73322bea..03aeba759 100644 --- a/uppsrc/plugin/pcre/RegExp.cpp +++ b/uppsrc/plugin/pcre/RegExp.cpp @@ -197,13 +197,13 @@ bool RegExp::ReplacePos(String& t, int p, int q, const String& r) } Vector RegExp::Make_rv(const String& r) -{ - RegExp reg("\\((.*?)\\)"); +{ + RegExp reg("\\(((\r|\n|.)*?)\\)"); Vector rv; while(reg.GlobalMatch(r)){ - rv.Add(reg.GetString(0)); + rv.Add(reg.GetString(0)); } return rv;