feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++/CppTools: Pass UTF-8 encoded source to Lexer

Browse Source 
The Lexer can handle it now.

Task-number: QTCREATORBUG-7356
Change-Id: I8c4b03a247656e013d44c3cedca4835e133d4036
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-12-12 21:36:01 +01:00
parent 587eb49c4e
commit 57ff992961
6 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/cplusplus/FastPreprocessor.cpp
View File

@@ -41,18 +41,6 @@ FastPreprocessor::FastPreprocessor(const Snapshot &snapshot)
, _preproc(this, &_env)
{ }
// This is a temporary fix to handle non-ascii characters. This can be removed when the lexer can
// handle multi-byte characters.
static QByteArray convertToLatin1(const QByteArray &contents)
{
const char *p = contents.constData();
while (char ch = *p++)
if (ch & 0x80)
return QString::fromUtf8(contents).toLatin1();
return contents;
}
QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source)
{
std::swap(newDoc, _currentDoc);
@@ -72,9 +60,7 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source)
mergeEnvironment(i.resolvedFileName());
}
QByteArray src = convertToLatin1(source);
const QByteArray preprocessed = _preproc.run(fileName, src);
const QByteArray preprocessed = _preproc.run(fileName, source);
// qDebug("FastPreprocessor::run for %s produced [[%s]]", fileName.toUtf8().constData(), preprocessed.constData());
std::swap(newDoc, _currentDoc);
return preprocessed;

4
src/libs/cplusplus/SimpleLexer.cpp
View File

@@ -61,11 +61,11 @@ bool SimpleLexer::endedJoined() const
return _endedJoined;
}
QList<Token> SimpleLexer::operator()(const QString &text, int state, bool convertToUtf8)
QList<Token> SimpleLexer::operator()(const QString &text, int state)
{
QList<Token> tokens;
const QByteArray bytes = convertToUtf8 ? text.toUtf8() : text.toLatin1();
const QByteArray bytes = text.toUtf8();
const char *firstChar = bytes.constData();
const char *lastChar = firstChar + bytes.size();

2
src/libs/cplusplus/SimpleLexer.h
View File

@@ -54,7 +54,7 @@ public:
bool endedJoined() const;
QList<Token> operator()(const QString &text, int state = 0, bool convertToUtf8 = false);
QList<Token> operator()(const QString &text, int state = 0);
int state() const
{ return _lastState; }

2
src/libs/cplusplus/pp-engine.cpp
View File

@@ -749,7 +749,7 @@ Preprocessor::Preprocessor(Client *client, Environment *env)
QByteArray Preprocessor::run(const QString &fileName, const QString &source)
{
return run(fileName, source.toLatin1());
return run(fileName, source.toUtf8());
}
QByteArray Preprocessor::run(const QString &fileName,