Switch to using QLatin1StringView, pull arrays out of AsmHighlighter into datawidget.cpp

Author: Sightem

gui/qt/datawidget.cpp

@@ -3,6 +3,33 @@
 #include "mainwindow.h"
 
 #include <QtWidgets/QApplication>
+#include <QStringView>
+#include <QtCore/QLatin1StringView>
+
+#include <algorithm>
+#include <array>
+
+
+using namespace Qt::StringLiterals;
+
+namespace {
+    inline constexpr std::array controlFlowMnemonics {
+        "CALL"_L1, "DJNZ"_L1, "JP"_L1, "JR"_L1, "RET"_L1, "RETI"_L1, "RETN"_L1, "RST"_L1
+    };
+
+    inline constexpr std::array noTargetMnemonics {
+        "RET"_L1, "RETI"_L1, "RETN"_L1
+    };
+
+    inline constexpr std::array reservedTokens {
+        "A"_L1, "B"_L1, "C"_L1, "D"_L1, "E"_L1, "H"_L1, "L"_L1, "I"_L1, "R"_L1,
+        "AF"_L1, "BC"_L1, "DE"_L1, "HL"_L1, "SP"_L1,
+        "IX"_L1, "IY"_L1, "IXH"_L1, "IXL"_L1,
+        "IYH"_L1, "IYL"_L1, "MB"_L1,
+        "NZ"_L1, "Z"_L1, "NC"_L1, "C"_L1,
+        "PO"_L1, "PE"_L1, "P"_L1, "M"_L1
+    };
+}
 
 DataWidget::DataWidget(QWidget *parent) : QPlainTextEdit{parent} {
     moveable = false;
@@ -193,7 +220,11 @@ void AsmHighlighter::highlightBlock(const QString &text) {
 
         const QString fullMnemonic = match.captured(6);
         const QString primary = fullMnemonic.section('.', 0, 0).toUpper();
-        const bool isControlFlow = std::find(controlFlowMnemonics.begin(), controlFlowMnemonics.end(), primary.toStdString()) != controlFlowMnemonics.end();
+        const QStringView pv{primary};
+
+        const bool isControlFlow = std::any_of(controlFlowMnemonics.begin(), controlFlowMnemonics.end(),
+                        [&](const QLatin1StringView tok){ return pv == tok; });
+
         if (isControlFlow) {
             setFormat(match.capturedStart(6), match.capturedLength(6), controlFlowFormat);
         }
@@ -212,7 +243,8 @@ void AsmHighlighter::highlightBlock(const QString &text) {
             return;
         }
 
-        if (std::find(noTargetMnemonics.begin(), noTargetMnemonics.end(), primary.toStdString()) != noTargetMnemonics.end()) {
+        if (std::any_of(noTargetMnemonics.begin(), noTargetMnemonics.end(),
+                        [&](const QLatin1StringView tok){ return pv == tok; })) {
             return;
         }
 
@@ -239,7 +271,8 @@ void AsmHighlighter::highlightBlock(const QString &text) {
             const auto m3 = lIt.next();
             if (m3.hasMatch()) {
                 const QString tok = m3.captured().toUpper();
-                if (std::find(reservedTokens.begin(), reservedTokens.end(), tok.toStdString()) != reservedTokens.end()) {
+                if (std::any_of(reservedTokens.begin(), reservedTokens.end(),
+                                [&](const QLatin1StringView t){ return tok == t; })) {
                     continue;
                 }
                 const int start = operandStart + m3.capturedStart();

gui/qt/datawidget.h

@@ -47,32 +47,6 @@ class AsmHighlighter : public QSyntaxHighlighter
     QTextCharFormat parenFormat;
     QTextCharFormat registerFormat;
 
-    std::array<std::string_view, 8> controlFlowMnemonics {
-        "CALL",
-        "DJNZ",
-        "JP",
-        "JR",
-        "RET",
-        "RETI",
-        "RETN",
-        "RST"
-    };
-
-    std::array<std::string_view, 3> noTargetMnemonics {
-        "RET",
-        "RETI",
-        "RETN"
-    };
-
-    std::array<std::string_view, 29> reservedTokens {
-        "A", "B", "C", "D", "E", "H", "L", "I", "R",
-        "AF", "BC", "DE", "HL", "SP",
-        "IX", "IY", "IXH", "IXL",
-        "IYH", "IYL", "MB",
-        "NZ", "Z", "NC", "C",
-        "PO", "PE", "P", "M"
-    };
-
     QRegularExpression labelPattern;
     QRegularExpression instructionPattern;
 };