Move SrcLocation to parser

joshuakarp · Aug 4, 2020 · b546cfd · b546cfd
1 parent ed93317
commit b546cfd
Show file tree

Hide file tree

Showing 44 changed files with 47 additions and 47 deletions.
diff --git a/src/AstToRamTranslator.cpp b/src/AstToRamTranslator.cpp
@@ -21,7 +21,6 @@
 #include "Global.h"
 #include "LogStatement.h"
 #include "RelationTag.h"
-#include "SrcLocation.h"
 #include "ast/Aggregator.h"
 #include "ast/Argument.h"
 #include "ast/Atom.h"
@@ -62,6 +61,7 @@
 #include "ast/analysis/TopologicallySortedSCCGraph.h"
 #include "ast/analysis/TypeEnvironment.h"
 #include "ast/analysis/TypeSystem.h"
+#include "parser/SrcLocation.h"
 #include "ram/Condition.h"
 #include "ram/Expression.h"
 #include "ram/Node.h"

diff --git a/src/ErrorReport.h b/src/ErrorReport.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <algorithm>
 #include <cassert>
 #include <iostream>

diff --git a/src/LogStatement.h b/src/LogStatement.h
@@ -14,7 +14,7 @@
  *
  ***********************************************************************/
 
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <sstream>
 #include <string>
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -87,10 +87,6 @@ souffle_sources = \
         GraphUtils.h                                       \
         IOSystem.h                                         \
         LogStatement.h                                     \
-        parser/ParserDriver.cpp                            \
-        parser/ParserDriver.h                              \
-        parser/ParserUtils.cpp                             \
-        parser/ParserUtils.h                               \
         ProfileEvent.h                                     \
         RamTypes.h                                         \
         ReadStream.h                                       \
@@ -100,8 +96,6 @@ souffle_sources = \
         RelationTag.h                                      \
         SerialisationStream.h                              \
         SignalHandler.h                                    \
-        SrcLocation.cpp                                    \
-        SrcLocation.h                                      \
         TypeAttribute.h                                    \
         Util.cpp                                           \
         WriteStream.h                                      \
@@ -272,6 +266,12 @@ souffle_sources = \
         interpreter/InterpreterRelation.h                  \
         parser/parser.cc                                   \
         parser/parser.hh                                   \
+        parser/ParserDriver.cpp                            \
+        parser/ParserDriver.h                              \
+        parser/ParserUtils.cpp                             \
+        parser/ParserUtils.h                               \
+        parser/SrcLocation.cpp                             \
+        parser/SrcLocation.h                               \
         ram/Condition.h                                    \
         ram/Expression.h                                   \
         ram/Node.h                                         \

diff --git a/src/ast/Aggregator.h b/src/ast/Aggregator.h
@@ -21,7 +21,7 @@
 #include "Literal.h"
 #include "Node.h"
 #include "NodeMapper.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"

diff --git a/src/ast/Atom.h b/src/ast/Atom.h
@@ -21,7 +21,7 @@
 #include "Node.h"
 #include "NodeMapper.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include <algorithm>

diff --git a/src/ast/Attribute.h b/src/ast/Attribute.h
@@ -18,7 +18,7 @@
 
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <ostream>
 #include <string>
 #include <utility>

diff --git a/src/ast/BinaryConstraint.h b/src/ast/BinaryConstraint.h
@@ -21,7 +21,7 @@
 #include "Constraint.h"
 #include "Node.h"
 #include "NodeMapper.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include <algorithm>

diff --git a/src/ast/BooleanConstraint.h b/src/ast/BooleanConstraint.h
@@ -18,7 +18,7 @@
 
 #include "Constraint.h"
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <cassert>
 #include <iostream>
 #include <string>

diff --git a/src/ast/Clause.h b/src/ast/Clause.h
@@ -21,7 +21,7 @@
 #include "Literal.h"
 #include "Node.h"
 #include "NodeMapper.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"

diff --git a/src/ast/ComponentInit.h b/src/ast/ComponentInit.h
@@ -19,7 +19,7 @@
 #include "ComponentType.h"
 #include "Node.h"
 #include "NodeMapper.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/MiscUtil.h"
 #include <memory>
 #include <ostream>

diff --git a/src/ast/ComponentType.h b/src/ast/ComponentType.h
@@ -18,7 +18,7 @@
 
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/StreamUtil.h"
 #include <ostream>
 #include <string>

diff --git a/src/ast/Constant.h b/src/ast/Constant.h
@@ -18,7 +18,7 @@
 
 #include "Argument.h"
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <ostream>
 #include <string>
 #include <utility>

diff --git a/src/ast/ExecutionOrder.h b/src/ast/ExecutionOrder.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/StreamUtil.h"
 #include <ostream>
 #include <string>

diff --git a/src/ast/FunctorDeclaration.h b/src/ast/FunctorDeclaration.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "TypeAttribute.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"

diff --git a/src/ast/IO.h b/src/ast/IO.h
@@ -18,7 +18,7 @@
 
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/MiscUtil.h"
 #include "utility/StreamUtil.h"
 #include <map>

diff --git a/src/ast/IntrinsicFunctor.h b/src/ast/IntrinsicFunctor.h
@@ -20,7 +20,7 @@
 #include "Functor.h"
 #include "FunctorOps.h"
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "TypeAttribute.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"

diff --git a/src/ast/Negation.h b/src/ast/Negation.h
@@ -20,7 +20,7 @@
 #include "Literal.h"
 #include "Node.h"
 #include "NodeMapper.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include <cassert>

diff --git a/src/ast/NilConstant.h b/src/ast/NilConstant.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Constant.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <string>
 #include <utility>
 

diff --git a/src/ast/Node.h b/src/ast/Node.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <iosfwd>
 #include <string>
 #include <typeinfo>

diff --git a/src/ast/NumericConstant.h b/src/ast/NumericConstant.h
@@ -19,7 +19,7 @@
 #include "Constant.h"
 #include "Node.h"
 #include "RamTypes.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <optional>
 #include <string>
 #include <utility>

diff --git a/src/ast/Pragma.h b/src/ast/Pragma.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <ostream>
 #include <string>
 #include <utility>

diff --git a/src/ast/RecordInit.h b/src/ast/RecordInit.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "Term.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"

diff --git a/src/ast/RecordType.h b/src/ast/RecordType.h
@@ -19,7 +19,7 @@
 #include "Attribute.h"
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "Type.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"

diff --git a/src/ast/Relation.h b/src/ast/Relation.h
@@ -21,7 +21,7 @@
 #include "NodeMapper.h"
 #include "QualifiedName.h"
 #include "RelationTag.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StreamUtil.h"
 #include <algorithm>

diff --git a/src/ast/StringConstant.h b/src/ast/StringConstant.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "Constant.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <ostream>
 #include <string>
 #include <utility>

diff --git a/src/ast/SubroutineArgument.h b/src/ast/SubroutineArgument.h
@@ -18,7 +18,7 @@
 
 #include "Argument.h"
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <cstddef>
 #include <ostream>
 #include <string>

diff --git a/src/ast/SubsetType.h b/src/ast/SubsetType.h
@@ -18,7 +18,7 @@
 
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "Type.h"
 #include <iostream>
 #include <string>

diff --git a/src/ast/Term.h b/src/ast/Term.h
@@ -19,7 +19,7 @@
 #include "Argument.h"
 #include "Node.h"
 #include "NodeMapper.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include <algorithm>
 #include <memory>

diff --git a/src/ast/Type.h b/src/ast/Type.h
@@ -18,7 +18,7 @@
 
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <string>
 #include <utility>
 

diff --git a/src/ast/TypeCast.h b/src/ast/TypeCast.h
@@ -20,7 +20,7 @@
 #include "Node.h"
 #include "NodeMapper.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include <memory>

diff --git a/src/ast/UnionType.h b/src/ast/UnionType.h
@@ -18,7 +18,7 @@
 
 #include "Node.h"
 #include "QualifiedName.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "Type.h"
 #include "utility/StreamUtil.h"
 #include <algorithm>

diff --git a/src/ast/UserDefinedFunctor.h b/src/ast/UserDefinedFunctor.h
@@ -18,7 +18,7 @@
 
 #include "Functor.h"
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "TypeAttribute.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"

diff --git a/src/ast/Variable.h b/src/ast/Variable.h
@@ -18,7 +18,7 @@
 
 #include "Argument.h"
 #include "Node.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include <ostream>
 #include <string>
 #include <utility>

diff --git a/src/ast/transform/ComponentChecker.cpp b/src/ast/transform/ComponentChecker.cpp
@@ -26,7 +26,7 @@
 #include "../analysis/ComponentLookup.h"
 #include "ErrorReport.h"
 #include "RelationTag.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/StringUtil.h"
 #include <functional>
 #include <map>

diff --git a/src/ast/transform/MagicSet.cpp b/src/ast/transform/MagicSet.cpp
@@ -35,7 +35,7 @@
 #include "BinaryConstraintOps.h"
 #include "Global.h"
 #include "RamTypes.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/ContainerUtil.h"
 #include "utility/MiscUtil.h"
 #include "utility/StringUtil.h"

diff --git a/src/ast/transform/SemanticChecker.cpp b/src/ast/transform/SemanticChecker.cpp
@@ -67,7 +67,7 @@
 #include "GroundedTermsChecker.h"
 #include "RamTypes.h"
 #include "RelationTag.h"
-#include "SrcLocation.h"
+#include "parser/SrcLocation.h"
 #include "utility/../RamTypes.h"
 #include "utility/ContainerUtil.h"
 #include "utility/FunctionalUtil.h"

diff --git a/src/SrcLocation.cpp → src/parser/SrcLocation.cpp b/src/SrcLocation.cpp → src/parser/SrcLocation.cpp
diff --git a/src/SrcLocation.h → src/parser/SrcLocation.h b/src/SrcLocation.h → src/parser/SrcLocation.h
diff --git a/src/tests/ast_parser_utils_test.cpp b/src/tests/ast_parser_utils_test.cpp
@@ -16,10 +16,10 @@
 
 #include "tests/test.h"
 
-#include "parser/ParserUtils.h"
 #include "ast/Atom.h"
 #include "ast/Clause.h"
 #include "ast/Node.h"
+#include "parser/ParserUtils.h"
 #include "utility/ContainerUtil.h"
 #include "utility/StringUtil.h"
 #include <memory>

diff --git a/src/tests/ast_print_test.cpp b/src/tests/ast_print_test.cpp
@@ -19,7 +19,6 @@
 #include "AggregateOp.h"
 #include "DebugReport.h"
 #include "ErrorReport.h"
-#include "parser/ParserDriver.h"
 #include "ast/Argument.h"
 #include "ast/Atom.h"
 #include "ast/Clause.h"
@@ -28,6 +27,7 @@
 #include "ast/Program.h"
 #include "ast/TranslationUnit.h"
 #include "ast/Variable.h"
+#include "parser/ParserDriver.h"
 #include <algorithm>
 #include <iosfwd>
 #include <memory>