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

C++: Inline Lexer::control()

Browse Source 
Change-Id: Ia37ec33fb031fdea4ad1890fcea3a80b7b46e272
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2013-04-16 13:15:47 +02:00
committed by Nikolai Kosjar
parent 13b0ca0092
commit ad0331a2a9
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/3rdparty/cplusplus/Lexer.cpp vendored
View File

@@ -29,6 +29,7 @@ using namespace CPlusPlus;
Lexer::Lexer(TranslationUnit *unit) Lexer::Lexer(TranslationUnit *unit)
: _translationUnit(unit), : _translationUnit(unit),
_control(unit->control()),
_state(State_Default), _state(State_Default),
_flags(0), _flags(0),
_currentLine(1) _currentLine(1)
@@ -40,6 +41,7 @@ Lexer::Lexer(TranslationUnit *unit)
Lexer::Lexer(const char *firstChar, const char *lastChar) Lexer::Lexer(const char *firstChar, const char *lastChar)
: _translationUnit(0), : _translationUnit(0),
_control(0),
_state(State_Default), _state(State_Default),
_flags(0), _flags(0),
_currentLine(1) _currentLine(1)
@@ -54,14 +56,6 @@ Lexer::~Lexer()
TranslationUnit *Lexer::translationUnit() const TranslationUnit *Lexer::translationUnit() const
{ return _translationUnit; } { return _translationUnit; }
Control *Lexer::control() const
{
if (_translationUnit)
return _translationUnit->control();
return 0;
}
void Lexer::setSource(const char *firstChar, const char *lastChar) void Lexer::setSource(const char *firstChar, const char *lastChar)
{ {
_firstChar = firstChar; _firstChar = firstChar;

3
src/libs/3rdparty/cplusplus/Lexer.h vendored
View File

@@ -43,7 +43,7 @@ public:
Lexer(const char *firstChar, const char *lastChar); Lexer(const char *firstChar, const char *lastChar);
~Lexer(); ~Lexer();
Control *control() const; Control *control() const { return _control; }
TranslationUnit *translationUnit() const; TranslationUnit *translationUnit() const;
bool qtMocRunEnabled() const; bool qtMocRunEnabled() const;
@@ -118,6 +118,7 @@ private:
}; };
TranslationUnit *_translationUnit; TranslationUnit *_translationUnit;
Control *_control;
const char *_firstChar; const char *_firstChar;
const char *_currentChar; const char *_currentChar;
const char *_lastChar; const char *_lastChar;