compiles agian...

project/auxillary/builder.cpp

@@ -1,3 +1,5 @@
+#include "builder.hpp"
+
 Builder Builder::open( char const* path )
 {
 	Builder result;

project/auxillary/builder.hpp

@@ -1,3 +1,6 @@
+#pragma once
+#include "gen.hpp"
+
 struct Builder
 {
 	FileInfo File;

project/auxillary/editor.hpp

@@ -1,9 +1,6 @@
 #pragma once
-
 #include "gen.scanner.hpp"
 
-namespace gen {
-
 struct Policy
 {
 	// Nothing for now.
@@ -68,6 +65,3 @@ struct Editor
 
 	bool process_requests( Array<Receipt> out_receipts );
 };
-
-// namespace gen
-};

project/auxillary/scanner.cpp

@@ -1 +1 @@
-
+#include "scanner.hpp"

project/auxillary/scanner.hpp

@@ -1,3 +1,6 @@
+#pragma once
+#include "gen.hpp"
+
 // This is a simple file reader that reads the entire file into memory.
 // It has an extra option to skip the first few lines for undesired includes.
 // This is done so that includes can be kept in dependency and component files so that intellisense works.
@@ -48,7 +51,7 @@ Code scan_file( char const* path, bool skip_header_includes = true )
 					}
 
 					// Skip the line
-					sptr skip_size = sptr( scanner - str );
+					sptr skip_size = sptr( scanner - str.Data );
 					if ( current == '\r' )
 					{
 						skip_size += 2;

project/components/ast.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "static_data.cpp"
+// #include "static_data.cpp"
 
 Code Code::Global;
 Code Code::Invalid;

project/components/ast.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "types.hpp"
+// #include "types.hpp"
-#include "temp/ecode.hpp"
+// #include "temp/ecode.hpp"
-#include "temp/eoperator.hpp"
+// #include "temp/eoperator.hpp"
-#include "temp/especifier.hpp"
+// #include "temp/especifier.hpp"
 
 struct AST;
 struct AST_Body;

project/components/ast_types.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "ast.hpp"
+// #include "ast.hpp"
 
 #pragma region AST Types
 /*

project/components/header_end.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "inlines.hpp"
+// #include "inlines.hpp"
-#include "temp/ast_inlines.hpp"
+// #include "temp/ast_inlines.hpp"
 
 #pragma region Constants
 
@@ -77,7 +77,7 @@ extern CodeSpecifiers spec_constexpr;
 extern CodeSpecifiers spec_constinit;
 extern CodeSpecifiers spec_extern_linkage;
 extern CodeSpecifiers spec_final;
-extern CodeSpeciifers spec_forceinline;
+extern CodeSpecifiers spec_forceinline;
 extern CodeSpecifiers spec_global;
 extern CodeSpecifiers spec_inline;
 extern CodeSpecifiers spec_internal_linkage;
@@ -144,11 +144,11 @@ extern CodeType t_typename;
 
 #	define args( ... ) num_args( __VA_ARGS__ ), __VA_ARGS__
 
-#	define code_str( ... ) gen::untyped_str( code( __VA_ARGS__ ) )
+#	define code_str( ... ) GEN_NS untyped_str( code( __VA_ARGS__ ) )
-#	define code_fmt( ... ) gen::untyped_str( token_fmt( __VA_ARGS__ ) )
+#	define code_fmt( ... ) GEN_NS untyped_str( token_fmt( __VA_ARGS__ ) )
 
 	// Takes a format string (char const*) and a list of tokens (StrC) and returns a StrC of the formatted string.
-#	define token_fmt( ... ) gen::token_fmt_impl( (num_args( __VA_ARGS__ ) + 1) / 2, __VA_ARGS__ )
+#	define token_fmt( ... ) GEN_NS token_fmt_impl( (num_args( __VA_ARGS__ ) + 1) / 2, __VA_ARGS__ )
 
 #pragma endregion Macros
 

project/components/header_start.hpp

@@ -20,9 +20,11 @@
 
 #ifndef GEN_NS_BEGIN
 #	ifdef GEN_DONT_USE_NAMESPACE
+#		define GEN_NS
 #		define GEN_NS_BEGIN
 #		define GEN_NS_END
 #	else
+#		define GEN_NS       gen::
 #		define GEN_NS_BEGIN namespace gen {
 #		define GEN_NS_END   }
 #	endif

project/components/inlines.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "interface.hpp"
+// #include "interface.hpp"
 
 void AST::append( AST* other )
 {

project/components/interface.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "ast.cpp"
+// #include "ast.cpp"
 
 internal void init_parser();
 internal void deinit_parser();

project/components/interface.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "ast_types.hpp"
+// #include "ast_types.hpp"
 
 #pragma region Gen Interface
 

project/components/interface.parsing.cpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "temp/etoktype.cpp"
+// #include "temp/etoktype.cpp"
-#include "interface.upfront.cpp"
+// #include "interface.upfront.cpp"
 
 namespace Parser
 {

project/components/interface.untyped.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "interface.parsing.cpp"
+// #include "interface.parsing.cpp"
 
 sw token_fmt_va( char* buf, uw buf_size, s32 num_tokens, va_list va )
 {

project/components/interface.upfront.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "interface.cpp"
+// #include "interface.cpp"
 
 #pragma region Upfront
 

project/components/static_data.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "src_start.cpp"
+// #include "src_start.cpp"
 
 #pragma region StaticData
 
@@ -50,7 +50,7 @@ global CodeSpecifiers spec_constexpr;
 global CodeSpecifiers spec_constinit;
 global CodeSpecifiers spec_extern_linkage;
 global CodeSpecifiers spec_final;
-global CodeSpeciifers spec_forceinline;
+global CodeSpecifiers spec_forceinline;
 global CodeSpecifiers spec_global;
 global CodeSpecifiers spec_inline;
 global CodeSpecifiers spec_internal_linkage;

project/components/types.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "header_start.hpp"
+// #include "header_start.hpp"
 
 using LogFailType = sw(*)(char const*, ...);
 

project/dependencies/basic_types.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "macros.hpp"
+// #include "macros.hpp"
 
 #pragma region Basic Types
 

project/dependencies/containers.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "printing.hpp"
+// #include "printing.hpp"
 
 #pragma region Containers
 

project/dependencies/debug.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "src_start.cpp"
+// #include "src_start.cpp"
 
 #pragma region Debug
 

project/dependencies/debug.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "basic_types.hpp"
+// #include "basic_types.hpp"
 
 #pragma region Debug
 

project/dependencies/filesystem.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "strings.cpp"
+// #include "strings.cpp"
 
 #pragma region File Handling
 

project/dependencies/filesystem.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "strings.hpp"
+// #include "strings.hpp"
 
 #pragma region File Handling
 

project/dependencies/hashing.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "memory.cpp"
+// #include "memory.cpp"
 
 #pragma region Hashing
 

project/dependencies/hashing.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "containers.hpp"
+// #include "containers.hpp"
 
 #pragma region Hashing
 

project/dependencies/header_start.hpp

@@ -116,9 +116,11 @@
 #pragma endregion Mandatory Includes
 
 #ifdef GEN_DONT_USE_NAMESPACE
+#	define GEN_NS
 #	define GEN_NS_BEGIN
 #	define GEN_NS_END
 #else
+#	define GEN_NS       gen::
 #	define GEN_NS_BEGIN namespace gen {
 #	define GEN_NS_END   }
 #endif

project/dependencies/macros.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "header_start.hpp"
+// #include "header_start.hpp"
 
 #pragma region Macros
 

project/dependencies/memory.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "printing.cpp"
+// #include "printing.cpp"
 
 #pragma region Memory
 

project/dependencies/memory.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "debug.hpp"
+// #include "debug.hpp"
 
 #pragma region Memory
 

project/dependencies/parsing.cpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #pragma region ADT
 
 #define _adt_fprintf( s_, fmt_, ... )                      \

project/dependencies/parsing.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #pragma region ADT
 
 enum ADT_Type : u32

project/dependencies/printing.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "string_ops.cpp"
+// #include "string_ops.cpp"
 
 #pragma region Printing
 

project/dependencies/printing.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "string_ops.hpp"
+// #include "string_ops.hpp"
 
 #pragma region Printing
 

project/dependencies/string_ops.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "debug.cpp"
+// #include "debug.cpp"
 
 #pragma region String Ops
 

project/dependencies/string_ops.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "memory.hpp"
+// #include "memory.hpp"
 
 #pragma region String Ops
 

project/dependencies/strings.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "hashing.cpp"
+// #include "hashing.cpp"
 
 #pragma region String
 

project/dependencies/strings.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "hashing.hpp"
+// #include "hashing.hpp"
 
 #pragma region Strings
 

project/dependencies/timing.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "filesystem.cpp"
+// #include "filesystem.cpp"
 
 #pragma region Timing
 

project/dependencies/timing.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "filesystem.hpp"
+// #include "filesystem.hpp"
 
 #pragma region Timing
 

project/gen.cpp

@@ -14,7 +14,7 @@
 #	include "gen.dep.cpp"
 #endif
 
-GEN_NS_BEGIN
+namespace gen {
 
 #include "components/static_data.cpp"
 
@@ -27,6 +27,6 @@ GEN_NS_BEGIN
 #include "components/interface.parsing.cpp"
 #include "components/interface.untyped.cpp"
 
-GEN_NS_END
+}
 
 #include "helpers/pop_ignores.inline.hpp"

project/gen.dep.cpp

@@ -3,7 +3,7 @@
 
 #include "dependencies/src_start.cpp"
 
-GEN_NS_BEGIN
+namespace gen {
 
 #include "dependencies/debug.cpp"
 #include "dependencies/string_ops.cpp"
@@ -14,4 +14,4 @@ GEN_NS_BEGIN
 #include "dependencies/filesystem.cpp"
 #include "dependencies/timing.cpp"
 
-GEN_NS_END
+}

project/gen.dep.hpp

@@ -3,7 +3,7 @@
 
 #include "dependencies/header_start.hpp"
 
-GEN_NS_BEGIN
+namespace gen {
 
 #include "dependencies/macros.hpp"
 #include "dependencies/basic_types.hpp"
@@ -17,4 +17,4 @@ GEN_NS_BEGIN
 #include "dependencies/filesystem.hpp"
 #include "dependencies/timing.hpp"
 
-GEN_NS_END
+}

project/gen.hpp

@@ -11,7 +11,7 @@
 #include "helpers/push_ignores.inline.hpp"
 #include "components/header_start.hpp"
 
-GEN_NS_BEGIN
+namespace gen {
 
 #include "components/types.hpp"
 #include "components/temp/ecode.hpp"
@@ -27,6 +27,6 @@ GEN_NS_BEGIN
 #include "components/temp/ast_inlines.hpp"
 #include "components/header_end.hpp"
 
-GEN_NS_END
+}
 
 #include "helpers/pop_ignores.inline.hpp"

project/helpers/helper.hpp

@@ -2,9 +2,9 @@
 
 #include "gen.hpp"
 
-GEN_NS_BEGIN
+namespace gen {
 #include "dependencies/parsing.hpp"
-GEN_NS_END
+}
 
 using namespace gen;
 
@@ -30,13 +30,7 @@ CodeBody gen_ecode( char const* path )
 		to_str_entries.append_fmt( "{ sizeof(\"%s\"), \"%s\" },\n", code, code );
 	}
 
-	CodeEnum enum_code = parse_enum( token_fmt( "entries", (StrC)enum_entries, stringize(
+	CodeEnum enum_code = parse_enum(gen::token_fmt_impl((3 + 1) / 2, "entries", (StrC)enum_entries, "enum Type : u32 { <entries> NumTypes };"));
-		enum Type : u32
-		{
-			<entries>
-			NumTypes
-		};
-	)));
 
 #pragma push_macro( "local_persist" )
 #undef local_persist