Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 30 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/parsercontext.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/parsercontext.cpp
index e9444e5..7f8ad7a 100644
--- a/SQLiteStudio3/coreSQLiteStudio/parser/parsercontext.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/parser/parsercontext.cpp
@@ -164,6 +164,36 @@ const QList<ParserError *> &ParserContext::getErrors()
     return errors;
 }
 
+QVariant *ParserContext::handleNumberToken(const QString &tokenValue)
+{
+    recentNumberIsCandidateForMaxNegative = false;
+    if (tokenValue.startsWith("0x", Qt::CaseInsensitive))
+    {
+        bool ok;
+        qint64 i64 = tokenValue.toLongLong(&ok, 16);
+        if (!ok)
+        {
+            quint64 ui64 = tokenValue.toULongLong(&ok, 16);
+            i64 = static_cast<qint64>(ui64);
+        }
+        return new QVariant(i64);
+    }
+    else if (tokenValue == "9223372036854775808") // max negative longlong value, but without a sign
+    {
+        recentNumberIsCandidateForMaxNegative = true;
+        return new QVariant(static_cast<qint64>(0L));
+    }
+    else
+    {
+        return new QVariant(QVariant(tokenValue).toLongLong());
+    }
+}
+
+bool ParserContext::isCandidateForMaxNegativeNumber() const
+{
+    return recentNumberIsCandidateForMaxNegative;
+}
+
 void ParserContext::cleanUp()
 {
     foreach (ParserError* err, errors)