From ed9331762af65fce348dc82714ca9d1cd18f1d99 Mon Sep 17 00:00:00 2001 From: Bernhard Scholz Date: Tue, 4 Aug 2020 10:56:43 +1000 Subject: [PATCH] Refactor parser dir --- src/Makefile.am | 32 ++++++++++++++--------------- src/main.cpp | 2 +- src/{ => parser}/ParserDriver.cpp | 2 +- src/{ => parser}/ParserDriver.h | 2 +- src/{ => parser}/ParserUtils.cpp | 2 +- src/{ => parser}/ParserUtils.h | 0 src/{ => parser}/parser.yy | 2 +- src/{ => parser}/scanner.ll | 4 ++-- src/tests/ast_parser_utils_test.cpp | 2 +- src/tests/ast_print_test.cpp | 2 +- src/tests/ast_program_test.cpp | 2 +- src/tests/ast_transformers_test.cpp | 2 +- src/tests/ast_utils_test.cpp | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) rename src/{ => parser}/ParserDriver.cpp (99%) rename src/{ => parser}/ParserDriver.h (99%) rename src/{ => parser}/ParserUtils.cpp (99%) rename src/{ => parser}/ParserUtils.h (100%) rename src/{ => parser}/parser.yy (99%) rename src/{ => parser}/scanner.ll (99%) diff --git a/src/Makefile.am b/src/Makefile.am index ba5ba1b5d23..22a661feedb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -87,10 +87,10 @@ souffle_sources = \ GraphUtils.h \ IOSystem.h \ LogStatement.h \ - ParserDriver.cpp \ - ParserDriver.h \ - ParserUtils.cpp \ - ParserUtils.h \ + parser/ParserDriver.cpp \ + parser/ParserDriver.h \ + parser/ParserUtils.cpp \ + parser/ParserUtils.h \ ProfileEvent.h \ RamTypes.h \ ReadStream.h \ @@ -270,8 +270,8 @@ souffle_sources = \ interpreter/InterpreterProgInterface.h \ interpreter/InterpreterRelation.cpp \ interpreter/InterpreterRelation.h \ - parser.cc \ - parser.hh \ + parser/parser.cc \ + parser/parser.hh \ ram/Condition.h \ ram/Expression.h \ ram/Node.h \ @@ -318,8 +318,8 @@ souffle_sources = \ ram/transform/ReportIndex.h \ ram/transform/TupleId.cpp \ ram/transform/TupleId.h \ - scanner.cc \ - stack.hh \ + parser/scanner.cc \ + parser/stack.hh \ synthesiser/Synthesiser.cpp \ synthesiser/Synthesiser.h \ synthesiser/SynthesiserRelation.cpp \ @@ -342,7 +342,7 @@ souffle_profile_SOURCES = souffle_prof.cpp dist_bin_SCRIPTS = souffle-compile souffle-config -EXTRA_DIST = parser.yy scanner.ll +EXTRA_DIST = parser/parser.yy parser/scanner.ll soufflepublicdir = $(includedir)/souffle @@ -397,17 +397,17 @@ souffleutilitydir = $(soufflepublicdir)/utility souffleutility_HEADERS = $(souffle_utility_sources) # files to clean -CLEANFILES = $(BUILT_SOURCES) parser.cc scanner.cc parser.hh stack.hh +CLEANFILES = $(BUILT_SOURCES) parser/parser.cc parser/scanner.cc parser/parser.hh parser/stack.hh # run Bison -$(builddir)/parser.hh: $(srcdir)/parser.yy - $(BISON) -Wall -Werror -Wno-error=deprecated -Wno-error=other -v -d -o parser.cc $(srcdir)/parser.yy +$(builddir)/parser/parser.hh: $(srcdir)/parser/parser.yy + $(BISON) -Wall -Werror -Wno-error=deprecated -Wno-error=other -v -d -o parser/parser.cc $(srcdir)/parser/parser.yy # and FLEX -$(builddir)/scanner.cc: $(srcdir)/scanner.ll - $(FLEX) -o scanner.cc $(srcdir)/scanner.ll +$(builddir)/parser/scanner.cc: $(srcdir)/parser/scanner.ll + $(FLEX) -o parser/scanner.cc $(srcdir)/parser/scanner.ll # driver depends on the generated header -$(builddir)/parser.cc $(builddir)/stack.hh $(builddir)/scanner.cc \ - $(builddir)/main.cpp $(builddir)/ParserDriver.cpp: $(builddir)/parser.hh +$(builddir)/parser/parser.cc $(builddir)/parser/stack.hh $(builddir)/parser/scanner.cc \ + $(builddir)/main.cpp $(builddir)/parser/ParserDriver.cpp: $(builddir)/parser/parser.hh diff --git a/src/main.cpp b/src/main.cpp index e9751b51a9a..5b059d8b37b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,6 @@ #include "ErrorReport.h" #include "Explain.h" #include "Global.h" -#include "ParserDriver.h" #include "RamTypes.h" #include "ast/Node.h" #include "ast/Program.h" @@ -65,6 +64,7 @@ #include "config.h" #include "interpreter/InterpreterEngine.h" #include "interpreter/InterpreterProgInterface.h" +#include "parser/ParserDriver.h" #include "profile/Tui.h" #include "ram/Node.h" #include "ram/Program.h" diff --git a/src/ParserDriver.cpp b/src/parser/ParserDriver.cpp similarity index 99% rename from src/ParserDriver.cpp rename to src/parser/ParserDriver.cpp index 4d61160b873..7a30a97dad5 100644 --- a/src/ParserDriver.cpp +++ b/src/parser/ParserDriver.cpp @@ -14,7 +14,7 @@ * ***********************************************************************/ -#include "ParserDriver.h" +#include "parser/ParserDriver.h" #include "ErrorReport.h" #include "Global.h" #include "ast/Clause.h" diff --git a/src/ParserDriver.h b/src/parser/ParserDriver.h similarity index 99% rename from src/ParserDriver.h rename to src/parser/ParserDriver.h index 70477a005b6..890890f53cf 100644 --- a/src/ParserDriver.h +++ b/src/parser/ParserDriver.h @@ -21,7 +21,7 @@ #include "SrcLocation.h" #include "ast/QualifiedName.h" #include "ast/TranslationUnit.h" -#include "parser.hh" +#include "parser/parser.hh" #include #include #include diff --git a/src/ParserUtils.cpp b/src/parser/ParserUtils.cpp similarity index 99% rename from src/ParserUtils.cpp rename to src/parser/ParserUtils.cpp index ded67e34960..81788cef416 100644 --- a/src/ParserUtils.cpp +++ b/src/parser/ParserUtils.cpp @@ -14,7 +14,7 @@ * ***********************************************************************/ -#include "ParserUtils.h" +#include "parser/ParserUtils.h" #include "ast/Atom.h" #include "ast/Clause.h" #include "ast/Constraint.h" diff --git a/src/ParserUtils.h b/src/parser/ParserUtils.h similarity index 100% rename from src/ParserUtils.h rename to src/parser/ParserUtils.h diff --git a/src/parser.yy b/src/parser/parser.yy similarity index 99% rename from src/parser.yy rename to src/parser/parser.yy index e81b1de8d87..f4f0d2db726 100644 --- a/src/parser.yy +++ b/src/parser/parser.yy @@ -67,7 +67,7 @@ #include "ast/UnionType.h" #include "ast/UnnamedVariable.h" #include "ast/UserDefinedFunctor.h" - #include "ParserUtils.h" + #include "parser/ParserUtils.h" #include "ast/Variable.h" #include "BinaryConstraintOps.h" #include "FunctorOps.h" diff --git a/src/scanner.ll b/src/parser/scanner.ll similarity index 99% rename from src/scanner.ll rename to src/parser/scanner.ll index ae545fe77ca..ed1170ebcce 100644 --- a/src/scanner.ll +++ b/src/parser/scanner.ll @@ -39,9 +39,9 @@ #include "SrcLocation.h" #define YYLTYPE SrcLocation - #include "ParserDriver.h" + #include "parser/ParserDriver.h" #include "RamTypes.h" - #include "parser.hh" + #include "parser/parser.hh" #include "utility/StringUtil.h" #include "utility/FileUtil.h" diff --git a/src/tests/ast_parser_utils_test.cpp b/src/tests/ast_parser_utils_test.cpp index 6cd128b7033..fe3049d795d 100644 --- a/src/tests/ast_parser_utils_test.cpp +++ b/src/tests/ast_parser_utils_test.cpp @@ -16,7 +16,7 @@ #include "tests/test.h" -#include "ParserUtils.h" +#include "parser/ParserUtils.h" #include "ast/Atom.h" #include "ast/Clause.h" #include "ast/Node.h" diff --git a/src/tests/ast_print_test.cpp b/src/tests/ast_print_test.cpp index 114efdb3bf0..07df68435fc 100644 --- a/src/tests/ast_print_test.cpp +++ b/src/tests/ast_print_test.cpp @@ -19,7 +19,7 @@ #include "AggregateOp.h" #include "DebugReport.h" #include "ErrorReport.h" -#include "ParserDriver.h" +#include "parser/ParserDriver.h" #include "ast/Argument.h" #include "ast/Atom.h" #include "ast/Clause.h" diff --git a/src/tests/ast_program_test.cpp b/src/tests/ast_program_test.cpp index 8cad2466ae9..341f3492f4d 100644 --- a/src/tests/ast_program_test.cpp +++ b/src/tests/ast_program_test.cpp @@ -19,7 +19,7 @@ #include "AggregateOp.h" #include "DebugReport.h" #include "ErrorReport.h" -#include "ParserDriver.h" +#include "parser/ParserDriver.h" #include "ast/Argument.h" #include "ast/Atom.h" #include "ast/Attribute.h" diff --git a/src/tests/ast_transformers_test.cpp b/src/tests/ast_transformers_test.cpp index caa362e3b63..46b4250f42b 100644 --- a/src/tests/ast_transformers_test.cpp +++ b/src/tests/ast_transformers_test.cpp @@ -18,7 +18,7 @@ #include "DebugReport.h" #include "ErrorReport.h" -#include "ParserDriver.h" +#include "parser/ParserDriver.h" #include "ast/Clause.h" #include "ast/Node.h" #include "ast/Program.h" diff --git a/src/tests/ast_utils_test.cpp b/src/tests/ast_utils_test.cpp index ea8a05c256e..3584a7db17a 100644 --- a/src/tests/ast_utils_test.cpp +++ b/src/tests/ast_utils_test.cpp @@ -19,7 +19,7 @@ #include "BinaryConstraintOps.h" #include "DebugReport.h" #include "ErrorReport.h" -#include "ParserDriver.h" +#include "parser/ParserDriver.h" #include "ast/Argument.h" #include "ast/Atom.h" #include "ast/BinaryConstraint.h"