autotests/reference/test.diff.ref

0001 <Normal Text>commit 2b16665838c8afeaa0f065cafc747438de35876b</Normal Text><br/>
0002 <Normal Text>Author: Volker Krause <vkrause@kde.org></Normal Text><br/>
0003 <Normal Text>Date:   Sat Oct 8 13:31:51 2016 +0200</Normal Text><br/>
0004 <Normal Text></Normal Text><br/>
0005 <Normal Text>    Implement dynamic DetectChar rules</Normal Text><br/>
0006 <Normal Text>    </Normal Text><br/>
0007 <Normal Text>    Needed for Perl highlighting.</Normal Text><br/>
0008 <Normal Text></Normal Text><br/>
0009 <File>diff --git a/src/lib/rule.cpp b/src/lib/rule.cpp</File><br/>
0010 <Normal Text>index f588985..c4c3b92 100644</Normal Text><br/>
0011 <Header>--- a/src/lib/rule.cpp</Header><br/>
0012 <Header>+++ b/src/lib/rule.cpp</Header><br/>
0013 <Header>@@ -308,12 +308,22 @@ bool DetectChar::doLoad(QXmlStreamReader& reader)</Header><br/>
0014 <Normal Text>     if (s.isEmpty())</Normal Text><br/>
0015 <Normal Text>         return false;</Normal Text><br/>
0016 <Normal Text>     m_char = s.at(0);</Normal Text><br/>
0017 <Added line>+    if (isDynamic()) {</Added line><br/>
0018 <Added line>+        m_captureIndex = m_char.digitValue();</Added line><br/>
0019 <Added line>+    }</Added line><br/>
0020 <Normal Text>     return true;</Normal Text><br/>
0021 <Normal Text> }</Normal Text><br/>
0022 <Normal Text> </Normal Text><br/>
0023 <Normal Text> MatchResult DetectChar::doMatch(const QString& text, int offset, const QStringList &captures)</Normal Text><br/>
0024 <Normal Text> {</Normal Text><br/>
0025 <Removed line>-    Q_UNUSED(captures); // TODO</Removed line><br/>
0026 <Added line>+    if (isDynamic()) {</Added line><br/>
0027 <Added line>+        if (captures.size() <= m_captureIndex || captures.at(m_captureIndex).isEmpty())</Added line><br/>
0028 <Added line>+            return offset;</Added line><br/>
0029 <Added line>+        if (text.at(offset) == captures.at(m_captureIndex).at(0))</Added line><br/>
0030 <Added line>+            return offset + 1;</Added line><br/>
0031 <Added line>+        return offset;</Added line><br/>
0032 <Added line>+    }</Added line><br/>
0033 <Added line>+</Added line><br/>
0034 <Normal Text>     if (text.at(offset) == m_char)</Normal Text><br/>
0035 <Normal Text>         return offset + 1;</Normal Text><br/>
0036 <Normal Text>     return offset;</Normal Text><br/>
0037 <File>diff --git a/src/lib/rule_p.h b/src/lib/rule_p.h</File><br/>
0038 <Normal Text>index d8862ae..d9cedbf 100644</Normal Text><br/>
0039 <Header>--- a/src/lib/rule_p.h</Header><br/>
0040 <Header>+++ b/src/lib/rule_p.h</Header><br/>
0041 <Header>@@ -103,6 +103,7 @@ protected:</Header><br/>
0042 <Normal Text> </Normal Text><br/>
0043 <Normal Text> private:</Normal Text><br/>
0044 <Normal Text>     QChar m_char;</Normal Text><br/>
0045 <Added line>+    int m_captureIndex;</Added line><br/>
0046 <Normal Text> };</Normal Text><br/>
0047 <Normal Text> </Normal Text><br/>
0048 <Normal Text> class Detect2Char : public Rule</Normal Text><br/>