1 files changed, 40 insertions, 67 deletions

diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
index cde01cf11d..869f7c793f 100644
--- a/src/tools/moc/symbols.h
+++ b/src/tools/moc/symbols.h
@@ -7,7 +7,7 @@
 
 #include "token.h"
 #include <qdebug.h>
-#include <qhash.h>
+#include <qhashfunctions.h>
 #include <qlist.h>
 #include <qstack.h>
 #include <qstring.h>
@@ -15,73 +15,48 @@
 
 QT_BEGIN_NAMESPACE
 
-//#define USE_LEXEM_STORE
-
 struct SubArray
 {
-    inline SubArray():from(0),len(-1){}
+    inline SubArray() = default;
     inline SubArray(const QByteArray &a):array(a),from(0), len(a.size()){}
     inline SubArray(const char *s):array(s),from(0) { len = array.size(); }
-    inline SubArray(const QByteArray &a, int from, int len):array(a), from(from), len(len){}
+    SubArray(const QByteArray &a, qsizetype from, qsizetype len)
+        : array(a), from(from), len(len)
+    {
+    }
     QByteArray array;
-    int from, len;
+    qsizetype from = 0;
+    qsizetype len = -1;
     inline bool operator==(const SubArray &other) const {
         if (len != other.len)
             return false;
-        for (int i = 0; i < len; ++i)
-            if (array.at(from + i) != other.array.at(other.from + i))
-                return false;
-        return true;
+        const auto begin = array.cbegin() + from;
+        const auto end = begin + len;
+        const auto other_begin = other.array.cbegin() + other.from;
+        return std::equal(begin, end, other_begin);
     }
 };
 
-inline size_t qHash(const SubArray &key)
+inline size_t qHash(const SubArray &key, size_t seed = 0)
 {
-    return qHash(QLatin1StringView(key.array.constData() + key.from, key.len));
+    return qHash(QLatin1StringView(key.array.constData() + key.from, key.len), seed);
 }
 
 
 struct Symbol
 {
-
-#ifdef USE_LEXEM_STORE
-    typedef QHash<SubArray, QHashDummyValue> LexemStore;
-    static LexemStore lexemStore;
-
-    inline Symbol() : lineNum(-1),token(NOTOKEN){}
-    inline Symbol(int lineNum, Token token):
-        lineNum(lineNum), token(token){}
-    inline Symbol(int lineNum, Token token, const QByteArray &lexem):
-        lineNum(lineNum), token(token),lex(lexem){}
-    inline Symbol(int lineNum, Token token, const QByteArray &lexem, int from, int len):
-        lineNum(lineNum), token(token){
-        LexemStore::const_iterator it = lexemStore.constFind(SubArray(lexem, from, len));
-
-        if (it != lexemStore.constEnd()) {
-            lex = it.key().array;
-        } else {
-            lex = lexem.mid(from, len);
-            lexemStore.insert(lex, QHashDummyValue());
-        }
+    inline Symbol() = default;
+    inline Symbol(int lineNum, Token token) : lineNum(lineNum), token(token) { }
+    inline Symbol(int lineNum, Token token, const QByteArray &lexem)
+        : lineNum(lineNum), token(token), lex(lexem), len(lex.size())
+    {
     }
-    int lineNum;
-    Token token;
-    inline QByteArray unquotedLexem() const { return lex.mid(1, lex.length()-2); }
-    inline QByteArray lexem() const { return lex; }
-    inline operator QByteArray() const { return lex; }
-    QByteArray lex;
-
-#else
-
-    inline Symbol() : lineNum(-1),token(NOTOKEN), from(0),len(-1) {}
-    inline Symbol(int lineNum, Token token):
-        lineNum(lineNum), token(token), from(0), len(-1) {}
-    inline Symbol(int lineNum, Token token, const QByteArray &lexem):
-        lineNum(lineNum), token(token), lex(lexem), from(0) { len = lex.size(); }
-    inline Symbol(int lineNum, Token token, const QByteArray &lexem, int from, int len):
-        lineNum(lineNum), token(token),lex(lexem),from(from), len(len){}
-    int lineNum;
-    Token token;
+    Symbol(int lineNum, Token token, const QByteArray &lexem, qsizetype from, qsizetype len)
+        : lineNum(lineNum), token(token), lex(lexem), from(from), len(len)
+    {
+    }
+    int lineNum = -1;
+    Token token = NOTOKEN;
     inline QByteArray lexem() const { return lex.mid(from, len); }
     inline QByteArray unquotedLexem() const { return lex.mid(from+1, len-2); }
     inline operator SubArray() const { return SubArray(lex, from, len); }
@@ -90,9 +65,8 @@ struct Symbol
         return SubArray(lex, from, len) == SubArray(o.lex, o.from, o.len);
     }
     QByteArray lex;
-    int from, len;
-
-#endif
+    qsizetype from = 0;
+    qsizetype len = -1;
 };
 Q_DECLARE_TYPEINFO(Symbol, Q_RELOCATABLE_TYPE);
 
@@ -102,7 +76,7 @@ struct SafeSymbols {
     Symbols symbols;
     QByteArray expandedMacro;
     QSet<QByteArray> excludedSymbols;
-    int index;
+    qsizetype index;
 };
 Q_DECLARE_TYPEINFO(SafeSymbols, Q_RELOCATABLE_TYPE);
 
@@ -127,13 +101,13 @@ public:
     inline QByteArray lexem() const { return symbol().lexem(); }
     inline QByteArray unquotedLexem() { return symbol().unquotedLexem(); }
 
-    bool dontReplaceSymbol(const QByteArray &name);
-    QSet<QByteArray> excludeSymbols();
+    bool dontReplaceSymbol(const QByteArray &name) const;
+    QSet<QByteArray> excludeSymbols() const;
 };
 
 inline bool SymbolStack::test(Token token)
 {
-    int stackPos = size() - 1;
+    qsizetype stackPos = size() - 1;
     while (stackPos >= 0 && at(stackPos).index >= at(stackPos).symbols.size())
         --stackPos;
     if (stackPos < 0)
@@ -145,21 +119,20 @@ inline bool SymbolStack::test(Token token)
     return false;
 }
 
-inline bool SymbolStack::dontReplaceSymbol(const QByteArray &name)
+inline bool SymbolStack::dontReplaceSymbol(const QByteArray &name) const
 {
-    for (int i = 0; i < size(); ++i) {
-        if (name == at(i).expandedMacro || at(i).excludedSymbols.contains(name))
-            return true;
-    }
-    return false;
+    auto matchesName = [&name](const SafeSymbols &sf) {
+        return name == sf.expandedMacro || sf.excludedSymbols.contains(name);
+    };
+    return std::any_of(cbegin(), cend(), matchesName);
 }
 
-inline QSet<QByteArray> SymbolStack::excludeSymbols()
+inline QSet<QByteArray> SymbolStack::excludeSymbols() const
 {
     QSet<QByteArray> set;
-    for (int i = 0; i < size(); ++i) {
-        set << at(i).expandedMacro;
-        set += at(i).excludedSymbols;
+    for (const SafeSymbols &sf : *this) {
+        set << sf.expandedMacro;
+        set += sf.excludedSymbols;
     }
     return set;
 }