Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

1 files changed, 23 insertions, 1 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
index cd7e4b0..41980b4 100644
--- a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
@@ -4,7 +4,7 @@
 #include <QStringList>
 
 Token::Token()
-    : lemonType(0), type(INVALID), value(QString::null), start(-1), end(-1)
+    : lemonType(0), type(INVALID), value(QString()), start(-1), end(-1)
 {
 }
 
@@ -160,6 +160,28 @@ bool Token::isSeparating() const
     return false;
 }
 
+bool Token::isMeaningful() const
+{
+    switch (type)
+    {
+        case Token::BIND_PARAM:
+        case Token::PAR_LEFT:
+        case Token::PAR_RIGHT:
+        case Token::BLOB:
+        case Token::FLOAT:
+        case Token::INTEGER:
+        case Token::INVALID:
+        case Token::KEYWORD:
+        case Token::OTHER:
+        case Token::STRING:
+        case Token::OPERATOR:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+
 bool Token::isDbObjectType() const
 {
     return ((type & TOKEN_TYPE_MASK_DB_OBJECT) == TOKEN_TYPE_MASK_DB_OBJECT);