Fix AniAdd lexer

The new regex engine matches the regex slightly differently leading
to splitting quoted string on spaces in some cases.

Also fixes compiling with PARSER_DEBUG enabled.

diff --git a/renameparser/AniAdd/lexer.cpp b/renameparser/AniAdd/lexer.cpp
index b3606ab2f6c1e8b8bc13577363704d38a1c956ee..b12a7d7e07fee713c2d174aff90fe4839ad642d1 100644 (file)
--- a/renameparser/AniAdd/lexer.cpp
+++ b/renameparser/AniAdd/lexer.cpp
@@ -37,7 +37,7 @@ bool Lexer::next()
                return false;
        }
 #ifdef PARSER_DEBUG
-       QString m = rx.cap();
+       QString m = m_last_match.captured(0);
        qDebug() << "TOKEN=" << m;
 #endif
        m_pos += m_last_match.capturedLength();
@@ -131,7 +131,8 @@ void Lexer::staticInit()
        staticInitialised = true;
 }
 
-const char *Lexer::regexp = ":=|=|%|\\?|:|\\$|,|\\(|\\)|\\[|\\]|\\{|\\}|\\n|else|if|(:?//|#)[^\\n]*\\n|[^\"\\[\\]:= {}(),%$?\\n]+|\"[^\"]*\"|'[^']*'";
+const char *Lexer::regexp =
+       ":=|=|%|\\?|:|\\$|,|\\(|\\)|\\[|\\]|\\{|\\}|\\n|else|if|(:?//|#)[^\\n]*\\n|\"[^\"]*\"|'[^']*'|[^\"\\[\\]:= {}(),%$?\\n]+";
 
 QRegularExpression Lexer::rx(Lexer::regexp);
 QMap<QString, int> Lexer::tokenMap;