Renamed AST files

souffle-lang · Jul 28, 2020 · d83f5b1 · d83f5b1
1 parent 285408b
commit d83f5b1
Show file tree

Hide file tree

Showing 105 changed files with 520 additions and 520 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 <cstdio>
 #include <memory>

diff --git 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 <iosfwd>

diff --git 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 → src/ast/analysis/Analysis.h b/src/ast/analysis/AstAnalysis.h → 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
@@ -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 <cstddef>
 #include <string>
 

diff --git 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
@@ -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 <cstddef>
 #include <map>
 #include <set>

diff --git a/src/ast/analysis/AstConstraint.h → src/ast/analysis/Constraint.h b/src/ast/analysis/AstConstraint.h → 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 <map>
 #include <memory>
 #include <ostream>

diff --git a/src/ast/analysis/AstGround.cpp → src/ast/analysis/Ground.cpp b/src/ast/analysis/AstGround.cpp → 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 <algorithm>

diff --git a/src/ast/analysis/AstGround.h → src/ast/analysis/Ground.h b/src/ast/analysis/AstGround.h → 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 → src/ast/analysis/IOType.cpp b/src/ast/analysis/AstIOType.cpp → 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 <ostream>
 #include <vector>

diff --git a/src/ast/analysis/AstIOType.h → src/ast/analysis/IOType.h b/src/ast/analysis/AstIOType.h → src/ast/analysis/IOType.h
@@ -8,15 +8,15 @@
 
 /************************************************************************
  *
- * @file AstIOType.h
+ * @file IOType.h
  *
  * Declares methods to identify a relation as input, output, or printsize.
  *
  ***********************************************************************/
 
 #pragma once
 
-#include "ast/analysis/AstAnalysis.h"
+#include "ast/analysis/Analysis.h"
 #include <iosfwd>
 #include <set>
 #include <string>

diff --git 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 <set>
 #include <string>
 #include <vector>