From 206f100a0d6761ebcfc4efdac19b860feecf3dbd Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Wed, 10 Oct 2012 15:15:21 +0200
Subject: [PATCH] qdoc: Allow empty character literal ''
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qdoc's tokenizer was reporting an error for the
empty character literal ''. Now it allows it.
Apparently it makes sense in .js files.

Task number: QTBUG-25775

Change-Id: If407427fad9b65a035c2c4785d53c9e3d5202e62
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
---
 src/tools/qdoc/tokenizer.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/tools/qdoc/tokenizer.cpp b/src/tools/qdoc/tokenizer.cpp
index 69f2dafc39..29ce322cc9 100644
--- a/src/tools/qdoc/tokenizer.cpp
+++ b/src/tools/qdoc/tokenizer.cpp
@@ -244,6 +244,13 @@ int Tokenizer::getToken()
                 }
             case '\'':
                 yyCh = getChar();
+                /*
+                  Allow empty character literal. QTBUG-25775
+                 */
+                if (yyCh == '\'') {
+                    yyCh = getChar();
+                    break;
+                }
                 if (yyCh == '\\')
                     yyCh = getChar();
                 do {
@@ -251,8 +258,7 @@ int Tokenizer::getToken()
                 } while (yyCh != EOF && yyCh != '\'');
 
                 if (yyCh == EOF) {
-                    yyTokLoc.warning(tr("Unterminated C++ character"
-                                        " literal"));
+                    yyTokLoc.warning(tr("Unterminated C++ character literal"));
                 }
                 else {
                     yyCh = getChar();