From cd9b393790e13331f180e01e03b3b841f3b2181d Mon Sep 17 00:00:00 2001
From: Ed_ <edwardgz@gmail.com>
Date: Tue, 25 Jul 2023 17:46:00 -0400
Subject: [PATCH] Fixes to bootstrap and singleheader generation

---
 project/gen.bootstrap.cpp         |  4 ++++
 singleheader/gen.singleheader.cpp | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/project/gen.bootstrap.cpp b/project/gen.bootstrap.cpp
index f045f56..2960137 100644
--- a/project/gen.bootstrap.cpp
+++ b/project/gen.bootstrap.cpp
@@ -116,6 +116,8 @@ int gen_main()
 		Code interface    = scan_file( "components/gen.interface.hpp" );
 		Code header_end   = scan_file( "components/gen.header_end.hpp" );
 
+		Code builder = scan_file( "filesystem/gen.builder.hpp" );
+
 		Builder
 		header;
 		header.open( "gen/gen.hpp" );
@@ -128,6 +130,7 @@ int gen_main()
 				header.print( data_structs );
 				header.print( interface );
 				header.print( header_end );
+					header.print( builder );
 			header.print_fmt( "GEN_NS_END\n\n");
 			header.print( pop_ignores );
 		header.write();
@@ -161,6 +164,7 @@ int gen_main()
 				impl.print( upfront );
 				impl.print( parsing );
 				impl.print( untyped );
+					impl.print( builder );
 			impl.print_fmt( "GEN_NS_END\n\n");
 			impl.print( pop_ignores );
 		impl.write();
diff --git a/singleheader/gen.singleheader.cpp b/singleheader/gen.singleheader.cpp
index 55b3182..450d2fd 100644
--- a/singleheader/gen.singleheader.cpp
+++ b/singleheader/gen.singleheader.cpp
@@ -30,8 +30,8 @@ constexpr StrC nspace_non_default = txt_StrC(R"(
 
 constexpr StrC implementation_guard_start = txt_StrC(R"(
 #pragma region GENCPP IMPLEMENTATION GUARD
-#if ! defined(GEN_IMPLEMENTATION)
-#	define GEN_IMPLEMENTATION
+#if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED)
+#	define GEN_IMPLEMENTED
 )");
 
 constexpr StrC implementation_guard_end = txt_StrC(R"(
@@ -92,8 +92,8 @@ int gen_main()
 			Code parsing       = scan_file( project_dir "dependencies/gen.parsing.hpp" );
 			Code timing        = scan_file( project_dir "dependencies/gen.timing.hpp" );
 
-			header.print_fmt( "GEN_NS_BEGIN\n\n" );
 			header.print( header_start );
+			header.print_fmt( "GEN_NS_BEGIN\n\n" );
 			header.print( macros );
 			header.print( basic_types );
 			header.print( debug );
@@ -115,11 +115,14 @@ int gen_main()
 		Code interface    = scan_file( project_dir "components/gen.interface.hpp" );
 		Code header_end   = scan_file( project_dir "components/gen.header_end.hpp" );
 
+		Code builder = scan_file( project_dir "filesystem/gen.builder.hpp" );
+
 		header.print_fmt( "GEN_NS_BEGIN\n\n" );
 		header.print( types );
 		header.print( data_structs );
 		header.print( interface );
 		header.print( header_end );
+		header.print( builder );
 		header.print_fmt( "GEN_NS_END\n" );
 	}
 
@@ -139,6 +142,8 @@ int gen_main()
 			Code string     = scan_file( project_dir "dependencies/gen.string.cpp" );
 			Code timing     = scan_file( project_dir "dependencies/gen.timing.cpp" );
 
+			Code file_handling = scan_file( project_dir "dependencies/gen.file_handling.cpp" );
+
 			header.print_fmt( "GEN_NS_BEGIN\n\n");
 			header.print( impl_start );
 			header.print( debug );
@@ -149,6 +154,9 @@ int gen_main()
 			header.print( hashing );
 			header.print( string );
 			header.print( timing );
+
+			header.print( file_handling );
+
 			header.print_fmt( "GEN_NS_END\n");
 
 			header.print_fmt( roll_own_dependencies_guard_end );
@@ -162,6 +170,8 @@ int gen_main()
 		Code parsing         = scan_file( project_dir "components/gen.interface.parsing.cpp" );
 		Code untyped         = scan_file( project_dir "components/gen.untyped.cpp" );
 
+		Code builder = scan_file( project_dir "filesystem/gen.builder.cpp" );
+
 		header.print_fmt( "GEN_NS_BEGIN\n\n");
 		header.print( data );
 		header.print( ast_case_macros );
@@ -170,6 +180,7 @@ int gen_main()
 		header.print( upfront );
 		header.print( parsing );
 		header.print( untyped );
+			header.print( builder );
 		header.print_fmt( "GEN_NS_END\n");
 
 		header.print_fmt( "%s\n", (char const*) implementation_guard_end );