diff options
| author | David Faure <david.faure@kdab.com> | 2020-11-07 13:25:52 +0100 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2020-11-15 09:54:36 +0100 |
| commit | 1e9b910f2cac559b265aa276639a6a90dc22371b (patch) | |
| tree | 92d3563c95292778d04d9ee6554778442d8c0342 /src/3rdparty | |
| parent | ff2bbd49ec47750ed55dfafcd1ce0862985974df (diff) | |
YarrParser: compile with explicit QChar(int) constructor
Change-Id: I10d30d1ba83f8db9568cef18a32baac1627b2c17
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrParser.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/masm/yarr/YarrParser.h b/src/3rdparty/masm/yarr/YarrParser.h index a18b553ef0..d5433286dd 100644 --- a/src/3rdparty/masm/yarr/YarrParser.h +++ b/src/3rdparty/masm/yarr/YarrParser.h @@ -889,7 +889,7 @@ private: return peek() - '0'; } - int tryConsumeUnicodeEscape() + char16_t tryConsumeUnicodeEscape() { if (!tryConsume('u')) return -1; @@ -942,9 +942,9 @@ private: return u; } - int tryConsumeIdentifierCharacter() + char16_t tryConsumeIdentifierCharacter() { - int ch = peek(); + char16_t ch = peek(); if (ch == '\\') { consume(); @@ -970,7 +970,7 @@ private: return WTF::isASCIIAlphanumeric(ch) || ch == '_' || ch == '='; } - int consume() + char16_t consume() { ASSERT(m_index < m_size); return m_data[m_index++]; @@ -1030,7 +1030,7 @@ private: ParseState state = saveState(); - int ch = tryConsumeIdentifierCharacter(); + char16_t ch = tryConsumeIdentifierCharacter(); if (isIdentifierStart(ch)) { StringBuilder identifierBuilder; @@ -1065,10 +1065,10 @@ private: bool foundEquals = false; unsigned errors = 0; - expressionBuilder.append(consume()); + expressionBuilder.append(QChar(consume())); while (!atEndOfPattern()) { - int ch = peek(); + char16_t ch = peek(); if (ch == '}') { consume(); if (errors) { |