[cfe-commits] r105179 - in /cfe/trunk/include/clang: AST/CMakeLists.txt AST/DeclNodes.td AST/Makefile AST/StmtNodes.td Basic/DeclNodes.td Basic/StmtNodes.td
Sean Hunt
rideau3 at gmail.com
Sun May 30 15:44:37 PDT 2010
Author: coppro
Date: Sun May 30 17:44:37 2010
New Revision: 105179
URL: http://llvm.org/viewvc/llvm-project?rev=105179&view=rev
Log:
Move .td files from AST to Basic.
Parse will need to see these files because it needs to know how to parse
attributes. The generated files are still placed in the appropriate directory so
as to preserve layering. No functional change.
Added:
cfe/trunk/include/clang/Basic/DeclNodes.td
- copied, changed from r105165, cfe/trunk/include/clang/AST/DeclNodes.td
cfe/trunk/include/clang/Basic/StmtNodes.td
- copied, changed from r105165, cfe/trunk/include/clang/AST/StmtNodes.td
Removed:
cfe/trunk/include/clang/AST/DeclNodes.td
cfe/trunk/include/clang/AST/StmtNodes.td
Modified:
cfe/trunk/include/clang/AST/CMakeLists.txt
cfe/trunk/include/clang/AST/Makefile
Modified: cfe/trunk/include/clang/AST/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/CMakeLists.txt?rev=105179&r1=105178&r2=105179&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/CMakeLists.txt (original)
+++ cfe/trunk/include/clang/AST/CMakeLists.txt Sun May 30 17:44:37 2010
@@ -1,10 +1,10 @@
-set(LLVM_TARGET_DEFINITIONS StmtNodes.td)
+set(LLVM_TARGET_DEFINITIONS ../Basic/StmtNodes.td)
tablegen(StmtNodes.inc
-gen-clang-stmt-nodes)
add_custom_target(ClangStmtNodes
DEPENDS StmtNodes.inc)
-set(LLVM_TARGET_DEFINITIONS DeclNodes.td)
+set(LLVM_TARGET_DEFINITIONS ../Basic/DeclNodes.td)
tablegen(DeclNodes.inc
-gen-clang-decl-nodes)
add_custom_target(ClangDeclNodes
Removed: cfe/trunk/include/clang/AST/DeclNodes.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclNodes.td?rev=105178&view=auto
==============================================================================
--- cfe/trunk/include/clang/AST/DeclNodes.td (original)
+++ cfe/trunk/include/clang/AST/DeclNodes.td (removed)
@@ -1,67 +0,0 @@
-class Decl<bit abstract = 0> {
- bit Abstract = abstract;
-}
-
-class DDecl<Decl base, bit abstract = 0> : Decl<abstract> {
- Decl Base = base;
-}
-
-class DeclContext { }
-
-def TranslationUnit : Decl, DeclContext;
-def Named : Decl<1>;
- def Namespace : DDecl<Named>, DeclContext;
- def UsingDirective : DDecl<Named>;
- def NamespaceAlias : DDecl<Named>;
- def Type : DDecl<Named, 1>;
- def Typedef : DDecl<Type>;
- def UnresolvedUsingTypename : DDecl<Type>;
- def Tag : DDecl<Type, 1>, DeclContext;
- def Enum : DDecl<Tag>;
- def Record : DDecl<Tag>;
- def CXXRecord : DDecl<Record>;
- def ClassTemplateSpecialization : DDecl<CXXRecord>;
- def ClassTemplatePartialSpecialization
- : DDecl<ClassTemplateSpecialization>;
- def TemplateTypeParm : DDecl<Type>;
- def Value : DDecl<Named, 1>;
- def EnumConstant : DDecl<Value>;
- def UnresolvedUsingValue : DDecl<Value>;
- def Declarator : DDecl<Value, 1>;
- def Function : DDecl<Declarator>, DeclContext;
- def CXXMethod : DDecl<Function>;
- def CXXConstructor : DDecl<CXXMethod>;
- def CXXDestructor : DDecl<CXXMethod>;
- def CXXConversion : DDecl<CXXMethod>;
- def Field : DDecl<Declarator>;
- def ObjCIvar : DDecl<Field>;
- def ObjCAtDefsField : DDecl<Field>;
- def Var : DDecl<Declarator>;
- def ImplicitParam : DDecl<Var>;
- def ParmVar : DDecl<Var>;
- def NonTypeTemplateParm : DDecl<Var>;
- def Template : DDecl<Named, 1>;
- def FunctionTemplate : DDecl<Template>;
- def ClassTemplate : DDecl<Template>;
- def TemplateTemplateParm : DDecl<Template>;
- def Using : DDecl<Named>;
- def UsingShadow : DDecl<Named>;
- def ObjCMethod : DDecl<Named>, DeclContext;
- def ObjCContainer : DDecl<Named, 1>, DeclContext;
- def ObjCCategory : DDecl<ObjCContainer>;
- def ObjCProtocol : DDecl<ObjCContainer>;
- def ObjCInterface : DDecl<ObjCContainer>;
- def ObjCImpl : DDecl<ObjCContainer, 1>;
- def ObjCCategoryImpl : DDecl<ObjCImpl>;
- def ObjCImplementation : DDecl<ObjCImpl>;
- def ObjCProperty : DDecl<Named>;
- def ObjCCompatibleAlias : DDecl<Named>;
-def LinkageSpec : Decl, DeclContext;
-def ObjCPropertyImpl : Decl;
-def ObjCForwardProtocol : Decl;
-def ObjCClass : Decl;
-def FileScopeAsm : Decl;
-def Friend : Decl;
-def FriendTemplate : Decl;
-def StaticAssert : Decl;
-def Block : Decl, DeclContext;
Modified: cfe/trunk/include/clang/AST/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Makefile?rev=105179&r1=105178&r2=105179&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Makefile (original)
+++ cfe/trunk/include/clang/AST/Makefile Sun May 30 17:44:37 2010
@@ -1,16 +1,17 @@
LEVEL = ../../../../..
BUILT_SOURCES = StmtNodes.inc DeclNodes.inc
+TD_SRC_DIR = $(PROJ_SRC_DIR)/../Basic
TABLEGEN_INC_FILES_COMMON = 1
include $(LEVEL)/Makefile.common
-INPUT_TDS = $(PROJ_SRC_DIR)/StmtNodes.td $(PROJ_SRC_DIR)/DeclNodes.td
+INPUT_TDS = $(TD_SRC_DIR)/StmtNodes.td $(TD_SRC_DIR)/DeclNodes.td
-$(ObjDir)/StmtNodes.inc.tmp : StmtNodes.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) $(ObjDir)/.dir
$(Echo) "Building Clang statement node tables with tblgen"
$(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $<
-$(ObjDir)/DeclNodes.inc.tmp : DeclNodes.td $(TBLGEN) $(ObjDir)/.dir
+$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) $(ObjDir)/.dir
$(Echo) "Building Clang declaration node tables with tblgen"
$(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $<
Removed: cfe/trunk/include/clang/AST/StmtNodes.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/StmtNodes.td?rev=105178&view=auto
==============================================================================
--- cfe/trunk/include/clang/AST/StmtNodes.td (original)
+++ cfe/trunk/include/clang/AST/StmtNodes.td (removed)
@@ -1,127 +0,0 @@
-class Stmt<bit abstract = 0> {
- bit Abstract = abstract;
-}
-
-class DStmt<Stmt base, bit abstract = 0> : Stmt<abstract> {
- Stmt Base = base;
-}
-
-// Statements
-def NullStmt : Stmt;
-def CompoundStmt : Stmt;
-def LabelStmt : Stmt;
-def IfStmt : Stmt;
-def SwitchStmt : Stmt;
-def WhileStmt : Stmt;
-def DoStmt : Stmt;
-def ForStmt : Stmt;
-def GotoStmt : Stmt;
-def IndirectGotoStmt : Stmt;
-def ContinueStmt : Stmt;
-def BreakStmt : Stmt;
-def ReturnStmt : Stmt;
-def DeclStmt : Stmt;
-def SwitchCase : Stmt;
-def CaseStmt : DStmt<SwitchCase>;
-def DefaultStmt : DStmt<SwitchCase>;
-
-// GNU Extensions
-def AsmStmt : Stmt;
-
-// Obj-C statements
-def ObjCAtTryStmt : Stmt;
-def ObjCAtCatchStmt : Stmt;
-def ObjCAtFinallyStmt : Stmt;
-def ObjCAtThrowStmt : Stmt;
-def ObjCAtSynchronizedStmt : Stmt;
-def ObjCForCollectionStmt : Stmt;
-
-// C++ statments
-def CXXCatchStmt : Stmt;
-def CXXTryStmt : Stmt;
-
-// Expressions
-def Expr : Stmt<1>;
-def PredefinedExpr : DStmt<Expr>;
-def DeclRefExpr : DStmt<Expr>;
-def IntegerLiteral : DStmt<Expr>;
-def FloatingLiteral : DStmt<Expr>;
-def ImaginaryLiteral : DStmt<Expr>;
-def StringLiteral : DStmt<Expr>;
-def CharacterLiteral : DStmt<Expr>;
-def ParenExpr : DStmt<Expr>;
-def UnaryOperator : DStmt<Expr>;
-def OffsetOfExpr : DStmt<Expr>;
-def SizeOfAlignOfExpr : DStmt<Expr>;
-def ArraySubscriptExpr : DStmt<Expr>;
-def CallExpr : DStmt<Expr>;
-def MemberExpr : DStmt<Expr>;
-def CastExpr : DStmt<Expr, 1>;
-def BinaryOperator : DStmt<Expr>;
-def CompoundAssignOperator : DStmt<BinaryOperator>;
-def ConditionalOperator : DStmt<Expr>;
-def ImplicitCastExpr : DStmt<CastExpr>;
-def ExplicitCastExpr : DStmt<CastExpr, 1>;
-def CStyleCastExpr : DStmt<ExplicitCastExpr>;
-def CompoundLiteralExpr : DStmt<Expr>;
-def ExtVectorElementExpr : DStmt<Expr>;
-def InitListExpr : DStmt<Expr>;
-def DesignatedInitExpr : DStmt<Expr>;
-def ImplicitValueInitExpr : DStmt<Expr>;
-def ParenListExpr : DStmt<Expr>;
-def VAArgExpr : DStmt<Expr>;
-
-// GNU Extensions.
-def AddrLabelExpr : DStmt<Expr>;
-def StmtExpr : DStmt<Expr>;
-def TypesCompatibleExpr : DStmt<Expr>;
-def ChooseExpr : DStmt<Expr>;
-def GNUNullExpr : DStmt<Expr>;
-
-// C++ Expressions.
-def CXXOperatorCallExpr : DStmt<CallExpr>;
-def CXXMemberCallExpr : DStmt<CallExpr>;
-def CXXNamedCastExpr : DStmt<ExplicitCastExpr, 1>;
-def CXXStaticCastExpr : DStmt<CXXNamedCastExpr>;
-def CXXDynamicCastExpr : DStmt<CXXNamedCastExpr>;
-def CXXReinterpretCastExpr : DStmt<CXXNamedCastExpr>;
-def CXXConstCastExpr : DStmt<CXXNamedCastExpr>;
-def CXXFunctionalCastExpr : DStmt<ExplicitCastExpr>;
-def CXXTypeidExpr : DStmt<Expr>;
-def CXXBoolLiteralExpr : DStmt<Expr>;
-def CXXNullPtrLiteralExpr : DStmt<Expr>;
-def CXXThisExpr : DStmt<Expr>;
-def CXXThrowExpr : DStmt<Expr>;
-def CXXDefaultArgExpr : DStmt<Expr>;
-def CXXZeroInitValueExpr : DStmt<Expr>;
-def CXXNewExpr : DStmt<Expr>;
-def CXXDeleteExpr : DStmt<Expr>;
-def CXXPseudoDestructorExpr : DStmt<Expr>;
-def UnresolvedLookupExpr : DStmt<Expr>;
-def UnaryTypeTraitExpr : DStmt<Expr>;
-def DependentScopeDeclRefExpr : DStmt<Expr>;
-def CXXConstructExpr : DStmt<Expr>;
-def CXXBindTemporaryExpr : DStmt<Expr>;
-def CXXBindReferenceExpr : DStmt<Expr>;
-def CXXExprWithTemporaries : DStmt<Expr>;
-def CXXTemporaryObjectExpr : DStmt<CXXConstructExpr>;
-def CXXUnresolvedConstructExpr : DStmt<Expr>;
-def CXXDependentScopeMemberExpr : DStmt<Expr>;
-def UnresolvedMemberExpr : DStmt<Expr>;
-
-// Obj-C Expressions.
-def ObjCStringLiteral : DStmt<Expr>;
-def ObjCEncodeExpr : DStmt<Expr>;
-def ObjCMessageExpr : DStmt<Expr>;
-def ObjCSelectorExpr : DStmt<Expr>;
-def ObjCProtocolExpr : DStmt<Expr>;
-def ObjCIvarRefExpr : DStmt<Expr>;
-def ObjCPropertyRefExpr : DStmt<Expr>;
-def ObjCImplicitSetterGetterRefExpr : DStmt<Expr>;
-def ObjCSuperExpr : DStmt<Expr>;
-def ObjCIsaExpr : DStmt<Expr>;
-
-// Clang Extensions.
-def ShuffleVectorExpr : DStmt<Expr>;
-def BlockExpr : DStmt<Expr>;
-def BlockDeclRefExpr : DStmt<Expr>;
Copied: cfe/trunk/include/clang/Basic/DeclNodes.td (from r105165, cfe/trunk/include/clang/AST/DeclNodes.td)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DeclNodes.td?p2=cfe/trunk/include/clang/Basic/DeclNodes.td&p1=cfe/trunk/include/clang/AST/DeclNodes.td&r1=105165&r2=105179&rev=105179&view=diff
==============================================================================
(empty)
Copied: cfe/trunk/include/clang/Basic/StmtNodes.td (from r105165, cfe/trunk/include/clang/AST/StmtNodes.td)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/StmtNodes.td?p2=cfe/trunk/include/clang/Basic/StmtNodes.td&p1=cfe/trunk/include/clang/AST/StmtNodes.td&r1=105165&r2=105179&rev=105179&view=diff
==============================================================================
(empty)
More information about the cfe-commits
mailing list