Commit 703f36a4 authored by Erik Verbruggen's avatar Erik Verbruggen Committed by Nikolai Kosjar
Browse files

C++: remove reserved names.



See [global.names] (17.6.4.3.2 in the C++11 spec.)

Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 12642cc4
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
namespace CPlusPlus { namespace CPlusPlus {
template <typename _Tp> template <typename Tptr>
class CPLUSPLUS_EXPORT List: public Managed class CPLUSPLUS_EXPORT List: public Managed
{ {
List(const List &other); List(const List &other);
...@@ -35,10 +35,10 @@ class CPLUSPLUS_EXPORT List: public Managed ...@@ -35,10 +35,10 @@ class CPLUSPLUS_EXPORT List: public Managed
public: public:
List() List()
: value(_Tp()), next(0) : value(Tptr()), next(0)
{ } { }
List(const _Tp &value) List(const Tptr &value)
: value(value), next(0) : value(value), next(0)
{ } { }
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
unsigned lastToken() const unsigned lastToken() const
{ {
_Tp lv = lastValue(); Tptr lv = lastValue();
if (lv) if (lv)
return lv->lastToken(); return lv->lastToken();
...@@ -62,9 +62,9 @@ public: ...@@ -62,9 +62,9 @@ public:
return 0; return 0;
} }
_Tp lastValue() const Tptr lastValue() const
{ {
_Tp lastValue = 0; Tptr lastValue = 0;
for (const List *it = this; it; it = it->next) { for (const List *it = this; it; it = it->next) {
if (it->value) if (it->value)
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
return lastValue; return lastValue;
} }
_Tp value; Tptr value;
List *next; List *next;
}; };
...@@ -92,8 +92,8 @@ public: ...@@ -92,8 +92,8 @@ public:
static void accept(AST *ast, ASTVisitor *visitor) static void accept(AST *ast, ASTVisitor *visitor)
{ if (ast) ast->accept(visitor); } { if (ast) ast->accept(visitor); }
template <typename _Tp> template <typename Tptr>
static void accept(List<_Tp> *it, ASTVisitor *visitor) static void accept(List<Tptr> *it, ASTVisitor *visitor)
{ {
for (; it; it = it->next) for (; it; it = it->next)
accept(it->value, visitor); accept(it->value, visitor);
...@@ -102,8 +102,8 @@ public: ...@@ -102,8 +102,8 @@ public:
static bool match(AST *ast, AST *pattern, ASTMatcher *matcher); static bool match(AST *ast, AST *pattern, ASTMatcher *matcher);
bool match(AST *pattern, ASTMatcher *matcher); bool match(AST *pattern, ASTMatcher *matcher);
template <typename _Tp> template <typename Tptr>
static bool match(List<_Tp> *it, List<_Tp> *patternIt, ASTMatcher *matcher) static bool match(List<Tptr> *it, List<Tptr> *patternIt, ASTMatcher *matcher)
{ {
while (it && patternIt) { while (it && patternIt) {
if (! match(it->value, patternIt->value, matcher)) if (! match(it->value, patternIt->value, matcher))
......
...@@ -63,8 +63,8 @@ public: ...@@ -63,8 +63,8 @@ public:
void accept(AST *ast); void accept(AST *ast);
template <typename _Tp> template <typename Tptr>
void accept(List<_Tp> *it) void accept(List<Tptr> *it)
{ {
for (; it; it = it->next) for (; it; it = it->next)
accept(it->value); accept(it->value);
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
namespace CPlusPlus { namespace CPlusPlus {
template <typename _Tp> class List; template <typename Tptr> class List;
class AST; class AST;
class ASTVisitor; class ASTVisitor;
......
...@@ -33,7 +33,7 @@ using namespace CPlusPlus; ...@@ -33,7 +33,7 @@ using namespace CPlusPlus;
namespace { namespace {
template <typename _Tp> template <typename T>
struct Compare; struct Compare;
template <> struct Compare<IntegerType> template <> struct Compare<IntegerType>
...@@ -178,26 +178,26 @@ template <> struct Compare<SelectorNameId> ...@@ -178,26 +178,26 @@ template <> struct Compare<SelectorNameId>
}; };
template <typename _Tp> template <typename T>
class Table: public std::set<_Tp, Compare<_Tp> > class Table: public std::set<T, Compare<T> >
{ {
typedef std::set<_Tp, Compare<_Tp> > _Base; typedef std::set<T, Compare<T> > _Base;
public: public:
_Tp *intern(const _Tp &element) T *intern(const T &element)
{ return const_cast<_Tp *>(&*_Base::insert(element).first); } { return const_cast<T *>(&*_Base::insert(element).first); }
}; };
} // end of anonymous namespace } // end of anonymous namespace
template <typename _Iterator> template <typename Iterator>
static void delete_array_entries(_Iterator first, _Iterator last) static void delete_array_entries(Iterator first, Iterator last)
{ {
for (; first != last; ++first) for (; first != last; ++first)
delete *first; delete *first;
} }
template <typename _Array> template <typename Array>
static void delete_array_entries(const _Array &a) static void delete_array_entries(const Array &a)
{ delete_array_entries(a.begin(), a.end()); } { delete_array_entries(a.begin(), a.end()); }
class Control::Data class Control::Data
...@@ -233,9 +233,9 @@ public: ...@@ -233,9 +233,9 @@ public:
return anonymousNameIds.intern(AnonymousNameId(classTokenIndex)); return anonymousNameIds.intern(AnonymousNameId(classTokenIndex));
} }
template <typename _Iterator> template <typename Iterator>
const TemplateNameId *findOrInsertTemplateNameId(const Identifier *id, bool isSpecialization, const TemplateNameId *findOrInsertTemplateNameId(const Identifier *id, bool isSpecialization,
_Iterator first, _Iterator last) Iterator first, Iterator last)
{ {
return templateNameIds.intern(TemplateNameId(id, isSpecialization, first, last)); return templateNameIds.intern(TemplateNameId(id, isSpecialization, first, last));
} }
...@@ -260,8 +260,8 @@ public: ...@@ -260,8 +260,8 @@ public:
return qualifiedNameIds.intern(QualifiedNameId(base, name)); return qualifiedNameIds.intern(QualifiedNameId(base, name));
} }
template <typename _Iterator> template <typename Iterator>
const SelectorNameId *findOrInsertSelectorNameId(_Iterator first, _Iterator last, bool hasArguments) const SelectorNameId *findOrInsertSelectorNameId(Iterator first, Iterator last, bool hasArguments)
{ {
return selectorNameIds.intern(SelectorNameId(first, last, hasArguments)); return selectorNameIds.intern(SelectorNameId(first, last, hasArguments));
} }
......
...@@ -137,7 +137,7 @@ void Lexer::scan(Token *tok) ...@@ -137,7 +137,7 @@ void Lexer::scan(Token *tok)
void Lexer::scan_helper(Token *tok) void Lexer::scan_helper(Token *tok)
{ {
_Lagain: again:
while (_yychar && std::isspace(_yychar)) { while (_yychar && std::isspace(_yychar)) {
if (_yychar == '\n') { if (_yychar == '\n') {
tok->f.joined = s._newlineExpected; tok->f.joined = s._newlineExpected;
...@@ -198,7 +198,7 @@ void Lexer::scan_helper(Token *tok) ...@@ -198,7 +198,7 @@ void Lexer::scan_helper(Token *tok)
} }
if (! f._scanCommentTokens) if (! f._scanCommentTokens)
goto _Lagain; goto again;
tok->f.kind = originalKind; tok->f.kind = originalKind;
return; // done return; // done
...@@ -232,7 +232,7 @@ void Lexer::scan_helper(Token *tok) ...@@ -232,7 +232,7 @@ void Lexer::scan_helper(Token *tok)
switch (ch) { switch (ch) {
case '\\': case '\\':
s._newlineExpected = true; s._newlineExpected = true;
goto _Lagain; goto again;
case '"': case '"':
scanStringLiteral(tok); scanStringLiteral(tok);
...@@ -404,7 +404,7 @@ void Lexer::scan_helper(Token *tok) ...@@ -404,7 +404,7 @@ void Lexer::scan_helper(Token *tok)
scanCppComment(commentType); scanCppComment(commentType);
if (! f._scanCommentTokens) if (! f._scanCommentTokens)
goto _Lagain; goto again;
tok->f.kind = commentType; tok->f.kind = commentType;
...@@ -419,7 +419,7 @@ void Lexer::scan_helper(Token *tok) ...@@ -419,7 +419,7 @@ void Lexer::scan_helper(Token *tok)
yyinp(); yyinp();
if (ch == '*' && _yychar == '/') if (ch == '*' && _yychar == '/')
goto _Ldone; goto done;
if (_yychar == '<') if (_yychar == '<')
yyinp(); yyinp();
...@@ -438,14 +438,14 @@ void Lexer::scan_helper(Token *tok) ...@@ -438,14 +438,14 @@ void Lexer::scan_helper(Token *tok)
} }
} }
_Ldone: done:
if (_yychar) if (_yychar)
yyinp(); yyinp();
else else
s._tokenKind = commentKind; s._tokenKind = commentKind;
if (! f._scanCommentTokens) if (! f._scanCommentTokens)
goto _Lagain; goto again;
tok->f.kind = commentKind; tok->f.kind = commentKind;
......
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
namespace CPlusPlus { namespace CPlusPlus {
template <typename _Literal> template <typename Literal>
class LiteralTable class LiteralTable
{ {
LiteralTable(const LiteralTable &other); LiteralTable(const LiteralTable &other);
void operator =(const LiteralTable &other); void operator =(const LiteralTable &other);
public: public:
typedef _Literal *const *iterator; typedef Literal *const *iterator;
public: public:
LiteralTable() LiteralTable()
...@@ -52,8 +52,8 @@ public: ...@@ -52,8 +52,8 @@ public:
void reset() void reset()
{ {
if (_literals) { if (_literals) {
_Literal **lastLiteral = _literals + _literalCount + 1; Literal **lastLiteral = _literals + _literalCount + 1;
for (_Literal **it = _literals; it != lastLiteral; ++it) for (Literal **it = _literals; it != lastLiteral; ++it)
delete *it; delete *it;
std::free(_literals); std::free(_literals);
} }
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
unsigned size() const unsigned size() const
{ return _literalCount + 1; } { return _literalCount + 1; }
const _Literal *at(unsigned index) const const Literal *at(unsigned index) const
{ return _literals[index]; } { return _literals[index]; }
iterator begin() const iterator begin() const
...@@ -82,12 +82,12 @@ public: ...@@ -82,12 +82,12 @@ public:
iterator end() const iterator end() const
{ return _literals + _literalCount + 1; } { return _literals + _literalCount + 1; }
const _Literal *findLiteral(const char *chars, unsigned size) const const Literal *findLiteral(const char *chars, unsigned size) const
{ {
if (_buckets) { if (_buckets) {
unsigned h = _Literal::hashCode(chars, size); unsigned h = Literal::hashCode(chars, size);
_Literal *literal = _buckets[h % _allocatedBuckets]; Literal *literal = _buckets[h % _allocatedBuckets];
for (; literal; literal = static_cast<_Literal *>(literal->_next)) { for (; literal; literal = static_cast<Literal *>(literal->_next)) {
if (literal->size() == size && ! std::strncmp(literal->chars(), chars, size)) if (literal->size() == size && ! std::strncmp(literal->chars(), chars, size))
return literal; return literal;
} }
...@@ -96,18 +96,18 @@ public: ...@@ -96,18 +96,18 @@ public:
return 0; return 0;
} }
const _Literal *findOrInsertLiteral(const char *chars, unsigned size) const Literal *findOrInsertLiteral(const char *chars, unsigned size)
{ {
if (_buckets) { if (_buckets) {
unsigned h = _Literal::hashCode(chars, size); unsigned h = Literal::hashCode(chars, size);
_Literal *literal = _buckets[h % _allocatedBuckets]; Literal *literal = _buckets[h % _allocatedBuckets];
for (; literal; literal = static_cast<_Literal *>(literal->_next)) { for (; literal; literal = static_cast<Literal *>(literal->_next)) {
if (literal->size() == size && ! std::strncmp(literal->chars(), chars, size)) if (literal->size() == size && ! std::strncmp(literal->chars(), chars, size))
return literal; return literal;
} }
} }
_Literal *literal = new _Literal(chars, size); Literal *literal = new Literal(chars, size);
if (++_literalCount == _allocatedLiterals) { if (++_literalCount == _allocatedLiterals) {
if (! _allocatedLiterals) if (! _allocatedLiterals)
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
else else
_allocatedLiterals <<= 1; _allocatedLiterals <<= 1;
_literals = (_Literal **) std::realloc(_literals, sizeof(_Literal *) * _allocatedLiterals); _literals = (Literal **) std::realloc(_literals, sizeof(Literal *) * _allocatedLiterals);
} }
_literals[_literalCount] = literal; _literals[_literalCount] = literal;
...@@ -142,12 +142,12 @@ protected: ...@@ -142,12 +142,12 @@ protected:
else else
_allocatedBuckets <<= 1; _allocatedBuckets <<= 1;
_buckets = (_Literal **) std::calloc(_allocatedBuckets, sizeof(_Literal *)); _buckets = (Literal **) std::calloc(_allocatedBuckets, sizeof(Literal *));
_Literal **lastLiteral = _literals + (_literalCount + 1); Literal **lastLiteral = _literals + (_literalCount + 1);
for (_Literal **it = _literals; it != lastLiteral; ++it) { for (Literal **it = _literals; it != lastLiteral; ++it) {
_Literal *literal = *it; Literal *literal = *it;
unsigned h = literal->hashCode() % _allocatedBuckets; unsigned h = literal->hashCode() % _allocatedBuckets;
literal->_next = _buckets[h]; literal->_next = _buckets[h];
...@@ -156,8 +156,8 @@ protected: ...@@ -156,8 +156,8 @@ protected:
} }
protected: protected:
_Literal **_literals; Literal **_literals;
_Literal **_buckets; Literal **_buckets;
int _allocatedLiterals; int _allocatedLiterals;
int _literalCount; int _literalCount;
int _allocatedBuckets; int _allocatedBuckets;
......
...@@ -77,9 +77,9 @@ private: ...@@ -77,9 +77,9 @@ private:
class CPLUSPLUS_EXPORT TemplateNameId: public Name class CPLUSPLUS_EXPORT TemplateNameId: public Name
{ {
public: public:
template <typename _Iterator> template <typename Iterator>
TemplateNameId(const Identifier *identifier, bool isSpecialization, _Iterator first, TemplateNameId(const Identifier *identifier, bool isSpecialization, Iterator first,
_Iterator last) Iterator last)
: _identifier(identifier) : _identifier(identifier)
, _templateArguments(first, last) , _templateArguments(first, last)
, _isSpecialization(isSpecialization) {} , _isSpecialization(isSpecialization) {}
...@@ -220,8 +220,8 @@ private: ...@@ -220,8 +220,8 @@ private:
class CPLUSPLUS_EXPORT SelectorNameId: public Name class CPLUSPLUS_EXPORT SelectorNameId: public Name
{ {
public: public:
template <typename _Iterator> template <typename Iterator>
SelectorNameId(_Iterator first, _Iterator last, bool hasArguments) SelectorNameId(Iterator first, Iterator last, bool hasArguments)
: _names(first, last), _hasArguments(hasArguments) {} : _names(first, last), _hasArguments(hasArguments) {}
virtual ~SelectorNameId(); virtual ~SelectorNameId();
......
...@@ -162,7 +162,7 @@ void TranslationUnit::tokenize() ...@@ -162,7 +162,7 @@ void TranslationUnit::tokenize()
do { do {
lex(&tk); lex(&tk);
_Lrecognize: recognize:
if (tk.is(T_POUND) && tk.newline()) { if (tk.is(T_POUND) && tk.newline()) {
const unsigned utf16CharOffset = tk.utf16charOffset; const unsigned utf16CharOffset = tk.utf16charOffset;
lex(&tk); lex(&tk);
...@@ -244,7 +244,7 @@ void TranslationUnit::tokenize() ...@@ -244,7 +244,7 @@ void TranslationUnit::tokenize()
while (tk.isNot(T_EOF_SYMBOL) && ! tk.newline()) while (tk.isNot(T_EOF_SYMBOL) && ! tk.newline())
lex(&tk); lex(&tk);
} }
goto _Lrecognize; goto recognize;
} else if (tk.kind() == T_LBRACE) { } else if (tk.kind() == T_LBRACE) {
braces.push(unsigned(_tokens->size())); braces.push(unsigned(_tokens->size()));
} else if (tk.kind() == T_RBRACE && ! braces.empty()) { } else if (tk.kind() == T_RBRACE && ! braces.empty()) {
......
...@@ -391,14 +391,14 @@ private: ...@@ -391,14 +391,14 @@ private:
class CPLUSPLUS_EXPORT Snapshot class CPLUSPLUS_EXPORT Snapshot
{ {
typedef QHash<QString, Document::Ptr> _Base; typedef QHash<QString, Document::Ptr> Base;
public: public:
Snapshot(); Snapshot();
~Snapshot(); ~Snapshot();
typedef _Base::const_iterator iterator; typedef Base::const_iterator iterator;
typedef _Base::const_iterator const_iterator; typedef Base::const_iterator const_iterator;
int size() const; // ### remove int size() const; // ### remove
bool isEmpty() const; bool isEmpty() const;
...@@ -428,7 +428,7 @@ private: ...@@ -428,7 +428,7 @@ private:
void allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const; void allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const;
private: private:
_Base _documents; Base _documents;
}; };
} // namespace CPlusPlus } // namespace CPlusPlus
......
...@@ -99,11 +99,11 @@ Macro *Environment::macroAt(unsigned index) const ...@@ -99,11 +99,11 @@ Macro *Environment::macroAt(unsigned index) const
return _macros[index]; return _macros[index];
} }
Macro *Environment::bind(const Macro &__macro) Macro *Environment::bind(const Macro &macro)
{ {
Q_ASSERT(! __macro.name().isEmpty()); Q_ASSERT(! macro.name().isEmpty());
Macro *m = new Macro (__macro); Macro *m = new Macro (macro);
const QByteArray &name = m->name(); const QByteArray &name = m->name();
m->_hashcode = hashCode(name.begin(), name.size()); m->_hashcode = hashCode(name.begin(), name.size());
......