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

Cleanup the C++ front-end.

Browse Source 
Removed CPLUSPLUS_BEGIN/END_NAMESPACE & co and made it possible to compile the parser with CPLUSPLUS_WITHOUT_QT.
This commit is contained in:
Roberto Raggi
2009-10-20 11:21:25 +02:00
parent 0a7d402d85
commit 13675cf6ed
71 changed files with 215 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/cplusplus/AST.cpp
View File

@@ -54,7 +54,7 @@
#include <cstddef> #include <cstddef>
#include <algorithm> #include <algorithm>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
AST::AST() AST::AST()
{ } { }
@@ -2493,4 +2493,4 @@ unsigned ObjCSynchronizedStatementAST::lastToken() const
return synchronized_token + 1; return synchronized_token + 1;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/AST.h
View File

@@ -53,8 +53,8 @@
#include "ASTfwd.h" #include "ASTfwd.h"
#include "MemoryPool.h" #include "MemoryPool.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
template <typename _Tp> template <typename _Tp>
class List: public Managed class List: public Managed
@@ -3168,7 +3168,7 @@ protected:
virtual void accept0(ASTVisitor *visitor); virtual void accept0(ASTVisitor *visitor);
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_AST_H #endif // CPLUSPLUS_AST_H

4
src/shared/cplusplus/ASTClone.cpp
View File

@@ -30,7 +30,7 @@
#include "AST.h" #include "AST.h"
#include "ASTVisitor.h" #include "ASTVisitor.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
SimpleSpecifierAST *SimpleSpecifierAST::clone(MemoryPool *pool) const SimpleSpecifierAST *SimpleSpecifierAST::clone(MemoryPool *pool) const
{ {
@@ -1516,4 +1516,4 @@ ObjCSynchronizedStatementAST *ObjCSynchronizedStatementAST::clone(MemoryPool *po
} }
CPLUSPLUS_END_NAMESPACE

4
src/shared/cplusplus/ASTVisit.cpp
View File

@@ -30,7 +30,7 @@
#include "AST.h" #include "AST.h"
#include "ASTVisitor.h" #include "ASTVisitor.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
void SimpleSpecifierAST::accept0(ASTVisitor *visitor) void SimpleSpecifierAST::accept0(ASTVisitor *visitor)
{ {
@@ -1465,4 +1465,4 @@ void ObjCSynchronizedStatementAST::accept0(ASTVisitor *visitor)
visitor->endVisit(this); visitor->endVisit(this);
} }
CPLUSPLUS_END_NAMESPACE

4
src/shared/cplusplus/ASTVisitor.cpp
View File

@@ -51,7 +51,7 @@
#include "TranslationUnit.h" #include "TranslationUnit.h"
#include "Control.h" #include "Control.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
ASTVisitor::ASTVisitor(Control *control) ASTVisitor::ASTVisitor(Control *control)
: _control(control) : _control(control)
@@ -111,4 +111,4 @@ void ASTVisitor::getTokenStartPosition(unsigned index, unsigned *line, unsigned
void ASTVisitor::getTokenEndPosition(unsigned index, unsigned *line, unsigned *column) const void ASTVisitor::getTokenEndPosition(unsigned index, unsigned *line, unsigned *column) const
{ getPosition(tokenAt(index).end(), line, column); } { getPosition(tokenAt(index).end(), line, column); }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/ASTVisitor.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "ASTfwd.h" #include "ASTfwd.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT ASTVisitor class CPLUSPLUS_EXPORT ASTVisitor
{ {
@@ -371,7 +371,7 @@ private:
Control *_control; Control *_control;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_ASTVISITOR_H #endif // CPLUSPLUS_ASTVISITOR_H

8
src/shared/cplusplus/ASTfwd.h
View File

@@ -51,8 +51,8 @@
#include <CPlusPlusForwardDeclarations.h> #include <CPlusPlusForwardDeclarations.h>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class AST; class AST;
class ASTVisitor; class ASTVisitor;
@@ -203,7 +203,7 @@ class ObjCDynamicPropertiesDeclarationAST;
class ObjCFastEnumerationAST; class ObjCFastEnumerationAST;
class ObjCSynchronizedStatementAST; class ObjCSynchronizedStatementAST;
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_ASTFWD_H #endif // CPLUSPLUS_ASTFWD_H

8
src/shared/cplusplus/Array.h
View File

@@ -53,8 +53,8 @@
#include <new> #include <new>
#include <cstdlib> #include <cstdlib>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
template <typename _Tp, int SEGMENT_SHIFT = 4> template <typename _Tp, int SEGMENT_SHIFT = 4>
class Array class Array
@@ -125,7 +125,7 @@ private:
int _count; int _count;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_ARRAY_H #endif // CPLUSPLUS_ARRAY_H

24
src/shared/cplusplus/CPlusPlusForwardDeclarations.h
View File

@@ -49,34 +49,19 @@
#ifndef CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H #ifndef CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
#define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H #define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
#ifndef CPLUSPLUS_WITH_NO_QT #ifndef CPLUSPLUS_WITHOUT_QT
# include <QtCore/qglobal.h> # include <QtCore/qglobal.h>
# define CPLUSPLUS_BEGIN_HEADER
# define CPLUSPLUS_END_HEADER
# if defined(CPLUSPLUS_BUILD_LIB) # if defined(CPLUSPLUS_BUILD_LIB)
# define CPLUSPLUS_EXPORT Q_DECL_EXPORT # define CPLUSPLUS_EXPORT Q_DECL_EXPORT
# else # else
# define CPLUSPLUS_EXPORT Q_DECL_IMPORT # define CPLUSPLUS_EXPORT Q_DECL_IMPORT
# endif # endif
# define CPLUSPLUS_WITH_NAMESPACE
#else #else
# define CPLUSPLUS_BEGIN_HEADER
# define CPLUSPLUS_END_HEADER
# define CPLUSPLUS_EXPORT # define CPLUSPLUS_EXPORT
#endif #endif
#ifdef CPLUSPLUS_WITH_NAMESPACE namespace CPlusPlus {
# define CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
# define CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPLus
# define CPLUSPLUS_USE_NAMESPACE using namespace CPlusPlus;
#else
# define CPLUSPLUS_BEGIN_NAMESPACE
# define CPLUSPLUS_END_NAMESPACE
# define CPLUSPLUS_USE_NAMESPACE ;
#endif
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE
class TranslationUnit; class TranslationUnit;
class Semantic; class Semantic;
@@ -144,7 +129,6 @@ class ObjCProtocol;
class ObjCForwardProtocolDeclaration; class ObjCForwardProtocolDeclaration;
class ObjCMethod; class ObjCMethod;
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H #endif // CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H

22
src/shared/cplusplus/CheckDeclaration.cpp
View File

@@ -57,9 +57,8 @@
#include "Control.h" #include "Control.h"
#include "Literals.h" #include "Literals.h"
#include <cassert> #include <cassert>
#include <QtCore/QByteArray>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
CheckDeclaration::CheckDeclaration(Semantic *semantic) CheckDeclaration::CheckDeclaration(Semantic *semantic)
: SemanticCheck(semantic), : SemanticCheck(semantic),
@@ -228,7 +227,6 @@ bool CheckDeclaration::visit(SimpleDeclarationAST *ast)
if (it->declarator && it->declarator->initializer) { if (it->declarator && it->declarator->initializer) {
FullySpecifiedType initTy = semantic()->check(it->declarator->initializer, _scope); FullySpecifiedType initTy = semantic()->check(it->declarator->initializer, _scope);
Q_UNUSED(initTy)
} }
*decl_it = new (translationUnit()->memoryPool()) List<Declaration *>(); *decl_it = new (translationUnit()->memoryPool()) List<Declaration *>();
@@ -703,25 +701,25 @@ bool CheckDeclaration::visit(ObjCPropertyDeclarationAST *ast)
continue; continue;
const char *attrName = spell(attrAst->attribute_identifier_token); const char *attrName = spell(attrAst->attribute_identifier_token);
if (!qstrcmp("getter", attrName)) { if (!strcmp("getter", attrName)) {
if (checkPropertyAttribute(attrAst, propAttrs, Getter)) { if (checkPropertyAttribute(attrAst, propAttrs, Getter)) {
// TODO: find method declaration for getter // TODO: find method declaration for getter
} }
} else if (!qstrcmp("setter", attrName)) { } else if (!strcmp("setter", attrName)) {
if (checkPropertyAttribute(attrAst, propAttrs, Setter)) { if (checkPropertyAttribute(attrAst, propAttrs, Setter)) {
// TODO: find method declaration for setter // TODO: find method declaration for setter
} }
} else if (!qstrcmp("readwrite", attrName)) { } else if (!strcmp("readwrite", attrName)) {
checkPropertyAttribute(attrAst, propAttrs, ReadWrite); checkPropertyAttribute(attrAst, propAttrs, ReadWrite);
} else if (!qstrcmp("readonly", attrName)) { } else if (!strcmp("readonly", attrName)) {
checkPropertyAttribute(attrAst, propAttrs, ReadOnly); checkPropertyAttribute(attrAst, propAttrs, ReadOnly);
} else if (!qstrcmp("assign", attrName)) { } else if (!strcmp("assign", attrName)) {
checkPropertyAttribute(attrAst, propAttrs, Assign); checkPropertyAttribute(attrAst, propAttrs, Assign);
} else if (!qstrcmp("retain", attrName)) { } else if (!strcmp("retain", attrName)) {
checkPropertyAttribute(attrAst, propAttrs, Retain); checkPropertyAttribute(attrAst, propAttrs, Retain);
} else if (!qstrcmp("copy", attrName)) { } else if (!strcmp("copy", attrName)) {
checkPropertyAttribute(attrAst, propAttrs, Copy); checkPropertyAttribute(attrAst, propAttrs, Copy);
} else if (!qstrcmp("nonatomic", attrName)) { } else if (!strcmp("nonatomic", attrName)) {
checkPropertyAttribute(attrAst, propAttrs, NonAtomic); checkPropertyAttribute(attrAst, propAttrs, NonAtomic);
} }
} }
@@ -745,4 +743,4 @@ bool CheckDeclaration::visit(ObjCPropertyDeclarationAST *ast)
return false; return false;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CheckDeclaration.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "SemanticCheck.h" #include "SemanticCheck.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckDeclaration: public SemanticCheck class CPLUSPLUS_EXPORT CheckDeclaration: public SemanticCheck
{ {
@@ -111,7 +111,7 @@ private:
bool _checkAnonymousArguments: 1; bool _checkAnonymousArguments: 1;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CHECKDECLARATION_H #endif // CPLUSPLUS_CHECKDECLARATION_H

4
src/shared/cplusplus/CheckDeclarator.cpp
View File

@@ -55,7 +55,7 @@
#include "CoreTypes.h" #include "CoreTypes.h"
#include "Symbols.h" #include "Symbols.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
CheckDeclarator::CheckDeclarator(Semantic *semantic) CheckDeclarator::CheckDeclarator(Semantic *semantic)
: SemanticCheck(semantic), : SemanticCheck(semantic),
@@ -300,4 +300,4 @@ void CheckDeclarator::applyCvQualifiers(SpecifierAST *cv)
} }
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CheckDeclarator.h
View File

@@ -53,8 +53,8 @@
#include "SemanticCheck.h" #include "SemanticCheck.h"
#include "FullySpecifiedType.h" #include "FullySpecifiedType.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckDeclarator: public SemanticCheck class CPLUSPLUS_EXPORT CheckDeclarator: public SemanticCheck
{ {
@@ -106,7 +106,7 @@ private:
FullySpecifiedType _fullySpecifiedType; FullySpecifiedType _fullySpecifiedType;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CHECKDECLARATOR_H #endif // CPLUSPLUS_CHECKDECLARATOR_H

8
src/shared/cplusplus/CheckExpression.cpp
View File

@@ -56,7 +56,7 @@
#include "Symbols.h" #include "Symbols.h"
#include "Control.h" #include "Control.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
CheckExpression::CheckExpression(Semantic *semantic) CheckExpression::CheckExpression(Semantic *semantic)
: SemanticCheck(semantic), : SemanticCheck(semantic),
@@ -207,7 +207,6 @@ bool CheckExpression::visit(NewExpressionAST *ast)
if (ast->new_placement) { if (ast->new_placement) {
for (ExpressionListAST *it = ast->new_placement->expression_list; it; it = it->next) { for (ExpressionListAST *it = ast->new_placement->expression_list; it; it = it->next) {
FullySpecifiedType exprTy = semantic()->check(it->expression, _scope); FullySpecifiedType exprTy = semantic()->check(it->expression, _scope);
Q_UNUSED(exprTy)
} }
} }
@@ -215,18 +214,15 @@ bool CheckExpression::visit(NewExpressionAST *ast)
if (ast->new_type_id) { if (ast->new_type_id) {
FullySpecifiedType ty = semantic()->check(ast->new_type_id->type_specifier, _scope); FullySpecifiedType ty = semantic()->check(ast->new_type_id->type_specifier, _scope);
Q_UNUSED(ty)
for (NewArrayDeclaratorAST *it = ast->new_type_id->new_array_declarators; it; it = it->next) { for (NewArrayDeclaratorAST *it = ast->new_type_id->new_array_declarators; it; it = it->next) {
FullySpecifiedType exprTy = semantic()->check(it->expression, _scope); FullySpecifiedType exprTy = semantic()->check(it->expression, _scope);
Q_UNUSED(exprTy)
} }
} }
// ### process new-initializer // ### process new-initializer
if (ast->new_initializer) { if (ast->new_initializer) {
FullySpecifiedType exprTy = semantic()->check(ast->new_initializer->expression, _scope); FullySpecifiedType exprTy = semantic()->check(ast->new_initializer->expression, _scope);
Q_UNUSED(exprTy)
} }
return false; return false;
@@ -397,4 +393,4 @@ bool CheckExpression::visit(ObjCSelectorExpressionAST *ast)
return false; return false;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CheckExpression.h
View File

@@ -53,8 +53,8 @@
#include "SemanticCheck.h" #include "SemanticCheck.h"
#include "FullySpecifiedType.h" #include "FullySpecifiedType.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckExpression: public SemanticCheck class CPLUSPLUS_EXPORT CheckExpression: public SemanticCheck
{ {
@@ -122,7 +122,7 @@ private:
bool _checkOldStyleCasts: 1; bool _checkOldStyleCasts: 1;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CHECKEXPRESSION_H #endif // CPLUSPLUS_CHECKEXPRESSION_H

4
src/shared/cplusplus/CheckName.cpp
View File

@@ -58,7 +58,7 @@
#include "Scope.h" #include "Scope.h"
#include <cassert> #include <cassert>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
CheckName::CheckName(Semantic *semantic) CheckName::CheckName(Semantic *semantic)
: SemanticCheck(semantic), : SemanticCheck(semantic),
@@ -425,4 +425,4 @@ bool CheckName::visit(ObjCMessageArgumentDeclarationAST *ast)
return false; return false;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CheckName.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "SemanticCheck.h" #include "SemanticCheck.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckName: public SemanticCheck class CPLUSPLUS_EXPORT CheckName: public SemanticCheck
{ {
@@ -89,7 +89,7 @@ private:
Scope *_scope; Scope *_scope;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CHECKNAME_H #endif // CPLUSPLUS_CHECKNAME_H

4
src/shared/cplusplus/CheckSpecifier.cpp
View File

@@ -58,7 +58,7 @@
#include "Control.h" #include "Control.h"
#include "Scope.h" #include "Scope.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
CheckSpecifier::CheckSpecifier(Semantic *semantic) CheckSpecifier::CheckSpecifier(Semantic *semantic)
: SemanticCheck(semantic), : SemanticCheck(semantic),
@@ -420,4 +420,4 @@ bool CheckSpecifier::visit(ObjCTypeNameAST * /*ast*/)
return true; return true;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CheckSpecifier.h
View File

@@ -53,8 +53,8 @@
#include "SemanticCheck.h" #include "SemanticCheck.h"
#include "FullySpecifiedType.h" #include "FullySpecifiedType.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckSpecifier: public SemanticCheck class CPLUSPLUS_EXPORT CheckSpecifier: public SemanticCheck
{ {
@@ -88,7 +88,7 @@ private:
Scope *_scope; Scope *_scope;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CHECKSPECIFIER_H #endif // CPLUSPLUS_CHECKSPECIFIER_H

4
src/shared/cplusplus/CheckStatement.cpp
View File

@@ -55,7 +55,7 @@
#include "Control.h" #include "Control.h"
#include "Symbols.h" #include "Symbols.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
CheckStatement::CheckStatement(Semantic *semantic) CheckStatement::CheckStatement(Semantic *semantic)
: SemanticCheck(semantic), : SemanticCheck(semantic),
@@ -307,4 +307,4 @@ bool CheckStatement::visit(WhileStatementAST *ast)
return false; return false;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CheckStatement.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "SemanticCheck.h" #include "SemanticCheck.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckStatement: public SemanticCheck class CPLUSPLUS_EXPORT CheckStatement: public SemanticCheck
{ {
@@ -94,7 +94,7 @@ private:
Scope *_scope; Scope *_scope;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CHECKSTATEMENT_H #endif // CPLUSPLUS_CHECKSTATEMENT_H

4
src/shared/cplusplus/Control.cpp
View File

@@ -57,7 +57,7 @@
#include <map> // ### replace me with LiteralTable #include <map> // ### replace me with LiteralTable
#include <string> #include <string>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
template <typename _Iterator> template <typename _Iterator>
@@ -766,4 +766,4 @@ ObjCForwardProtocolDeclaration *Control::newObjCForwardProtocolDeclaration(unsig
ObjCMethod *Control::newObjCMethod(unsigned sourceLocation, Name *name) ObjCMethod *Control::newObjCMethod(unsigned sourceLocation, Name *name)
{ return d->newObjCMethod(sourceLocation, name); } { return d->newObjCMethod(sourceLocation, name); }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Control.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include <cstddef> #include <cstddef>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Control class CPLUSPLUS_EXPORT Control
{ {
@@ -199,7 +199,7 @@ private:
Data *d; Data *d;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CONTROL_H #endif // CPLUSPLUS_CONTROL_H

4
src/shared/cplusplus/CoreTypes.cpp
View File

@@ -51,7 +51,7 @@
#include "Names.h" #include "Names.h"
#include <algorithm> #include <algorithm>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
bool VoidType::isEqualTo(const Type *other) const bool VoidType::isEqualTo(const Type *other) const
@@ -230,4 +230,4 @@ bool NamedType::isEqualTo(const Type *other) const
void NamedType::accept0(TypeVisitor *visitor) void NamedType::accept0(TypeVisitor *visitor)
{ visitor->visit(this); } { visitor->visit(this); }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/CoreTypes.h
View File

@@ -54,8 +54,8 @@
#include "FullySpecifiedType.h" #include "FullySpecifiedType.h"
#include <cstddef> #include <cstddef>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT UndefinedType : public Type class CPLUSPLUS_EXPORT UndefinedType : public Type
{ {
@@ -272,7 +272,7 @@ private:
Name *_name; Name *_name;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_CORETYPES_H #endif // CPLUSPLUS_CORETYPES_H

4
src/shared/cplusplus/DiagnosticClient.cpp
View File

@@ -48,7 +48,7 @@
#include "DiagnosticClient.h" #include "DiagnosticClient.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
DiagnosticClient::DiagnosticClient() DiagnosticClient::DiagnosticClient()
{ } { }
@@ -56,4 +56,4 @@ DiagnosticClient::DiagnosticClient()
DiagnosticClient::~DiagnosticClient() DiagnosticClient::~DiagnosticClient()
{ } { }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/DiagnosticClient.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "stdarg.h" #include "stdarg.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT DiagnosticClient class CPLUSPLUS_EXPORT DiagnosticClient
{ {
@@ -76,7 +76,7 @@ public:
const char *format, va_list ap) = 0; const char *format, va_list ap) = 0;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_DIAGNOSTICCLIENT_H #endif // CPLUSPLUS_DIAGNOSTICCLIENT_H

4
src/shared/cplusplus/FullySpecifiedType.cpp
View File

@@ -50,7 +50,7 @@
#include "Type.h" #include "Type.h"
#include "CoreTypes.h" #include "CoreTypes.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
FullySpecifiedType::FullySpecifiedType(Type *type) : FullySpecifiedType::FullySpecifiedType(Type *type) :
_type(type), _flags(0) _type(type), _flags(0)
@@ -209,4 +209,4 @@ FullySpecifiedType FullySpecifiedType::simplified() const
return *this; return *this;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/FullySpecifiedType.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT FullySpecifiedType class CPLUSPLUS_EXPORT FullySpecifiedType
{ {
@@ -151,7 +151,7 @@ private:
}; };
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_FULLYSPECIFIEDTYPE_H #endif // CPLUSPLUS_FULLYSPECIFIEDTYPE_H

4
src/shared/cplusplus/Keywords.cpp
View File

@@ -49,7 +49,7 @@
#include "Lexer.h" #include "Lexer.h"
#include "Token.h" #include "Token.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
static inline int classify2(const char *s, bool) { static inline int classify2(const char *s, bool) {
if (s[0] == 'd') { if (s[0] == 'd') {
@@ -1400,4 +1400,4 @@ int Lexer::classifyOperator(const char *s, int n) {
} // switch } // switch
} }
CPLUSPLUS_END_NAMESPACE

4
src/shared/cplusplus/Lexer.cpp
View File

@@ -55,7 +55,7 @@
using namespace std; using namespace std;
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
Lexer::Lexer(TranslationUnit *unit) Lexer::Lexer(TranslationUnit *unit)
: _translationUnit(unit), : _translationUnit(unit),
@@ -720,4 +720,4 @@ void Lexer::scan_helper(Token *tok)
} // switch } // switch
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Lexer.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "Token.h" #include "Token.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Lexer class CPLUSPLUS_EXPORT Lexer
{ {
@@ -152,7 +152,7 @@ private:
unsigned _currentLine; unsigned _currentLine;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_LEXER_H #endif // CPLUSPLUS_LEXER_H

8
src/shared/cplusplus/LiteralTable.h
View File

@@ -53,8 +53,8 @@
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
template <typename _Literal> template <typename _Literal>
class LiteralTable class LiteralTable
@@ -185,7 +185,7 @@ protected:
int _allocatedBuckets; int _allocatedBuckets;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_LITERALTABLE_H #endif // CPLUSPLUS_LITERALTABLE_H

4
src/shared/cplusplus/Literals.cpp
View File

@@ -53,7 +53,7 @@
using namespace std; using namespace std;
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Literal::Literal(const char *chars, unsigned size) Literal::Literal(const char *chars, unsigned size)
@@ -227,4 +227,4 @@ bool Identifier::isEqualTo(const Identifier *other) const
return ! strcmp(chars(), other->chars()); return ! strcmp(chars(), other->chars());
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Literals.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "Token.h" #include "Token.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Literal class CPLUSPLUS_EXPORT Literal
{ {
@@ -135,7 +135,7 @@ public:
bool isEqualTo(const Identifier *other) const; bool isEqualTo(const Identifier *other) const;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_LITERALS_H #endif // CPLUSPLUS_LITERALS_H

4
src/shared/cplusplus/MemoryPool.cpp
View File

@@ -51,7 +51,7 @@
#include <cstring> #include <cstring>
#include <cassert> #include <cassert>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
using namespace std; using namespace std;
@@ -125,4 +125,4 @@ void Managed::operator delete(void *)
void Managed::operator delete(void *, MemoryPool *) void Managed::operator delete(void *, MemoryPool *)
{ } { }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/MemoryPool.h
View File

@@ -53,8 +53,8 @@
#include <cstddef> #include <cstddef>
#include <new> #include <new>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT MemoryPool class CPLUSPLUS_EXPORT MemoryPool
{ {
@@ -110,7 +110,7 @@ public:
void operator delete(void *, MemoryPool *); void operator delete(void *, MemoryPool *);
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_MEMORYPOOL_H #endif // CPLUSPLUS_MEMORYPOOL_H

4
src/shared/cplusplus/Name.cpp
View File

@@ -50,7 +50,7 @@
#include "Names.h" #include "Names.h"
#include "NameVisitor.h" #include "NameVisitor.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
Name::Name() Name::Name()
{ } { }
@@ -93,4 +93,4 @@ void Name::accept(Name *name, NameVisitor *visitor)
name->accept(visitor); name->accept(visitor);
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Name.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Name class CPLUSPLUS_EXPORT Name
{ {
@@ -98,7 +98,7 @@ protected:
virtual void accept0(NameVisitor *visitor) = 0; virtual void accept0(NameVisitor *visitor) = 0;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_NAME_H #endif // CPLUSPLUS_NAME_H

4
src/shared/cplusplus/NameVisitor.cpp
View File

@@ -49,7 +49,7 @@
#include "NameVisitor.h" #include "NameVisitor.h"
#include "Names.h" #include "Names.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
NameVisitor::NameVisitor() NameVisitor::NameVisitor()
{ } { }
@@ -60,4 +60,4 @@ NameVisitor::~NameVisitor()
void NameVisitor::accept(Name *name) void NameVisitor::accept(Name *name)
{ Name::accept(name, this); } { Name::accept(name, this); }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/NameVisitor.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT NameVisitor class CPLUSPLUS_EXPORT NameVisitor
{ {
@@ -77,7 +77,7 @@ public:
virtual void visit(SelectorNameId *) {} virtual void visit(SelectorNameId *) {}
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_NAMEVISITOR_H #endif // CPLUSPLUS_NAMEVISITOR_H

4
src/shared/cplusplus/Names.cpp
View File

@@ -52,7 +52,7 @@
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
QualifiedNameId::QualifiedNameId(Name *const names[], QualifiedNameId::QualifiedNameId(Name *const names[],
unsigned nameCount, unsigned nameCount,
@@ -326,4 +326,4 @@ bool SelectorNameId::isEqualTo(const Name *other) const
return true; return true;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Names.h
View File

@@ -53,8 +53,8 @@
#include "Name.h" #include "Name.h"
#include "FullySpecifiedType.h" #include "FullySpecifiedType.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT QualifiedNameId: public Name class CPLUSPLUS_EXPORT QualifiedNameId: public Name
{ {
@@ -304,7 +304,7 @@ private:
bool _hasArguments; bool _hasArguments;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_NAMES_H #endif // CPLUSPLUS_NAMES_H

4
src/shared/cplusplus/ObjectiveCAtKeywords.cpp
View File

@@ -1,7 +1,7 @@
#include "Lexer.h" #include "Lexer.h"
#include "Token.h" #include "Token.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
static inline int classify3(const char *s) { static inline int classify3(const char *s) {
if (s[0] == 'e') { if (s[0] == 'e') {
@@ -461,4 +461,4 @@ int Lexer::classifyObjCAtKeyword(const char *s, int n) {
} // switch } // switch
} }
CPLUSPLUS_END_NAMESPACE

6
src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
View File

@@ -29,7 +29,7 @@
#include "ObjectiveCTypeQualifiers.h" #include "ObjectiveCTypeQualifiers.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
static inline int classify2(const char *s) { static inline int classify2(const char *s) {
if (s[0] == 'i') { if (s[0] == 'i') {
@@ -234,7 +234,7 @@ static inline int classify9(const char *s) {
return Token_identifier; return Token_identifier;
} }
int classifyObjectiveCTypeQualifiers(const char *s, int n) { int CPlusPlus::classifyObjectiveCTypeQualifiers(const char *s, int n) {
switch (n) { switch (n) {
case 2: return classify2(s); case 2: return classify2(s);
case 3: return classify3(s); case 3: return classify3(s);
@@ -247,4 +247,4 @@ int classifyObjectiveCTypeQualifiers(const char *s, int n) {
} // switch } // switch
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/ObjectiveCTypeQualifiers.h
View File

@@ -31,8 +31,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
enum { enum {
Token_in, Token_in,
@@ -54,7 +54,7 @@ enum {
CPLUSPLUS_EXPORT int classifyObjectiveCTypeQualifiers(const char *s, int n); CPLUSPLUS_EXPORT int classifyObjectiveCTypeQualifiers(const char *s, int n);
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_OBJC_TYPEQUALIFIERS_H #endif // CPLUSPLUS_OBJC_TYPEQUALIFIERS_H

4
src/shared/cplusplus/Parser.cpp
View File

@@ -57,7 +57,7 @@
#include <cstring> #include <cstring>
#include <cassert> #include <cassert>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
Parser::Parser(TranslationUnit *unit) Parser::Parser(TranslationUnit *unit)
: _translationUnit(unit), : _translationUnit(unit),
@@ -4857,4 +4857,4 @@ bool Parser::parseObjCContextKeyword(int kind, unsigned &in_token)
} }
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Parser.h
View File

@@ -54,8 +54,8 @@
#include "Token.h" #include "Token.h"
#include "TranslationUnit.h" #include "TranslationUnit.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Parser class CPLUSPLUS_EXPORT Parser
{ {
@@ -305,7 +305,7 @@ private:
void operator =(const Parser& source); void operator =(const Parser& source);
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_PARSER_H #endif // CPLUSPLUS_PARSER_H

4
src/shared/cplusplus/Scope.cpp
View File

@@ -57,7 +57,7 @@
using namespace std; using namespace std;
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
Scope::Scope(ScopedSymbol *owner) Scope::Scope(ScopedSymbol *owner)
: _owner(owner), : _owner(owner),
@@ -312,4 +312,4 @@ Scope::iterator Scope::firstSymbol() const
Scope::iterator Scope::lastSymbol() const Scope::iterator Scope::lastSymbol() const
{ return _symbols + _symbolCount + 1; } { return _symbols + _symbolCount + 1; }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Scope.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Scope class CPLUSPLUS_EXPORT Scope
{ {
@@ -153,7 +153,7 @@ private:
int _hashSize; int _hashSize;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_SCOPE_H #endif // CPLUSPLUS_SCOPE_H

4
src/shared/cplusplus/Semantic.cpp
View File

@@ -59,7 +59,7 @@
#include "CheckExpression.h" #include "CheckExpression.h"
#include "CheckName.h" #include "CheckName.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
class Semantic::Data class Semantic::Data
{ {
@@ -252,4 +252,4 @@ int Semantic::visibilityForClassKey(int tokenKind) const
} }
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Semantic.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "ASTfwd.h" #include "ASTfwd.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Semantic class CPLUSPLUS_EXPORT Semantic
{ {
@@ -114,7 +114,7 @@ private:
Data *d; Data *d;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_SEMANTIC_H #endif // CPLUSPLUS_SEMANTIC_H

4
src/shared/cplusplus/SemanticCheck.cpp
View File

@@ -49,7 +49,7 @@
#include "SemanticCheck.h" #include "SemanticCheck.h"
#include "Semantic.h" #include "Semantic.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
SemanticCheck::SemanticCheck(Semantic *semantic) SemanticCheck::SemanticCheck(Semantic *semantic)
: ASTVisitor(semantic->control()), : ASTVisitor(semantic->control()),
@@ -65,4 +65,4 @@ Semantic *SemanticCheck::semantic() const
Control *SemanticCheck::control() const Control *SemanticCheck::control() const
{ return _semantic->control(); } { return _semantic->control(); }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/SemanticCheck.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include "ASTVisitor.h" #include "ASTVisitor.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT SemanticCheck: public ASTVisitor class CPLUSPLUS_EXPORT SemanticCheck: public ASTVisitor
{ {
@@ -68,7 +68,7 @@ private:
Semantic *_semantic; Semantic *_semantic;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_SEMANTICCHECK_H #endif // CPLUSPLUS_SEMANTICCHECK_H

4
src/shared/cplusplus/Symbol.cpp
View File

@@ -59,7 +59,7 @@
#include <cstddef> #include <cstddef>
#include <cassert> #include <cassert>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
class Symbol::HashCode: protected NameVisitor class Symbol::HashCode: protected NameVisitor
{ {
@@ -476,4 +476,4 @@ bool Symbol::isObjCForwardProtocolDeclaration() const
bool Symbol::isObjCMethod() const bool Symbol::isObjCMethod() const
{ return asObjCMethod() != 0; } { return asObjCMethod() != 0; }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Symbol.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Symbol class CPLUSPLUS_EXPORT Symbol
{ {
@@ -331,7 +331,7 @@ private:
friend class Scope; friend class Scope;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_SYMBOL_H #endif // CPLUSPLUS_SYMBOL_H

2
src/shared/cplusplus/SymbolVisitor.cpp
View File

@@ -49,7 +49,7 @@
#include "SymbolVisitor.h" #include "SymbolVisitor.h"
#include "Symbol.h" #include "Symbol.h"
CPLUSPLUS_USE_NAMESPACE using namespace CPlusPlus;
SymbolVisitor::SymbolVisitor() SymbolVisitor::SymbolVisitor()
{ } { }

8
src/shared/cplusplus/SymbolVisitor.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT SymbolVisitor class CPLUSPLUS_EXPORT SymbolVisitor
{ {
@@ -90,7 +90,7 @@ public:
virtual bool visit(ObjCMethod *) { return true; } virtual bool visit(ObjCMethod *) { return true; }
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // SYMBOLVISITOR_H #endif // SYMBOLVISITOR_H

4
src/shared/cplusplus/Symbols.cpp
View File

@@ -53,7 +53,7 @@
#include "Scope.h" #include "Scope.h"
#include <cstdlib> #include <cstdlib>
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
TemplateParameters::TemplateParameters(Scope *scope) TemplateParameters::TemplateParameters(Scope *scope)
: _previous(0), _scope(scope) : _previous(0), _scope(scope)
@@ -819,4 +819,4 @@ void ObjCMethod::visitSymbol0(SymbolVisitor *visitor)
} }
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Symbols.h
View File

@@ -55,8 +55,8 @@
#include "FullySpecifiedType.h" #include "FullySpecifiedType.h"
#include "Array.h" #include "Array.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class TemplateParameters class TemplateParameters
{ {
@@ -729,7 +729,7 @@ private:
Scope *_arguments; Scope *_arguments;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_SYMBOLS_H #endif // CPLUSPLUS_SYMBOLS_H

4
src/shared/cplusplus/Token.cpp
View File

@@ -49,7 +49,7 @@
#include "Token.h" #include "Token.h"
#include "Literals.h" #include "Literals.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
static const char *token_names[] = { static const char *token_names[] = {
(""), ("<error>"), (""), ("<error>"),
@@ -133,4 +133,4 @@ const char *Token::spell() const
} // switch } // switch
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Token.h
View File

@@ -52,8 +52,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include <cstddef> #include <cstddef>
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
enum Kind { enum Kind {
T_EOF_SYMBOL = 0, T_EOF_SYMBOL = 0,
@@ -336,7 +336,7 @@ public:
}; };
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_TOKEN_H #endif // CPLUSPLUS_TOKEN_H

4
src/shared/cplusplus/TranslationUnit.cpp
View File

@@ -61,7 +61,7 @@
using namespace std; using namespace std;
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
TranslationUnit::TranslationUnit(Control *control, StringLiteral *fileId) TranslationUnit::TranslationUnit(Control *control, StringLiteral *fileId)
: _control(control), : _control(control),
@@ -517,4 +517,4 @@ void TranslationUnit::release()
_tokens = 0; _tokens = 0;
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/TranslationUnit.h
View File

@@ -56,8 +56,8 @@
#include <stdio.h> // for FILE* #include <stdio.h> // for FILE*
#include <vector> // ### remove me #include <vector> // ### remove me
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT TranslationUnit class CPLUSPLUS_EXPORT TranslationUnit
{ {
@@ -204,7 +204,7 @@ private:
}; };
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_TRANSLATIONUNIT_H #endif // CPLUSPLUS_TRANSLATIONUNIT_H

4
src/shared/cplusplus/Type.cpp
View File

@@ -51,7 +51,7 @@
#include "CoreTypes.h" #include "CoreTypes.h"
#include "Symbols.h" #include "Symbols.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
Type::Type() Type::Type()
{ } { }
@@ -131,4 +131,4 @@ void Type::accept(Type *type, TypeVisitor *visitor)
type->accept(visitor); type->accept(visitor);
} }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/Type.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT Type class CPLUSPLUS_EXPORT Type
{ {
@@ -130,7 +130,7 @@ protected:
virtual void accept0(TypeVisitor *visitor) = 0; virtual void accept0(TypeVisitor *visitor) = 0;
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_TYPE_H #endif // CPLUSPLUS_TYPE_H

4
src/shared/cplusplus/TypeVisitor.cpp
View File

@@ -49,7 +49,7 @@
#include "TypeVisitor.h" #include "TypeVisitor.h"
#include "Type.h" #include "Type.h"
CPLUSPLUS_BEGIN_NAMESPACE using namespace CPlusPlus;
TypeVisitor::TypeVisitor() TypeVisitor::TypeVisitor()
{ } { }
@@ -60,4 +60,4 @@ TypeVisitor::~TypeVisitor()
void TypeVisitor::accept(Type *type) void TypeVisitor::accept(Type *type)
{ Type::accept(type, this); } { Type::accept(type, this); }
CPLUSPLUS_END_NAMESPACE

8
src/shared/cplusplus/TypeVisitor.h
View File

@@ -51,8 +51,8 @@
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
CPLUSPLUS_BEGIN_HEADER
CPLUSPLUS_BEGIN_NAMESPACE namespace CPlusPlus {
class CPLUSPLUS_EXPORT TypeVisitor class CPLUSPLUS_EXPORT TypeVisitor
{ {
@@ -88,7 +88,7 @@ public:
virtual void visit(ObjCForwardProtocolDeclaration*) {} virtual void visit(ObjCForwardProtocolDeclaration*) {}
}; };
CPLUSPLUS_END_NAMESPACE } // end of namespace CPlusPlus
CPLUSPLUS_END_HEADER
#endif // CPLUSPLUS_TYPEVISITOR_H #endif // CPLUSPLUS_TYPEVISITOR_H

2
tests/auto/cplusplus/ast/tst_ast.cpp
View File

@@ -7,7 +7,7 @@
#include <Parser.h> #include <Parser.h>
#include <AST.h> #include <AST.h>
CPLUSPLUS_USE_NAMESPACE using namespace CPlusPlus;
class tst_AST: public QObject class tst_AST: public QObject
{ {

2
tests/auto/cplusplus/lookup/tst_lookup.cpp
View File

@@ -10,7 +10,7 @@
#include <Symbols.h> #include <Symbols.h>
#include <Overview.h> #include <Overview.h>
CPLUSPLUS_USE_NAMESPACE using namespace CPlusPlus;
template <template <typename, typename> class _Map, typename _T1, typename _T2> template <template <typename, typename> class _Map, typename _T1, typename _T2>
_Map<_T2, _T1> invert(const _Map<_T1, _T2> &m) _Map<_T2, _T1> invert(const _Map<_T1, _T2> &m)

2
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -13,7 +13,7 @@
#include <Literals.h> #include <Literals.h>
#include <DiagnosticClient.h> #include <DiagnosticClient.h>
CPLUSPLUS_USE_NAMESPACE using namespace CPlusPlus;
class tst_Semantic: public QObject class tst_Semantic: public QObject
{ {