From d83f5b1d9841f5b32f94cf43c53a07f486fc6010 Mon Sep 17 00:00:00 2001 From: Bernhard Scholz Date: Tue, 28 Jul 2020 12:30:26 +1000 Subject: [PATCH] Renamed AST files --- src/AstToRamTranslator.cpp | 28 +++---- src/AstToRamTranslator.h | 8 +- src/Makefile.am | 84 +++++++++---------- src/ParserDriver.cpp | 22 ++--- src/ParserDriver.h | 4 +- src/ast/TranslationUnit.h | 2 +- src/ast/Utils.cpp | 2 +- .../analysis/{AstAnalysis.h => Analysis.h} | 2 +- src/ast/analysis/AuxArity.h | 8 +- src/ast/analysis/ComponentLookup.cpp | 8 +- src/ast/analysis/ComponentLookup.h | 4 +- .../{AstConstraint.h => Constraint.h} | 12 +-- .../analysis/{AstGround.cpp => Ground.cpp} | 16 ++-- src/ast/analysis/{AstGround.h => Ground.h} | 2 +- .../analysis/{AstIOType.cpp => IOType.cpp} | 18 ++-- src/ast/analysis/{AstIOType.h => IOType.h} | 4 +- src/ast/analysis/PrecedenceGraph.cpp | 10 +-- src/ast/analysis/PrecedenceGraph.h | 4 +- .../{AstProfileUse.cpp => ProfileUse.cpp} | 6 +- .../{AstProfileUse.h => ProfileUse.h} | 6 +- src/ast/analysis/RecursiveClauses.cpp | 14 ++-- src/ast/analysis/RecursiveClauses.h | 2 +- src/ast/analysis/RedundantRelations.cpp | 10 +-- src/ast/analysis/RedundantRelations.h | 2 +- src/ast/analysis/RelationDetailCache.cpp | 14 ++-- src/ast/analysis/RelationDetailCache.h | 6 +- src/ast/analysis/RelationSchedule.cpp | 6 +- src/ast/analysis/RelationSchedule.h | 2 +- src/ast/analysis/SCCGraph.cpp | 10 +-- src/ast/analysis/SCCGraph.h | 6 +- .../analysis/TopologicallySortedSCCGraph.cpp | 6 +- .../analysis/TopologicallySortedSCCGraph.h | 2 +- src/ast/analysis/{AstType.cpp => Type.cpp} | 32 +++---- src/ast/analysis/{AstType.h => Type.h} | 6 +- ...ypeEnvironment.cpp => TypeEnvironment.cpp} | 12 +-- ...AstTypeEnvironment.h => TypeEnvironment.h} | 6 +- ...ponentChecker.cpp => ComponentChecker.cpp} | 16 ++-- ...tComponentChecker.h => ComponentChecker.h} | 4 +- src/ast/transform/ComponentInstantiation.cpp | 24 +++--- src/ast/transform/ComponentInstantiation.h | 2 +- src/ast/transform/Conditional.h | 2 +- src/ast/transform/DebugReporter.cpp | 6 +- src/ast/transform/DebugReporter.h | 2 +- src/ast/transform/Fixpoint.h | 2 +- src/ast/transform/FoldAnonymousRecords.cpp | 14 ++-- src/ast/transform/FoldAnonymousRecords.h | 2 +- src/ast/transform/IOAttributes.h | 6 +- src/ast/transform/IODefaults.h | 4 +- src/ast/transform/InlineRelations.cpp | 22 ++--- src/ast/transform/InlineRelations.h | 2 +- src/ast/transform/MagicSet.cpp | 16 ++-- src/ast/transform/MagicSet.h | 16 ++-- .../MaterializeAggregationQueries.cpp | 30 +++---- .../transform/MaterializeAggregationQueries.h | 2 +- .../MaterializeSingletonAggregation.cpp | 24 +++--- .../MaterializeSingletonAggregation.h | 2 +- src/ast/transform/MinimiseProgram.cpp | 20 ++--- src/ast/transform/MinimiseProgram.h | 2 +- src/ast/transform/NameUnnamedVariables.cpp | 12 +-- src/ast/transform/NameUnnamedVariables.h | 2 +- src/ast/transform/NormaliseConstraints.cpp | 16 ++-- src/ast/transform/NormaliseConstraints.h | 2 +- src/ast/transform/PartitionBodyLiterals.cpp | 18 ++-- src/ast/transform/PartitionBodyLiterals.h | 2 +- src/ast/transform/Pipeline.h | 2 +- src/ast/transform/PolymorphicObjects.cpp | 14 ++-- src/ast/transform/PolymorphicObjects.h | 2 +- ...AstPragmaChecker.cpp => PragmaChecker.cpp} | 12 +-- .../{AstPragmaChecker.h => PragmaChecker.h} | 4 +- src/ast/transform/Provenance.cpp | 22 ++--- src/ast/transform/Provenance.h | 2 +- src/ast/transform/ReduceExistentials.cpp | 24 +++--- src/ast/transform/ReduceExistentials.h | 2 +- .../transform/RemoveBooleanConstraints.cpp | 18 ++-- src/ast/transform/RemoveBooleanConstraints.h | 2 +- src/ast/transform/RemoveEmptyRelations.cpp | 20 ++--- src/ast/transform/RemoveEmptyRelations.h | 2 +- .../transform/RemoveRedundantRelations.cpp | 6 +- src/ast/transform/RemoveRedundantRelations.h | 2 +- src/ast/transform/RemoveRedundantSums.cpp | 10 +-- src/ast/transform/RemoveRedundantSums.h | 2 +- src/ast/transform/RemoveRelationCopies.cpp | 22 ++--- src/ast/transform/RemoveRelationCopies.h | 2 +- src/ast/transform/RemoveTypecasts.cpp | 10 +-- src/ast/transform/RemoveTypecasts.h | 2 +- src/ast/transform/ReorderLiterals.cpp | 18 ++-- src/ast/transform/ReorderLiterals.h | 2 +- .../transform/ReplaceSingletonVariables.cpp | 16 ++-- src/ast/transform/ReplaceSingletonVariables.h | 2 +- src/ast/transform/ResolveAliases.cpp | 18 ++-- src/ast/transform/ResolveAliases.h | 2 +- .../ResolveAnonymousRecordsAliases.cpp | 18 ++-- .../ResolveAnonymousRecordsAliases.h | 2 +- ...emanticChecker.cpp => SemanticChecker.cpp} | 40 ++++----- ...AstSemanticChecker.h => SemanticChecker.h} | 4 +- .../{AstTransformer.cpp => Transformer.cpp} | 6 +- .../{AstTransformer.h => Transformer.h} | 2 +- .../transform/UniqueAggregationVariables.cpp | 10 +-- .../transform/UniqueAggregationVariables.h | 2 +- ...edFunctors.cpp => UserDefinedFunctors.cpp} | 16 ++-- ...efinedFunctors.h => UserDefinedFunctors.h} | 4 +- src/ast/transform/While.h | 2 +- src/main.cpp | 16 ++-- src/parser.yy | 18 ++-- src/scanner.ll | 2 +- 105 files changed, 520 insertions(+), 520 deletions(-) rename src/ast/analysis/{AstAnalysis.h => Analysis.h} (98%) rename src/ast/analysis/{AstConstraint.h => Constraint.h} (96%) rename src/ast/analysis/{AstGround.cpp => Ground.cpp} (96%) rename src/ast/analysis/{AstGround.h => Ground.h} (98%) rename src/ast/analysis/{AstIOType.cpp => IOType.cpp} (86%) rename src/ast/analysis/{AstIOType.h => IOType.h} (96%) rename src/ast/analysis/{AstProfileUse.cpp => ProfileUse.cpp} (94%) rename src/ast/analysis/{AstProfileUse.h => ProfileUse.h} (94%) rename src/ast/analysis/{AstType.cpp => Type.cpp} (98%) rename src/ast/analysis/{AstType.h => Type.h} (96%) rename src/ast/analysis/{AstTypeEnvironment.cpp => TypeEnvironment.cpp} (97%) rename src/ast/analysis/{AstTypeEnvironment.h => TypeEnvironment.h} (94%) rename src/ast/transform/{AstComponentChecker.cpp => ComponentChecker.cpp} (97%) rename src/ast/transform/{AstComponentChecker.h => ComponentChecker.h} (96%) rename src/ast/transform/{AstPragmaChecker.cpp => PragmaChecker.cpp} (85%) rename src/ast/transform/{AstPragmaChecker.h => PragmaChecker.h} (92%) rename src/ast/transform/{AstSemanticChecker.cpp => SemanticChecker.cpp} (98%) rename src/ast/transform/{AstSemanticChecker.h => SemanticChecker.h} (96%) rename src/ast/transform/{AstTransformer.cpp => Transformer.cpp} (93%) rename src/ast/transform/{AstTransformer.h => Transformer.h} (98%) rename src/ast/transform/{AstUserDefinedFunctors.cpp => UserDefinedFunctors.cpp} (89%) rename src/ast/transform/{AstUserDefinedFunctors.h => UserDefinedFunctors.h} (93%) diff --git a/src/AstToRamTranslator.cpp b/src/AstToRamTranslator.cpp index da934c1025a..d15989764f0 100644 --- a/src/AstToRamTranslator.cpp +++ b/src/AstToRamTranslator.cpp @@ -22,21 +22,21 @@ #include "LogStatement.h" #include "RelationTag.h" #include "SrcLocation.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstIO.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstType.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/IO.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Type.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstTypeEnvironment.h" +#include "ast/analysis/TypeEnvironment.h" #include "ast/analysis/AuxArity.h" #include "ast/analysis/RelationSchedule.h" #include "ast/analysis/SCCGraph.h" diff --git a/src/AstToRamTranslator.h b/src/AstToRamTranslator.h index 0bdbdd32836..619ddaa3041 100644 --- a/src/AstToRamTranslator.h +++ b/src/AstToRamTranslator.h @@ -18,10 +18,10 @@ #include "RamTypes.h" #include "SymbolTable.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstNode.h" -#include "ast/AstQualifiedName.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Node.h" +#include "ast/QualifiedName.h" #include "json11.h" #include "ram/RamRelation.h" #include "ram/RamStatement.h" diff --git a/src/Makefile.am b/src/Makefile.am index 9facbde08e1..5f11bc5c898 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,40 +104,40 @@ souffle_sources = \ WriteStream.h \ WriteStreamCSV.h \ WriteStreamJSON.h \ - ast/AstAbstract.h \ - ast/AstArgument.h \ - ast/AstAttribute.h \ - ast/AstClause.h \ - ast/AstComponent.h \ - ast/AstFunctorDeclaration.h \ - ast/AstIO.h \ - ast/AstLiteral.h \ - ast/AstNode.h \ - ast/AstParserUtils.cpp \ - ast/AstParserUtils.h \ - ast/AstPragma.h \ - ast/AstProgram.h \ - ast/AstQualifiedName.h \ - ast/AstRelation.h \ - ast/AstTranslationUnit.h \ - ast/AstType.h \ - ast/AstUtils.cpp \ - ast/AstUtils.h \ - ast/AstVisitor.h \ + ast/Abstract.h \ + ast/Argument.h \ + ast/Attribute.h \ + ast/Clause.h \ + ast/Component.h \ + ast/FunctorDeclaration.h \ + ast/IO.h \ + ast/Literal.h \ + ast/Node.h \ + ast/ParserUtils.cpp \ + ast/ParserUtils.h \ + ast/Pragma.h \ + ast/Program.h \ + ast/QualifiedName.h \ + ast/Relation.h \ + ast/TranslationUnit.h \ + ast/Type.h \ + ast/Utils.cpp \ + ast/Utils.h \ + ast/Visitor.h \ ast/TypeSystem.cpp \ ast/TypeSystem.h \ - ast/analysis/AstAnalysis.h \ - ast/analysis/AstConstraint.h \ - ast/analysis/AstGround.cpp \ - ast/analysis/AstGround.h \ - ast/analysis/AstIOType.cpp \ - ast/analysis/AstIOType.h \ - ast/analysis/AstProfileUse.cpp \ - ast/analysis/AstProfileUse.h \ - ast/analysis/AstType.cpp \ - ast/analysis/AstType.h \ - ast/analysis/AstTypeEnvironment.cpp \ - ast/analysis/AstTypeEnvironment.h \ + ast/analysis/Analysis.h \ + ast/analysis/Constraint.h \ + ast/analysis/Ground.cpp \ + ast/analysis/Ground.h \ + ast/analysis/IOType.cpp \ + ast/analysis/IOType.h \ + ast/analysis/ProfileUse.cpp \ + ast/analysis/ProfileUse.h \ + ast/analysis/Type.cpp \ + ast/analysis/Type.h \ + ast/analysis/TypeEnvironment.cpp \ + ast/analysis/TypeEnvironment.h \ ast/analysis/AuxArity.cpp \ ast/analysis/AuxArity.h \ ast/analysis/ComponentLookup.cpp \ @@ -156,16 +156,16 @@ souffle_sources = \ ast/analysis/SCCGraph.h \ ast/analysis/TopologicallySortedSCCGraph.cpp \ ast/analysis/TopologicallySortedSCCGraph.h \ - ast/transform/AstComponentChecker.cpp \ - ast/transform/AstComponentChecker.h \ - ast/transform/AstPragmaChecker.cpp \ - ast/transform/AstPragmaChecker.h \ - ast/transform/AstSemanticChecker.cpp \ - ast/transform/AstSemanticChecker.h \ - ast/transform/AstTransformer.cpp \ - ast/transform/AstTransformer.h \ - ast/transform/AstUserDefinedFunctors.cpp \ - ast/transform/AstUserDefinedFunctors.h \ + ast/transform/ComponentChecker.cpp \ + ast/transform/ComponentChecker.h \ + ast/transform/PragmaChecker.cpp \ + ast/transform/PragmaChecker.h \ + ast/transform/SemanticChecker.cpp \ + ast/transform/SemanticChecker.h \ + ast/transform/Transformer.cpp \ + ast/transform/Transformer.h \ + ast/transform/UserDefinedFunctors.cpp \ + ast/transform/UserDefinedFunctors.h \ ast/transform/ComponentInstantiation.cpp \ ast/transform/ComponentInstantiation.h \ ast/transform/Conditional.h \ diff --git a/src/ParserDriver.cpp b/src/ParserDriver.cpp index 6e4ce387e7f..b1dcde38b90 100644 --- a/src/ParserDriver.cpp +++ b/src/ParserDriver.cpp @@ -16,17 +16,17 @@ #include "ParserDriver.h" #include "ErrorReport.h" -#include "ast/AstClause.h" -#include "ast/AstComponent.h" -#include "ast/AstFunctorDeclaration.h" -#include "ast/AstIO.h" -#include "ast/AstPragma.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstType.h" -#include "ast/AstUtils.h" +#include "ast/Clause.h" +#include "ast/Component.h" +#include "ast/FunctorDeclaration.h" +#include "ast/IO.h" +#include "ast/Pragma.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Type.h" +#include "ast/Utils.h" #include "utility/ContainerUtil.h" #include "utility/FunctionalUtil.h" #include "utility/MiscUtil.h" diff --git a/src/ParserDriver.h b/src/ParserDriver.h index 5fc401b38ae..70477a005b6 100644 --- a/src/ParserDriver.h +++ b/src/ParserDriver.h @@ -19,8 +19,8 @@ #include "RamTypes.h" #include "RelationTag.h" #include "SrcLocation.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstTranslationUnit.h" +#include "ast/QualifiedName.h" +#include "ast/TranslationUnit.h" #include "parser.hh" #include #include diff --git a/src/ast/TranslationUnit.h b/src/ast/TranslationUnit.h index 0b0ee29df4a..b0835028e70 100644 --- a/src/ast/TranslationUnit.h +++ b/src/ast/TranslationUnit.h @@ -21,7 +21,7 @@ #include "DebugReport.h" #include "Global.h" #include "ast/Program.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include "ast/analysis/RecursiveClauses.h" #include "ast/analysis/SCCGraph.h" #include diff --git a/src/ast/Utils.cpp b/src/ast/Utils.cpp index dae32b315c0..432e6836572 100644 --- a/src/ast/Utils.cpp +++ b/src/ast/Utils.cpp @@ -28,7 +28,7 @@ #include "ast/Relation.h" #include "ast/Type.h" #include "ast/Visitor.h" -#include "ast/analysis/AstType.h" +#include "ast/analysis/Type.h" #include "utility/ContainerUtil.h" #include "utility/MiscUtil.h" #include "utility/StringUtil.h" diff --git a/src/ast/analysis/AstAnalysis.h b/src/ast/analysis/Analysis.h similarity index 98% rename from src/ast/analysis/AstAnalysis.h rename to src/ast/analysis/Analysis.h index 0f89f07abf6..c4ed4f7e2e2 100644 --- a/src/ast/analysis/AstAnalysis.h +++ b/src/ast/analysis/Analysis.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstAnalysis.h + * @file Analysis.h * * Defines an interface for AST analysis * diff --git a/src/ast/analysis/AuxArity.h b/src/ast/analysis/AuxArity.h index 5058d42ad63..1cf26455c40 100644 --- a/src/ast/analysis/AuxArity.h +++ b/src/ast/analysis/AuxArity.h @@ -16,10 +16,10 @@ #pragma once -#include "ast/AstLiteral.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/Literal.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/analysis/Analysis.h" #include #include diff --git a/src/ast/analysis/ComponentLookup.cpp b/src/ast/analysis/ComponentLookup.cpp index ce0912d72c5..8abd25a2e4b 100644 --- a/src/ast/analysis/ComponentLookup.cpp +++ b/src/ast/analysis/ComponentLookup.cpp @@ -15,10 +15,10 @@ ***********************************************************************/ #include "ast/analysis/ComponentLookup.h" -#include "ast/AstComponent.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstVisitor.h" +#include "ast/Component.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Visitor.h" #include "utility/StringUtil.h" namespace souffle { diff --git a/src/ast/analysis/ComponentLookup.h b/src/ast/analysis/ComponentLookup.h index 617e728029f..1951c1e397b 100644 --- a/src/ast/analysis/ComponentLookup.h +++ b/src/ast/analysis/ComponentLookup.h @@ -14,8 +14,8 @@ #pragma once -#include "ast/AstQualifiedName.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/QualifiedName.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/AstConstraint.h b/src/ast/analysis/Constraint.h similarity index 96% rename from src/ast/analysis/AstConstraint.h rename to src/ast/analysis/Constraint.h index 3e500c28c4a..d7317afd329 100644 --- a/src/ast/analysis/AstConstraint.h +++ b/src/ast/analysis/Constraint.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstConstraint.h + * @file Constraint.h * * Contains AST Constraint Analysis Infrastructure for doing constraint analysis on AST objects * @@ -17,11 +17,11 @@ #pragma once #include "Constraints.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstNode.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Node.h" +#include "ast/Visitor.h" #include #include #include diff --git a/src/ast/analysis/AstGround.cpp b/src/ast/analysis/Ground.cpp similarity index 96% rename from src/ast/analysis/AstGround.cpp rename to src/ast/analysis/Ground.cpp index 26fb6193443..6404be05f7f 100644 --- a/src/ast/analysis/AstGround.cpp +++ b/src/ast/analysis/Ground.cpp @@ -8,22 +8,22 @@ /************************************************************************ * - * @file AstGroundAnalysis.cpp + * @file GroundAnalysis.cpp * * Implements AST Analysis methods to find the grounded arguments in a clause * ***********************************************************************/ -#include "ast/analysis/AstGround.h" +#include "ast/analysis/Ground.h" #include "BinaryConstraintOps.h" #include "Constraints.h" #include "RelationTag.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/analysis/AstConstraint.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/analysis/Constraint.h" #include "ast/analysis/RelationDetailCache.h" #include "utility/StreamUtil.h" #include diff --git a/src/ast/analysis/AstGround.h b/src/ast/analysis/Ground.h similarity index 98% rename from src/ast/analysis/AstGround.h rename to src/ast/analysis/Ground.h index d79ac60b912..74a392a1426 100644 --- a/src/ast/analysis/AstGround.h +++ b/src/ast/analysis/Ground.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstGround.h + * @file Ground.h * * Defines a function for computing the grounded arguments in a clause * diff --git a/src/ast/analysis/AstIOType.cpp b/src/ast/analysis/IOType.cpp similarity index 86% rename from src/ast/analysis/AstIOType.cpp rename to src/ast/analysis/IOType.cpp index cac34cdcc46..e4c53098364 100644 --- a/src/ast/analysis/AstIOType.cpp +++ b/src/ast/analysis/IOType.cpp @@ -8,20 +8,20 @@ /************************************************************************ * - * @file AstIOTypeAnalysis.cpp + * @file IOTypeAnalysis.cpp * * Implements methods to identify a relation as input, output, or printsize. * ***********************************************************************/ -#include "ast/analysis/AstIOType.h" -#include "ast/AstIO.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/analysis/IOType.h" +#include "ast/IO.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "utility/StreamUtil.h" #include #include diff --git a/src/ast/analysis/AstIOType.h b/src/ast/analysis/IOType.h similarity index 96% rename from src/ast/analysis/AstIOType.h rename to src/ast/analysis/IOType.h index 181c947dc83..ae5c8a6965e 100644 --- a/src/ast/analysis/AstIOType.h +++ b/src/ast/analysis/IOType.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstIOType.h + * @file IOType.h * * Declares methods to identify a relation as input, output, or printsize. * @@ -16,7 +16,7 @@ #pragma once -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/PrecedenceGraph.cpp b/src/ast/analysis/PrecedenceGraph.cpp index e328cd154c3..c2e71aeef49 100644 --- a/src/ast/analysis/PrecedenceGraph.cpp +++ b/src/ast/analysis/PrecedenceGraph.cpp @@ -18,11 +18,11 @@ #include "ast/analysis/PrecedenceGraph.h" #include "GraphUtils.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include #include #include diff --git a/src/ast/analysis/PrecedenceGraph.h b/src/ast/analysis/PrecedenceGraph.h index a0f433a00a8..df761a365d0 100644 --- a/src/ast/analysis/PrecedenceGraph.h +++ b/src/ast/analysis/PrecedenceGraph.h @@ -19,8 +19,8 @@ #pragma once #include "GraphUtils.h" -#include "ast/AstRelation.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/Relation.h" +#include "ast/analysis/Analysis.h" #include #include diff --git a/src/ast/analysis/AstProfileUse.cpp b/src/ast/analysis/ProfileUse.cpp similarity index 94% rename from src/ast/analysis/AstProfileUse.cpp rename to src/ast/analysis/ProfileUse.cpp index 049c8ff6d82..3fc72e78d32 100644 --- a/src/ast/analysis/AstProfileUse.cpp +++ b/src/ast/analysis/ProfileUse.cpp @@ -8,16 +8,16 @@ /************************************************************************ * - * @file AstProfileUse.cpp + * @file ProfileUse.cpp * * Implements an AstAnalysis that provides profile information * from a profile log file for profile-guided optimisations. * ***********************************************************************/ -#include "ast/analysis/AstProfileUse.h" +#include "ast/analysis/ProfileUse.h" #include "Global.h" -#include "ast/AstQualifiedName.h" +#include "ast/QualifiedName.h" #include "profile/ProgramRun.h" #include "profile/Reader.h" #include "profile/Relation.h" diff --git a/src/ast/analysis/AstProfileUse.h b/src/ast/analysis/ProfileUse.h similarity index 94% rename from src/ast/analysis/AstProfileUse.h rename to src/ast/analysis/ProfileUse.h index 4b8a1c895a5..17d5f4fac1e 100644 --- a/src/ast/analysis/AstProfileUse.h +++ b/src/ast/analysis/ProfileUse.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstProfileUse.h + * @file ProfileUse.h * * Defines a simple class to query profile data from a profile * for profile-guided optimisation. @@ -17,8 +17,8 @@ #pragma once -#include "ast/AstQualifiedName.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/QualifiedName.h" +#include "ast/analysis/Analysis.h" #include "profile/ProgramRun.h" #include #include diff --git a/src/ast/analysis/RecursiveClauses.cpp b/src/ast/analysis/RecursiveClauses.cpp index beff61642b1..2a7117900be 100644 --- a/src/ast/analysis/RecursiveClauses.cpp +++ b/src/ast/analysis/RecursiveClauses.cpp @@ -17,13 +17,13 @@ ***********************************************************************/ #include "ast/analysis/RecursiveClauses.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "ast/analysis/RelationDetailCache.h" #include "utility/StreamUtil.h" #include diff --git a/src/ast/analysis/RecursiveClauses.h b/src/ast/analysis/RecursiveClauses.h index ddd6a9bd817..464e8e061ed 100644 --- a/src/ast/analysis/RecursiveClauses.h +++ b/src/ast/analysis/RecursiveClauses.h @@ -18,7 +18,7 @@ #pragma once -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/RedundantRelations.cpp b/src/ast/analysis/RedundantRelations.cpp index fcda60192f3..d1a876542a3 100644 --- a/src/ast/analysis/RedundantRelations.cpp +++ b/src/ast/analysis/RedundantRelations.cpp @@ -18,11 +18,11 @@ #include "ast/analysis/RedundantRelations.h" #include "GraphUtils.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/analysis/IOType.h" #include "ast/analysis/PrecedenceGraph.h" #include "utility/StreamUtil.h" #include diff --git a/src/ast/analysis/RedundantRelations.h b/src/ast/analysis/RedundantRelations.h index df34c50ef30..6889a68f647 100644 --- a/src/ast/analysis/RedundantRelations.h +++ b/src/ast/analysis/RedundantRelations.h @@ -18,7 +18,7 @@ #pragma once -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/RelationDetailCache.cpp b/src/ast/analysis/RelationDetailCache.cpp index 1b0c57c6c83..4902dc300d9 100644 --- a/src/ast/analysis/RelationDetailCache.cpp +++ b/src/ast/analysis/RelationDetailCache.cpp @@ -17,13 +17,13 @@ ***********************************************************************/ #include "ast/analysis/RelationDetailCache.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" #include #include #include diff --git a/src/ast/analysis/RelationDetailCache.h b/src/ast/analysis/RelationDetailCache.h index 5ad97af0b03..c45732abdcb 100644 --- a/src/ast/analysis/RelationDetailCache.h +++ b/src/ast/analysis/RelationDetailCache.h @@ -18,9 +18,9 @@ #pragma once -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/RelationSchedule.cpp b/src/ast/analysis/RelationSchedule.cpp index 5c30b93ecf7..ef42fab2443 100644 --- a/src/ast/analysis/RelationSchedule.cpp +++ b/src/ast/analysis/RelationSchedule.cpp @@ -18,9 +18,9 @@ #include "ast/analysis/RelationSchedule.h" #include "GraphUtils.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" #include "ast/analysis/PrecedenceGraph.h" #include "ast/analysis/SCCGraph.h" #include "ast/analysis/TopologicallySortedSCCGraph.h" diff --git a/src/ast/analysis/RelationSchedule.h b/src/ast/analysis/RelationSchedule.h index 5b10ae6f13d..772d74ae501 100644 --- a/src/ast/analysis/RelationSchedule.h +++ b/src/ast/analysis/RelationSchedule.h @@ -18,7 +18,7 @@ #pragma once -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/SCCGraph.cpp b/src/ast/analysis/SCCGraph.cpp index a5bf518989d..e920d4a90dd 100644 --- a/src/ast/analysis/SCCGraph.cpp +++ b/src/ast/analysis/SCCGraph.cpp @@ -19,11 +19,11 @@ #include "ast/analysis/SCCGraph.h" #include "Global.h" #include "GraphUtils.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/analysis/IOType.h" #include "utility/StreamUtil.h" #include #include diff --git a/src/ast/analysis/SCCGraph.h b/src/ast/analysis/SCCGraph.h index ebd0ff3164f..cee49533dfa 100644 --- a/src/ast/analysis/SCCGraph.h +++ b/src/ast/analysis/SCCGraph.h @@ -19,9 +19,9 @@ #pragma once #include "GraphUtils.h" -#include "ast/AstRelation.h" -#include "ast/analysis/AstAnalysis.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Relation.h" +#include "ast/analysis/Analysis.h" +#include "ast/analysis/IOType.h" #include "ast/analysis/PrecedenceGraph.h" #include #include diff --git a/src/ast/analysis/TopologicallySortedSCCGraph.cpp b/src/ast/analysis/TopologicallySortedSCCGraph.cpp index 81341f0da14..748db0c297e 100644 --- a/src/ast/analysis/TopologicallySortedSCCGraph.cpp +++ b/src/ast/analysis/TopologicallySortedSCCGraph.cpp @@ -17,9 +17,9 @@ ***********************************************************************/ #include "ast/analysis/TopologicallySortedSCCGraph.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" #include "ast/analysis/SCCGraph.h" #include "utility/StreamUtil.h" #include diff --git a/src/ast/analysis/TopologicallySortedSCCGraph.h b/src/ast/analysis/TopologicallySortedSCCGraph.h index aa93d4ee5a3..14c7317d3b1 100644 --- a/src/ast/analysis/TopologicallySortedSCCGraph.h +++ b/src/ast/analysis/TopologicallySortedSCCGraph.h @@ -18,7 +18,7 @@ #pragma once -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/AstType.cpp b/src/ast/analysis/Type.cpp similarity index 98% rename from src/ast/analysis/AstType.cpp rename to src/ast/analysis/Type.cpp index 83d323cddbe..a1f753650b2 100644 --- a/src/ast/analysis/AstType.cpp +++ b/src/ast/analysis/Type.cpp @@ -8,33 +8,33 @@ /************************************************************************ * - * @file AstTypeAnalysis.cpp + * @file TypeAnalysis.cpp * * Implements a collection of type analyses operating on AST constructs. * ***********************************************************************/ -#include "ast/analysis/AstType.h" +#include "ast/analysis/Type.h" #include "AggregateOp.h" #include "Constraints.h" #include "FunctorOps.h" #include "Global.h" #include "RamTypes.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstConstraint.h" -#include "ast/analysis/AstTypeEnvironment.h" +#include "ast/analysis/Constraint.h" +#include "ast/analysis/TypeEnvironment.h" #include "utility/ContainerUtil.h" #include "utility/FunctionalUtil.h" #include "utility/MiscUtil.h" diff --git a/src/ast/analysis/AstType.h b/src/ast/analysis/Type.h similarity index 96% rename from src/ast/analysis/AstType.h rename to src/ast/analysis/Type.h index 3fc0ad9ab30..0e0f65e8fa5 100644 --- a/src/ast/analysis/AstType.h +++ b/src/ast/analysis/Type.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstType.h + * @file Type.h * * A collection of type analyses operating on AST constructs. * @@ -16,9 +16,9 @@ #pragma once -#include "ast/AstClause.h" +#include "ast/Clause.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include #include #include diff --git a/src/ast/analysis/AstTypeEnvironment.cpp b/src/ast/analysis/TypeEnvironment.cpp similarity index 97% rename from src/ast/analysis/AstTypeEnvironment.cpp rename to src/ast/analysis/TypeEnvironment.cpp index b15d0f23669..30972a8e0b2 100644 --- a/src/ast/analysis/AstTypeEnvironment.cpp +++ b/src/ast/analysis/TypeEnvironment.cpp @@ -8,18 +8,18 @@ /************************************************************************ * - * @file AstTypeEnvironmentAnalysis.cpp + * @file TypeEnvironmentAnalysis.cpp * * Implements AST Analysis methods for a Type Environment * ***********************************************************************/ -#include "ast/analysis/AstTypeEnvironment.h" +#include "ast/analysis/TypeEnvironment.h" #include "GraphUtils.h" -#include "ast/AstAttribute.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstType.h" +#include "ast/Attribute.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Type.h" #include "ast/TypeSystem.h" #include "utility/MiscUtil.h" #include "utility/tinyformat.h" diff --git a/src/ast/analysis/AstTypeEnvironment.h b/src/ast/analysis/TypeEnvironment.h similarity index 94% rename from src/ast/analysis/AstTypeEnvironment.h rename to src/ast/analysis/TypeEnvironment.h index ebe2d54c2f4..f978e1b74c8 100644 --- a/src/ast/analysis/AstTypeEnvironment.h +++ b/src/ast/analysis/TypeEnvironment.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstTypeEnvironment.h + * @file TypeEnvironment.h * * A wrapper for TypeEnvironment to be used for AST Analysis * @@ -18,9 +18,9 @@ #include "GraphUtils.h" #include "RamTypes.h" -#include "ast/AstQualifiedName.h" +#include "ast/QualifiedName.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstAnalysis.h" +#include "ast/analysis/Analysis.h" #include "utility/ContainerUtil.h" #include #include diff --git a/src/ast/transform/AstComponentChecker.cpp b/src/ast/transform/ComponentChecker.cpp similarity index 97% rename from src/ast/transform/AstComponentChecker.cpp rename to src/ast/transform/ComponentChecker.cpp index 753b8ad4724..a2173094814 100644 --- a/src/ast/transform/AstComponentChecker.cpp +++ b/src/ast/transform/ComponentChecker.cpp @@ -8,22 +8,22 @@ /************************************************************************ * - * @file AstComponentChecker.cpp + * @file ComponentChecker.cpp * * Implementation of the component semantic checker pass. * ***********************************************************************/ -#include "ast/transform/AstComponentChecker.h" +#include "ast/transform/ComponentChecker.h" #include "ErrorReport.h" #include "RelationTag.h" #include "SrcLocation.h" -#include "ast/AstComponent.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstType.h" +#include "ast/Component.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Type.h" #include "ast/analysis/ComponentLookup.h" #include "utility/StringUtil.h" #include diff --git a/src/ast/transform/AstComponentChecker.h b/src/ast/transform/ComponentChecker.h similarity index 96% rename from src/ast/transform/AstComponentChecker.h rename to src/ast/transform/ComponentChecker.h index 248a56d32f3..969338eb414 100644 --- a/src/ast/transform/AstComponentChecker.h +++ b/src/ast/transform/ComponentChecker.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstComponentChecker.h + * @file ComponentChecker.h * * Defines the component semantic checker pass. * @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/ComponentInstantiation.cpp b/src/ast/transform/ComponentInstantiation.cpp index 69cb8bf24d3..98239893102 100644 --- a/src/ast/transform/ComponentInstantiation.cpp +++ b/src/ast/transform/ComponentInstantiation.cpp @@ -16,18 +16,18 @@ #include "ast/transform/ComponentInstantiation.h" #include "ErrorReport.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstComponent.h" -#include "ast/AstIO.h" -#include "ast/AstLiteral.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstType.h" -#include "ast/AstVisitor.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/Component.h" +#include "ast/IO.h" +#include "ast/Literal.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Type.h" +#include "ast/Visitor.h" #include "ast/analysis/ComponentLookup.h" #include "utility/StringUtil.h" #include diff --git a/src/ast/transform/ComponentInstantiation.h b/src/ast/transform/ComponentInstantiation.h index cb328fdfc54..7cffd01344e 100644 --- a/src/ast/transform/ComponentInstantiation.h +++ b/src/ast/transform/ComponentInstantiation.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/Conditional.h b/src/ast/transform/Conditional.h index 6e314683edb..bda2a2adfb7 100644 --- a/src/ast/transform/Conditional.h +++ b/src/ast/transform/Conditional.h @@ -17,7 +17,7 @@ #pragma once #include "DebugReporter.h" -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include #include diff --git a/src/ast/transform/DebugReporter.cpp b/src/ast/transform/DebugReporter.cpp index 6ab6f138956..bdefdb4ced5 100644 --- a/src/ast/transform/DebugReporter.cpp +++ b/src/ast/transform/DebugReporter.cpp @@ -16,9 +16,9 @@ #include "ast/transform/DebugReporter.h" #include "DebugReport.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include namespace souffle { diff --git a/src/ast/transform/DebugReporter.h b/src/ast/transform/DebugReporter.h index 73b9425abb3..a4fd309ed70 100644 --- a/src/ast/transform/DebugReporter.h +++ b/src/ast/transform/DebugReporter.h @@ -15,7 +15,7 @@ ***********************************************************************/ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/Fixpoint.h b/src/ast/transform/Fixpoint.h index b6805d37987..376729c7939 100644 --- a/src/ast/transform/Fixpoint.h +++ b/src/ast/transform/Fixpoint.h @@ -17,7 +17,7 @@ #pragma once #include "DebugReporter.h" -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include #include diff --git a/src/ast/transform/FoldAnonymousRecords.cpp b/src/ast/transform/FoldAnonymousRecords.cpp index 3494cc43a3b..8653443d6e5 100644 --- a/src/ast/transform/FoldAnonymousRecords.cpp +++ b/src/ast/transform/FoldAnonymousRecords.cpp @@ -14,13 +14,13 @@ #include "ast/transform/FoldAnonymousRecords.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Visitor.h" #include "utility/ContainerUtil.h" #include "utility/MiscUtil.h" #include diff --git a/src/ast/transform/FoldAnonymousRecords.h b/src/ast/transform/FoldAnonymousRecords.h index 9f0f7382b85..a06f2d750f3 100644 --- a/src/ast/transform/FoldAnonymousRecords.h +++ b/src/ast/transform/FoldAnonymousRecords.h @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include #include diff --git a/src/ast/transform/IOAttributes.h b/src/ast/transform/IOAttributes.h index d9d86299747..593713d3945 100644 --- a/src/ast/transform/IOAttributes.h +++ b/src/ast/transform/IOAttributes.h @@ -17,10 +17,10 @@ #pragma once -#include "ast/AstUtils.h" -#include "ast/analysis/AstTypeEnvironment.h" +#include "ast/Utils.h" +#include "ast/analysis/TypeEnvironment.h" #include "ast/analysis/AuxArity.h" -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include #include diff --git a/src/ast/transform/IODefaults.h b/src/ast/transform/IODefaults.h index e1261b482d7..4dda5c7ad1e 100644 --- a/src/ast/transform/IODefaults.h +++ b/src/ast/transform/IODefaults.h @@ -16,8 +16,8 @@ #pragma once -#include "ast/AstUtils.h" -#include "ast/transform/AstTransformer.h" +#include "ast/Utils.h" +#include "ast/transform/Transformer.h" #include #include #include diff --git a/src/ast/transform/InlineRelations.cpp b/src/ast/transform/InlineRelations.cpp index d2b628b5ff7..a0600af37a0 100644 --- a/src/ast/transform/InlineRelations.cpp +++ b/src/ast/transform/InlineRelations.cpp @@ -19,17 +19,17 @@ #include "BinaryConstraintOps.h" #include "FunctorOps.h" #include "RelationTag.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/InlineRelations.h b/src/ast/transform/InlineRelations.h index 2ff790cd45e..ac69a59370f 100644 --- a/src/ast/transform/InlineRelations.h +++ b/src/ast/transform/InlineRelations.h @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/MagicSet.cpp b/src/ast/transform/MagicSet.cpp index a73c8283fa7..a16c9aebfba 100644 --- a/src/ast/transform/MagicSet.cpp +++ b/src/ast/transform/MagicSet.cpp @@ -19,14 +19,14 @@ #include "Global.h" #include "RamTypes.h" #include "SrcLocation.h" -#include "ast/AstAttribute.h" -#include "ast/AstIO.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Attribute.h" +#include "ast/IO.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/analysis/IOType.h" #include "utility/ContainerUtil.h" #include "utility/MiscUtil.h" #include "utility/StringUtil.h" diff --git a/src/ast/transform/MagicSet.h b/src/ast/transform/MagicSet.h index d5da269b77a..3feb11421e8 100644 --- a/src/ast/transform/MagicSet.h +++ b/src/ast/transform/MagicSet.h @@ -16,14 +16,14 @@ #pragma once -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstVisitor.h" -#include "ast/analysis/AstAnalysis.h" -#include "ast/transform/AstTransformer.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/QualifiedName.h" +#include "ast/Visitor.h" +#include "ast/analysis/Analysis.h" +#include "ast/transform/Transformer.h" #include "utility/StreamUtil.h" #include #include diff --git a/src/ast/transform/MaterializeAggregationQueries.cpp b/src/ast/transform/MaterializeAggregationQueries.cpp index 01dc56f7f84..768d45d589e 100644 --- a/src/ast/transform/MaterializeAggregationQueries.cpp +++ b/src/ast/transform/MaterializeAggregationQueries.cpp @@ -15,22 +15,22 @@ #include "ast/transform/MaterializeAggregationQueries.h" #include "AggregateOp.h" #include "RamTypes.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstGround.h" -#include "ast/analysis/AstType.h" -#include "ast/analysis/AstTypeEnvironment.h" +#include "ast/analysis/Ground.h" +#include "ast/analysis/Type.h" +#include "ast/analysis/TypeEnvironment.h" #include "utility/MiscUtil.h" #include "utility/StringUtil.h" #include diff --git a/src/ast/transform/MaterializeAggregationQueries.h b/src/ast/transform/MaterializeAggregationQueries.h index c33b84982cb..d4960ec3c61 100644 --- a/src/ast/transform/MaterializeAggregationQueries.h +++ b/src/ast/transform/MaterializeAggregationQueries.h @@ -17,7 +17,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/MaterializeSingletonAggregation.cpp b/src/ast/transform/MaterializeSingletonAggregation.cpp index 29fb2ceeda7..1ef9e61039c 100644 --- a/src/ast/transform/MaterializeSingletonAggregation.cpp +++ b/src/ast/transform/MaterializeSingletonAggregation.cpp @@ -14,18 +14,18 @@ #include "ast/transform/MaterializeSingletonAggregation.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "utility/MiscUtil.h" #include "utility/StringUtil.h" #include diff --git a/src/ast/transform/MaterializeSingletonAggregation.h b/src/ast/transform/MaterializeSingletonAggregation.h index 1848c2ded15..0551bc46b11 100644 --- a/src/ast/transform/MaterializeSingletonAggregation.h +++ b/src/ast/transform/MaterializeSingletonAggregation.h @@ -17,7 +17,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/MinimiseProgram.cpp b/src/ast/transform/MinimiseProgram.cpp index 741176a61c9..fe008b6e052 100644 --- a/src/ast/transform/MinimiseProgram.cpp +++ b/src/ast/transform/MinimiseProgram.cpp @@ -16,16 +16,16 @@ #include "ast/transform/MinimiseProgram.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/analysis/IOType.h" #include "utility/ContainerUtil.h" #include "utility/MiscUtil.h" #include "utility/StringUtil.h" diff --git a/src/ast/transform/MinimiseProgram.h b/src/ast/transform/MinimiseProgram.h index 65f2d4d5120..ef0bfed11a6 100644 --- a/src/ast/transform/MinimiseProgram.h +++ b/src/ast/transform/MinimiseProgram.h @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include diff --git a/src/ast/transform/NameUnnamedVariables.cpp b/src/ast/transform/NameUnnamedVariables.cpp index 4bd4d2e097c..74fc93ceb25 100644 --- a/src/ast/transform/NameUnnamedVariables.cpp +++ b/src/ast/transform/NameUnnamedVariables.cpp @@ -13,12 +13,12 @@ ***********************************************************************/ #include "ast/transform/NameUnnamedVariables.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include #include #include diff --git a/src/ast/transform/NameUnnamedVariables.h b/src/ast/transform/NameUnnamedVariables.h index ed4e10e0954..812a4a5bc7c 100644 --- a/src/ast/transform/NameUnnamedVariables.h +++ b/src/ast/transform/NameUnnamedVariables.h @@ -18,7 +18,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/NormaliseConstraints.cpp b/src/ast/transform/NormaliseConstraints.cpp index b6ec93104c3..bb7170c72d8 100644 --- a/src/ast/transform/NormaliseConstraints.cpp +++ b/src/ast/transform/NormaliseConstraints.cpp @@ -14,14 +14,14 @@ #include "ast/transform/NormaliseConstraints.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/NormaliseConstraints.h b/src/ast/transform/NormaliseConstraints.h index 98eb82b873d..a52a29ec185 100644 --- a/src/ast/transform/NormaliseConstraints.h +++ b/src/ast/transform/NormaliseConstraints.h @@ -17,7 +17,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/PartitionBodyLiterals.cpp b/src/ast/transform/PartitionBodyLiterals.cpp index 506b7eb2310..5c5d98ae62e 100644 --- a/src/ast/transform/PartitionBodyLiterals.cpp +++ b/src/ast/transform/PartitionBodyLiterals.cpp @@ -14,15 +14,15 @@ #include "ast/transform/PartitionBodyLiterals.h" #include "GraphUtils.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Visitor.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/PartitionBodyLiterals.h b/src/ast/transform/PartitionBodyLiterals.h index 69cb941c610..dbbd898083c 100644 --- a/src/ast/transform/PartitionBodyLiterals.h +++ b/src/ast/transform/PartitionBodyLiterals.h @@ -21,7 +21,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/Pipeline.h b/src/ast/transform/Pipeline.h index 7d7625ad87b..944cdd5e4cc 100644 --- a/src/ast/transform/Pipeline.h +++ b/src/ast/transform/Pipeline.h @@ -17,7 +17,7 @@ #pragma once #include "DebugReporter.h" -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/PolymorphicObjects.cpp b/src/ast/transform/PolymorphicObjects.cpp index aee0145c1ec..c651fadb5a0 100644 --- a/src/ast/transform/PolymorphicObjects.cpp +++ b/src/ast/transform/PolymorphicObjects.cpp @@ -16,14 +16,14 @@ #include "AggregateOp.h" #include "BinaryConstraintOps.h" #include "RamTypes.h" -#include "ast/AstArgument.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Argument.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstType.h" +#include "ast/analysis/Type.h" #include "utility/ContainerUtil.h" #include "utility/FunctionalUtil.h" #include diff --git a/src/ast/transform/PolymorphicObjects.h b/src/ast/transform/PolymorphicObjects.h index a2192d98c7e..0bcbe20d070 100644 --- a/src/ast/transform/PolymorphicObjects.h +++ b/src/ast/transform/PolymorphicObjects.h @@ -17,7 +17,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/AstPragmaChecker.cpp b/src/ast/transform/PragmaChecker.cpp similarity index 85% rename from src/ast/transform/AstPragmaChecker.cpp rename to src/ast/transform/PragmaChecker.cpp index ff55bfd1c92..ed37b9bb881 100644 --- a/src/ast/transform/AstPragmaChecker.cpp +++ b/src/ast/transform/PragmaChecker.cpp @@ -8,18 +8,18 @@ /************************************************************************ * - * @file AstPragmaChecker.cpp + * @file PragmaChecker.cpp * * Defines a transformer that applies pragmas found in parsed input. * ***********************************************************************/ -#include "ast/transform/AstPragmaChecker.h" +#include "ast/transform/PragmaChecker.h" #include "Global.h" -#include "ast/AstPragma.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstVisitor.h" +#include "ast/Pragma.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Visitor.h" #include #include diff --git a/src/ast/transform/AstPragmaChecker.h b/src/ast/transform/PragmaChecker.h similarity index 92% rename from src/ast/transform/AstPragmaChecker.h rename to src/ast/transform/PragmaChecker.h index b7280f567f4..2a55ec5f303 100644 --- a/src/ast/transform/AstPragmaChecker.h +++ b/src/ast/transform/PragmaChecker.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstPragmaChecker.h + * @file PragmaChecker.h * * Defines a transformer that applies pragmas found in parsed input. * @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/Provenance.cpp b/src/ast/transform/Provenance.cpp index 3ac1d989481..fcd5f008239 100644 --- a/src/ast/transform/Provenance.cpp +++ b/src/ast/transform/Provenance.cpp @@ -19,17 +19,17 @@ #include "FunctorOps.h" #include "Global.h" #include "RelationTag.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include "utility/ContainerUtil.h" #include "utility/MiscUtil.h" #include "utility/StreamUtil.h" diff --git a/src/ast/transform/Provenance.h b/src/ast/transform/Provenance.h index f36957f3830..1f00ff1d07f 100644 --- a/src/ast/transform/Provenance.h +++ b/src/ast/transform/Provenance.h @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/ReduceExistentials.cpp b/src/ast/transform/ReduceExistentials.cpp index 638c0bf7b30..76cfe080af6 100644 --- a/src/ast/transform/ReduceExistentials.cpp +++ b/src/ast/transform/ReduceExistentials.cpp @@ -15,18 +15,18 @@ #include "ast/transform/ReduceExistentials.h" #include "GraphUtils.h" #include "RelationTag.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" +#include "ast/analysis/IOType.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/ReduceExistentials.h b/src/ast/transform/ReduceExistentials.h index 952f9d7d03b..39c47fc17ac 100644 --- a/src/ast/transform/ReduceExistentials.h +++ b/src/ast/transform/ReduceExistentials.h @@ -17,7 +17,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/RemoveBooleanConstraints.cpp b/src/ast/transform/RemoveBooleanConstraints.cpp index 10bf260651f..1c5ed963c05 100644 --- a/src/ast/transform/RemoveBooleanConstraints.cpp +++ b/src/ast/transform/RemoveBooleanConstraints.cpp @@ -14,15 +14,15 @@ #include "ast/transform/RemoveBooleanConstraints.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/RemoveBooleanConstraints.h b/src/ast/transform/RemoveBooleanConstraints.h index 26380d1f340..b979baf47da 100644 --- a/src/ast/transform/RemoveBooleanConstraints.h +++ b/src/ast/transform/RemoveBooleanConstraints.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/RemoveEmptyRelations.cpp b/src/ast/transform/RemoveEmptyRelations.cpp index ba474f57c5a..eb2cb1723ae 100644 --- a/src/ast/transform/RemoveEmptyRelations.cpp +++ b/src/ast/transform/RemoveEmptyRelations.cpp @@ -13,16 +13,16 @@ ***********************************************************************/ #include "ast/transform/RemoveEmptyRelations.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstProgram.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Program.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" +#include "ast/analysis/IOType.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/RemoveEmptyRelations.h b/src/ast/transform/RemoveEmptyRelations.h index 45b23651261..e70c5c29b53 100644 --- a/src/ast/transform/RemoveEmptyRelations.h +++ b/src/ast/transform/RemoveEmptyRelations.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/RemoveRedundantRelations.cpp b/src/ast/transform/RemoveRedundantRelations.cpp index 39cf95b5ea6..751312a0c98 100644 --- a/src/ast/transform/RemoveRedundantRelations.cpp +++ b/src/ast/transform/RemoveRedundantRelations.cpp @@ -13,9 +13,9 @@ ***********************************************************************/ #include "ast/transform/RemoveRedundantRelations.h" -#include "ast/AstProgram.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" +#include "ast/Program.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" #include "ast/analysis/RedundantRelations.h" #include diff --git a/src/ast/transform/RemoveRedundantRelations.h b/src/ast/transform/RemoveRedundantRelations.h index f3fd1b18803..23d4d3df8df 100644 --- a/src/ast/transform/RemoveRedundantRelations.h +++ b/src/ast/transform/RemoveRedundantRelations.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/RemoveRedundantSums.cpp b/src/ast/transform/RemoveRedundantSums.cpp index b954f5e404d..3d96dd10054 100644 --- a/src/ast/transform/RemoveRedundantSums.cpp +++ b/src/ast/transform/RemoveRedundantSums.cpp @@ -14,11 +14,11 @@ #include "ast/transform/RemoveRedundantSums.h" #include "AggregateOp.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/RemoveRedundantSums.h b/src/ast/transform/RemoveRedundantSums.h index d7e34780692..434a4f051b2 100644 --- a/src/ast/transform/RemoveRedundantSums.h +++ b/src/ast/transform/RemoveRedundantSums.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/RemoveRelationCopies.cpp b/src/ast/transform/RemoveRelationCopies.cpp index fbb9caba193..9f46e6a1570 100644 --- a/src/ast/transform/RemoveRelationCopies.cpp +++ b/src/ast/transform/RemoveRelationCopies.cpp @@ -13,17 +13,17 @@ ***********************************************************************/ #include "ast/transform/RemoveRelationCopies.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" -#include "ast/analysis/AstIOType.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" +#include "ast/analysis/IOType.h" #include "utility/ContainerUtil.h" #include #include diff --git a/src/ast/transform/RemoveRelationCopies.h b/src/ast/transform/RemoveRelationCopies.h index dd838e455e9..46eebbe7788 100644 --- a/src/ast/transform/RemoveRelationCopies.h +++ b/src/ast/transform/RemoveRelationCopies.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/RemoveTypecasts.cpp b/src/ast/transform/RemoveTypecasts.cpp index 567c1130dc0..feadc6c5ec0 100644 --- a/src/ast/transform/RemoveTypecasts.cpp +++ b/src/ast/transform/RemoveTypecasts.cpp @@ -13,11 +13,11 @@ ***********************************************************************/ #include "ast/transform/RemoveTypecasts.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" #include "utility/MiscUtil.h" #include diff --git a/src/ast/transform/RemoveTypecasts.h b/src/ast/transform/RemoveTypecasts.h index f35919a2313..78952c7edc8 100644 --- a/src/ast/transform/RemoveTypecasts.h +++ b/src/ast/transform/RemoveTypecasts.h @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/ReorderLiterals.cpp b/src/ast/transform/ReorderLiterals.cpp index e0c21bb50da..bac8ca48225 100644 --- a/src/ast/transform/ReorderLiterals.cpp +++ b/src/ast/transform/ReorderLiterals.cpp @@ -17,15 +17,15 @@ #include "ast/transform/ReorderLiterals.h" #include "Global.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" -#include "ast/analysis/AstProfileUse.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" +#include "ast/analysis/ProfileUse.h" #include #include #include diff --git a/src/ast/transform/ReorderLiterals.h b/src/ast/transform/ReorderLiterals.h index 21b1e4b6350..4a956a6cbe8 100644 --- a/src/ast/transform/ReorderLiterals.h +++ b/src/ast/transform/ReorderLiterals.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/ReplaceSingletonVariables.cpp b/src/ast/transform/ReplaceSingletonVariables.cpp index 9adba829744..42f5c51ce91 100644 --- a/src/ast/transform/ReplaceSingletonVariables.cpp +++ b/src/ast/transform/ReplaceSingletonVariables.cpp @@ -13,14 +13,14 @@ ***********************************************************************/ #include "ast/transform/ReplaceSingletonVariables.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include #include #include diff --git a/src/ast/transform/ReplaceSingletonVariables.h b/src/ast/transform/ReplaceSingletonVariables.h index 13fe53f2f91..1ae1a002e99 100644 --- a/src/ast/transform/ReplaceSingletonVariables.h +++ b/src/ast/transform/ReplaceSingletonVariables.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/ResolveAliases.cpp b/src/ast/transform/ResolveAliases.cpp index 281c235ae4c..344c3abe292 100644 --- a/src/ast/transform/ResolveAliases.cpp +++ b/src/ast/transform/ResolveAliases.cpp @@ -17,15 +17,15 @@ #include "ast/transform/ResolveAliases.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "utility/FunctionalUtil.h" #include "utility/MiscUtil.h" #include "utility/StreamUtil.h" diff --git a/src/ast/transform/ResolveAliases.h b/src/ast/transform/ResolveAliases.h index 3578acafdde..d0ac7b055aa 100644 --- a/src/ast/transform/ResolveAliases.h +++ b/src/ast/transform/ResolveAliases.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include diff --git a/src/ast/transform/ResolveAnonymousRecordsAliases.cpp b/src/ast/transform/ResolveAnonymousRecordsAliases.cpp index 551dff5490c..80633c981fa 100644 --- a/src/ast/transform/ResolveAnonymousRecordsAliases.cpp +++ b/src/ast/transform/ResolveAnonymousRecordsAliases.cpp @@ -14,16 +14,16 @@ #include "ast/transform/ResolveAnonymousRecordsAliases.h" #include "BinaryConstraintOps.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstClause.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Clause.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstGround.h" -#include "ast/analysis/AstType.h" +#include "ast/analysis/Ground.h" +#include "ast/analysis/Type.h" #include "utility/MiscUtil.h" #include #include diff --git a/src/ast/transform/ResolveAnonymousRecordsAliases.h b/src/ast/transform/ResolveAnonymousRecordsAliases.h index ce8415b132e..7aa4389299e 100644 --- a/src/ast/transform/ResolveAnonymousRecordsAliases.h +++ b/src/ast/transform/ResolveAnonymousRecordsAliases.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include diff --git a/src/ast/transform/AstSemanticChecker.cpp b/src/ast/transform/SemanticChecker.cpp similarity index 98% rename from src/ast/transform/AstSemanticChecker.cpp rename to src/ast/transform/SemanticChecker.cpp index 5fcca139bbe..576160cc917 100644 --- a/src/ast/transform/AstSemanticChecker.cpp +++ b/src/ast/transform/SemanticChecker.cpp @@ -8,13 +8,13 @@ /************************************************************************ * - * @file AstSemanticChecker.cpp + * @file SemanticChecker.cpp * * Implementation of the semantic checker pass. * ***********************************************************************/ -#include "ast/transform/AstSemanticChecker.h" +#include "ast/transform/SemanticChecker.h" #include "AggregateOp.h" #include "BinaryConstraintOps.h" #include "ErrorReport.h" @@ -24,25 +24,25 @@ #include "RamTypes.h" #include "RelationTag.h" #include "SrcLocation.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstAttribute.h" -#include "ast/AstClause.h" -#include "ast/AstIO.h" -#include "ast/AstLiteral.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstQualifiedName.h" -#include "ast/AstRelation.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstType.h" -#include "ast/AstUtils.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Attribute.h" +#include "ast/Clause.h" +#include "ast/IO.h" +#include "ast/Literal.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/QualifiedName.h" +#include "ast/Relation.h" +#include "ast/TranslationUnit.h" +#include "ast/Type.h" +#include "ast/Utils.h" +#include "ast/Visitor.h" #include "ast/TypeSystem.h" -#include "ast/analysis/AstGround.h" -#include "ast/analysis/AstIOType.h" -#include "ast/analysis/AstType.h" -#include "ast/analysis/AstTypeEnvironment.h" +#include "ast/analysis/Ground.h" +#include "ast/analysis/IOType.h" +#include "ast/analysis/Type.h" +#include "ast/analysis/TypeEnvironment.h" #include "ast/analysis/PrecedenceGraph.h" #include "ast/analysis/RecursiveClauses.h" #include "ast/analysis/RelationSchedule.h" diff --git a/src/ast/transform/AstSemanticChecker.h b/src/ast/transform/SemanticChecker.h similarity index 96% rename from src/ast/transform/AstSemanticChecker.h rename to src/ast/transform/SemanticChecker.h index 98710cf882e..fe600a44fa2 100644 --- a/src/ast/transform/AstSemanticChecker.h +++ b/src/ast/transform/SemanticChecker.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstSemanticChecker.h + * @file SemanticChecker.h * * Defines the semantic checker pass. * @@ -16,7 +16,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/AstTransformer.cpp b/src/ast/transform/Transformer.cpp similarity index 93% rename from src/ast/transform/AstTransformer.cpp rename to src/ast/transform/Transformer.cpp index 5fe65c122b0..360eb675881 100644 --- a/src/ast/transform/AstTransformer.cpp +++ b/src/ast/transform/Transformer.cpp @@ -8,15 +8,15 @@ /************************************************************************ * - * @file AstTransformer.cpp + * @file Transformer.cpp * * Defines the interface for AST transformation passes. * ***********************************************************************/ -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include "ErrorReport.h" -#include "ast/AstTranslationUnit.h" +#include "ast/TranslationUnit.h" #include #include diff --git a/src/ast/transform/AstTransformer.h b/src/ast/transform/Transformer.h similarity index 98% rename from src/ast/transform/AstTransformer.h rename to src/ast/transform/Transformer.h index f9f830bf0cf..7decd67af76 100644 --- a/src/ast/transform/AstTransformer.h +++ b/src/ast/transform/Transformer.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstTransformer.h + * @file Transformer.h * * Defines the interface for AST transformation passes. * diff --git a/src/ast/transform/UniqueAggregationVariables.cpp b/src/ast/transform/UniqueAggregationVariables.cpp index 40a563ce962..ce4f400112e 100644 --- a/src/ast/transform/UniqueAggregationVariables.cpp +++ b/src/ast/transform/UniqueAggregationVariables.cpp @@ -13,11 +13,11 @@ ***********************************************************************/ #include "ast/transform/UniqueAggregationVariables.h" -#include "ast/AstAbstract.h" -#include "ast/AstArgument.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstVisitor.h" +#include "ast/Abstract.h" +#include "ast/Argument.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Visitor.h" #include "utility/StringUtil.h" #include #include diff --git a/src/ast/transform/UniqueAggregationVariables.h b/src/ast/transform/UniqueAggregationVariables.h index 1401e947bc0..fcea9853ad4 100644 --- a/src/ast/transform/UniqueAggregationVariables.h +++ b/src/ast/transform/UniqueAggregationVariables.h @@ -14,7 +14,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/AstUserDefinedFunctors.cpp b/src/ast/transform/UserDefinedFunctors.cpp similarity index 89% rename from src/ast/transform/AstUserDefinedFunctors.cpp rename to src/ast/transform/UserDefinedFunctors.cpp index f1f8d604dd8..296154ee2c4 100644 --- a/src/ast/transform/AstUserDefinedFunctors.cpp +++ b/src/ast/transform/UserDefinedFunctors.cpp @@ -8,19 +8,19 @@ /************************************************************************ * - * @file AstUserDefinedFunctors.cpp + * @file UserDefinedFunctors.cpp * ***********************************************************************/ -#include "ast/transform/AstUserDefinedFunctors.h" +#include "ast/transform/UserDefinedFunctors.h" #include "ErrorReport.h" #include "RamTypes.h" -#include "ast/AstArgument.h" -#include "ast/AstFunctorDeclaration.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/AstUtils.h" +#include "ast/Argument.h" +#include "ast/FunctorDeclaration.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/Utils.h" #include #include diff --git a/src/ast/transform/AstUserDefinedFunctors.h b/src/ast/transform/UserDefinedFunctors.h similarity index 93% rename from src/ast/transform/AstUserDefinedFunctors.h rename to src/ast/transform/UserDefinedFunctors.h index e5836e6c7e5..ba762053abf 100644 --- a/src/ast/transform/AstUserDefinedFunctors.h +++ b/src/ast/transform/UserDefinedFunctors.h @@ -8,7 +8,7 @@ /************************************************************************ * - * @file AstUserDefinedFunctors.h + * @file UserDefinedFunctors.h * * Transformation that passes the type information from user functors * declaration to functors instances @@ -17,7 +17,7 @@ #pragma once -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include namespace souffle { diff --git a/src/ast/transform/While.h b/src/ast/transform/While.h index 2f670a95c0f..df2b28fbc92 100644 --- a/src/ast/transform/While.h +++ b/src/ast/transform/While.h @@ -15,7 +15,7 @@ #pragma once #include "DebugReporter.h" -#include "ast/transform/AstTransformer.h" +#include "ast/transform/Transformer.h" #include #include #include diff --git a/src/main.cpp b/src/main.cpp index b3499aebf1b..c3b250ee51b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,15 +21,15 @@ #include "Global.h" #include "ParserDriver.h" #include "RamTypes.h" -#include "ast/AstNode.h" -#include "ast/AstProgram.h" -#include "ast/AstTranslationUnit.h" -#include "ast/analysis/AstType.h" +#include "ast/Node.h" +#include "ast/Program.h" +#include "ast/TranslationUnit.h" +#include "ast/analysis/Type.h" #include "ast/analysis/PrecedenceGraph.h" -#include "ast/transform/AstComponentChecker.h" -#include "ast/transform/AstPragmaChecker.h" -#include "ast/transform/AstSemanticChecker.h" -#include "ast/transform/AstUserDefinedFunctors.h" +#include "ast/transform/ComponentChecker.h" +#include "ast/transform/PragmaChecker.h" +#include "ast/transform/SemanticChecker.h" +#include "ast/transform/UserDefinedFunctors.h" #include "ast/transform/ComponentInstantiation.h" #include "ast/transform/Conditional.h" #include "ast/transform/Fixpoint.h" diff --git a/src/parser.yy b/src/parser.yy index fd3f76fa937..474fd91327d 100644 --- a/src/parser.yy +++ b/src/parser.yy @@ -35,15 +35,15 @@ /* -- Dependencies -- */ %code requires { #include "AggregateOp.h" - #include "ast/AstArgument.h" - #include "ast/AstClause.h" - #include "ast/AstComponent.h" - #include "ast/AstFunctorDeclaration.h" - #include "ast/AstIO.h" - #include "ast/AstNode.h" - #include "ast/AstParserUtils.h" - #include "ast/AstPragma.h" - #include "ast/AstProgram.h" + #include "ast/Argument.h" + #include "ast/Clause.h" + #include "ast/Component.h" + #include "ast/FunctorDeclaration.h" + #include "ast/IO.h" + #include "ast/Node.h" + #include "ast/ParserUtils.h" + #include "ast/Pragma.h" + #include "ast/Program.h" #include "BinaryConstraintOps.h" #include "FunctorOps.h" #include "RamTypes.h" diff --git a/src/scanner.ll b/src/scanner.ll index 46e326f3b4a..ae545fe77ca 100644 --- a/src/scanner.ll +++ b/src/scanner.ll @@ -34,7 +34,7 @@ #include #include - #include "ast/AstProgram.h" + #include "ast/Program.h" #include "SrcLocation.h" #define YYLTYPE SrcLocation