diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-11-25 16:48:49 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-11-25 16:48:49 -0500 |
| commit | 7412693e086a7eafaa7ea861164caf523943e5fa (patch) | |
| tree | 0aee322e40572df306b9813546c7a12b3093bcea /SQLiteStudio3/coreSQLiteStudio/parser/token.cpp | |
| parent | 640196993d31cf5d6fdf36386990ec05f473a048 (diff) | |
| parent | 8e640722c62692818ab840d50b3758f89a41a54e (diff) | |
Merge tag 'upstream/3.0.7'
Upstream version 3.0.7
# gpg: Signature made Wed 25 Nov 2015 04:48:48 PM EST 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>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/parser/token.cpp')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/parser/token.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp index d3e05f1..f2102c3 100644 --- a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp @@ -140,9 +140,9 @@ Range Token::getRange() return Range(start, end); } -bool Token::isWhitespace() const +bool Token::isWhitespace(bool includeComments) const { - return (type == SPACE || type == COMMENT); + return (type == SPACE || (includeComments && type == COMMENT)); } bool Token::isSeparating() const @@ -490,11 +490,11 @@ TokenList TokenList::filter(Token::Type type) const return filtered; } -TokenList TokenList::filterWhiteSpaces() const +TokenList TokenList::filterWhiteSpaces(bool includeComments) const { TokenList filtered; foreach (TokenPtr token, *this) - if (!token->isWhitespace()) + if (!token->isWhitespace(includeComments)) filtered << token; return filtered; |