From e53c95f180eba8c8c656fa67ccd15cb10334844c Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 9 Apr 2011 06:37:03 +0000 Subject: fix PR9629 - We were lowering regexes like a{{b|c}}d into ab|cd, which is substantially different than a(b|c)d. Form the latter regex instead. This found a few problems in the testsuite, which serves as its test. llvm-svn: 129196 --- llvm/utils/FileCheck/FileCheck.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'llvm/utils/FileCheck/FileCheck.cpp') diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp index 58001b7..f225594 100644 --- a/llvm/utils/FileCheck/FileCheck.cpp +++ b/llvm/utils/FileCheck/FileCheck.cpp @@ -148,8 +148,16 @@ bool Pattern::ParsePattern(StringRef PatternStr, SourceMgr &SM) { return true; } + // Enclose {{}} patterns in parens just like [[]] even though we're not + // capturing the result for any purpose. This is required in case the + // expression contains an alternation like: CHECK: abc{{x|z}}def. We + // want this to turn into: "abc(x|z)def" not "abcx|zdef". + RegExStr += '('; + ++CurParen; + if (AddRegExToRegEx(PatternStr.substr(2, End-2), CurParen, SM)) return true; + RegExStr += ')'; PatternStr = PatternStr.substr(End+2); continue; -- cgit v1.1