From c4d5637a64df74556545561ede1d768df5575be8 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Mon, 7 Aug 2023 14:52:26 -0400 Subject: [PATCH] Fixes to single header generation (bad parsing adt/csv injection in wrong place) --- singleheader/gen.singleheader.cpp | 2 -- test/{ => parsed}/test.parsing.cpp | 10 +++++----- test/test.cpp | 2 +- test/{ => upfront}/test.upfront.cpp | 11 +++++------ 4 files changed, 11 insertions(+), 14 deletions(-) rename test/{ => parsed}/test.parsing.cpp (84%) rename test/{ => upfront}/test.upfront.cpp (73%) diff --git a/singleheader/gen.singleheader.cpp b/singleheader/gen.singleheader.cpp index 7a2d601..2b5d389 100644 --- a/singleheader/gen.singleheader.cpp +++ b/singleheader/gen.singleheader.cpp @@ -171,7 +171,6 @@ int gen_main() Code string_ops = scan_file( project_dir "dependencies/string_ops.cpp" ); Code printing = scan_file( project_dir "dependencies/printing.cpp" ); Code memory = scan_file( project_dir "dependencies/memory.cpp" ); - Code parsing = scan_file( project_dir "dependencies/parsing.cpp" ); Code hashing = scan_file( project_dir "dependencies/hashing.cpp" ); Code string = scan_file( project_dir "dependencies/string.cpp" ); Code file_handling = scan_file( project_dir "dependencies/file_handling.cpp" ); @@ -185,7 +184,6 @@ int gen_main() header.print( string_ops ); header.print( printing ); header.print( memory ); - header.print( parsing ); header.print( hashing ); header.print( string ); header.print( file_handling ); diff --git a/test/test.parsing.cpp b/test/parsed/test.parsing.cpp similarity index 84% rename from test/test.parsing.cpp rename to test/parsed/test.parsing.cpp index 536e036..7f66b5b 100644 --- a/test/test.parsing.cpp +++ b/test/parsed/test.parsing.cpp @@ -4,11 +4,11 @@ #define GEN_ENFORCE_STRONG_CODE_TYPES #define GEN_EXPOSE_BACKEND #define GEN_BENCHMARK -#include "Parsed\Array.Parsed.hpp" -#include "Parsed\Buffer.Parsed.hpp" -#include "Parsed\HashTable.Parsed.hpp" -#include "Parsed\Ring.Parsed.hpp" -#include "Parsed\Sanity.Parsed.hpp" +#include "Array.Parsed.hpp" +#include "Buffer.Parsed.hpp" +#include "HashTable.Parsed.hpp" +#include "Ring.Parsed.hpp" +#include "Sanity.Parsed.hpp" #include "SOA.cpp" #include "gen.cpp" diff --git a/test/test.cpp b/test/test.cpp index 11b6c77..ea42ffe 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -16,7 +16,7 @@ int gen_main() // check_sanity(); - // check_SOA(); + check_SOA(); check_singleheader_ast(); diff --git a/test/test.upfront.cpp b/test/upfront/test.upfront.cpp similarity index 73% rename from test/test.upfront.cpp rename to test/upfront/test.upfront.cpp index 340dc5d..cdebf7b 100644 --- a/test/test.upfront.cpp +++ b/test/upfront/test.upfront.cpp @@ -5,12 +5,11 @@ #define GEN_EXPOSE_BACKEND #define GEN_BENCHMARK #include "gen.cpp" -#include "Upfront\Array.Upfront.hpp" -#include "Upfront\Buffer.Upfront.hpp" -#include "Upfront\HashTable.Upfront.hpp" -#include "Upfront\Ring.Upfront.hpp" -#include "Upfront\Sanity.Upfront.hpp" - +#include "Array.Upfront.hpp" +#include "Buffer.Upfront.hpp" +#include "HashTable.Upfront.hpp" +#include "Ring.Upfront.hpp" +#include "Sanity.Upfront.hpp" using namespace gen;