From 7dacc2f2c0ead489464aabab268c7563c21cf1a0 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Mon, 5 Feb 2018 16:41:36 -0800 Subject: [PATCH] Lexer code has confusion between strings and chars Clang complained about this; at least two of these appear to be actual bugs. --- libraries/baking/src/JSBaker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/baking/src/JSBaker.cpp b/libraries/baking/src/JSBaker.cpp index a97a7fe5b3..7d5a3eaf9e 100644 --- a/libraries/baking/src/JSBaker.cpp +++ b/libraries/baking/src/JSBaker.cpp @@ -190,7 +190,7 @@ bool JSBaker::handleMultiLineComments(QTextStream& in) { while (!in.atEnd()) { in >> character; if (character == '*') { - if (in.read(1) == '/') { + if (in.read(1)[0] == '/') { return true; } } @@ -228,7 +228,7 @@ bool JSBaker::isSpecialCharacter(QChar c) { // If previous character is a special character, maybe don't omit new line (depends on next character as well) bool JSBaker::isSpecialCharacterPrevious(QChar c) { return (c == '\'' || c == '$' || c == '_' || c == '}' || c == ']' || c == ')' || c == '+' || c == '-' - || c == '"' || c == "'"); + || c == '"' || c == '\''); } // If next character is a special character, maybe don't omit new line (depends on previous character as well) @@ -243,5 +243,5 @@ bool JSBaker::isSpaceOrTab(QChar c) { // Check If the currentCharacter is " or ' or ` bool JSBaker::isQuote(QChar c) { - return (c == '"' || c == "'" || c == '`'); + return (c == '"' || c == '\'' || c == '`'); }