From e5a37ca38ef7b28695313e4b59f62c03d4801f2d Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 30 Aug 2018 10:30:07 +0200 Subject: protect comment from alias --- dicealias.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dicealias.cpp b/dicealias.cpp index f514e9e..5730187 100644 --- a/dicealias.cpp +++ b/dicealias.cpp @@ -33,6 +33,7 @@ QString makeReplament(const QString& pattern, const QString& replacement, QStrin { auto hasVariable = cmd.contains("${"); auto hasQuote = cmd.contains("\""); + auto commentPos = cmd.lastIndexOf("#"); if(!hasQuote && !hasVariable) { @@ -75,7 +76,6 @@ QString makeReplament(const QString& pattern, const QString& replacement, QStrin pos = start; } } - pos= 0; while((pos = cmd.indexOf(pattern,pos)) && pos!=-1) { @@ -84,9 +84,13 @@ QString makeReplament(const QString& pattern, const QString& replacement, QStrin { if(!isInsidePair) isInsidePair = (pos > pair.first && pos < pair.second); + + if(commentPos >= 0 && pos > commentPos) + isInsidePair = true; } if(!isInsidePair) patternPosList.push_back(pos); + pos+=1; } -- cgit v1.2.3-70-g09d2