3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 12:17:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow quotes in CAPTURE arguments (#1608)

Browse Source 
* Allow quotes in CAPTURE arguments

Fix CAPTURE to handle string and character literals properly
This commit is contained in:
Petr Ledvina
2019-05-01 19:12:44 +02:00
committed by Martin Hořeňovský
parent 979bbf03bb
commit 9c741fe960
7 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/internal/catch_message.cpp
View File

@@ -9,6 +9,7 @@
#include "catch_message.h"
#include "catch_interfaces_capture.h"
#include "catch_uncaught_exceptions.h"
#include "catch_enforce.h"
#include <cassert>
#include <stack>
@@ -76,6 +77,15 @@ namespace Catch {
}
return names.substr(start, end - start + 1);
};
auto skipq = [&] (size_t start, char quote) {
for (auto i = start + 1; i < names.size() ; ++i) {
if (names[i] == quote)
return i;
if (names[i] == '\\')
++i;
}
CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched parentheses");
};
size_t start = 0;
std::stack<char> openings;
@@ -96,6 +106,10 @@ namespace Catch {
// case '>':
openings.pop();
break;
case '"':
case '\'':
pos = skipq(pos, c);
break;
case ',':
if (start != pos && openings.size() == 0) {
m_messages.emplace_back(macroName, lineInfo, resultType);