docs/Readme.md

@@ -25,8 +25,6 @@ This library was written in a subset of C++ where the following are not used at
 * Exceptions
 
 Polymorphic & Member-functions are used as an ergonomic choice, along with a conserative use of operator overloads.  
-The base library itself does not use anything but C-like features to allow for generating a derviative compatiable with C (WIP).
-
 There are only 4 template definitions in the entire library. (`Array<Type>`, `Hashtable<Type>`, `swap<Type>`, and `AST/Code::cast<Type>`)
 
 Two generic templated containers are used throughout the library:

gen_c_library/c_library.cpp

@@ -2,7 +2,6 @@
 #define GEN_ENFORCE_STRONG_CODE_TYPES
 #define GEN_EXPOSE_BACKEND
 #define GEN_SUPPORT_CPP_MEMBER_FEATURES 1
-#define GEN_SUPPORT_CPP_REFERENCES      1
 #include "../project/gen.cpp"
 
 #include "helpers/push_ignores.inline.hpp"
@@ -136,40 +135,26 @@ int gen_main()
 				case ECode::Using:
 				{
 					log_fmt("REPLACE THIS MANUALLY: %S\n", entry->Name);
-					CodeUsing   using_ver   = entry.code_cast<CodeUsing>();
+					CodeUsing   using_ver   = entry.cast<CodeUsing>();
 					CodeTypedef typedef_ver = def_typedef(using_ver->Name, using_ver->UnderlyingType);
 
 					memory.append(typedef_ver);
 				}
 				break;
-				case ECode::Function_Fwd:
-				{
-					CodeFn fn = entry.code_cast<CodeFn>();
-					if ( fn->Name.is_equal(txt("free")) )
-					{
-						fn->Name = get_cached_string(txt("gen_free_ptr"));
-					}
-					memory.append(entry);
-				}
-				break;
 				case ECode::Function:
 				{
-					CodeFn fn = entry.code_cast<CodeFn>();
+					CodeFn fn = entry.cast<CodeFn>();
 					s32 constexpr_found = fn->Specs.remove( ESpecifier::Constexpr );
 					if (constexpr_found > -1) {
 						log_fmt("Found constexpr: %S\n", entry->to_string());
 						fn->Specs.append(ESpecifier::Inline);
 					}
-					if ( fn->Name.is_equal(txt("free")) )
-					{
-						fn->Name = get_cached_string(txt("gen_free_ptr"));
-					}
 					memory.append(entry);
 				}
 				break;
 				case ECode::Template:
 				{
-					CodeTemplate tmpl = entry.code_cast<CodeTemplate>();
+					CodeTemplate tmpl = entry.cast<CodeTemplate>();
 					if ( tmpl->Declaration->Name.contains(txt("swap")))
 					{
 						CodeBody macro_swap = parse_global_body( txt(R"(
@@ -312,7 +297,7 @@ int gen_main()
 				{
 					if ( entry->Name.is_equal(txt("String")) )
 					{
-						CodeTypedef c_def = parse_typedef(code( typedef char* String; ));
+						CodeTypedef c_def = parse_typedef(code( typedef Type* String; ));
 						strings.append(c_def);
 						strings.append(fmt_newline);
 						++ entry;
@@ -322,29 +307,6 @@ int gen_main()
 				}
 				break;
 
-				case ECode::Struct:
-				{
-					CodeBody body     = entry->Body->operator CodeBody();
-					CodeBody new_body = def_body( entry->Body->Type );
-					for ( Code body_entry = body.begin(); body_entry != body.end(); ++ body_entry ) switch
-					(body_entry->Type) {
-						case ECode::Preprocess_If:
-						{
-							b32 found = ignore_preprocess_cond_block(txt("! GEN_COMPILER_C"), body_entry, body );
-							if (found) break;
-
-							new_body.append(body_entry);
-						}
-						break;
-						default:
-							new_body.append(body_entry);
-						break;
-					}
-					entry->Body = rcast(AST*, new_body.ast);
-					strings.append(entry);
-				}
-				break;
-
 				default:
 					strings.append(entry);
 				break;
@@ -354,8 +316,8 @@ int gen_main()
 
 		Code filesystem = scan_file( project_dir "dependencies/filesystem.hpp" );
 		Code timing = scan_file( project_dir "dependencies/timing.hpp" );
-		// header.print( filesystem );
-		// header.print( timing );
+		header.print( filesystem );
+		header.print( timing );
 
 		header.print_fmt( "\nGEN_NS_END\n" );
 		header.print_fmt( roll_own_dependencies_guard_end );
@@ -373,7 +335,6 @@ int gen_main()
 		CodeBody especifier  = gen_especifier( project_dir "enums/ESpecifier.csv" );
 		CodeBody ast_inlines = gen_ast_inlines();
 
-#if 0
 		header.print_fmt("#pragma region Types\n");
 		header.print( types );
 		header.print( fmt_newline );
@@ -384,7 +345,6 @@ int gen_main()
 		header.print( dump_to_scratch_and_retireve( especifier ));
 		header.print( fmt_newline );
 		header.print_fmt("#pragma endregion Types\n\n");
-	#endif
 	}
 
 	header.print( pop_ignores );

gen_c_library/components/memory.fixed_arena.hpp

@@ -20,7 +20,7 @@ CodeBody gen_fixed_arenas()
 		inline
 		void fixed_arena_init_<Name>(FixedArena_<Name>* result) {
 			zero_size(& result->memory[0], <Size>);
-			result->arena = arena_init_from_memory(& result->memory[0], <Size>);
+			result.arena = arena_init_from_memory(& result->memory[0], <Size>);
 		}
 
 		inline

gen_c_library/components/misc.hpp

@@ -8,7 +8,7 @@ using SwapContentProc = CodeBody(void);
 b32 ignore_preprocess_cond_block( StrC cond_sig, Code& entry_iter, CodeBody& body )
 {
 	b32 found = false;
-	CodePreprocessCond cond = entry_iter.code_cast<CodePreprocessCond>();
+	CodePreprocessCond cond = entry_iter.cast<CodePreprocessCond>();
 	if ( cond->Content.contains(cond_sig) )
 	{
 		log_fmt("Preprocess cond found: %S\n", cond->Content);
@@ -44,7 +44,7 @@ b32 ignore_preprocess_cond_block( StrC cond_sig, Code& entry_iter, CodeBody& bod
 bool swap_pragma_region_implementation( StrC region_name, SwapContentProc* swap_content, Code& entry_iter, CodeBody& body )
 {
 	bool found = false;
-	CodePragma possible_region = entry_iter.code_cast<CodePragma>();
+	CodePragma possible_region = entry_iter.cast<CodePragma>();
 
 	String region_sig    = string_fmt_buf(GlobalAllocator, "region %s",    region_name.Ptr);
 	String endregion_sig = string_fmt_buf(GlobalAllocator, "endregion %s", region_name.Ptr);
@@ -58,7 +58,7 @@ bool swap_pragma_region_implementation( StrC region_name, SwapContentProc* swap_
 		(entry_iter->Type) {
 			case ECode::Preprocess_Pragma:
 			{
-				CodePragma possible_end_region = entry_iter.code_cast<CodePragma>();
+				CodePragma possible_end_region = entry_iter.cast<CodePragma>();
 				if ( possible_end_region->Content.contains(endregion_sig) ) {
 					// body.append(possible_end_region);
 					continue_for = false;

gen_c_library/gen.c

@@ -1,7 +0,0 @@
-#define GEN_IMPLEMENTATION
-#include "gen/gen.h"
-
-int main()
-{
-	// init();
-}

project/Readme.md

@@ -30,13 +30,6 @@ Feature Macros:
 * `GEN_ROLL_OWN_DEPENDENCIES` : Optional override so that user may define the dependencies themselves.
 * `GEN_DONT_ALLOW_INVALID_CODE` (Not implemented yet) : Will fail when an invalid code is constructed, parsed, or serialized.
 
-By default the base library implementation strictly uses a C-like interface. This is to allow for the generation of a C-variant of the library using [gen_c_library](../gen_c_library/). However, the library was written in C++ and supports some of its features:
-
-* `GEN_SUPPORT_CPP_REFERENCES` : Will enable support for reference interface on some definitions
-* `GEN_SUPPORT_CPP_MEMBER_FEATURES` : Will enable support for definitions to have their interface as members.
-
-*Note: A variant of the C++ library could be generated where those additonal support features are removed (see gen_c_library implementation for an idea of how)*
-
 ## On multi-threading
 
 Currently unsupported. I want the library to be *stable* and *correct*, with the addition of exhausting all basic single-threaded optimizations before I consider multi-threading.

project/auxillary/builder.cpp

@@ -21,7 +21,7 @@ Builder Builder::open( char const* path )
 
 void Builder::pad_lines( s32 num )
 {
-	append( & Buffer,  "\n" );
+	append( Buffer,  "\n" );
 }
 
 void Builder::print( Code code )
@@ -29,7 +29,7 @@ void Builder::print( Code code )
 	String   str = code->to_string();
 	// const ssize len = str.length();
 	// log_fmt( "%s - print: %.*s\n", File.filename, len > 80 ? 80 : len, str.Data );
-	append( & Buffer, str );
+	append( Buffer, str );
 }
 
 void Builder::print_fmt( char const* fmt, ... )
@@ -43,7 +43,7 @@ void Builder::print_fmt( char const* fmt, ... )
 	va_end( va );
 
 	// log_fmt( "$%s - print_fmt: %.*s\n", File.filename, res > 80 ? 80 : res, buf );
-	append( & Buffer, buf, res );
+	append( Buffer, buf, res );
 }
 
 void Builder::write()
@@ -55,5 +55,5 @@ void Builder::write()
 
 	log_fmt( "Generated: %s\n", File.filename );
 	file_close( & File );
-	free(& Buffer);
+	free(Buffer);
 }

project/auxillary/scanner.hpp

@@ -25,7 +25,7 @@ Code scan_file( char const* path )
 
 	String str = string_make_reserve( GlobalAllocator, fsize );
 		file_read( & file, str, fsize );
-		get_header(str)->Length = fsize;
+		get_header(str).Length = fsize;
 
 	// Skip GEN_INTELLISENSE_DIRECTIVES preprocessor blocks
 	// Its designed so that the directive should be the first thing in the file.
@@ -97,12 +97,12 @@ Code scan_file( char const* path )
 					if ( (scanner + 2) >= ( str.Data + fsize ) )
 					{
 						mem_move( str, scanner, left );
-						get_header(str)->Length = left;
+						get_header(str).Length = left;
 						break;
 					}
 
 					mem_move( str, scanner, left );
-					get_header(str)->Length = left;
+					get_header(str).Length = left;
 
 					break;
 				}

project/bootstrap.cpp

@@ -1,8 +1,7 @@
 #define GEN_DEFINE_LIBRARY_CODE_CONSTANTS
 #define GEN_ENFORCE_STRONG_CODE_TYPES
 #define GEN_EXPOSE_BACKEND
-#define GEN_SUPPORT_CPP_MEMBER_FEATURES 1
-#define GEN_SUPPORT_CPP_REFERENCES      0
+#define GEN_SUPPORT_CPP_MEMBER_FEATURES 0
 #include "gen.cpp"
 
 #include "helpers/push_ignores.inline.hpp"
@@ -29,17 +28,17 @@ void format_file( char const* path )
 	String resolved_path = string_make(GlobalAllocator, to_str(path));
 
 	String style_arg = string_make(GlobalAllocator, txt("-style=file:"));
-	append( & style_arg, "../scripts/.clang-format ");
+	append( style_arg, "../scripts/.clang-format ");
 
 	// Need to execute clang format on the generated file to get it to match the original.
 	#define clang_format      "clang-format "
 	#define cf_format_inplace "-i "
 	#define cf_verbose        "-verbose "
 	String command = string_make( GlobalAllocator, clang_format );
-	append( & command, cf_format_inplace );
-	append( & command, cf_verbose );
-	append( & command, style_arg );
-	append( & command, resolved_path );
+	append( command, cf_format_inplace );
+	append( command, cf_verbose );
+	append( command, style_arg );
+	append( command, resolved_path );
 		log_fmt("\tRunning clang-format on file:\n");
 		system( command );
 		log_fmt("\tclang-format finished reformatting.\n");
@@ -64,8 +63,6 @@ int gen_main()
 {
 	gen::init();
 
-	// PreprocessorDefines.append("GEN_NS");
-
 	Code push_ignores = scan_file( "helpers/push_ignores.inline.hpp" );
 	Code pop_ignores  = scan_file( "helpers/pop_ignores.inline.hpp" );
 

project/components/ast.hpp

@@ -146,19 +146,6 @@ namespace parser
 	struct Token;
 }
 
-template< class Type> forceinline Type tmpl_cast( Code* self ) { return * rcast( Type*, self ); }
-#if ! GEN_COMPILER_C && 0
-template< class Type> forceinline Type tmpl_cast( Code& self ) { return * rcast( Type*, & self ); }
-#endif
-
-char const* debug_str (Code code);
-Code        duplicate (Code code);
-bool        is_equal  (Code code, Code other);
-bool        is_body   (Code code);
-bool        is_valid  (Code code);
-void        set_global(Code code);
-String      to_string (Code code);
-
 /*
 	AST* wrapper
 	- Not constantly have to append the '*' as this is written often..
@@ -166,26 +153,32 @@ String      to_string (Code code);
 */
 struct Code
 {
-	AST* ast;
+#	pragma region Statics
+	// Used to identify ASTs that should always be duplicated. (Global constant ASTs)
+	static Code Global;
+
+	// Used to identify invalid generated code.
+	static Code Invalid;
+#	pragma endregion Statics
 
 #	define Using_Code( Typename )          \
-	char const* debug_str()                { return GEN_NS debug_str(* this); } \
-	Code        duplicate()                { return GEN_NS duplicate(* this); }	\
-	bool        is_equal( Code other )     { return GEN_NS is_equal(* this, other); } \
-	bool        is_body()                  { return GEN_NS is_body(* this); } \
-	bool        is_valid()                 { return GEN_NS is_valid(* this); } \
-	void        set_global()               { return GEN_NS set_global(* this); } \
+	char const* debug_str();               \
+	Code        duplicate();			   \
+	bool        is_equal( Code other );    \
+	bool        is_body();                 \
+	bool        is_valid();                \
+	void        set_global();              \
 	String      to_string();               \
 	Typename&   operator = ( AST* other ); \
 	Typename&   operator = ( Code other ); \
-	bool        operator ==( Code other ) { return (AST*)ast == other.ast; } \
-	bool        operator !=( Code other ) { return (AST*)ast != other.ast; } \
+	bool        operator ==( Code other ); \
+	bool        operator !=( Code other ); \
 	operator bool();
 
 	Using_Code( Code );
 
 	template< class Type >
-	forceinline Type code_cast()
+	forceinline Type cast()
 	{
 		return * rcast( Type*, this );
 	}
@@ -208,6 +201,8 @@ struct Code
 		return *this;
 	}
 
+	AST* ast;
+
 #ifdef GEN_ENFORCE_STRONG_CODE_TYPES
 #	define operator explicit operator
 #endif
@@ -243,14 +238,6 @@ struct Code
 	#undef operator
 };
 
-#pragma region Statics
-// Used to identify ASTs that should always be duplicated. (Global constant ASTs)
-extern Code Code_Global;
-
-// Used to identify invalid generated code.
-extern Code Code_Invalid;
-#pragma endregion Statics
-
 struct Code_POD
 {
 	AST* ast;
@@ -261,54 +248,32 @@ static_assert( sizeof(Code) == sizeof(Code_POD), "ERROR: Code is not POD" );
 // Desired width of the AST data structure.
 constexpr int const AST_POD_Size = 128;
 
-void        append     ( AST* self, AST* other );
-char const* debug_str  ( AST* self );
-AST*        duplicate  ( AST* self );
-Code*       entry      ( AST* self, u32 idx );
-bool        has_entries( AST* self );
-bool        is_body    ( AST* self );
-bool        is_equal   ( AST* self, AST* other );
-String      to_string  ( AST* self );
-char const* type_str   ( AST* self );
-
-#if GEN_CPP_SUPPORT_REFERENCES
-void        append   ( AST& self, AST& other ) { return append(& self, & other); }
-bool        is_body  ( AST& self )             { return is_body(& self); }
-bool        is_equal ( AST& self, AST& other ) { return is_equal(& self, & other); }
-char const* debug_str( AST& self )             { return debug_str( & self ); }
-String      to_string( AST& self )             { return to_string( & self ); }
-char const* type_str ( AST& self )             { return type_str( & self ); }
-#endif
-
 /*
 	Simple AST POD with functionality to seralize into C++ syntax.
 */
 struct AST
 {
-#if GEN_SUPPORT_CPP_MEMBER_FEATURES
 #	pragma region Member Functions
-	void        append     ( AST* other ) { GEN_NS append(this, other); }
-	char const* debug_str  ()             { return GEN_NS debug_str(this); }
-	AST*        duplicate  ()             { return GEN_NS duplicate(this); }
-	Code*       entry      ( u32 idx )    { return GEN_NS entry(this, idx); }
+	void        append     ( AST* other );
+	char const* debug_str  ();
+	AST*        duplicate  ();
+	Code&       entry      ( u32 idx );
 	bool        has_entries();
-	bool        is_equal   ( AST* other )  { return GEN_NS is_equal(this, other); }
-	bool        is_body()                  { return GEN_NS is_body(this); }
-	char const* type_str()                 { return GEN_NS type_str(this); }
+	bool        is_equal   ( AST* other );
+	bool        is_body();
+	char const* type_str();
 	bool        validate_body();
 
-	String to_string(); //{ return GEN_NS to_string(this); }
-
-	template< class Type >
-	forceinline Type code_cast()
-	{
-		return * this;
-	}
+	String to_string();
 
 	neverinline
 	void to_string( String& result );
-#	pragma endregion Member Functions
-#endif
+
+	template< class Type >
+	forceinline Type cast()
+	{
+		return * this;
+	}
 
 	operator Code();
 	operator CodeBody();
@@ -340,6 +305,7 @@ struct AST
 	operator CodeUnion();
 	operator CodeUsing();
 	operator CodeVar();
+#	pragma endregion Member Functions
 
 	constexpr static
 	int ArrSpecs_Cap =
@@ -480,9 +446,12 @@ struct AST_POD
 	};
 };
 
+struct test {
+	SpecifierT ArrSpecs[AST::ArrSpecs_Cap]; // Specifiers
+	AST* NextSpecs;                         // Specifiers; If ArrSpecs is full, then NextSpecs is used.
+};
 
-// TODO(Ed): Convert
-String      to_string  ( AST* self ) { return self->to_string(); }
+constexpr int pls = sizeof(test);
 
 // Its intended for the AST to have equivalent size to its POD.
 // All extra functionality within the AST namespace should just be syntatic sugar.
@@ -491,4 +460,4 @@ static_assert( sizeof(AST_POD) == AST_POD_Size,    "ERROR: AST POD is not size o
 
 // Used when the its desired when omission is allowed in a definition.
 #define NoCode      { nullptr }
-#define InvalidCode (* Code_Invalid.ast) // Uses an implicitly overloaded cast from the AST to the desired code type.
+#define CodeInvalid (* Code::Invalid.ast) // Uses an implicitly overloaded cast from the AST to the desired code type.

project/components/code_types.hpp

@@ -11,30 +11,37 @@ struct CodeBody
 
 	void append( Code other )
 	{
-		GEN_ASSERT(other.ast != nullptr);
-
-		if (other.is_body()) {
-			append( cast(CodeBody, & other) );
+		if (other.is_body())
+		{
+			append( other.cast<CodeBody>() );
 		}
-
-		GEN_NS append( raw(), other.ast );
+		raw()->append( other.ast );
 	}
 	void append( CodeBody body )
 	{
-		for ( Code entry : body ) {
+		for ( Code entry : body )
+		{
 			append( entry );
 		}
 	}
-	bool has_entries() { return GEN_NS has_entries(rcast( AST*, ast )); }
-	AST* raw()         { return rcast( AST*, ast ); }
-
+	bool has_entries()
+	{
+		return rcast( AST*, ast )->has_entries();
+	}
 	void to_string( String& result );
 	void to_string_export( String& result );
-
-	AST_Body* operator->() { return ast; }
-
-	operator Code() { return * rcast( Code*, this ); }
-
+	AST* raw()
+	{
+		return rcast( AST*, ast );
+	}
+	AST_Body* operator->()
+	{
+		return ast;
+	}
+	operator Code()
+	{
+		return * rcast( Code*, this );
+	}
 #pragma region Iterator
 	Code begin()
 	{

project/components/inlines.hpp

@@ -4,62 +4,56 @@
 #endif
 
 inline
-void append( AST* self, AST* other )
+void AST::append( AST* other )
 {
-	GEN_ASSERT(self  != nullptr);
-	GEN_ASSERT(other != nullptr);
-
 	if ( other->Parent )
-		other = duplicate(other);
+		other = other->duplicate();
 
-	other->Parent = self;
+	other->Parent = this;
 
-	if ( self->Front == nullptr )
+	if ( Front == nullptr )
 	{
-		self->Front = other;
-		self->Back  = other;
+		Front = other;
+		Back  = other;
 
-		self->NumEntries++;
+		NumEntries++;
 		return;
 	}
 
 	AST*
-	Current       = self->Back;
+	Current       = Back;
 	Current->Next = other;
 	other->Prev   = Current;
-	self->Back    = other;
-	self->NumEntries++;
+	Back          = other;
+	NumEntries++;
 }
 
 inline
-Code* entry( AST* self, u32 idx )
+Code& AST::entry( u32 idx )
 {
-	GEN_ASSERT(self != nullptr);
-	AST** current = & self->Front;
+	AST** current = & Front;
 	while ( idx >= 0 && current != nullptr )
 	{
 		if ( idx == 0 )
-			return rcast( Code*, current);
+			return * rcast( Code*, current);
 
 		current = & ( * current )->Next;
 		idx--;
 	}
 
-	return rcast( Code*, current);
+	return * rcast( Code*, current);
 }
 
 inline
-bool has_entries(AST* self)
+bool AST::has_entries()
 {
-	GEN_ASSERT(self != nullptr);
-	return self->NumEntries > 0;
+	return NumEntries > 0;
 }
 
 inline
-bool is_body(AST* self)
+bool AST::is_body()
 {
-	GEN_ASSERT(self != nullptr);
-	switch (self->Type)
+	switch (Type)
 	{
 		case ECode::Enum_Body:
 		case ECode::Class_Body:
@@ -76,10 +70,9 @@ bool is_body(AST* self)
 }
 
 inline
-char const* type_str(AST* self)
+char const* AST::type_str()
 {
-	GEN_ASSERT(self != nullptr);
-	return ECode::to_str( self->Type );
+	return ECode::to_str( Type );
 }
 
 inline
@@ -88,69 +81,6 @@ AST::operator Code()
 	return { this };
 }
 
-#pragma region Code
-
-inline
-char const* debug_str( Code code )
-{
-	if ( code.ast == nullptr )
-		return "Code::debug_str: AST is null!";
-
-	return debug_str( code.ast );
-}
-
-inline
-Code duplicate( Code code )
-{
-	if ( code.ast == nullptr )
-	{
-		log_failure("Code::duplicate: Cannot duplicate code, AST is null!");
-		return Code_Invalid;
-	}
-
-	return { duplicate(code.ast) };
-}
-
-inline
-bool is_body(Code code)
-{
-	if ( code.ast == nullptr )
-	{
-		return is_body(code.ast);
-	}
-	return false;
-}
-
-inline
-bool is_equal( Code self, Code other )
-{
-	if ( self.ast == nullptr || other.ast == nullptr )
-	{
-		// Just check if they're both null.
-		// log_failure( "Code::is_equal: Cannot compare code, AST is null!" );
-		return self.ast == nullptr && other.ast == nullptr;
-	}
-	return is_equal( self.ast, other.ast );
-}
-
-inline
-bool is_valid(Code self)
-{
-	return self.ast != nullptr && self.ast->Type != CodeT::Invalid;
-}
-
-inline
-void set_global(Code self)
-{
-	if ( self.ast == nullptr )
-	{
-		log_failure("Code::set_global: Cannot set code as global, AST is null!");
-		return;
-	}
-
-	self->Parent = Code_Global.ast;
-}
-
 inline
 Code& Code::operator ++()
 {
@@ -160,8 +90,6 @@ Code& Code::operator ++()
 	return *this;
 }
 
-#pragma endregion Code
-
 inline
 void CodeClass::add_interface( CodeType type )
 {
@@ -189,7 +117,7 @@ void CodeParam::append( CodeParam other )
 	AST* entry = (AST*) other.ast;
 
 	if ( entry->Parent )
-		entry = GEN_NS duplicate( entry );
+		entry = entry->duplicate();
 
 	entry->Parent = self;
 
@@ -274,7 +202,7 @@ CodeBody def_body( CodeT type )
 
 		default:
 			log_failure( "def_body: Invalid type %s", (char const*)ECode::to_str(type) );
-			return (CodeBody)Code_Invalid;
+			return (CodeBody)Code::Invalid;
 	}
 
 	Code

project/components/interface.cpp

@@ -11,7 +11,7 @@ internal void deinit();
 internal
 void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
 {
-	Arena* last = back(& Global_AllocatorBuckets);
+	Arena* last = & back(Global_AllocatorBuckets);
 
 	switch ( type )
 	{
@@ -24,13 +24,13 @@ void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, s
 				if ( bucket.PhysicalStart == nullptr )
 					GEN_FATAL( "Failed to create bucket for Global_AllocatorBuckets");
 
-				if ( ! append( & Global_AllocatorBuckets, bucket ) )
+				if ( ! append( Global_AllocatorBuckets, bucket ) )
 					GEN_FATAL( "Failed to append bucket to Global_AllocatorBuckets");
 
-				last = back(& Global_AllocatorBuckets);
+				last = & back(Global_AllocatorBuckets);
 			}
 
-			return alloc_align( allocator_info(last), size, alignment );
+			return alloc_align( allocator_info(* last), size, alignment );
 		}
 		case EAllocation_FREE:
 		{
@@ -51,10 +51,10 @@ void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, s
 				if ( bucket.PhysicalStart == nullptr )
 					GEN_FATAL( "Failed to create bucket for Global_AllocatorBuckets");
 
-				if ( ! append( & Global_AllocatorBuckets, bucket ) )
+				if ( ! append( Global_AllocatorBuckets, bucket ) )
 					GEN_FATAL( "Failed to append bucket to Global_AllocatorBuckets");
 
-				last = back(& Global_AllocatorBuckets);
+				last = & back(Global_AllocatorBuckets);
 			}
 
 			void* result = alloc_align( last->Backing, size, alignment );
@@ -74,12 +74,12 @@ void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, s
 internal
 void define_constants()
 {
-	Code_Global                         = make_code();
-	scast(String, Code_Global->Name)    = get_cached_string( txt("Global Code") );
-	scast(String, Code_Global->Content) = Code_Global->Name;
+	Code::Global                         = make_code();
+	scast(String, Code::Global->Name)    = get_cached_string( txt("Global Code") );
+	scast(String, Code::Global->Content) = Code::Global->Name;
 
-	Code_Invalid = make_code();
-	Code_Invalid.set_global();
+	Code::Invalid = make_code();
+	Code::Invalid.set_global();
 
 	t_empty       = (CodeType) make_code();
 	t_empty->Type = ECode::Typename;
@@ -249,7 +249,7 @@ void init()
 		if ( bucket.PhysicalStart == nullptr )
 			GEN_FATAL( "Failed to create first bucket for Global_AllocatorBuckets");
 
-		append( & Global_AllocatorBuckets, bucket );
+		append( Global_AllocatorBuckets, bucket );
 	}
 
 	// Setup the arrays
@@ -272,7 +272,7 @@ void init()
 		if ( code_pool.PhysicalStart == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the code pool" );
 
-		append( & CodePools, code_pool );
+		append(CodePools, code_pool );
 
 		LexArena = arena_init_from_allocator( Allocator_Lexer, LexAllocator_Size );
 
@@ -281,7 +281,7 @@ void init()
 		if ( string_arena.PhysicalStart == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the string arena" );
 
-		append( & StringArenas, string_arena );
+		append(StringArenas, string_arena );
 	}
 
 	// Setup the hash tables
@@ -306,7 +306,7 @@ void deinit()
 	do
 	{
 		Pool* code_pool = & CodePools[index];
-		free(code_pool);
+		free(* code_pool);
 		index++;
 	}
 	while ( left--, left );
@@ -316,26 +316,26 @@ void deinit()
 	do
 	{
 		Arena* string_arena = & StringArenas[index];
-		free(string_arena);
+		free(* string_arena);
 		index++;
 	}
 	while ( left--, left );
 
-	destroy(& StringCache);
+	destroy(StringCache);
 
-	free( & CodePools);
-	free( & StringArenas);
+	free(CodePools);
+	free(StringArenas);
 
-	free(& LexArena);
+	free(LexArena);
 
-	free(& PreprocessorDefines);
+	free(PreprocessorDefines);
 
 	index = 0;
 	left  = num(Global_AllocatorBuckets);
 	do
 	{
 		Arena* bucket = & Global_AllocatorBuckets[ index ];
-		free(bucket);
+		free(* bucket);
 		index++;
 	}
 	while ( left--, left );
@@ -373,7 +373,7 @@ void reset()
 
 AllocatorInfo get_string_allocator( s32 str_length )
 {
-	Arena* last = back(& StringArenas);
+	Arena* last = & back(StringArenas);
 
 	usize size_req = str_length + sizeof(StringHeader) + sizeof(char*);
 
@@ -381,13 +381,13 @@ AllocatorInfo get_string_allocator( s32 str_length )
 	{
 		Arena new_arena = arena_init_from_allocator( Allocator_StringArena, SizePer_StringArena );
 
-		if ( ! append( & StringArenas, new_arena ) )
+		if ( ! append(StringArenas, new_arena ) )
 			GEN_FATAL( "gen::get_string_allocator: Failed to allocate a new string arena" );
 
-		last = back(& StringArenas);
+		last = & back(StringArenas);
 	}
 
-	return allocator_info(last);
+	return allocator_info(* last);
 }
 
 // Will either make or retrive a code string.
@@ -403,7 +403,7 @@ StringCached get_cached_string( StrC str )
 	}
 
 	String result = string_make( get_string_allocator( str.Len ), str );
-	set<StringCached>(& StringCache, key, result );
+	set<StringCached>(StringCache, key, result );
 
 	return result;
 }
@@ -411,7 +411,7 @@ StringCached get_cached_string( StrC str )
 // Used internally to retireve a Code object form the CodePool.
 Code make_code()
 {
-	Pool* allocator = back( & CodePools);
+	Pool* allocator = & back(CodePools);
 	if ( allocator->FreeList == nullptr )
 	{
 		Pool code_pool = pool_init( Allocator_CodePool, CodePool_NumBlocks, sizeof(AST) );
@@ -419,13 +419,13 @@ Code make_code()
 		if ( code_pool.PhysicalStart == nullptr )
 			GEN_FATAL( "gen::make_code: Failed to allocate a new code pool - CodePool allcoator returned nullptr." );
 
-		if ( ! append( & CodePools, code_pool ) )
+		if ( ! append( CodePools, code_pool ) )
 			GEN_FATAL( "gen::make_code: Failed to allocate a new code pool - CodePools failed to append new pool." );
 
-		allocator = back( & CodePools);
+		allocator = & back(CodePools);
 	}
 
-	Code result { rcast( AST*, alloc( allocator_info(allocator), sizeof(AST) )) };
+	Code result { rcast( AST*, alloc( allocator_info(* allocator), sizeof(AST) )) };
 	mem_set( result.ast, 0, sizeof(AST) );
 	// result->Type = ECode::Invalid;
 

project/components/interface.parsing.cpp

@@ -15,7 +15,7 @@ CodeClass parse_class( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	push_scope();
@@ -31,7 +31,7 @@ CodeConstructor parse_constructor( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	// TODO(Ed): Constructors can have prefix attributes
 
@@ -61,7 +61,7 @@ CodeConstructor parse_constructor( StrC def )
 			default :
 				log_failure( "Invalid specifier %s for variable\n%s", ESpecifier::to_str( spec ), Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		// Every specifier after would be considered part of the type type signature
@@ -91,7 +91,7 @@ CodeDestructor parse_destructor( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	// TODO(Ed): Destructors can have prefix attributes
 	// TODO(Ed): Destructors can have virtual
@@ -110,7 +110,7 @@ CodeEnum parse_enum( StrC def )
 	if ( toks.Arr == nullptr )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Context.Tokens = toks;
@@ -124,7 +124,7 @@ CodeBody parse_export_body( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_export_body();
@@ -137,7 +137,7 @@ CodeExtern parse_extern_link( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_extern_link();
@@ -150,7 +150,7 @@ CodeFriend parse_friend( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_friend();
@@ -163,7 +163,7 @@ CodeFn parse_function( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return (CodeFn) parse_function();
@@ -176,7 +176,7 @@ CodeBody parse_global_body( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	push_scope();
@@ -192,7 +192,7 @@ CodeNS parse_namespace( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_namespace();
@@ -205,7 +205,7 @@ CodeOperator parse_operator( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return (CodeOperator) parse_operator();
@@ -218,7 +218,7 @@ CodeOpCast parse_operator_cast( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_operator_cast();
@@ -231,7 +231,7 @@ CodeStruct parse_struct( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	push_scope();
@@ -247,7 +247,7 @@ CodeTemplate parse_template( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_template();
@@ -260,7 +260,7 @@ CodeType parse_type( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_type();
@@ -273,7 +273,7 @@ CodeTypedef parse_typedef( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_typedef();
@@ -286,7 +286,7 @@ CodeUnion parse_union( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_union();
@@ -299,7 +299,7 @@ CodeUsing parse_using( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_using();
@@ -312,7 +312,7 @@ CodeVar parse_variable( StrC def )
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return InvalidCode;
+		return CodeInvalid;
 
 	Context.Tokens = toks;
 	return parse_variable();

project/components/interface.untyped.cpp

@@ -17,7 +17,7 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 		char tok_map_mem[ TokenFmt_TokenMap_MemSize ];
 
 		tok_map_arena = arena_init_from_memory( tok_map_mem, sizeof(tok_map_mem) );
-		tok_map       = hashtable_init<StrC>( allocator_info(& tok_map_arena) );
+		tok_map       = hashtable_init<StrC>( allocator_info(tok_map_arena) );
 
 		s32 left = num_tokens - 1;
 
@@ -27,7 +27,8 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 			StrC        value = va_arg( va, StrC );
 
 			u32 key = crc32( token, str_len(token) );
-			set(& tok_map, key, value );
+
+			set(tok_map, key, value );
 		}
 	}
 
@@ -94,7 +95,7 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 	}
 
 	clear(tok_map);
-	free(& tok_map_arena);
+	free(tok_map_arena);
 
 	ssize result = buf_size - remaining;
 
@@ -106,7 +107,7 @@ Code untyped_str( StrC content )
 	if ( content.Len == 0 )
 	{
 		log_failure( "untyped_str: empty string" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Code
@@ -118,7 +119,7 @@ Code untyped_str( StrC content )
 	if ( result->Name == nullptr )
 	{
 		log_failure( "untyped_str: could not cache string" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	return result;
@@ -129,7 +130,7 @@ Code untyped_fmt( char const* fmt, ...)
 	if ( fmt == nullptr )
 	{
 		log_failure( "untyped_fmt: null format string" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	local_persist thread_local
@@ -149,7 +150,7 @@ Code untyped_fmt( char const* fmt, ...)
 	if ( result->Name == nullptr )
 	{
 		log_failure( "untyped_fmt: could not cache string" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	return result;
@@ -160,7 +161,7 @@ Code untyped_token_fmt( s32 num_tokens, ... )
 	if ( num_tokens == 0 )
 	{
 		log_failure( "untyped_token_fmt: zero tokens" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	local_persist thread_local
@@ -180,7 +181,7 @@ Code untyped_token_fmt( s32 num_tokens, ... )
 	if ( result->Name == nullptr )
 	{
 		log_failure( "untyped_fmt: could not cache string" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	return result;

project/components/interface.upfront.cpp

@@ -381,13 +381,13 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 	if ( Name_.Len <= 0 )                                                                             \
 	{                                                                                                 \
 		log_failure( "gen::" stringize(Context_) ": Invalid name length provided - %d",  Name_.Len ); \
-		return InvalidCode;                                                                           \
+		return CodeInvalid;                                                                           \
 	}                                                                                                 \
 																									  \
 	if ( Name_.Ptr == nullptr )                                                                       \
 	{                                                                                                 \
 		log_failure( "gen::" stringize(Context_) ": name is null" );                                  \
-		return InvalidCode;                                                                           \
+		return CodeInvalid;                                                                           \
 	}                                                                                                 \
 }
 
@@ -395,7 +395,7 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 	if ( ! Code_ )                                                                            \
 	{                                                                                         \
 		log_failure( "gen::" stringize(Context_) ": " stringize(Code_) " provided is null" ); \
-		return InvalidCode;                                                                   \
+		return CodeInvalid;                                                                   \
 	}
 
 #define null_or_invalid_check( Context_, Code_ )                                                \
@@ -403,19 +403,19 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 	if ( ! Code_ )                                                                              \
 	{                                                                                           \
 		log_failure( "gen::" stringize(Context_) ": " stringize(Code_) " provided is null" );   \
-		return InvalidCode;                                                                     \
+		return CodeInvalid;                                                                     \
 	}                                                                                           \
 																								\
 	if ( Code_->is_invalid() )                                                                  \
 	{                                                                                           \
 		log_failure("gen::" stringize(Context_) ": " stringize(Code_) " provided is invalid" ); \
-		return InvalidCode;                                                                     \
+		return CodeInvalid;                                                                     \
 	}                                                                                           \
 }
 
 #define not_implemented( Context_ )                             \
 	log_failure( "gen::%s: This function is not implemented" ); \
-	return InvalidCode;
+	return CodeInvalid;
 #pragma endregion Helper Marcos
 
 
@@ -436,7 +436,7 @@ CodeAttributes def_attributes( StrC content )
 	if ( content.Len <= 0 || content.Ptr == nullptr )
 	{
 		log_failure( "gen::def_attributes: Invalid attributes provided" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Code
@@ -453,7 +453,7 @@ CodeComment def_comment( StrC content )
 	if ( content.Len <= 0 || content.Ptr == nullptr )
 	{
 		log_failure( "gen::def_comment: Invalid comment provided:" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	static char line[ MaxCommentLineLength ];
@@ -474,15 +474,15 @@ CodeComment def_comment( StrC content )
 		length++;
 
 		str_copy( line, scanner, length );
-		append_fmt(& cmt_formatted, "//%.*s", length, line );
+		append_fmt(cmt_formatted, "//%.*s", length, line );
 		mem_set( line, 0, MaxCommentLineLength );
 
 		scanner += length;
 	}
 	while ( scanner <= end );
 
-	if ( * back(& cmt_formatted) != '\n' )
-		append( & cmt_formatted, "\n" );
+	if ( back(cmt_formatted) != '\n' )
+		append( cmt_formatted, "\n" );
 
 	Code
 	result          = make_code();
@@ -490,7 +490,7 @@ CodeComment def_comment( StrC content )
 	result->Name    = get_cached_string( cmt_formatted );
 	result->Content = result->Name;
 
-	free(& cmt_formatted);
+	free(cmt_formatted);
 
 	return (CodeComment) result;
 }
@@ -502,7 +502,7 @@ CodeConstructor def_constructor( CodeParam params, Code initializer_list, Code b
 	if ( params && params->Type != Parameters )
 	{
 		log_failure("gen::def_constructor: params must be of Parameters type - %s", params.debug_str());
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeConstructor
@@ -528,7 +528,7 @@ CodeConstructor def_constructor( CodeParam params, Code initializer_list, Code b
 
 			default:
 				log_failure("gen::def_constructor: body must be either of Function_Body or Untyped type - %s", body.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		result->Type = Constructor;
@@ -556,13 +556,13 @@ CodeClass def_class( StrC name
 	if ( attributes && attributes->Type != PlatformAttributes )
 	{
 		log_failure( "gen::def_class: attributes was not a 'PlatformAttributes' type: %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( parent && ( parent->Type != Class && parent->Type != Struct && parent->Type != Typename && parent->Type != Untyped ) )
 	{
 		log_failure( "gen::def_class: parent provided is not type 'Class', 'Struct', 'Typeanme', or 'Untyped': %s", parent.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeClass
@@ -580,7 +580,7 @@ CodeClass def_class( StrC name
 
 			default:
 				log_failure("gen::def_class: body must be either of Class_Body or Untyped type - %s", body.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		result->Type = Class;
@@ -623,7 +623,7 @@ CodeDefine def_define( StrC name, StrC content )
 	if ( content.Len <= 0 || content.Ptr == nullptr )
 	{
 		log_failure( "gen::def_define: Invalid value provided" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 #endif
 
@@ -648,7 +648,7 @@ CodeDestructor def_destructor( Code body, CodeSpecifiers specifiers )
 	if ( specifiers && specifiers->Type != Specifiers )
 	{
 		log_failure( "gen::def_destructor: specifiers was not a 'Specifiers' type: %s", specifiers.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeDestructor result = (CodeDestructor) make_code();
@@ -666,7 +666,7 @@ CodeDestructor def_destructor( Code body, CodeSpecifiers specifiers )
 
 			default:
 				log_failure("gen::def_destructor: body must be either of Function_Body or Untyped type - %s", body.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		result->Type = Destructor;
@@ -692,13 +692,13 @@ CodeEnum def_enum( StrC name
 	if ( type && type->Type != Typename )
 	{
 		log_failure( "gen::def_enum: enum underlying type provided was not of type Typename: %s", type.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( attributes && attributes->Type != PlatformAttributes )
 	{
 		log_failure( "gen::def_enum: attributes was not a 'PlatformAttributes' type: %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeEnum
@@ -716,7 +716,7 @@ CodeEnum def_enum( StrC name
 
 			default:
 				log_failure( "gen::def_enum: body must be of Enum_Body or Untyped type %s", body.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		result->Type = specifier == EnumDecl_Class ?
@@ -740,7 +740,7 @@ CodeEnum def_enum( StrC name
 	else if ( result->Type != Enum_Class_Fwd && result->Type != Enum_Fwd )
 	{
 		log_failure( "gen::def_enum: enum forward declaration must have an underlying type" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	return result;
@@ -751,7 +751,7 @@ CodeExec def_execution( StrC content )
 	if ( content.Len <= 0 || content.Ptr == nullptr )
 	{
 		log_failure( "gen::def_execution: Invalid execution provided" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Code
@@ -773,7 +773,7 @@ CodeExtern def_extern_link( StrC name, Code body )
 	if ( body->Type != Extern_Linkage_Body && body->Type != Untyped )
 	{
 		log_failure("gen::def_extern_linkage: body is not of extern_linkage or untyped type %s", body->debug_str());
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeExtern
@@ -805,7 +805,7 @@ CodeFriend def_friend( Code declaration )
 
 		default:
 			log_failure("gen::def_friend: requires declartion to have class, function, operator, or struct - %s", declaration->debug_str());
-			return InvalidCode;
+			return CodeInvalid;
 	}
 
 	CodeFriend
@@ -829,25 +829,25 @@ CodeFn def_function( StrC name
 	if ( params && params->Type != Parameters )
 	{
 		log_failure( "gen::def_function: params was not a `Parameters` type: %s", params.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( ret_type && ret_type->Type != Typename )
 	{
 		log_failure( "gen::def_function: ret_type was not a Typename: %s", ret_type.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( specifiers && specifiers->Type != Specifiers )
 	{
 		log_failure( "gen::def_function: specifiers was not a `Specifiers` type: %s", specifiers.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( attributes && attributes->Type != PlatformAttributes )
 	{
 		log_failure( "gen::def_function: attributes was not a `PlatformAttributes` type: %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeFn
@@ -867,7 +867,7 @@ CodeFn def_function( StrC name
 			default:
 			{
 				log_failure("gen::def_function: body must be either of Function_Body, Execution, or Untyped type. %s", body->debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 			}
 		}
 
@@ -905,7 +905,7 @@ CodeInclude def_include( StrC path, bool foreign )
 	if ( path.Len <= 0 || path.Ptr == nullptr )
 	{
 		log_failure( "gen::def_include: Invalid path provided - %d" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	StrC content = foreign ?
@@ -945,7 +945,7 @@ CodeNS def_namespace( StrC name, Code body, ModuleFlag mflags )
 	if ( body->Type != Namespace_Body && body->Type != Untyped )
 	{
 		log_failure("gen::def_namespace: body is not of namespace or untyped type %s", body.debug_str());
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeNS
@@ -968,20 +968,20 @@ CodeOperator def_operator( OperatorT op, StrC nspace
 	if ( attributes && attributes->Type != PlatformAttributes )
 	{
 		log_failure( "gen::def_operator: PlatformAttributes was provided but its not of attributes type: %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( specifiers && specifiers->Type != Specifiers )
 	{
 		log_failure( "gen::def_operator: Specifiers was provided but its not of specifiers type: %s", specifiers.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	OpValidateResult check_result = operator__validate( op, params_code, ret_type, specifiers );
 
 	if ( check_result == OpValidateResult::Fail )
 	{
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	char const* name = nullptr;
@@ -1009,7 +1009,7 @@ CodeOperator def_operator( OperatorT op, StrC nspace
 			default:
 			{
 				log_failure("gen::def_operator: body must be either of Function_Body, Execution, or Untyped type. %s", body->debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 			}
 		}
 
@@ -1046,7 +1046,7 @@ CodeOpCast def_operator_cast( CodeType type, Code body, CodeSpecifiers const_spe
 	if ( type->Type != Typename )
 	{
 		log_failure( "gen::def_operator_cast: type is not a typename - %s", type.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeOpCast result = (CodeOpCast) make_code();
@@ -1058,7 +1058,7 @@ CodeOpCast def_operator_cast( CodeType type, Code body, CodeSpecifiers const_spe
 		if ( body->Type != Function_Body && body->Type != Execution )
 		{
 			log_failure( "gen::def_operator_cast: body is not of function body or execution type - %s", body.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result->Body = body;
@@ -1087,13 +1087,13 @@ CodeParam def_param( CodeType type, StrC name, Code value )
 	if ( type->Type != Typename )
 	{
 		log_failure( "gen::def_param: type is not a typename - %s", type.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( value && value->Type != Untyped )
 	{
 		log_failure( "gen::def_param: value is not untyped - %s", value.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeParam
@@ -1118,7 +1118,7 @@ CodePragma def_pragma( StrC directive )
 	if ( directive.Len <= 0 || directive.Ptr == nullptr )
 	{
 		log_failure( "gen::def_comment: Invalid comment provided:" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodePragma
@@ -1136,7 +1136,7 @@ CodePreprocessCond def_preprocess_cond( EPreprocessCond type, StrC expr )
 	if ( expr.Len <= 0 || expr.Ptr == nullptr )
 	{
 		log_failure( "gen::def_comment: Invalid comment provided:" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodePreprocessCond
@@ -1184,19 +1184,19 @@ CodeStruct def_struct( StrC name
 	if ( attributes && attributes->Type != PlatformAttributes )
 	{
 		log_failure( "gen::def_struct: attributes was not a `PlatformAttributes` type - %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( parent && parent->Type != Typename )
 	{
 		log_failure( "gen::def_struct: parent was not a `Struct` type - %s", parent.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( body && body->Type != Struct_Body )
 	{
 		log_failure( "gen::def_struct: body was not a Struct_Body type - %s", body.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeStruct
@@ -1243,7 +1243,7 @@ CodeTemplate def_template( CodeParam params, Code declaration, ModuleFlag mflags
 	if ( params && params->Type != ECode::Parameters )
 	{
 		log_failure( "gen::def_template: params is not of parameters type - %s", params.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	switch (declaration->Type )
@@ -1276,19 +1276,19 @@ CodeType def_type( StrC name, Code arrayexpr, CodeSpecifiers specifiers, CodeAtt
 	if ( attributes && attributes->Type != ECode::PlatformAttributes )
 	{
 		log_failure( "gen::def_type: attributes is not of attributes type - %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( specifiers && specifiers->Type != ECode::Specifiers )
 	{
 		log_failure( "gen::def_type: specifiers is not of specifiers type - %s", specifiers.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( arrayexpr && arrayexpr->Type != ECode::Untyped )
 	{
 		log_failure( "gen::def_type: arrayexpr is not of untyped type - %s", arrayexpr->debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeType
@@ -1330,13 +1330,13 @@ CodeTypedef def_typedef( StrC name, Code type, CodeAttributes attributes, Module
 			break;
 		default:
 			log_failure( "gen::def_typedef: type was not a Class, Enum, Function Forward, Struct, Typename, or Union - %s", type.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 	}
 
 	if ( attributes && attributes->Type != ECode::PlatformAttributes )
 	{
 		log_failure( "gen::def_typedef: attributes was not a PlatformAttributes - %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	// Registering the type.
@@ -1345,7 +1345,7 @@ CodeTypedef def_typedef( StrC name, Code type, CodeAttributes attributes, Module
 	if ( ! registered_type )
 	{
 		log_failure( "gen::def_typedef: failed to register type" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeTypedef
@@ -1360,7 +1360,7 @@ CodeTypedef def_typedef( StrC name, Code type, CodeAttributes attributes, Module
 		if (type->Type != Untyped)
 		{
 			log_failure( "gen::def_typedef: name was empty and type was not untyped (indicating its a function typedef) - %s", type.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result->Name       = get_cached_string( type->Name );
@@ -1382,13 +1382,13 @@ CodeUnion def_union( StrC name, Code body, CodeAttributes attributes, ModuleFlag
 	if ( body->Type != ECode::Union_Body )
 	{
 		log_failure( "gen::def_union: body was not a Union_Body type - %s", body.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( attributes && attributes->Type != ECode::PlatformAttributes )
 	{
 		log_failure( "gen::def_union: attributes was not a PlatformAttributes type - %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeUnion
@@ -1419,13 +1419,13 @@ CodeUsing def_using( StrC name, CodeType type
 	if ( ! register_type )
 	{
 		log_failure( "gen::def_using: failed to register type" );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( attributes && attributes->Type != ECode::PlatformAttributes )
 	{
 		log_failure( "gen::def_using: attributes was not a PlatformAttributes type - %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeUsing
@@ -1465,25 +1465,25 @@ CodeVar def_variable( CodeType type, StrC name, Code value
 	if ( attributes && attributes->Type != ECode::PlatformAttributes )
 	{
 		log_failure( "gen::def_variable: attributes was not a `PlatformAttributes` type - %s", attributes.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( specifiers && specifiers->Type != ECode::Specifiers )
 	{
 		log_failure( "gen::def_variable: specifiers was not a `Specifiers` type - %s", specifiers.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( type->Type != ECode::Typename )
 	{
 		log_failure( "gen::def_variable: type was not a Typename - %s", type.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( value && value->Type != ECode::Untyped )
 	{
 		log_failure( "gen::def_variable: value was not a `Untyped` type - %s", value.debug_str() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeVar
@@ -1513,7 +1513,7 @@ using namespace ECode;                                                        \
 if ( num <= 0 )                                                               \
 {                                                                             \
 	log_failure("gen::" stringize(Name_) ": num cannot be zero or negative"); \
-	return InvalidCode;                                                       \
+	return CodeInvalid;                                                       \
 }
 
 #define def_body_code_array_start( Name_ )                                     \
@@ -1522,13 +1522,13 @@ using namespace ECode;                                                         \
 if ( num <= 0 )                                                                \
 {                                                                              \
 	log_failure("gen::" stringize(Name_) ": num cannot be zero or negative");  \
-	return InvalidCode;                                                        \
+	return CodeInvalid;                                                        \
 }                                                                              \
 																			   \
 if ( codes == nullptr )                                                        \
 {                                                                              \
 	log_failure("gen::" stringize(Name_)" : Provided a null array of codes");  \
-	return InvalidCode;                                                        \
+	return CodeInvalid;                                                        \
 }
 
 #pragma endregion Helper Macros for def_**_body functions
@@ -1552,14 +1552,14 @@ CodeBody def_class_body( s32 num, ... )
 			log_failure("gen::"
 						"def_class_body"
 						": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_CLASS_UNALLOWED_TYPES
 				log_failure("gen::" "def_class_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1589,14 +1589,14 @@ CodeBody def_class_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_class_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_CLASS_UNALLOWED_TYPES
 				log_failure("gen::" "def_class_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1627,13 +1627,13 @@ CodeBody def_enum_body( s32 num, ... )
 		if ( ! entry )
 		{
 			log_failure("gen::def_enum_body: Provided a null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		if ( entry->Type != Untyped && entry->Type != Comment )
 		{
 			log_failure("gen::def_enum_body: Entry type is not allowed - %s. Must be of untyped or comment type.", entry.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result.append( entry );
@@ -1659,13 +1659,13 @@ CodeBody def_enum_body( s32 num, Code* codes )
 		if ( ! entry )
 		{
 			log_failure("gen::def_enum_body: Provided a null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		if ( entry->Type != Untyped && entry->Type != Comment )
 		{
 			log_failure("gen::def_enum_body: Entry type is not allowed: %s", entry.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result.append( entry );
@@ -1693,14 +1693,14 @@ CodeBody def_export_body( s32 num, ... )
 		if (!entry)
 		{
 			log_failure("gen::" "def_export_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_EXPORT_UNALLOWED_TYPES
 				log_failure("gen::" "def_export_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1730,14 +1730,14 @@ CodeBody def_export_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_export_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_EXPORT_UNALLOWED_TYPES
 				log_failure("gen::" "def_export_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1768,14 +1768,14 @@ CodeBody def_extern_link_body( s32 num, ... )
 		if (!entry)
 		{
 			log_failure("gen::" "def_extern_linkage_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES
 				log_failure("gen::" "def_extern_linkage_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1805,14 +1805,14 @@ CodeBody def_extern_link_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_extern_linkage_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES
 				log_failure("gen::" "def_extern_linkage_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1844,7 +1844,7 @@ CodeBody def_function_body( s32 num, ... )
 		if (!entry)
 		{
 			log_failure("gen::" stringize(def_function_body) ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
@@ -1852,7 +1852,7 @@ CodeBody def_function_body( s32 num, ... )
 
 			GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES
 				log_failure("gen::" stringize(def_function_body) ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1882,14 +1882,14 @@ CodeBody def_function_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_function_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES
 				log_failure("gen::" "def_function_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -1919,18 +1919,18 @@ CodeBody def_global_body( s32 num, ... )
 		if (!entry)
 		{
 			log_failure("gen::" "def_global_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			case Global_Body:
-				result.append( entry.code_cast<CodeBody>() ) ;
+				result.append( entry.cast<CodeBody>() ) ;
 				continue;
 
 			GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
 				log_failure("gen::" "def_global_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return (*Code::Invalid.ast);
 
 			default:
 			break;
@@ -1960,18 +1960,18 @@ CodeBody def_global_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_global_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			case Global_Body:
-				result.append( entry.code_cast<CodeBody>() ) ;
+				result.append( entry.cast<CodeBody>() ) ;
 				continue;
 
 			GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
 				log_failure("gen::" "def_global_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -2002,14 +2002,14 @@ CodeBody def_namespace_body( s32 num, ... )
 		if (!entry)
 		{
 			log_failure("gen::" "def_namespace_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES
 				log_failure("gen::" "def_namespace_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -2039,14 +2039,14 @@ CodeBody def_namespace_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_namespace_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES
 				log_failure("gen::" "def_namespace_body" ": Entry type is not allowed: %s", entry.debug_str() );
-				return InvalidCode;
+				return CodeInvalid;
 
 			default: break;
 		}
@@ -2073,7 +2073,7 @@ CodeParam def_params( s32 num, ... )
 	if ( param->Type != Parameters )
 	{
 		log_failure( "gen::def_params: param %d is not a Parameters", num - num + 1 );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeParam result = (CodeParam) param.duplicate();
@@ -2086,7 +2086,7 @@ CodeParam def_params( s32 num, ... )
 		if ( param->Type != Parameters )
 		{
 			log_failure( "gen::def_params: param %d is not a Parameters", num - num + 1 );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result.append( param );
@@ -2104,13 +2104,13 @@ CodeParam def_params( s32 num, CodeParam* codes )
 	if ( current.ast == nullptr )                                                                               \
 	{                                                                                                           \
 		log_failure("gen::def_params: Provide a null code in codes array");                                     \
-		return InvalidCode;                                                                                     \
+		return CodeInvalid;                                                                                     \
 	}                                                                                                           \
 																												\
 	if (current->Type != Parameters )                                                                           \
 	{                                                                                                           \
 		log_failure("gen::def_params: Code in coes array is not of paramter type - %s", current.debug_str() );  \
-		return InvalidCode;                                                                                     \
+		return CodeInvalid;                                                                                     \
 	}
 
 	CodeParam current = (CodeParam) codes->duplicate();
@@ -2137,13 +2137,13 @@ CodeSpecifiers def_specifiers( s32 num, ... )
 	if ( num <= 0 )
 	{
 		log_failure("gen::def_specifiers: num cannot be zero or less");
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( num > AST::ArrSpecs_Cap )
 	{
 		log_failure("gen::def_specifiers: num of speciifers to define AST larger than AST specicifier capacity - %d", num);
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeSpecifiers
@@ -2169,13 +2169,13 @@ CodeSpecifiers def_specifiers( s32 num, SpecifierT* specs )
 	if ( num <= 0 )
 	{
 		log_failure("gen::def_specifiers: num cannot be zero or less");
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( num > AST::ArrSpecs_Cap )
 	{
 		log_failure("gen::def_specifiers: num of speciifers to define AST larger than AST specicifier capacity - %d", num);
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodeSpecifiers
@@ -2211,14 +2211,14 @@ CodeBody def_struct_body( s32 num, ... )
 		if (!entry)
 		{
 			log_failure("gen::" "def_struct_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_STRUCT_UNALLOWED_TYPES
 				log_failure("gen::" "def_struct_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -2248,14 +2248,14 @@ CodeBody def_struct_body( s32 num, Code* codes )
 		if (!entry)
 		{
 			log_failure("gen::" "def_struct_body" ": Provided an null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		switch (entry->Type)
 		{
 			GEN_AST_BODY_STRUCT_UNALLOWED_TYPES
 				log_failure("gen::" "def_struct_body" ": Entry type is not allowed: %s", entry.debug_str() );
-				return InvalidCode;
+				return CodeInvalid;
 
 			default:
 			break;
@@ -2286,13 +2286,13 @@ CodeBody def_union_body( s32 num, ... )
 		if ( ! entry )
 		{
 			log_failure("gen::def_union_body: Provided a null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		if ( entry->Type != Untyped && entry->Type != Comment )
 		{
 			log_failure("gen::def_union_body: Entry type is not allowed - %s. Must be of untyped or comment type.", entry.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result.append( entry );
@@ -2318,13 +2318,13 @@ CodeBody def_union_body( s32 num, CodeUnion* codes )
 		if ( ! entry )
 		{
 			log_failure("gen::def_union_body: Provided a null entry");
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		if ( entry->Type != Untyped && entry->Type != Comment )
 		{
 			log_failure("gen::def_union_body: Entry type is not allowed: %s", entry.debug_str() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result.append( entry );

project/components/lexer.cpp

@@ -93,7 +93,7 @@ struct Token
 
 		StrC type_str = ETokType::to_str( Type );
 
-		append_fmt( & result, "Line: %d Column: %d, Type: %.*s Content: %.*s"
+		append_fmt( result, "Line: %d Column: %d, Type: %.*s Content: %.*s"
 			, Line, Column
 			, type_str.Len, type_str.Ptr
 			, Length, Text
@@ -222,7 +222,7 @@ s32 lex_preprocessor_directive(
 	, Token&           token )
 {
 	char const* hash = scanner;
-	append( & Tokens, { hash, 1, TokType::Preprocess_Hash, line, column, TF_Preprocess } );
+	append(Tokens, { hash, 1, TokType::Preprocess_Hash, line, column, TF_Preprocess } );
 
 	move_forward();
 	SkipWhitespace();
@@ -298,14 +298,14 @@ s32 lex_preprocessor_directive(
 
 		token.Length = token.Length + token.Text - hash;
 		token.Text   = hash;
-		append( & Tokens, token );
+		append(Tokens, token );
 		return Lex_Continue; // Skip found token, its all handled here.
 	}
 
 	if ( token.Type == TokType::Preprocess_Else || token.Type == TokType::Preprocess_EndIf )
 	{
 		token.Flags |= TF_Preprocess_Cond;
-		append( & Tokens, token );
+		append(Tokens, token );
 		end_line();
 		return Lex_Continue;
 	}
@@ -314,7 +314,7 @@ s32 lex_preprocessor_directive(
 		token.Flags |= TF_Preprocess_Cond;
 	}
 
-	append( & Tokens, token );
+	append(Tokens, token );
 
 	SkipWhitespace();
 
@@ -338,10 +338,10 @@ s32 lex_preprocessor_directive(
 			name.Length++;
 		}
 
-		append( & Tokens, name );
+		append(Tokens, name );
 
 		u64 key = crc32( name.Text, name.Length );
-		set<StrC>(& defines, key, name );
+		set<StrC>(defines, key, name );
 	}
 
 	Token preprocess_content = { scanner, 0, TokType::Preprocess_Content, line, column, TF_Preprocess };
@@ -384,7 +384,7 @@ s32 lex_preprocessor_directive(
 			move_forward();
 		}
 
-		append( & Tokens, preprocess_content );
+		append(Tokens, preprocess_content );
 		return Lex_Continue; // Skip found token, its all handled here.
 	}
 
@@ -446,7 +446,7 @@ s32 lex_preprocessor_directive(
 		preprocess_content.Length++;
 	}
 
-	append( & Tokens, preprocess_content );
+	append(Tokens, preprocess_content );
 	return Lex_Continue; // Skip found token, its all handled here.
 }
 
@@ -461,7 +461,7 @@ void lex_found_token( StrC& content
 {
 	if ( token.Type != TokType::Invalid )
 	{
-		append( & Tokens, token );
+		append(Tokens, token );
 		return;
 	}
 
@@ -488,7 +488,7 @@ void lex_found_token( StrC& content
 		}
 
 		token.Type = type;
-		append( & Tokens, token );
+		append(Tokens, token );
 		return;
 	}
 
@@ -498,7 +498,7 @@ void lex_found_token( StrC& content
 	{
 		token.Type   = type;
 		token.Flags |= TF_Specifier;
-		append( & Tokens, token );
+		append(Tokens, token );
 		return;
 	}
 
@@ -506,7 +506,7 @@ void lex_found_token( StrC& content
 	if ( type != TokType::Invalid )
 	{
 		token.Type = type;
-		append( & Tokens, token );
+		append(Tokens, token );
 		return;
 	}
 
@@ -558,7 +558,7 @@ void lex_found_token( StrC& content
 		token.Type = TokType::Identifier;
 	}
 
-	append( & Tokens, token );
+	append(Tokens, token );
 }
 
 
@@ -579,7 +579,7 @@ TokArray lex( StrC content )
 	if ( left <= 0 )
 	{
 		log_failure( "gen::lex: no tokens found (only whitespace provided)" );
-		return { {}, 0 };
+		return { { nullptr }, 0 };
 	}
 
 	foreach( StringCached, entry, PreprocessorDefines )
@@ -597,7 +597,7 @@ TokArray lex( StrC content )
 		}
 
 		u64 key = crc32( entry.Data, length );
-		set<StrC>(& defines, key, entry );
+		set<StrC>(defines, key, entry );
 	}
 
 	clear(Tokens);
@@ -630,7 +630,7 @@ TokArray lex( StrC content )
 				token.Type = TokType::NewLine;
 				token.Length++;
 
-				append( & Tokens, token );
+				append(Tokens, token );
 				continue;
 			}
 		}
@@ -652,7 +652,7 @@ TokArray lex( StrC content )
 						continue;
 
 					case Lex_ReturnNull:
-						return { {}, 0 };
+						return { { nullptr }, 0 };
 				}
 			}
 			case '.':
@@ -1099,7 +1099,7 @@ TokArray lex( StrC content )
 							move_forward();
 							token.Length++;
 						}
-						append( & Tokens, token );
+						append(Tokens, token );
 						continue;
 					}
 					else if ( current == '*' )
@@ -1135,7 +1135,7 @@ TokArray lex( StrC content )
 							move_forward();
 							token.Length++;
 						}
-						append( & Tokens, token );
+						append(Tokens, token );
 						// end_line();
 						continue;
 					}
@@ -1256,7 +1256,7 @@ TokArray lex( StrC content )
 	if ( num(Tokens) == 0 )
 	{
 		log_failure( "Failed to lex any tokens" );
-		return { {}, 0 };
+		return { { nullptr }, 0 };
 	}
 
 	clear(defines);

project/components/parser.cpp

@@ -52,24 +52,24 @@ struct ParseContext
 
 		sptr        length  = scope_start.Length;
 		char const* current = scope_start.Text + length;
-		while ( current <= back( & Tokens.Arr)->Text && *current != '\n' && length < 74 )
+		while ( current <= back(Tokens.Arr).Text && *current != '\n' && length < 74 )
 		{
 			current++;
 			length++;
 		}
 
 		String line = string_make( GlobalAllocator, { length, scope_start.Text } );
-		append_fmt( & result, "\tScope    : %s\n", line );
-		free(& line);
+		append_fmt( result, "\tScope    : %s\n", line );
+		free(line);
 
 		sptr   dist            = (sptr)last_valid.Text - (sptr)scope_start.Text + 2;
 		sptr   length_from_err = dist;
 		String line_from_err   = string_make( GlobalAllocator, { length_from_err, last_valid.Text } );
 
 		if ( length_from_err < 100 )
-			append_fmt(& result, "\t(%d, %d):%*c\n", last_valid.Line, last_valid.Column, length_from_err, '^' );
+			append_fmt(result, "\t(%d, %d):%*c\n", last_valid.Line, last_valid.Column, length_from_err, '^' );
 		else
-			append_fmt(& result, "\t(%d, %d)\n", last_valid.Line, last_valid.Column );
+			append_fmt(result, "\t(%d, %d)\n", last_valid.Line, last_valid.Column );
 
 		StackNode* curr_scope = Scope;
 		s32 level = 0;
@@ -77,11 +77,11 @@ struct ParseContext
 		{
 			if ( curr_scope->Name )
 			{
-				append_fmt(& result, "\t%d: %s, AST Name: %.*s\n", level, curr_scope->ProcName.Ptr, curr_scope->Name.Length, curr_scope->Name.Text );
+				append_fmt(result, "\t%d: %s, AST Name: %.*s\n", level, curr_scope->ProcName.Ptr, curr_scope->Name.Length, curr_scope->Name.Text );
 			}
 			else
 			{
-				append_fmt(& result, "\t%d: %s\n", level, curr_scope->ProcName.Ptr );
+				append_fmt(result, "\t%d: %s\n", level, curr_scope->ProcName.Ptr );
 			}
 
 			curr_scope = curr_scope->Prev;
@@ -132,12 +132,12 @@ bool TokArray::__eat( TokType type )
 internal
 void init()
 {
-	Tokens = array_init_reserve<Token>( allocator_info( & LexArena)
+	Tokens = array_init_reserve<Token>( allocator_info(LexArena)
 		, ( LexAllocator_Size - sizeof( ArrayHeader ) ) / sizeof(Token)
 	);
 
-	fixed_arena_init(& defines_map_arena);
-	defines = hashtable_init_reserve<StrC>( allocator_info( & defines_map_arena), 256 );
+	fixed_arena_init(defines_map_arena);
+	defines = hashtable_init_reserve<StrC>( allocator_info(defines_map_arena), 256 );
 }
 
 internal
@@ -153,13 +153,13 @@ if ( def.Len <= 0 )                                                            \
 {                                                                              \
 	log_failure( "gen::" stringize(__func__) ": length must greater than 0" ); \
 	parser::Context.pop();                                                     \
-	return InvalidCode;                                                        \
+	return CodeInvalid;                                                        \
 }                                                                              \
 if ( def.Ptr == nullptr )                                                      \
 {                                                                              \
 	log_failure( "gen::" stringize(__func__) ": def was null" );               \
 	parser::Context.pop();                                                     \
-	return InvalidCode;                                                        \
+	return CodeInvalid;                                                        \
 }
 
 #	define currtok_noskip Context.Tokens.current( dont_skip_formatting )
@@ -290,7 +290,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			if ( tokleft )
 				move_fwd();
 
-			append( & content, cut_ptr, cut_length );
+			append( content, cut_ptr, cut_length );
 			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 			continue;
 		}
@@ -312,7 +312,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			if ( tokleft )
 				move_fwd();
 
-			append( & content, cut_ptr, cut_length );
+			append( content, cut_ptr, cut_length );
 			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 			continue;
 		}
@@ -326,7 +326,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			scanner += 2;
 			tokleft -= 2;
 
-			append( & content,  cut_ptr, cut_length );
+			append( content,  cut_ptr, cut_length );
 			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 			continue;
 		}
@@ -345,7 +345,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			if (tokleft)
 				move_fwd();
 
-			append( & content,  cut_ptr, cut_length );
+			append( content,  cut_ptr, cut_length );
 			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 			continue;
 		}
@@ -354,10 +354,10 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 		if (scanner[0] == '\t')
 		{
 			if (pos > last_cut)
-				append( & content, cut_ptr, cut_length);
+				append( content, cut_ptr, cut_length);
 
-			if ( * back( & content ) != ' ' )
-				append( & content, ' ');
+			if ( back( content ) != ' ' )
+				append( content, ' ');
 
 			move_fwd();
 			last_cut = sptr(scanner) - sptr(raw_text.Ptr);
@@ -373,17 +373,17 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 				scanner += 2;
 				tokleft -= 2;
 
-				append( & content,  cut_ptr, cut_length );
+				append( content,  cut_ptr, cut_length );
 				last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 				continue;
 			}
 
 			if ( pos > last_cut )
-				append( & content,  cut_ptr, cut_length );
+				append( content,  cut_ptr, cut_length );
 
 			// Replace with a space
-			if ( * back( & content ) != ' ' )
-				append( & content,  ' ' );
+			if ( back( content ) != ' ' )
+				append( content,  ' ' );
 
 			scanner += 2;
 			tokleft -= 2;
@@ -400,17 +400,17 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 
 				move_fwd();
 
-				append( & content,  cut_ptr, cut_length );
+				append( content,  cut_ptr, cut_length );
 				last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 				continue;
 			}
 
 			if ( pos > last_cut )
-				append( & content,  cut_ptr, cut_length );
+				append( content,  cut_ptr, cut_length );
 
 			// Replace with a space
-			if ( * back( & content ) != ' ' )
-				append( & content,  ' ' );
+			if ( back( content ) != ' ' )
+				append( content,  ' ' );
 
 			move_fwd();
 
@@ -421,7 +421,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 		// Escaped newlines
 		if ( scanner[0] == '\\' )
 		{
-			append( & content,  cut_ptr, cut_length );
+			append( content,  cut_ptr, cut_length );
 
 			s32 amount_to_skip = 1;
 			if ( tokleft > 1 && scanner[1] == '\n' )
@@ -448,7 +448,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 		// Consectuive spaces
 		if ( tokleft > 1 && char_is_space( scanner[0] ) && char_is_space( scanner[ 1 ] ) )
 		{
-			append( & content,  cut_ptr, cut_length );
+			append( content,  cut_ptr, cut_length );
 			do
 			{
 				move_fwd();
@@ -458,9 +458,8 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
 
 			// Preserve only 1 space of formattting
-			char* last = back(& content);
-			if ( last == nullptr || * last != ' ' )
-				append( & content,  ' ' );
+			if ( back( content ) != ' ' )
+				append( content,  ' ' );
 
 			continue;
 		}
@@ -470,7 +469,7 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 
 	if ( last_cut < raw_text.Len )
 	{
-		append( & content,  cut_ptr, raw_text.Len - last_cut );
+		append( content,  cut_ptr, raw_text.Len - last_cut );
 	}
 
 #undef cut_ptr
@@ -505,14 +504,14 @@ Code parse_array_decl()
 		{
 			log_failure( "Error, unexpected end of array declaration ( '[]' scope started )\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		if ( currtok.Type == TokType::BraceSquare_Close )
 		{
 			log_failure( "Error, empty array expression in definition\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		Token untyped_tok = currtok;
@@ -531,14 +530,14 @@ Code parse_array_decl()
 		{
 			log_failure( "Error, unexpected end of array declaration, expected ]\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		if ( currtok.Type != TokType::BraceSquare_Close )
 		{
 			log_failure( "%s: Error, expected ] in array declaration, not %s\n%s", ETokType::to_str( currtok.Type ), Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		eat( TokType::BraceSquare_Close );
@@ -678,7 +677,7 @@ Code parse_class_struct( TokType which, bool inplace_def = false )
 	if ( which != TokType::Decl_Class && which != TokType::Decl_Struct )
 	{
 		log_failure( "Error, expected class or struct, not %s\n%s", ETokType::to_str( which ), Context.to_string() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Token name { nullptr, 0, TokType::Invalid };
@@ -689,7 +688,7 @@ Code parse_class_struct( TokType which, bool inplace_def = false )
 	CodeAttributes attributes = { nullptr };
 	ModuleFlag     mflags     = ModuleFlag_None;
 
-	CodeClass result = InvalidCode;
+	CodeClass result = CodeInvalid;
 
 	if ( check(TokType::Module_Export) )
 	{
@@ -715,7 +714,7 @@ Code parse_class_struct( TokType which, bool inplace_def = false )
 	char interface_arr_mem[ kilobytes(4) ] {0};
 	Array<CodeType> interfaces; {
 		Arena arena = arena_init_from_memory( interface_arr_mem, kilobytes(4) );
-		interfaces  = array_init_reserve<CodeType>( allocator_info(& arena), 4 );
+		interfaces  = array_init_reserve<CodeType>( allocator_info(arena), 4 );
 	}
 
 	// TODO(Ed) : Make an AST_DerivedType, we'll store any arbitary derived type into there as a linear linked list of them.
@@ -746,7 +745,7 @@ Code parse_class_struct( TokType which, bool inplace_def = false )
 			}
 			Token interface_tok = parse_identifier();
 
-			append( & interfaces, def_type( interface_tok ) );
+			append(interfaces, def_type( interface_tok ) );
 			// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>, ...
 		}
 	}
@@ -778,7 +777,7 @@ Code parse_class_struct( TokType which, bool inplace_def = false )
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	free(& interfaces);
+	free(interfaces);
 	return result;
 }
 
@@ -802,7 +801,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 
 	while ( left && currtok_noskip.Type != TokType::BraceCurly_Close )
 	{
-		Code           member     = Code_Invalid;
+		Code           member     = Code::Invalid;
 		CodeAttributes attributes = { nullptr };
 		CodeSpecifiers specifiers = { nullptr };
 
@@ -901,7 +900,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 				if ( currtok.Text[0] != '~' )
 				{
 					log_failure( "Operator token found in global body but not destructor unary negation\n%s", Context.to_string() );
-					return InvalidCode;
+					return CodeInvalid;
 				}
 
 				member = parse_destructor();
@@ -1015,7 +1014,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 						default:
 							log_failure( "Invalid specifier %s for variable\n%s", ESpecifier::to_str(spec), Context.to_string() );
 							Context.pop();
-							return InvalidCode;
+							return CodeInvalid;
 					}
 
 					// Every specifier after would be considered part of the type type signature
@@ -1041,7 +1040,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 					if ( attributes )
 					{
 						String fused = string_make_reserve( GlobalAllocator, length(attributes->Content) + length(more_attributes->Content) );
-						append_fmt( & fused, "%S %S", attributes->Content, more_attributes->Content );
+						append_fmt( fused, "%S %S", attributes->Content, more_attributes->Content );
 
 						attributes->Name    = get_cached_string(fused);
 						attributes->Content = attributes->Name;
@@ -1108,11 +1107,11 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 			break;
 		}
 
-		if ( member == Code_Invalid )
+		if ( member == Code::Invalid )
 		{
 			log_failure( "Failed to parse member\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		result.append( member );
@@ -1200,7 +1199,7 @@ Code parse_complicated_definition( TokType which )
 
 		log_failure( "Unsupported or bad member definition after %s declaration\n%s", to_str(which), Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	if ( tok.Type == TokType::Identifier )
 	{
@@ -1245,7 +1244,7 @@ Code parse_complicated_definition( TokType which )
 		{
 			log_failure( "Unsupported or bad member definition after %s declaration\n%s", to_str(which), Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		Code result = parse_operator_function_or_variable( false, { nullptr }, { nullptr } );
@@ -1264,7 +1263,7 @@ Code parse_complicated_definition( TokType which )
 		{
 			log_failure( "Unsupported or bad member definition after %s declaration\n%s", to_str(which), Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		// Its a forward declaration of an enum class
@@ -1294,7 +1293,7 @@ Code parse_complicated_definition( TokType which )
 	{
 		log_failure( "Unsupported or bad member definition after %s declaration\n%S", to_str(which).Ptr, Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 }
 
@@ -1313,7 +1312,7 @@ CodeDefine parse_define()
 	{
 		log_failure( "Error, expected identifier after #define\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Context.Scope->Name = currtok;
@@ -1325,7 +1324,7 @@ CodeDefine parse_define()
 	{
 		log_failure( "Error, expected content after #define %s\n%s", define->Name, Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( currtok.Length == 0 )
@@ -1360,7 +1359,7 @@ Code parse_assignment_expression()
 	{
 		log_failure( "Expected expression after assignment operator\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	s32 level = 0;
@@ -1387,7 +1386,7 @@ Code parse_assignment_expression()
 internal inline
 Code parse_forward_or_definition( TokType which, bool is_inplace )
 {
-	Code result = InvalidCode;
+	Code result = CodeInvalid;
 
 	switch ( which )
 	{
@@ -1412,7 +1411,7 @@ Code parse_forward_or_definition( TokType which, bool is_inplace )
 				"(only supports class, enum, struct, union) \n%s"
 				, Context.to_string() );
 
-			return InvalidCode;
+			return CodeInvalid;
 	}
 }
 
@@ -1450,10 +1449,10 @@ CodeFn parse_function_after_name(
 	if ( check( TokType::BraceCurly_Open ) )
 	{
 		body = parse_function_body();
-		if ( body == Code_Invalid )
+		if ( body == Code::Invalid )
 		{
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 		// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers> { <Body> }
 	}
@@ -1505,7 +1504,7 @@ CodeFn parse_function_after_name(
 			{
 				log_failure("Body must be either of Function_Body or Untyped type, %s\n%s", body.debug_str(), Context.to_string());
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 		}
 
@@ -1585,7 +1584,7 @@ CodeBody parse_global_nspace( CodeT which )
 	push_scope();
 
 	if ( which != Namespace_Body && which != Global_Body && which != Export_Body && which != Extern_Linkage_Body )
-		return InvalidCode;
+		return CodeInvalid;
 
 	if ( which != Global_Body )
 		eat( TokType::BraceCurly_Open );
@@ -1597,7 +1596,7 @@ CodeBody parse_global_nspace( CodeT which )
 
 	while ( left && currtok_noskip.Type != TokType::BraceCurly_Close )
 	{
-		Code           member     = Code_Invalid;
+		Code           member     = Code::Invalid;
 		CodeAttributes attributes = { nullptr };
 		CodeSpecifiers specifiers = { nullptr };
 
@@ -1798,7 +1797,7 @@ CodeBody parse_global_nspace( CodeT which )
 
 							log_failure( "Invalid specifier %.*s for variable\n%s", spec_str.Len, spec_str, Context.to_string() );
 							Context.pop();
-							return InvalidCode;
+							return CodeInvalid;
 					}
 
 					if (ignore_spec)
@@ -1870,11 +1869,11 @@ CodeBody parse_global_nspace( CodeT which )
 			}
 		}
 
-		if ( member == Code_Invalid )
+		if ( member == Code::Invalid )
 		{
 			log_failure( "Failed to parse member\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		// log_fmt("Global Body Member: %s", member->debug_str());
@@ -2108,7 +2107,7 @@ CodeInclude parse_include()
 	{
 		log_failure( "Error, expected include string after #include\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Context.Scope->Name = currtok;
@@ -2157,7 +2156,7 @@ CodeOperator parse_operator_after_ret_type(
 	{
 		log_failure( "Expected operator after 'operator' keyword\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Context.Scope->Name = currtok;
@@ -2410,7 +2409,7 @@ CodeOperator parse_operator_after_ret_type(
 				{
 					log_failure( "Invalid operator '%s'\n%s", prevtok.Text, Context.to_string() );
 					Context.pop();
-					return InvalidCode;
+					return CodeInvalid;
 				}
 			}
 		}
@@ -2420,7 +2419,7 @@ CodeOperator parse_operator_after_ret_type(
 	{
 		log_failure( "Invalid operator '%s'\n%s", currtok.Text, Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( ! was_new_or_delete)
@@ -2454,10 +2453,10 @@ CodeOperator parse_operator_after_ret_type(
 	if ( check( TokType::BraceCurly_Open ) )
 	{
 		body = parse_function_body();
-		if ( body == Code_Invalid )
+		if ( body == Code::Invalid )
 		{
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 		// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers> { ... }
 	}
@@ -2487,7 +2486,7 @@ Code parse_operator_function_or_variable( bool expects_function, CodeAttributes
 {
 	push_scope();
 
-	Code result = InvalidCode;
+	Code result = CodeInvalid;
 
 #ifndef GEN_PARSER_DISABLE_MACRO_FUNCTION_SIGNATURES
 	if ( currtok.Type == TokType::Preprocess_Macro )
@@ -2503,10 +2502,10 @@ Code parse_operator_function_or_variable( bool expects_function, CodeAttributes
 	CodeType type = parse_type();
 	// <Attributes> <Specifiers> <ReturnType/ValueType>
 
-	if ( type == InvalidCode )
+	if ( type == CodeInvalid )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	bool found_operator = false;
@@ -2562,7 +2561,7 @@ Code parse_operator_function_or_variable( bool expects_function, CodeAttributes
 			{
 				log_failure( "Expected function declaration (consteval was used)\n%s", Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 
 			// Dealing with a variable
@@ -2590,7 +2589,7 @@ CodePragma parse_pragma()
 	{
 		log_failure( "Error, expected content after #pragma\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Context.Scope->Name = currtok;
@@ -2667,10 +2666,10 @@ CodeParam parse_params( bool use_template_capture )
 	if ( currtok.Type != TokType::Comma )
 	{
 		type = parse_type( use_template_capture );
-		if ( type == Code_Invalid )
+		if ( type == Code::Invalid )
 		{
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 		// ( <Macro> <ValueType>
 
@@ -2704,7 +2703,7 @@ CodeParam parse_params( bool use_template_capture )
 			{
 				log_failure( "Expected value after assignment operator\n%s.", Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 
 			s32 capture_level  = 0;
@@ -2777,10 +2776,10 @@ CodeParam parse_params( bool use_template_capture )
 		if ( currtok.Type != TokType::Comma )
 		{
 			type = parse_type( use_template_capture );
-			if ( type == Code_Invalid )
+			if ( type == Code::Invalid )
 			{
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 			// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType>
 
@@ -2816,7 +2815,7 @@ CodeParam parse_params( bool use_template_capture )
 				{
 					log_failure( "Expected value after assignment operator\n%s", Context.to_string() );
 					Context.pop();
-					return InvalidCode;
+					return CodeInvalid;
 				}
 
 				s32 capture_level  = 0;
@@ -2877,7 +2876,7 @@ CodeParam parse_params( bool use_template_capture )
 		{
 			log_failure( "Expected '<' after 'template' keyword\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 		eat( TokType::Operator );
 		// < <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>, .. >
@@ -2897,7 +2896,7 @@ CodePreprocessCond parse_preprocess_cond()
 	{
 		log_failure( "Error, expected preprocess conditional\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	CodePreprocessCond
@@ -2910,7 +2909,7 @@ CodePreprocessCond parse_preprocess_cond()
 	{
 		log_failure( "Error, expected content after #define\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	Context.Scope->Name = currtok;
@@ -3168,7 +3167,7 @@ CodeVar parse_variable_after_name(
 		{
 			log_failure( "Expected expression after bitfield \n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		while ( left && currtok.Type != TokType::Statement_End )
@@ -3466,7 +3465,7 @@ CodeDestructor parse_destructor( CodeSpecifiers specifiers )
 	else
 	{
 		log_failure( "Expected destructor '~' token\n%s", Context.to_string() );
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	// <Virtual Specifier> ~
 
@@ -3503,7 +3502,7 @@ CodeDestructor parse_destructor( CodeSpecifiers specifiers )
 		else
 		{
 			log_failure( "Pure or default specifier expected due to '=' token\n%s", Context.to_string() );
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		pure_virtual = true;
@@ -3598,11 +3597,11 @@ CodeEnum parse_enum( bool inplace_def )
 		// enum <class> <Attributes> <Name> :
 
 		type = parse_type();
-		if ( type == Code_Invalid )
+		if ( type == Code::Invalid )
 		{
 			log_failure( "Failed to parse enum classifier\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 		// enum <class> <Attributes> <Name> : <UnderlyingType>
 	}
@@ -3628,7 +3627,7 @@ CodeEnum parse_enum( bool inplace_def )
 		eat( TokType::BraceCurly_Open );
 		// enum <class> <Attributes> <Name> : <UnderlyingType> {
 
-		Code member = InvalidCode;
+		Code member = CodeInvalid;
 
 		bool expects_entry = true;
 		while ( left && currtok_noskip.Type != TokType::BraceCurly_Close )
@@ -3736,11 +3735,11 @@ CodeEnum parse_enum( bool inplace_def )
 				break;
 			}
 
-			if ( member == Code_Invalid )
+			if ( member == Code::Invalid )
 			{
 				log_failure( "Failed to parse member\n%s", Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 
 			body.append( member );
@@ -3839,7 +3838,7 @@ CodeExtern parse_extern_link()
 	result->Name = get_cached_string( name );
 
 	Code entry = parse_extern_link_body();
-	if ( entry == Code_Invalid )
+	if ( entry == Code::Invalid )
 	{
 		log_failure( "Failed to parse body\n%s", Context.to_string() );
 		Context.pop();
@@ -3866,10 +3865,10 @@ CodeFriend parse_friend()
 
 	// Type declaration or return type
 	CodeType type = parse_type();
-	if ( type == Code_Invalid )
+	if ( type == Code::Invalid )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	// friend <Type>
 
@@ -3966,7 +3965,7 @@ CodeFn parse_function()
 			default:
 				log_failure( "Invalid specifier %s for functon\n%s", ESpecifier::to_str(spec), Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		if ( spec == ESpecifier::Const )
@@ -3984,10 +3983,10 @@ CodeFn parse_function()
 	// <export> <Attributes> <Specifiers>
 
 	CodeType ret_type = parse_type();
-	if ( ret_type == Code_Invalid )
+	if ( ret_type == Code::Invalid )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	// <export> <Attributes> <Specifiers> <ReturnType>
 
@@ -3996,7 +3995,7 @@ CodeFn parse_function()
 	if ( ! name )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	// <export> <Attributes> <Specifiers> <ReturnType> <Name>
 
@@ -4020,10 +4019,10 @@ CodeNS parse_namespace()
 	// namespace <Name>
 
 	CodeBody body = parse_global_nspace( ECode::Namespace_Body );
-	if ( body == Code_Invalid )
+	if ( body == Code::Invalid )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	// namespace <Name> { <Body> }
 
@@ -4077,7 +4076,7 @@ CodeOperator parse_operator()
 			default:
 				log_failure( "Invalid specifier " "%s" " for operator\n%s", ESpecifier::to_str(spec), Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		if ( spec == ESpecifier::Const )
@@ -4246,10 +4245,10 @@ CodeTemplate parse_template()
 	// <export> template
 
 	Code params = parse_params( UseTemplateCapture );
-	if ( params == Code_Invalid )
+	if ( params == Code::Invalid )
 	{
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 	// <export> template< <Parameters> >
 
@@ -4328,7 +4327,7 @@ CodeTemplate parse_template()
 					default :
 						log_failure( "Invalid specifier %s for variable or function\n%s", ESpecifier::to_str( spec ), Context.to_string() );
 						Context.pop();
-						return InvalidCode;
+						return CodeInvalid;
 				}
 
 				// Ignore const it will be handled by the type
@@ -4451,7 +4450,7 @@ CodeType parse_type( bool from_template, bool* typedef_is_function )
 		{
 			log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		specs_found[ NumSpecifiers ] = spec;
@@ -4464,7 +4463,7 @@ CodeType parse_type( bool from_template, bool* typedef_is_function )
 	{
 		log_failure( "Error, unexpected end of type definition\n%s", Context.to_string() );
 		Context.pop();
-		return InvalidCode;
+		return CodeInvalid;
 	}
 
 	if ( from_template && currtok.Type == TokType::Decl_Class )
@@ -4548,7 +4547,7 @@ else if ( currtok.Type == TokType::DeclType )
 			{
 				log_failure( "Error, failed to type signature\n%s", Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 		}
 	}
@@ -4562,7 +4561,7 @@ else if ( currtok.Type == TokType::DeclType )
 		{
 			log_failure( "Error, failed to type signature\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 		// <Attributes> <Specifiers> <Qualifier ::> <Identifier>
 		// <Attributes> <Specifiers> <Identifier>
@@ -4577,7 +4576,7 @@ else if ( currtok.Type == TokType::DeclType )
 		{
 			log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		specs_found[ NumSpecifiers ] = spec;
@@ -4710,7 +4709,7 @@ else if ( currtok.Type == TokType::DeclType )
 				{
 					log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
 					Context.pop();
-					return InvalidCode;
+					return CodeInvalid;
 				}
 
 				specs_found[ NumSpecifiers ] = spec;
@@ -4780,7 +4779,7 @@ else if ( currtok.Type == TokType::DeclType )
 			{
 				log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 			}
 
 			specs_found[ NumSpecifiers ] = spec;
@@ -4911,12 +4910,10 @@ CodeTypedef parse_typedef()
 			||	currtok.Type == TokType::Decl_Struct
 			||	currtok.Type == TokType::Decl_Union;
 
-
 		// This code is highly correlated with parse_complicated_definition
 		if ( is_complicated )
 		{
 			TokArray tokens = Context.Tokens;
-			TokType  which  = currtok.Type;
 
 			s32 idx = tokens.Idx;
 			s32 level = 0;
@@ -4932,80 +4929,73 @@ CodeTypedef parse_typedef()
 					break;
 			}
 
-			Token pre_foward_tok = currtok;
-			if ( (idx - 3 ) == tokens.Idx )
+			if ( (idx - 2 ) == tokens.Idx )
 			{
-				log_fmt("Identified forward typedef\n");
 				// Its a forward declaration only
-				type = parse_forward_or_definition( which, from_typedef );
+				type = parse_forward_or_definition( currtok.Type, from_typedef );
 				// <ModuleFalgs> typedef <UnderlyingType: Forward Decl>
 			}
-			else
+
+			Token tok = tokens[ idx - 1 ];
+			if ( tok.Type == TokType::Identifier )
 			{
-				Token tok = tokens.Arr[ idx - 1 ];
-				if ( tok.Type == TokType::Identifier )
+				tok = tokens[ idx - 2 ];
+
+				bool is_indirection = tok.Type == TokType::Ampersand
+				||                    tok.Type == TokType::Star;
+
+				bool ok_to_parse = false;
+
+				if ( tok.Type == TokType::BraceCurly_Close )
 				{
-					log_fmt("Found id\n");
-					tok = tokens.Arr[ idx - 2 ];
-
-					bool is_indirection = tok.Type == TokType::Ampersand
-					||                    tok.Type == TokType::Star;
-
-					bool ok_to_parse = false;
-
-					Token temp_3 = tokens.Arr[ idx - 3 ];
-
-					if ( tok.Type == TokType::BraceCurly_Close )
-					{
-						// Its an inplace definition
-						// typedef <which> <type_identifier> { ... } <identifier>;
-						ok_to_parse = true;
-					}
-					else if ( tok.Type == TokType::Identifier && tokens.Arr[ idx - 3 ].Type == which )
-					{
-						// Its a variable with type ID using which namespace.
-						// typedef <which> <type_identifier> <identifier>;
-						ok_to_parse = true;
-					}
-					else if ( is_indirection )
-					{
-						// Its a indirection type with type ID using struct namespace.
-						// typedef <which> <type_identifier>* <identifier>;
-						ok_to_parse = true;
-					}
-
-					if ( ! ok_to_parse )
-					{
-						log_failure( "Unsupported or bad member definition after struct declaration\n%s", Context.to_string() );
-						Context.pop();
-						return InvalidCode;
-					}
-
-					// TODO(Ed) : I'm not sure if I have to use parse_type here, I'd rather not as that would complicate parse_type.
-					// type = parse_type();
-					type = parse_forward_or_definition( which, from_typedef );
-					// <ModuleFalgs> typedef <UnderlyingType>
+					// Its an inplace definition
+					// typdef <which> <type_identifier> { ... } <identifier>;
+					ok_to_parse = true;
 				}
-				else if ( tok.Type == TokType::BraceCurly_Close )
+				else if ( tok.Type == TokType::Identifier && tokens[ idx - 3 ].Type == TokType::Decl_Struct )
 				{
-					// Its a definition
-					// <which> { ... };
-					type = parse_forward_or_definition( currtok.Type, from_typedef );
-					// <ModuleFalgs> typedef <UnderlyingType>
+					// Its a variable with type ID using struct namespace.
+					// <which> <type_identifier> <identifier>;
+					ok_to_parse = true;
 				}
-				else if ( tok.Type == TokType::BraceSquare_Close)
+				else if ( is_indirection )
 				{
-					// Its an array definition
-					// <which> <type_identifier> <identifier> [ ... ];
-					type = parse_type();
-					// <ModuleFalgs> typedef <UnderlyingType>
+					// Its a indirection type with type ID using struct namespace.
+					// <which> <type_identifier>* <identifier>;
+					ok_to_parse = true;
 				}
-				else
+
+				if ( ! ok_to_parse )
 				{
 					log_failure( "Unsupported or bad member definition after struct declaration\n%s", Context.to_string() );
 					Context.pop();
-					return InvalidCode;
+					return CodeInvalid;
 				}
+
+				// TODO(Ed) : I'm not sure if I have to use parse_type here, I'd rather not as that would complicate parse_type.
+				// type = parse_type();
+				type = parse_forward_or_definition( currtok.Type, from_typedef );
+				// <ModuleFalgs> typedef <UnderlyingType>
+			}
+			else if ( tok.Type == TokType::BraceCurly_Close )
+			{
+				// Its a definition
+				// <which> { ... };
+				type = parse_forward_or_definition( currtok.Type, from_typedef );
+				// <ModuleFalgs> typedef <UnderlyingType>
+			}
+			else if ( tok.Type == TokType::BraceSquare_Close)
+			{
+				// Its an array definition
+				// <which> <type_identifier> <identifier> [ ... ];
+				type = parse_type();
+				// <ModuleFalgs> typedef <UnderlyingType>
+			}
+			else
+			{
+				log_failure( "Unsupported or bad member definition after struct declaration\n%s", Context.to_string() );
+				Context.pop();
+				return CodeInvalid;
 			}
 		}
 		else
@@ -5025,7 +5015,7 @@ CodeTypedef parse_typedef()
 		{
 			log_failure( "Error, expected identifier for typedef\n%s", Context.to_string() );
 			Context.pop();
-			return InvalidCode;
+			return CodeInvalid;
 		}
 
 		array_expr = parse_array_decl();
@@ -5067,7 +5057,7 @@ CodeTypedef parse_typedef()
 	// Type needs to be aware of its parent so that it can be serialized properly.
 
 	if ( type->Type == Typename && array_expr && array_expr->Type != Invalid )
-		type.code_cast<CodeType>()->ArrExpr = array_expr;
+		type.cast<CodeType>()->ArrExpr = array_expr;
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
@@ -5360,7 +5350,7 @@ CodeVar parse_variable()
 			default:
 				log_failure( "Invalid specifier %s for variable\n%s", ESpecifier::to_str( spec ), Context.to_string() );
 				Context.pop();
-				return InvalidCode;
+				return CodeInvalid;
 		}
 
 		// Ignore const specifiers, they're handled by the type
@@ -5381,8 +5371,8 @@ CodeVar parse_variable()
 	CodeType type = parse_type();
 	// <ModuleFlags> <Attributes> <Specifiers> <ValueType>
 
-	if ( type == Code_Invalid )
-		return InvalidCode;
+	if ( type == Code::Invalid )
+		return CodeInvalid;
 
 	Context.Scope->Name = parse_identifier();
 	// <ModuleFlags> <Attributes> <Specifiers> <ValueType> <Name>

project/components/types.hpp

@@ -25,7 +25,7 @@ enum AccessSpec enum_underlying(u32)
 
 	AccessSpec_SizeDef = GEN_U32_MAX,
 };
-static_assert( size_of(AccessSpec) == size_of(u32), "AccessSpec not u32 size" );
+static_assert( size_of(AccessSpec) == size_of(u32));
 
 inline
 char const* to_str( AccessSpec type )
@@ -54,7 +54,7 @@ enum CodeFlag enum_underlying(u32)
 
 	CodeFlag_SizeDef = GEN_U32_MAX,
 };
-static_assert( size_of(CodeFlag) == size_of(u32), "CodeFlag not u32 size" );
+static_assert( size_of(CodeFlag) == size_of(u32));
 
 // Used to indicate if enum definitoin is an enum class or regular enum.
 enum EnumDecl enum_underlying(u8)
@@ -77,7 +77,7 @@ enum ModuleFlag enum_underlying(u32)
 
 	ModuleFlag_SizeDef = GEN_U32_MAX,
 };
-static_assert( size_of(ModuleFlag) == size_of(u32), "ModuleFlag not u32 size" );
+static_assert( size_of(ModuleFlag) == size_of(u32));
 
 inline
 StrC to_str( ModuleFlag flag )
@@ -110,4 +110,4 @@ enum EPreprocessCond enum_underlying(u32)
 
 	EPreprocessCond_SizeDef = GEN_U32_MAX,
 };
-static_assert( size_of(EPreprocessCond) == size_of(u32), "EPreprocessCond not u32 size" );
+static_assert( size_of(EPreprocessCond) == size_of(u32));

project/dependencies/containers.hpp

@@ -29,25 +29,29 @@ struct ArrayHeader;
 
 usize array_grow_formula(ssize value);
 
-template<class Type> Array(Type)  array_init        (AllocatorInfo allocator);
-template<class Type> Array(Type)  array_init_reserve(AllocatorInfo allocator, ssize capacity);
-template<class Type> bool         append            (Array(Type)* array, Array(Type) other);
-template<class Type> bool         append            (Array(Type)* array, Type value);
-template<class Type> bool         append            (Array(Type)* array, Type* items, usize item_num);
-template<class Type> bool         append_at         (Array(Type)* array, Type item, usize idx);
-template<class Type> bool         append_at         (Array(Type)* array, Type* items, usize item_num, usize idx);
-template<class Type> Type*        back              (Array(Type)  array);
-template<class Type> void         clear             (Array(Type)  array);
-template<class Type> bool         fill              (Array(Type)  array, usize begin, usize end, Type value);
-template<class Type> void         free              (Array(Type)* array);
-template<class Type> bool         grow              (Array(Type)* array, usize min_capacity);
-template<class Type> usize        num               (Array(Type)  array);
-template<class Type> void         pop               (Array(Type)  array);
-template<class Type> void         remove_at         (Array(Type)  array, usize idx);
-template<class Type> bool         reserve           (Array(Type)* array, usize new_capacity);
-template<class Type> bool         resize            (Array(Type)* array, usize num);
-template<class Type> bool         set_capacity      (Array(Type)* array, usize new_capacity);
-template<class Type> ArrayHeader* get_header        (Array(Type)  array);
+template<class Type> Array<Type>  array_init(AllocatorInfo allocator);
+template<class Type> Array<Type>  array_init_reserve(AllocatorInfo allocator, ssize capacity);
+template<class Type> bool         append(Array<Type>& array, Array<Type> other);
+template<class Type> bool         append(Array<Type>& array, Type value);
+template<class Type> bool         append(Array<Type>& array, Type* items, usize item_num);
+template<class Type> bool         append_at(Array<Type>& array, Type item, usize idx);
+template<class Type> bool         append_at(Array<Type>& array, Type* items, usize item_num, usize idx);
+template<class Type> Type&        back(Array<Type>& array);
+template<class Type> void         clear(Array<Type>& array);
+template<class Type> bool         fill(Array<Type>& array, usize begin, usize end, Type value);
+template<class Type> void         free(Array<Type>& array);
+template<class Type> bool         grow(Array<Type>& array, usize min_capacity);
+template<class Type> usize        num(Array<Type>& array);
+template<class Type> void         pop(Array<Type>& array);
+template<class Type> void         remove_at(Array<Type>& array, usize idx);
+template<class Type> bool         reserve(Array<Type>& array, usize new_capacity);
+template<class Type> bool         resize(Array<Type>& array, usize num);
+template<class Type> bool         set_capacity(Array<Type>& array, usize new_capacity);
+template<class Type> ArrayHeader* get_header(Array<Type>& array);
+
+template<class Type> forceinline Type* begin(Array<Type>& array)             { return array;      }
+template<class Type> forceinline Type* end(Array<Type>& array)               { return array + get_header(array)->Num; }
+template<class Type> forceinline Type* next(Array<Type>& array, Type* entry) { return entry + 1; }
 
 struct ArrayHeader {
 	AllocatorInfo Allocator;
@@ -66,56 +70,32 @@ struct Array
 	forceinline static Array  init_reserve(AllocatorInfo allocator, ssize capacity) { return GEN_NS array_init_reserve<Type>(allocator, capacity); }
 	forceinline static usize  grow_formula(ssize value)                             { return GEN_NS array_grow_formula<Type>(value); }
 
-	forceinline bool         append(Array other)                               { return GEN_NS append<Type>(this, other); }
-	forceinline bool         append(Type value)                                { return GEN_NS append<Type>(this, value); }
-	forceinline bool         append(Type* items, usize item_num)               { return GEN_NS append<Type>(this, items, item_num); }
-	forceinline bool         append_at(Type item, usize idx)                   { return GEN_NS append_at<Type>(this, item, idx); }
-	forceinline bool         append_at(Type* items, usize item_num, usize idx) { return GEN_NS append_at<Type>(this, items, item_num, idx); }
-	forceinline Type*        back()                                            { return GEN_NS back<Type>(* this); }
-	forceinline void         clear()                                           { GEN_NS clear<Type>(* this); }
-	forceinline bool         fill(usize begin, usize end, Type value)          { return GEN_NS fill<Type>(* this, begin, end, value); }
-	forceinline void         free()                                            { GEN_NS free<Type>(this); }
-	forceinline ArrayHeader* get_header()                                      { return GEN_NS get_header<Type>(* this); }
-	forceinline bool         grow(usize min_capacity)                          { return GEN_NS grow<Type>(this, min_capacity); }
+	forceinline bool         append(Array other)                               { return GEN_NS append<Type>(*this, other); }
+	forceinline bool         append(Type value)                                { return GEN_NS append<Type>(*this, value); }
+	forceinline bool         append(Type* items, usize item_num)               { return GEN_NS append<Type>(*this, items, item_num); }
+	forceinline bool         append_at(Type item, usize idx)                   { return GEN_NS append_at<Type>(*this, item, idx); }
+	forceinline bool         append_at(Type* items, usize item_num, usize idx) { return GEN_NS append_at<Type>(*this, items, item_num, idx); }
+	forceinline Type&        back()                                            { return GEN_NS back<Type>(*this); }
+	forceinline void         clear()                                           { GEN_NS clear<Type>(*this); }
+	forceinline bool         fill(usize begin, usize end, Type value)          { return GEN_NS fill<Type>(*this, begin, end, value); }
+	forceinline void         free()                                            { GEN_NS free<Type>(*this); }
+	forceinline ArrayHeader* get_header()                                      { return GEN_NS get_header<Type>(*this); }
+	forceinline bool         grow(usize min_capacity)                          { return GEN_NS grow<Type>(*this, min_capacity); }
 	forceinline usize        num()                                             { return GEN_NS num<Type>(*this); }
-	forceinline void         pop()                                             { GEN_NS pop<Type>(* this); }
-	forceinline void         remove_at(usize idx)                              { GEN_NS remove_at<Type>(* this, idx); }
-	forceinline bool         reserve(usize new_capacity)                       { return GEN_NS reserve<Type>(this, new_capacity); }
-	forceinline bool         resize(usize num)                                 { return GEN_NS resize<Type>(this, num); }
-	forceinline bool         set_capacity(usize new_capacity)                  { return GEN_NS set_capacity<Type>(this, new_capacity); }
-#pragma endregion Member Mapping
+	forceinline void         pop()                                             { GEN_NS pop<Type>(*this); }
+	forceinline void         remove_at(usize idx)                              { GEN_NS remove_at<Type>(*this, idx); }
+	forceinline bool         reserve(usize new_capacity)                       { return GEN_NS reserve<Type>(*this, new_capacity); }
+	forceinline bool         resize(usize num)                                 { return GEN_NS resize<Type>(*this, num); }
+	forceinline bool         set_capacity(usize new_capacity)                  { return GEN_NS set_capacity<Type>(*this, new_capacity); }
 
 	forceinline operator Type*()             { return Data; }
 	forceinline operator Type const*() const { return Data; }
 	forceinline Type* begin()                { return Data; }
 	forceinline Type* end()                  { return Data + get_header()->Num; }
-
-	forceinline Type&       operator[](ssize index)       { return Data[index]; }
-	forceinline Type const& operator[](ssize index) const { return Data[index]; }
+#pragma endregion Member Mapping
 };
 #endif
 
-#if GEN_SUPPORT_CPP_REFERENCES
-template<class Type> bool         append(Array<Type>& array, Array<Type> other)                         { return GEN_NS append( & array, other ); }
-template<class Type> bool         append(Array<Type>& array, Type value)                                { return GEN_NS append( & array, value ); }
-template<class Type> bool         append(Array<Type>& array, Type* items, usize item_num)               { return GEN_NS append( & array, items, item_num ); }
-template<class Type> bool         append_at(Array<Type>& array, Type item, usize idx)                   { return GEN_NS append_at( & array, item, idx ); }
-template<class Type> bool         append_at(Array<Type>& array, Type* items, usize item_num, usize idx) { return GEN_NS append_at( & array, items, item_num, idx ); }
-template<class Type> void         free(Array<Type>& array)                                              { return GEN_NS free( & array ); }
-template<class Type> bool         grow(Array<Type>& array, usize min_capacity)                          { return GEN_NS grow( & array, min_capacity); }
-template<class Type> bool         reserve(Array<Type>& array, usize new_capacity)                       { return GEN_NS reserve( & array, new_capacity); }
-template<class Type> bool         resize(Array<Type>& array, usize num)                                 { return GEN_NS resize( & array, num); }
-template<class Type> bool         set_capacity(Array<Type>& array, usize new_capacity)                  { return GEN_NS set_capacity( & array, new_capacity); }
-
-template<class Type> forceinline Type* begin(Array<Type>& array)             { return array;      }
-template<class Type> forceinline Type* end(Array<Type>& array)               { return array + get_header(array)->Num; }
-template<class Type> forceinline Type* next(Array<Type>& array, Type* entry) { return entry + 1; }
-#else
-template<class Type> forceinline Type* begin(Array<Type> array)             { return array;      }
-template<class Type> forceinline Type* end(Array<Type> array)               { return array + get_header(array)->Num; }
-template<class Type> forceinline Type* next(Array<Type> array, Type* entry) { return entry + 1; }
-#endif
-
 template<class Type> inline
 Array<Type> array_init(AllocatorInfo allocator) {
 	return array_init_reserve<Type>(allocator, array_grow_formula(0));
@@ -141,30 +121,30 @@ usize array_grow_formula(ssize value) {
 }
 
 template<class Type> inline
-bool append(Array<Type>* array, Array<Type> other) {
+bool append(Array<Type>& array, Array<Type> other) {
 	return append(array, other, num(other));
 }
 
 template<class Type> inline
-bool append(Array<Type>* array, Type value)
+bool append(Array<Type>& array, Type value)
 {
-	ArrayHeader* header = get_header(* array);
+	ArrayHeader* header = get_header(array);
 
 	if (header->Num == header->Capacity)
 	{
 		if (!grow(array, header->Capacity))
 			return false;
-		header = get_header(* array);
+		header = get_header(array);
 	}
 
-	(*array)[ header->Num] = value;
+	array[header->Num] = value;
 	header->Num++;
 
 	return true;
 }
 
 template<class Type> inline
-bool append(Array<Type>* array, Type* items, usize item_num)
+bool append(Array<Type>& array, Type* items, usize item_num)
 {
 	ArrayHeader* header = get_header(array);
 
@@ -182,37 +162,34 @@ bool append(Array<Type>* array, Type* items, usize item_num)
 }
 
 template<class Type> inline
-bool append_at(Array<Type>* array, Type item, usize idx)
+bool append_at(Array<Type>& array, Type item, usize idx)
 {
-	ArrayHeader* header = get_header(* array);
+	ArrayHeader* header = get_header(array);
 
-	ssize slot = idx;
-	if (slot >= header->Num)
-	 	slot = header->Num - 1;
+	if (idx >= header->Num)
+	 	idx = header->Num - 1;
 
-	if (slot < 0)
- 		slot = 0;
+	if (idx < 0)
+ 		idx = 0;
 
 	if (header->Capacity < header->Num + 1)
 	{
-		if ( ! grow(array, header->Capacity + 1))
+		if (!grow(array, header->Capacity + 1))
 			return false;
 
-		header = get_header(* array);
+		header = get_header(array);
 	}
 
-	Type* target = array->Data + slot;
+	Type* target = array + idx;
 
-	mem_move(target + 1, target, (header->Num - slot) * sizeof(Type));
+	mem_move(target + 1, target, (header->Num - idx) * sizeof(Type));
 	header->Num++;
 
-	header = get_header(* array);
-
 	return true;
 }
 
 template<class Type> inline
-bool append_at(Array<Type>* array, Type* items, usize item_num, usize idx)
+bool append_at(Array<Type>& array, Type* items, usize item_num, usize idx)
 {
 	ArrayHeader* header = get_header(array);
 
@@ -223,7 +200,7 @@ bool append_at(Array<Type>* array, Type* items, usize item_num, usize idx)
 
 	if (item_num > header->Capacity)
 	{
-		if (! grow(array, header->Capacity + item_num))
+		if (!grow(array, header->Capacity + item_num))
 			return false;
 
 		header = get_header(array);
@@ -240,25 +217,19 @@ bool append_at(Array<Type>* array, Type* items, usize item_num, usize idx)
 }
 
 template<class Type> inline
-Type* back(Array<Type>* array)
-{
-	GEN_ASSERT(array != nullptr);
-
-	ArrayHeader* header = get_header(* array);
-	if (header->Num <= 0)
-		return nullptr;
-
-	return & (*array)[header->Num - 1];
+Type& back(Array<Type>& array) {
+	ArrayHeader* header = get_header(array);
+	return array[header->Num - 1];
 }
 
 template<class Type> inline
-void clear(Array<Type> array) {
+void clear(Array<Type>& array) {
 	ArrayHeader* header = get_header(array);
 	header->Num = 0;
 }
 
 template<class Type> inline
-bool fill(Array<Type> array, usize begin, usize end, Type value)
+bool fill(Array<Type>& array, usize begin, usize end, Type value)
 {
 	ArrayHeader* header = get_header(array);
 
@@ -274,25 +245,25 @@ bool fill(Array<Type> array, usize begin, usize end, Type value)
 }
 
 template<class Type> inline
-void free(Array<Type>* array) {
-	GEN_ASSERT(array != nullptr);
-	ArrayHeader* header = get_header(* array);
+void free(Array<Type>& array) {
+	ArrayHeader* header = get_header(array);
 	GEN_NS free(header->Allocator, header);
-	array->Data = nullptr;
+	Type*& Data = rcast(Type*&, array);
+	Data = nullptr;
 }
 
-template<class Type> forceinline
-ArrayHeader* get_header(Array<Type> array) {
-    Type* Data = array;
-
-	using NonConstType = TRemoveConst<Type>;
-    return rcast(ArrayHeader*, const_cast<NonConstType*>(Data)) - 1;
-}
 template<class Type> inline
-bool grow(Array<Type>* array, usize min_capacity)
+ArrayHeader* get_header(Array<Type>& array) {
+	using NonConstType = TRemoveConst<Type>;
+	Type* Data = array; // This should do nothing in C but in C++ gets member Data struct.
+	return rcast(ArrayHeader*, const_cast<NonConstType*>(Data)) - 1;
+}
+
+template<class Type> inline
+bool grow(Array<Type>& array, usize min_capacity)
 {
-	ArrayHeader* header       = get_header(* array);
-	usize        new_capacity = array_grow_formula(header->Capacity);
+	ArrayHeader* header = get_header(array);
+	usize new_capacity = array_grow_formula(header->Capacity);
 
 	if (new_capacity < min_capacity)
 	new_capacity = min_capacity;
@@ -301,19 +272,19 @@ bool grow(Array<Type>* array, usize min_capacity)
 }
 
 template<class Type> inline
-usize num(Array<Type> array) {
+usize num(Array<Type>& array) {
 	return get_header(array)->Num;
 }
 
 template<class Type> inline
-void pop(Array<Type> array) {
+void pop(Array<Type>& array) {
 	ArrayHeader* header = get_header(array);
 	GEN_ASSERT(header->Num > 0);
 	header->Num--;
 }
 
 template<class Type> inline
-void remove_at(Array<Type> array, usize idx)
+void remove_at(Array<Type>& array, usize idx)
 {
 	ArrayHeader* header = get_header(array);
 	GEN_ASSERT(idx < header->Num);
@@ -323,7 +294,7 @@ void remove_at(Array<Type> array, usize idx)
 }
 
 template<class Type> inline
-bool reserve(Array<Type>* array, usize new_capacity)
+bool reserve(Array<Type>& array, usize new_capacity)
 {
 	ArrayHeader* header = get_header(array);
 
@@ -334,14 +305,14 @@ bool reserve(Array<Type>* array, usize new_capacity)
 }
 
 template<class Type> inline
-bool resize(Array<Type>* array, usize num)
+bool resize(Array<Type>& array, usize num)
 {
-	ArrayHeader* header = get_header(* array);
+	ArrayHeader* header = get_header(array);
 
 	if (header->Capacity < num) {
-		if (! grow( array, num))
+		if (!grow(array, num))
 			return false;
-		header = get_header(* array);
+		header = get_header(array);
 	}
 
 	header->Num = num;
@@ -349,9 +320,9 @@ bool resize(Array<Type>* array, usize num)
 }
 
 template<class Type> inline
-bool set_capacity(Array<Type>* array, usize new_capacity)
+bool set_capacity(Array<Type>& array, usize new_capacity)
 {
-	ArrayHeader* header = get_header(* array);
+	ArrayHeader* header = get_header(array);
 
 	if (new_capacity == header->Capacity)
 	return true;
@@ -362,7 +333,7 @@ bool set_capacity(Array<Type>* array, usize new_capacity)
 		return true;
 	}
 
-	ssize        size       = sizeof(ArrayHeader) + sizeof(Type) * new_capacity;
+	ssize size = sizeof(ArrayHeader) + sizeof(Type) * new_capacity;
 	ArrayHeader* new_header = rcast(ArrayHeader*, alloc(header->Allocator, size));
 
 	if (new_header == nullptr)
@@ -374,10 +345,32 @@ bool set_capacity(Array<Type>* array, usize new_capacity)
 
 	GEN_NS free(header->Allocator, header);
 
-	array->Data = rcast(Type*, new_header + 1);
+	Type*& Data = rcast(Type*&, array);
+	Data = rcast(Type*, new_header + 1);
 	return true;
 }
 
+#define array_init(Type, allocator)                            array_init<Type>(allocator)
+#define array_init(Type, allocator)                            array_init<Type>(allocator)
+#define array_init_reserve(Type, allocator, capacity)          array_init_reserve<Type>(allocator, capacity)
+#define array_append(Type, array, other)                       append<Type>(array, other)
+#define array_append_value(Type, array, value)                 append<Type>(array, value)
+#define array_append_items(Type, array, items, item_num)       append<Type>(array, items, item_num)
+#define array_append_at(Type, array, item, idx)                append_at<Type>(array, item, idx)
+#define array_append_items_at(Type, array, items, num, idx)    append_at<Type>(array, items, num, idx)
+#define array_back(Type, array)                                back<Type>(array)
+#define array_clear(Type, array)                               clear<Type>(array)
+#define array_fill(Type, array, begin, end, value)             fill<Type>(array, begin, end, value)
+#define array_free(Type, array)                                free<Type>(array)
+#define array_grow(Type, array, min_capacity)                  grow<Type>(array, min_capacity)
+#define array_num(Type, array)                                 num<Type>(array)
+#define array_pop(Type, array)                                 pop<Type>(array)
+#define array_remove_at(Type, array, idx)                      remove_at<Type>(array, idx)
+#define array_reserve(Type, array, new_capacity)               reserve<Type>(array, new_capacity)
+#define array_resize(Type, array, num)                         resize<Type>(array, num)
+#define array_set_capacity(Type, array, new_capacity)          set_capacity<Type>(array, new_capacity)
+#define array_get_header(array)                                get_header(array)
+
 #pragma endregion Array
 
 // TODO(Ed) : This thing needs ALOT of work.
@@ -402,21 +395,21 @@ struct HashTableEntry {
 
 template<class Type> HashTable<Type>       hashtable_init(AllocatorInfo allocator);
 template<class Type> HashTable<Type>       hashtable_init_reserve(AllocatorInfo allocator, usize num);
-template<class Type> void                  clear        (HashTable<Type>  table);
-template<class Type> void                  destroy      (HashTable<Type>* table);
-template<class Type> Type*                 get          (HashTable<Type>  table, u64 key);
-template<class Type> void                  grow         (HashTable<Type>* table);
-template<class Type> void                  rehash       (HashTable<Type>* table, ssize new_num);
-template<class Type> void                  rehash_fast  (HashTable<Type>  table);
-template<class Type> void                  remove       (HashTable<Type>  table, u64 key);
-template<class Type> void                  remove_entry (HashTable<Type>  table, ssize idx);
-template<class Type> void                  set          (HashTable<Type>* table, u64 key, Type value);
-template<class Type> ssize                 slot         (HashTable<Type>  table, u64 key);
-template<class Type> ssize                 add_entry    (HashTable<Type>* table, u64 key);
-template<class Type> HashTableFindResult   find         (HashTable<Type>  table, u64 key);
-template<class Type> bool                  full         (HashTable<Type>  table);
-template<class Type> void                  map          (HashTable<Type>  table, void (*map_proc)(u64 key, Type value));
-template<class Type> void                  map_mut      (HashTable<Type>  table, void (*map_proc)(u64 key, Type* value));
+template<class Type> void                  clear(HashTable<Type>& table);
+template<class Type> void                  destroy(HashTable<Type>& table);
+template<class Type> Type*                 get(HashTable<Type>& table, u64 key);
+template<class Type> void                  grow(HashTable<Type>& table);
+template<class Type> void                  rehash(HashTable<Type>& table, ssize new_num);
+template<class Type> void                  rehash_fast(HashTable<Type>& table);
+template<class Type> void                  remove(HashTable<Type>& table, u64 key);
+template<class Type> void                  remove_entry(HashTable<Type>& table, ssize idx);
+template<class Type> void                  set(HashTable<Type>& table, u64 key, Type value);
+template<class Type> ssize                 slot(HashTable<Type>& table, u64 key);
+template<class Type> ssize                 add_entry(HashTable<Type>& table, u64 key);
+template<class Type> HashTableFindResult   find(HashTable<Type>& table, u64 key);
+template<class Type> bool                  full(HashTable<Type>& table);
+template<class Type> void                  map(HashTable<Type>& table, void (*map_proc)(u64 key, Type value));
+template<class Type> void                  map_mut(HashTable<Type>& table, void (*map_proc)(u64 key, Type* value));
 
 static constexpr f32 HashTable_CriticalLoadScale = 0.7f;
 
@@ -447,14 +440,6 @@ struct HashTable
 #endif
 };
 
-#if GEN_SUPPORT_CPP_REFERENCES
-template<class Type> void  destroy  (HashTable<Type>& table)                      { destroy(& table); }
-template<class Type> void  grow     (HashTable<Type>& table)                      { grow(& table); }
-template<class Type> void  rehash   (HashTable<Type>& table, ssize new_num)       { rehash(& table, new_num); }
-template<class Type> void  set      (HashTable<Type>& table, u64 key, Type value) { set(& table, key, value); }
-template<class Type> ssize add_entry(HashTable<Type>& table, u64 key)             { add_entry(& table, key); }
-#endif
-
 template<typename Type> inline
 HashTable<Type> hashtable_init(AllocatorInfo allocator) {
 	HashTable<Type> result = hashtable_init_reserve<Type>(allocator, 8);
@@ -468,7 +453,7 @@ HashTable<Type> hashtable_init_reserve(AllocatorInfo allocator, usize num)
 
 	result.Hashes = array_init_reserve<ssize>(allocator, num);
 	get_header(result.Hashes)->Num = num;
-	resize(& result.Hashes, num);
+	resize(result.Hashes, num);
 	fill<ssize>(result.Hashes, 0, num, -1);
 
 	result.Entries = array_init_reserve<HashTableEntry<Type>>(allocator, num);
@@ -476,65 +461,65 @@ HashTable<Type> hashtable_init_reserve(AllocatorInfo allocator, usize num)
 }
 
 template<typename Type> inline
-void clear(HashTable<Type> table) {
+void clear(HashTable<Type>& table) {
 	clear(table.Entries);
 	fill<ssize>(table.Hashes, 0, num(table.Hashes), -1);
 }
 
 template<typename Type> inline
-void destroy(HashTable<Type>* table) {
-	if (table->Hashes && get_header(table->Hashes)->Capacity) {
-		free(& table->Hashes);
-		free(& table->Entries);
+void destroy(HashTable<Type>& table) {
+	if (table.Hashes && get_header(table.Hashes)->Capacity) {
+		free(table.Hashes);
+		free(table.Entries);
 	}
 }
 
 template<typename Type> inline
-Type* get(HashTable<Type> table, u64 key) {
+Type* get(HashTable<Type>& table, u64 key) {
 	ssize idx = find(table, key).EntryIndex;
 	if (idx >= 0)
-		return & table.Entries[idx].Value;
+		return &table.Entries[idx].Value;
 
 	return nullptr;
 }
 
 template<typename Type> inline
-void map(HashTable<Type> table, void (*map_proc)(u64 key, Type value)) {
+void map(HashTable<Type>& table, void (*map_proc)(u64 key, Type value)) {
 	GEN_ASSERT_NOT_NULL(map_proc);
 
-	for (ssize idx = 0; idx < ssize(num(table.Entries)); ++idx) {
+	for (ssize idx = 0; idx < ssize(table.Entries.num()); ++idx) {
 		map_proc(table.Entries[idx].Key, table.Entries[idx].Value);
 	}
 }
 
 template<typename Type> inline
-void map_mut(HashTable<Type> table, void (*map_proc)(u64 key, Type* value)) {
+void map_mut(HashTable<Type>& table, void (*map_proc)(u64 key, Type* value)) {
 	GEN_ASSERT_NOT_NULL(map_proc);
 
-	for (ssize idx = 0; idx < ssize(num(table.Entries)); ++idx) {
-		map_proc(table.Entries[idx].Key, & table.Entries[idx].Value);
+	for (ssize idx = 0; idx < ssize(table.Entries.num()); ++idx) {
+		map_proc(table.Entries[idx].Key, &table.Entries[idx].Value);
 	}
 }
 
 template<typename Type> inline
-void grow(HashTable<Type>* table) {
-	ssize new_num = array_grow_formula(num(table->Entries));
+void grow(HashTable<Type>& table) {
+	ssize new_num = array_grow_formula(num(table.Entries));
 	rehash(table, new_num);
 }
 
 template<typename Type> inline
-void rehash(HashTable<Type>* table, ssize new_num)
+void rehash(HashTable<Type>& table, ssize new_num)
 {
 	ssize last_added_index;
-	HashTable<Type> new_ht = hashtable_init_reserve<Type>(get_header(table->Hashes)->Allocator, new_num);
+	HashTable<Type> new_ht = hashtable_init_reserve<Type>(get_header(table.Hashes)->Allocator, new_num);
 
-	for (ssize idx = 0; idx < ssize(num(table->Entries)); ++idx)
+	for (ssize idx = 0; idx < ssize(num(table.Entries)); ++idx)
 	{
 		HashTableFindResult find_result;
-		HashTableEntry<Type>& entry = table->Entries[idx];
+		HashTableEntry<Type>& entry = table.Entries[idx];
 
 		find_result = find(new_ht, entry.Key);
-		last_added_index = add_entry(& new_ht, entry.Key);
+		last_added_index = add_entry(new_ht, entry.Key);
 
 		if (find_result.PrevIndex < 0)
 			new_ht.Hashes[find_result.HashIndex] = last_added_index;
@@ -546,21 +531,21 @@ void rehash(HashTable<Type>* table, ssize new_num)
 	}
 
 	destroy(table);
-	* table = new_ht;
+	table = new_ht;
 }
 
 template<typename Type> inline
-void rehash_fast(HashTable<Type> table)
+void rehash_fast(HashTable<Type>& table)
 {
 	ssize idx;
 
-	for (idx = 0; idx < ssize(num(table.Entries)); idx++)
+	for (idx = 0; idx < ssize(table.Entries.num()); idx++)
 		table.Entries[idx].Next = -1;
 
-	for (idx = 0; idx < ssize(num(table.Hashes)); idx++)
+	for (idx = 0; idx < ssize(table.Hashes.num()); idx++)
 		table.Hashes[idx] = -1;
 
-	for (idx = 0; idx < ssize(num(table.Entries)); idx++)
+	for (idx = 0; idx < ssize(table.Entries.num()); idx++)
 	{
 		HashTableEntry<Type>* entry;
 		HashTableFindResult find_result;
@@ -576,30 +561,30 @@ void rehash_fast(HashTable<Type> table)
 }
 
 template<typename Type> inline
-void remove(HashTable<Type> table, u64 key) {
+void remove(HashTable<Type>& table, u64 key) {
 	HashTableFindResult find_result = find(table, key);
 
 	if (find_result.EntryIndex >= 0) {
-		remove_at(table.Entries, find_result.EntryIndex);
+		table.Entries.remove_at(find_result.EntryIndex);
 		rehash_fast(table);
 	}
 }
 
 template<typename Type> inline
-void remove_entry(HashTable<Type> table, ssize idx) {
-	remove_at(table.Entries, idx);
+void remove_entry(HashTable<Type>& table, ssize idx) {
+	table.Entries.remove_at(idx);
 }
 
 template<typename Type> inline
-void set(HashTable<Type>* table, u64 key, Type value)
+void set(HashTable<Type>& table, u64 key, Type value)
 {
 	ssize idx;
 	HashTableFindResult find_result;
 
-	if (full(* table))
+	if (full(table))
 		grow(table);
 
-	find_result = find(* table, key);
+	find_result = find(table, key);
 	if (find_result.EntryIndex >= 0) {
 		idx = find_result.EntryIndex;
 	}
@@ -608,22 +593,22 @@ void set(HashTable<Type>* table, u64 key, Type value)
 		idx = add_entry(table, key);
 
 		if (find_result.PrevIndex >= 0) {
-			table->Entries[find_result.PrevIndex].Next = idx;
+			table.Entries[find_result.PrevIndex].Next = idx;
 		}
 		else {
-			table->Hashes[find_result.HashIndex] = idx;
+			table.Hashes[find_result.HashIndex] = idx;
 		}
 	}
 
-	table->Entries[idx].Value = value;
+	table.Entries[idx].Value = value;
 
-	if (full(* table))
+	if (full(table))
 		grow(table);
 }
 
 template<typename Type> inline
-ssize slot(HashTable<Type> table, u64 key) {
-	for (ssize idx = 0; idx < ssize(num(table.Hashes)); ++idx)
+ssize slot(HashTable<Type>& table, u64 key) {
+	for (ssize idx = 0; idx < ssize(table.Hashes.num()); ++idx)
 		if (table.Hashes[idx] == key)
 			return idx;
 
@@ -631,17 +616,17 @@ ssize slot(HashTable<Type> table, u64 key) {
 }
 
 template<typename Type> inline
-ssize add_entry(HashTable<Type>* table, u64 key) {
+ssize add_entry(HashTable<Type>& table, u64 key) {
 	ssize idx;
 	HashTableEntry<Type> entry = { key, -1 };
 
-	idx = num(table->Entries);
-	append( & table->Entries, entry);
+	idx = num(table.Entries);
+	append(table.Entries, entry);
 	return idx;
 }
 
 template<typename Type> inline
-HashTableFindResult find(HashTable<Type> table, u64 key)
+HashTableFindResult find(HashTable<Type>& table, u64 key)
 {
 	HashTableFindResult result = { -1, -1, -1 };
 
@@ -664,7 +649,7 @@ HashTableFindResult find(HashTable<Type> table, u64 key)
 }
 
 template<typename Type> inline
-bool full(HashTable<Type> table) {
+bool full(HashTable<Type>& table) {
 	usize critical_load = usize(HashTable_CriticalLoadScale * f32(num(table.Hashes)));
 	b32 result = num(table.Entries) > critical_load;
 	return result;

project/dependencies/filesystem.cpp

@@ -612,7 +612,7 @@ GEN_FILE_WRITE_AT_PROC( _memory_file_write )
 
 		if ( get_header(arr)->Capacity < usize(new_cap) )
 		{
-			if ( ! grow( & arr, ( s64 )( new_cap ) ) )
+			if ( ! grow( arr, ( s64 )( new_cap ) ) )
 				return false;
 			d->buf = arr;
 		}
@@ -647,7 +647,7 @@ GEN_FILE_CLOSE_PROC( _memory_file_close )
 	if ( d->flags & EFileStream_CLONE_WRITABLE )
 	{
 		Array<u8> arr = { d->buf };
-		free(& arr);
+		free(arr);
 	}
 
 	free( allocator, d );

project/dependencies/macros.hpp

@@ -23,11 +23,7 @@
 #define bitfield_is_equal( Type, Field, Mask ) ( (Type(Mask) & Type(Field)) == Type(Mask) )
 #endif
 
-
 #if ! GEN_C_COMPILER
-#	ifndef cast
-#	define cast( type, value ) (tmpl_cast<type>( value ))
-#	endif
 #	ifndef ccast
 #	define ccast( type, value ) ( const_cast< type >( (value) ) )
 #	endif
@@ -41,14 +37,11 @@
 #	define scast( type, value ) static_cast< type >( value )
 #	endif
 #else
-#	ifndef cast
-#	define cast( type, value )  ( (type)(value) )
-#	endif
 #	ifndef ccast
 #	define ccast( type, value ) ( (type)(value) )
 #	endif
 #	ifndef pcast
-#	define pcast( type, value ) ( * (type*)(value) )
+#	define pcast( type, value ) ( (type)(value) )
 #	endif
 #	ifndef rcast
 #	define rcast( type, value ) ( (type)(value) )
@@ -188,14 +181,8 @@
 #	endif
 #endif
 
-#if !defined(GEN_SUPPORT_CPP_REFERENCES) && (GEN_COMPILER_C || __STDC_VERSION__ < 202311L)
-#	undef    GEN_SUPPORT_CPP_REFERENCES
-#	define   GEN_SUPPORT_CPP_REFERENCES 0
-#endif
-
-#if !defined(GEN_SUPPORT_CPP_MEMBER_FEATURES) && (GEN_COMPILER_C || __STDC_VERSION__ < 202311L)
-#	undef    GEN_SUPPORT_CPP_MEMBER_FEATURES
-#	define   GEN_SUPPORT_CPP_MEMBER_FEATURES 0
+#if !defined(GEN_SUPPORT_CPP_MEMBER_FEATURES) && (!GEN_COMPILER_C || __STDC_VERSION__ < 202311L)
+#	define GEN_SUPPORT_CPP_MEMBER_FEATURES 0
 #endif
 
 #if !defined(typeof) && (!GEN_COMPILER_C || __STDC_VERSION__ < 202311L)
@@ -228,10 +215,4 @@
 #	define enum_underlying(type) : type
 #endif
 
-#if GEN_COMPILER_C
-#	ifndef nullptr
-#		define nullptr NULL
-#	endif
-#endif
-
 #pragma endregion Macros

project/dependencies/memory.hpp

@@ -62,23 +62,21 @@ void zero_size( void* ptr, ssize size );
 //! Clears up an array.
 #define zero_array( a, count ) zero_size( ( a ), size_of( *( a ) ) * count )
 
-enum AllocType_Def //enum_underlying(u8)
+enum AllocType : u8
 {
 	EAllocation_ALLOC,
 	EAllocation_FREE,
 	EAllocation_FREE_ALL,
 	EAllocation_RESIZE,
 };
-typedef enum AllocType_Def AllocType;
 
 typedef void*(AllocatorProc)( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags );
 
-struct AllocatorInfo_Def
+struct AllocatorInfo
 {
 	AllocatorProc* Proc;
 	void*          Data;
 };
-typedef struct AllocatorInfo_Def AllocatorInfo;
 
 enum AllocFlag
 {
@@ -134,7 +132,7 @@ void* default_resize_align( AllocatorInfo a, void* ptr, ssize old_size, ssize ne
 void* heap_allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags );
 
 //! The heap allocator backed by operating system's memory manager.
-constexpr AllocatorInfo heap( void ) { AllocatorInfo allocator = { heap_allocator_proc, nullptr }; return allocator; }
+constexpr AllocatorInfo heap( void ) { return { heap_allocator_proc, nullptr }; }
 
 //! Helper to allocate memory using heap allocator.
 #define malloc( sz ) alloc( heap(), sz )
@@ -172,26 +170,26 @@ ssize gen_virtual_memory_page_size( ssize* alignment_out );
 #pragma region Arena
 struct Arena;
 
-AllocatorInfo allocator_info( Arena* arena );
+AllocatorInfo allocator_info( Arena& arena );
 
 // Remove static keyword and rename allocator_proc
 void* arena_allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags);
 
 // Add these declarations after the Arena struct
 Arena arena_init_from_allocator(AllocatorInfo backing, ssize size);
-Arena arena_init_from_memory   ( void* start, ssize size );
-
-Arena init_sub      (Arena* parent, ssize size);
-ssize alignment_of  (Arena* arena, ssize alignment);
-void  free          (Arena* arena);
-ssize size_remaining(Arena* arena, ssize alignment);
+Arena arena_init_from_memory( void* start, ssize size );
+Arena init_sub(Arena& parent, ssize size);
+ssize alignment_of(Arena& arena, ssize alignment);
 
 // This id is defined by Unreal for asserts
 #pragma push_macro("check")
 #undef check
-void   check(Arena* arena);
+void   check(Arena& arena);
 #pragma pop_macro("check")
 
+void  free(Arena& arena);
+ssize size_remaining(Arena& arena, ssize alignment);
+
 struct Arena
 {
 	AllocatorInfo Backing;
@@ -202,45 +200,29 @@ struct Arena
 
 #if GEN_SUPPORT_CPP_MEMBER_FEATURES
 #pragma region Member Mapping
-	forceinline operator AllocatorInfo() { return GEN_NS allocator_info(this); }
+	forceinline operator AllocatorInfo() { return GEN_NS allocator_info(* this); }
 
 	forceinline static void* allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags ) { return GEN_NS arena_allocator_proc( allocator_data, type, size, alignment, old_memory, old_size, flags ); }
 	forceinline static Arena init_from_memory( void* start, ssize size )                                                                                      { return GEN_NS arena_init_from_memory( start, size ); }
 	forceinline static Arena init_from_allocator( AllocatorInfo backing, ssize size )                                                                         { return GEN_NS arena_init_from_allocator( backing, size ); }
 	forceinline static Arena init_sub( Arena& parent, ssize size )                                                                                            { return GEN_NS arena_init_from_allocator( parent.Backing, size ); }
-	forceinline        ssize alignment_of( ssize alignment )                                                                                                  { return GEN_NS alignment_of(this, alignment); }
-	forceinline        void  free()                                                                                                                           { return GEN_NS free(this);  }
-	forceinline        ssize size_remaining( ssize alignment )                                                                                                { return GEN_NS size_remaining(this, alignment); }
+	forceinline        ssize alignment_of( ssize alignment )                                                                                                  { return GEN_NS alignment_of(* this, alignment); }
+	forceinline        void  free()                                                                                                                           { return GEN_NS free(* this);  }
+	forceinline        ssize size_remaining( ssize alignment )                                                                                                { return GEN_NS size_remaining(* this, alignment); }
 
 // This id is defined by Unreal for asserts
 #pragma push_macro("check")
 #undef check
-	forceinline void check() { GEN_NS check(this); }
+	forceinline void check() { GEN_NS check(* this); }
 #pragma pop_macro("check")
 
 #pragma endregion Member Mapping
 #endif
 };
 
-#if GEN_SUPPORT_CPP_REFERENCES
-forceinline AllocatorInfo allocator_info(Arena& arena )                 { return allocator_info(& arena); }
-forceinline Arena         init_sub      (Arena& parent, ssize size)     { return init_sub( & parent, size); }
-forceinline ssize         alignment_of  (Arena& arena, ssize alignment) { return alignment_of( & arena, alignment); }
-forceinline void          free          (Arena& arena)                  { return free(& arena); }
-forceinline ssize         size_remaining(Arena& arena, ssize alignment) { return size_remaining(& arena, alignment); }
-
-// This id is defined by Unreal for asserts
-#pragma push_macro("check")
-#undef check
-forceinline void check(Arena& arena) { return check(& arena); };
-#pragma pop_macro("check")
-#endif
-
-
 inline
-AllocatorInfo allocator_info( Arena* arena ) {
-	GEN_ASSERT(arena != nullptr);
-	return { arena_allocator_proc, arena };
+AllocatorInfo allocator_info( Arena& arena ) {
+	return { arena_allocator_proc, &arena };
 }
 
 inline
@@ -269,20 +251,18 @@ Arena arena_init_from_allocator(AllocatorInfo backing, ssize size) {
 }
 
 inline
-Arena init_sub(Arena* parent, ssize size) {
-	GEN_ASSERT(parent != nullptr);
-	return arena_init_from_allocator(parent->Backing, size);
+Arena init_sub(Arena& parent, ssize size) {
+	return arena_init_from_allocator(parent.Backing, size);
 }
 
 inline
-ssize alignment_of(Arena* arena, ssize alignment)
+ssize alignment_of(Arena& arena, ssize alignment)
 {
-	GEN_ASSERT(arena != nullptr);
 	ssize alignment_offset, result_pointer, mask;
 	GEN_ASSERT(is_power_of_two(alignment));
 
 	alignment_offset = 0;
-	result_pointer  = (ssize)arena->PhysicalStart + arena->TotalUsed;
+	result_pointer  = (ssize)arena.PhysicalStart + arena.TotalUsed;
 	mask            = alignment - 1;
 
 	if (result_pointer & mask)
@@ -294,29 +274,26 @@ ssize alignment_of(Arena* arena, ssize alignment)
 #pragma push_macro("check")
 #undef check
 inline
-void check(Arena* arena)
+void check(Arena& arena)
 {
-    GEN_ASSERT(arena != nullptr );
-    GEN_ASSERT(arena->TempCount == 0);
+    GEN_ASSERT(arena.TempCount == 0);
 }
 #pragma pop_macro("check")
 
 inline
-void free(Arena* arena)
+void free(Arena& arena)
 {
-	GEN_ASSERT(arena != nullptr);
-	if (arena->Backing.Proc)
+	if (arena.Backing.Proc)
 	{
-		GEN_NS free(arena->Backing, arena->PhysicalStart);
-		arena->PhysicalStart = nullptr;
+		GEN_NS free(arena.Backing, arena.PhysicalStart);
+		arena.PhysicalStart = nullptr;
 	}
 }
 
 inline
-ssize size_remaining(Arena* arena, ssize alignment)
+ssize size_remaining(Arena& arena, ssize alignment)
 {
-	GEN_ASSERT(arena != nullptr);
-	ssize result = arena->TotalSize - (arena->TotalUsed + alignment_of(arena, alignment));
+	ssize result = arena.TotalSize - (arena.TotalUsed + alignment_of(arena, alignment));
 	return result;
 }
 #pragma endregion Arena
@@ -325,14 +302,9 @@ ssize size_remaining(Arena* arena, ssize alignment)
 template<s32 Size>
 struct FixedArena;
 
+template<s32 Size> AllocatorInfo    allocator_info( FixedArena<Size>& fixed_arena );
 template<s32 Size> FixedArena<Size> fixed_arena_init();
-template<s32 Size> AllocatorInfo    allocator_info(FixedArena<Size>* fixed_arena );
-template<s32 Size> ssize            size_remaining(FixedArena<Size>* fixed_arena, ssize alignment);
-
-#if GEN_SUPPORT_CPP_REFERENCES
-template<s32 Size> AllocatorInfo    allocator_info( FixedArena<Size>& fixed_arena )                { return allocator_info(& fixed_arena); }
-template<s32 Size> ssize            size_remaining(FixedArena<Size>& fixed_arena, ssize alignment) { return size_remaining( & fixed_arena, alignment); }
-#endif
+template<s32 Size> ssize            size_remaining(FixedArena<Size>& fixed_arena, ssize alignment);
 
 // Just a wrapper around using an arena with memory associated with its scope instead of from an allocator.
 // Used for static segment or stack allocations.
@@ -344,29 +316,26 @@ struct FixedArena
 
 #if GEN_SUPPORT_CPP_MEMBER_FEATURES
 #pragma region Member Mapping
-	forceinline operator AllocatorInfo() { return GEN_NS allocator_info(this); }
+	forceinline operator AllocatorInfo() { return GEN_NS allocator_info(* this); }
 
 	forceinline static FixedArena init()                          { FixedArena result; GEN_NS fixed_arena_init<Size>(result); return result; }
-	forceinline ssize             size_remaining(ssize alignment) { GEN_NS size_remaining(this, alignment); }
+	forceinline ssize             size_remaining(ssize alignment) { GEN_NS size_remaining(*this, alignment); }
 #pragma endregion Member Mapping
 #endif
 };
 
 template<s32 Size> inline
-AllocatorInfo allocator_info( FixedArena<Size>* fixed_arena ) {
-	GEN_ASSERT(fixed_arena);
-	return { arena_allocator_proc, & fixed_arena->arena };
+AllocatorInfo allocator_info( FixedArena<Size>& fixed_arena ) { return { arena_allocator_proc, & fixed_arena.arena }; }
+
+template<s32 Size> inline
+void fixed_arena_init(FixedArena<Size>& result) {
+    zero_size(& result.memory[0], Size);
+    result.arena = arena_init_from_memory(& result.memory[0], Size);
 }
 
 template<s32 Size> inline
-void fixed_arena_init(FixedArena<Size>* result) {
-    zero_size(& result->memory[0], Size);
-    result->arena = arena_init_from_memory(& result->memory[0], Size);
-}
-
-template<s32 Size> inline
-ssize size_remaining(FixedArena<Size>* fixed_arena, ssize alignment) {
-    return size_remaining(fixed_arena->arena, alignment);
+ssize size_remaining(FixedArena<Size>& fixed_arena, ssize alignment) {
+    return size_remaining(fixed_arena.arena, alignment);
 }
 
 using Arena_1KB   = FixedArena< kilobytes( 1 ) >;
@@ -386,19 +355,12 @@ using Arena_4MB   = FixedArena< megabytes( 4 ) >;
 #pragma region Pool
 struct Pool;
 
-void* pool_allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags);
-
+AllocatorInfo allocator_info(Pool& pool);
+void*         pool_allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags);
 Pool          pool_init(AllocatorInfo backing, ssize num_blocks, ssize block_size);
 Pool          pool_init_align(AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align);
-AllocatorInfo allocator_info(Pool* pool);
-void          clear(Pool* pool);
-void          free(Pool* pool);
-
-#if GEN_SUPPORT_CPP_REFERENCES
-AllocatorInfo allocator_info(Pool& pool);
 void          clear(Pool& pool);
 void          free(Pool& pool);
-#endif
 
 struct Pool
 {
@@ -412,20 +374,20 @@ struct Pool
 
 #if GEN_SUPPORT_CPP_MEMBER_FEATURES
 #pragma region Member Mapping
-    forceinline operator AllocatorInfo() { return GEN_NS allocator_info(this); }
+    forceinline operator AllocatorInfo() { return GEN_NS allocator_info(* this); }
 
     forceinline static void* allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags) { return GEN_NS pool_allocator_proc(allocator_data, type, size, alignment, old_memory, old_size, flags); }
     forceinline static Pool  init(AllocatorInfo backing, ssize num_blocks, ssize block_size)                                                                { return GEN_NS pool_init(backing, num_blocks, block_size); }
     forceinline static Pool  init_align(AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align)                                       { return GEN_NS pool_init_align(backing, num_blocks, block_size, block_align); }
-    forceinline        void  clear() { GEN_NS clear( this); }
-    forceinline        void  free()  { GEN_NS free( this); }
+    forceinline        void  clear() { GEN_NS clear(* this); }
+    forceinline        void  free()  { GEN_NS free(* this); }
 #pragma endregion
 #endif
 };
 
 inline
-AllocatorInfo allocator_info(Pool* pool) {
-   return { pool_allocator_proc, pool };
+AllocatorInfo allocator_info(Pool& pool) {
+   return { pool_allocator_proc, &pool };
 }
 
 inline
@@ -434,9 +396,9 @@ Pool pool_init(AllocatorInfo backing, ssize num_blocks, ssize block_size) {
 }
 
 inline
-void free(Pool* pool) {
-   if(pool->Backing.Proc) {
-       GEN_NS free(pool->Backing, pool->PhysicalStart);
+void free(Pool& pool) {
+   if(pool.Backing.Proc) {
+       GEN_NS free(pool.Backing, pool.PhysicalStart);
    }
 }
 #pragma endregion Pool

project/dependencies/parsing.cpp

@@ -41,7 +41,7 @@ u8 adt_destroy_branch( ADT_Node* node )
 			adt_destroy_branch( node->nodes + i );
 		}
 
-		free(& node->nodes);
+		free(node->nodes);
 	}
 	return 0;
 }
@@ -287,11 +287,10 @@ ADT_Node* adt_alloc_at( ADT_Node* parent, ssize index )
 
 	ADT_Node o = { 0 };
 	o.parent   = parent;
-	if ( ! append_at( & parent->nodes, o, index ) )
+	if ( ! append_at( parent->nodes, o, index ) )
 		return NULL;
 
-	ADT_Node* node = & parent->nodes[index];
-	return node;
+	return parent->nodes + index;
 }
 
 ADT_Node* adt_alloc( ADT_Node* parent )
@@ -403,9 +402,7 @@ ADT_Node* adt_append_arr( ADT_Node* parent, char const* name )
 	ADT_Node* o = adt_alloc( parent );
 	if ( ! o )
 		return NULL;
-
-	ArrayHeader* node_header = get_header(parent->nodes);
-	if ( adt_set_arr( o, name, node_header->Allocator ) )
+	if ( adt_set_arr( o, name, get_header(parent->nodes)->Allocator ) )
 	{
 		adt_remove_node( o );
 		return NULL;
@@ -954,7 +951,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 			adt_append_arr( root, NULL );
 		}
 
-		append( & root->nodes[ columnIndex ].nodes, rowItem );
+		append(root->nodes[ columnIndex ].nodes, rowItem );
 
 		if ( delimiter == delim )
 		{

project/dependencies/parsing.hpp

@@ -83,7 +83,7 @@ struct ADT_Node
 	union
 	{
 		char const*     string;
-		Array(ADT_Node) nodes;    ///< zpl_array
+		Array<ADT_Node> nodes;    ///< zpl_array
 
 		struct
 		{

project/dependencies/platform.hpp

@@ -125,13 +125,9 @@
 #		include <intrin.h>
 #	endif
 
-#if GEN_COMPILER_C
-#include <assert.h>
-#endif
-
 #pragma endregion Mandatory Includes
 
-#if GEN_DONT_USE_NAMESPACE || GEN_COMPILER_C
+#if GEN_DONT_USE_NAMESPACE
 #	if GEN_COMPILER_C
 #		define GEN_NS_ENUM_BEGIN
 #		define GEN_NS_ENUM_END

project/dependencies/strings.hpp

@@ -33,41 +33,40 @@ StrC to_str( char const* str ) {
 struct StringHeader;
 struct String;
 
-usize string_grow_formula(usize value);
-
-String        string_make         (AllocatorInfo allocator, char const*  str);
-String        string_make         (AllocatorInfo allocator, StrC         str);
-String        string_make_reserve (AllocatorInfo allocator, ssize        capacity);
-String        string_make_length  (AllocatorInfo allocator, char const*  str,   ssize length);
-String        string_fmt          (AllocatorInfo allocator, char*        buf,   ssize buf_size,  char const* fmt, ...);
-String        string_fmt_buf      (AllocatorInfo allocator, char const*  fmt, ...);
-String        string_join         (AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue);
-bool          are_equal           (String const lhs, String const rhs);
-bool          are_equal           (String const lhs, StrC rhs);
-bool          make_space_for      (String*      str, char const*  to_append, ssize add_len);
-bool          append              (String*      str, char         c);
-bool          append              (String*      str, char const*  str_to_append);
-bool          append              (String*      str, char const*  str_to_append, ssize length);
-bool          append              (String*      str, StrC         str_to_append);
-bool          append              (String*      str, String const other);
-bool          append_fmt          (String*      str, char const*  fmt, ...);
-ssize         avail_space         (String const str);
-char*         back                (String       str);
-bool          contains            (String const str, StrC         substring);
-bool          contains            (String const str, String const substring);
-ssize         capacity            (String const str);
-void          clear               (String       str);
-String        duplicate           (String const str, AllocatorInfo allocator);
-void          free                (String*      str);
-StringHeader* get_header          (String       str);
-ssize         length              (String const str);
-b32           starts_with         (String const str, StrC   substring);
-b32           starts_with         (String const str, String substring);
-void          skip_line           (String       str);
-void          strip_space         (String       str);
-void          trim                (String       str, char const* cut_set);
-void          trim_space          (String       str);
-String        visualize_whitespace(String const str);
+String        string_make(AllocatorInfo allocator, char const* str);
+String        string_make(AllocatorInfo allocator, StrC str);
+String        string_make_reserve(AllocatorInfo allocator, ssize capacity);
+String        string_make_length(AllocatorInfo allocator, char const* str, ssize length);
+String        string_fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...);
+String        string_fmt_buf(AllocatorInfo allocator, char const* fmt, ...);
+String        string_join(AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue);
+usize         string_grow_formula(usize value);
+bool          are_equal(String const& lhs, String const& rhs);
+bool          are_equal(String const& lhs, StrC rhs);
+bool          make_space_for(String& str, char const* to_append, ssize add_len);
+bool          append(String& str, char c);
+bool          append(String& str, char const* str_to_append);
+bool          append(String& str, char const* str_to_append, ssize length);
+bool          append(String& str, StrC str_to_append);
+bool          append(String& str, const String other);
+bool          append_fmt(String& str, char const* fmt, ...);
+ssize         avail_space(String const& str);
+char&         back(String& str);
+bool          contains(String const& str, StrC substring);
+bool          contains(String const& str, String const& substring);
+ssize         capacity(String const& str);
+void          clear(String& str);
+String        duplicate(String const& str, AllocatorInfo allocator);
+void          free(String& str);
+StringHeader& get_header(String& str);
+ssize         length(String const& str);
+b32           starts_with(String const& str, StrC substring);
+b32           starts_with(String const& str, String substring);
+void          skip_line(String& str);
+void          strip_space(String& str);
+void          trim(String& str, char const* cut_set);
+void          trim_space(String& str);
+String        visualize_whitespace(String const& str);
 
 struct StringHeader {
 	AllocatorInfo Allocator;
@@ -130,31 +129,31 @@ struct String
 		return GEN_NS string_make(allocator, buf);
 	}
 
-	forceinline bool          make_space_for(char const* str, ssize add_len) { return GEN_NS make_space_for(this, str, add_len); }
-	forceinline bool          append(char c)                                 { return GEN_NS append(this, c); }
-	forceinline bool          append(char const* str)                        { return GEN_NS append(this, str); }
-	forceinline bool          append(char const* str, ssize length)          { return GEN_NS append(this, str, length); }
-	forceinline bool          append(StrC str)                               { return GEN_NS append(this, str); }
-	forceinline bool          append(const String other)                     { return GEN_NS append(this, other); }
-	forceinline ssize         avail_space() const                            { return GEN_NS avail_space(* this); }
-	forceinline char*         back()                                         { return GEN_NS back(* this); }
-	forceinline bool          contains(StrC substring) const                 { return GEN_NS contains(* this, substring); }
-	forceinline bool          contains(String const& substring) const        { return GEN_NS contains(* this, substring); }
-	forceinline ssize         capacity() const                               { return GEN_NS capacity(* this); }
-	forceinline void          clear()                                        { GEN_NS clear(* this); }
-	forceinline String        duplicate(AllocatorInfo allocator) const       { return GEN_NS duplicate(* this, allocator); }
-	forceinline void          free()                                         { GEN_NS free(this); }
+	forceinline bool          make_space_for(char const* str, ssize add_len) { return GEN_NS make_space_for(*this, str, add_len); }
+	forceinline bool          append(char c)                                 { return GEN_NS append(*this, c); }
+	forceinline bool          append(char const* str)                        { return GEN_NS append(*this, str); }
+	forceinline bool          append(char const* str, ssize length)          { return GEN_NS append(*this, str, length); }
+	forceinline bool          append(StrC str)                               { return GEN_NS append(*this, str); }
+	forceinline bool          append(const String other)                     { return GEN_NS append(*this, other); }
+	forceinline ssize         avail_space() const                            { return GEN_NS avail_space(*this); }
+	forceinline char&         back()                                         { return GEN_NS back(*this); }
+	forceinline bool          contains(StrC substring) const                 { return GEN_NS contains(*this, substring); }
+	forceinline bool          contains(String const& substring) const        { return GEN_NS contains(*this, substring); }
+	forceinline ssize         capacity() const                               { return GEN_NS capacity(*this); }
+	forceinline void          clear()                                        { GEN_NS clear(*this); }
+	forceinline String        duplicate(AllocatorInfo allocator) const       { return GEN_NS duplicate(*this, allocator); }
+	forceinline void          free()                                         { GEN_NS free(*this); }
 	forceinline bool          is_equal(String const& other) const            { return GEN_NS are_equal(* this, other); }
 	forceinline bool          is_equal(StrC other) const                     { return GEN_NS are_equal(* this, other); }
-	forceinline ssize         length() const                                 { return GEN_NS length(* this); }
-	forceinline b32           starts_with(StrC substring) const              { return GEN_NS starts_with(* this, substring); }
-	forceinline b32           starts_with(String substring) const            { return GEN_NS starts_with(* this, substring); }
-	forceinline void          skip_line()                                    { GEN_NS skip_line(* this); }
-	forceinline void          strip_space()                                  { GEN_NS strip_space(* this); }
-	forceinline void          trim(char const* cut_set)                      { GEN_NS trim(* this, cut_set); }
-	forceinline void          trim_space()                                   { GEN_NS trim_space(* this); }
-	forceinline String        visualize_whitespace() const                   { return GEN_NS visualize_whitespace(* this); }
-	forceinline StringHeader& get_header()                                   { return * GEN_NS get_header(* this); }
+	forceinline ssize         length() const                                 { return GEN_NS length(*this); }
+	forceinline b32           starts_with(StrC substring) const              { return GEN_NS starts_with(*this, substring); }
+	forceinline b32           starts_with(String substring) const            { return GEN_NS starts_with(*this, substring); }
+	forceinline void          skip_line()                                    { GEN_NS skip_line(*this); }
+	forceinline void          strip_space()                                  { GEN_NS strip_space(*this); }
+	forceinline void          trim(char const* cut_set)                      { GEN_NS trim(*this, cut_set); }
+	forceinline void          trim_space()                                   { GEN_NS trim_space(*this); }
+	forceinline String        visualize_whitespace() const                   { return GEN_NS visualize_whitespace(*this); }
+	forceinline StringHeader& get_header()                                   { return GEN_NS get_header(*this); }
 
 	bool append_fmt(char const* fmt, ...) {
 		ssize res;
@@ -165,26 +164,13 @@ struct String
 		res = str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
 		va_end(va);
 
-		return GEN_NS append(this, buf, res);
+		return GEN_NS append(*this, buf, res);
 	}
 #pragma endregion Member Mapping
 #endif
 };
 #endif
 
-#if GEN_SUPPORT_CPP_REFERENCES
-bool          make_space_for(String& str, char const* to_append, ssize add_len);
-bool          append(String& str, char c);
-bool          append(String& str, char const* str_to_append);
-bool          append(String& str, char const* str_to_append, ssize length);
-bool          append(String& str, StrC str_to_append);
-bool          append(String& str, const String other);
-bool          append_fmt(String& str, char const* fmt, ...);
-char&         back(String& str);
-void          clear(String& str);
-void          free(String& str);
-#endif
-
 inline char* begin(String& str) { return str; }
 inline char* end(String& str)   { return scast(char*, str) + length(str); }
 inline char* next(String& str)  { return scast(char*, str) + 1; }
@@ -237,64 +223,57 @@ String string_join(AllocatorInfo allocator, char const** parts, ssize num_parts,
 
 	for (ssize idx = 0; idx < num_parts; ++idx)
 	{
-		append(& result, parts[idx]);
+		append(result, parts[idx]);
 
 		if (idx < num_parts - 1)
-			append(& result, glue);
+			append(result, glue);
 	}
 
 	return result;
 }
 
 inline
-bool append(String* str, char c) {
-	GEN_ASSERT(str != nullptr);
+bool append(String& str, char c) {
 	return append(str, &c, 1);
 }
 
 inline
-bool append(String* str, char const* str_to_append) {
-	GEN_ASSERT(str != nullptr);
+bool append(String& str, char const* str_to_append) {
 	return append(str, str_to_append, str_len(str_to_append));
 }
 
 inline
-bool append(String* str, char const* str_to_append, ssize append_length)
+bool append(String& str, char const* str_to_append, ssize append_length)
 {
-	GEN_ASSERT(str != nullptr);
 	if (sptr(str_to_append) > 0)
 	{
-		ssize curr_len = length(* str);
+		ssize curr_len = length(str);
 
-		if ( ! make_space_for(str, str_to_append, append_length))
+		if (!make_space_for(str, str_to_append, append_length))
 			return false;
 
-		StringHeader* header = get_header(* str);
+		StringHeader& header = get_header(str);
 
-		char* Data = * str;
-		mem_copy( Data + curr_len, str_to_append, append_length);
+		mem_copy( scast(char*, str) + curr_len, str_to_append, append_length);
 
-		Data[curr_len + append_length] = '\0';
+		str[curr_len + append_length] = '\0';
 
-		header->Length = curr_len + append_length;
+		header.Length = curr_len + append_length;
 	}
 	return str_to_append != nullptr;
 }
 
 inline
-bool append(String* str, StrC str_to_append) {
-	GEN_ASSERT(str != nullptr);
+bool append(String& str, StrC str_to_append) {
 	return append(str, str_to_append.Ptr, str_to_append.Len);
 }
 
 inline
-bool append(String* str, const String other) {
-	GEN_ASSERT(str != nullptr);
+bool append(String& str, const String other) {
 	return append(str, other, length(other));
 }
 
-bool append_fmt(String* str, char const* fmt, ...) {
-	GEN_ASSERT(str != nullptr);
+bool append_fmt(String& str, char const* fmt, ...) {
 	ssize res;
 	char buf[GEN_PRINTF_MAXLEN] = { 0 };
 
@@ -307,7 +286,7 @@ bool append_fmt(String* str, char const* fmt, ...) {
 }
 
 inline
-bool are_equal(String const lhs, String const rhs)
+bool are_equal(String const& lhs, String const& rhs)
 {
 	if (length(lhs) != length(rhs))
 		return false;
@@ -320,43 +299,43 @@ bool are_equal(String const lhs, String const rhs)
 }
 
 inline
-bool are_equal(String const lhs, StrC rhs)
+bool are_equal(String const& lhs, StrC rhs)
 {
 	if (length(lhs) != (rhs.Len))
 		return false;
 
 	for (ssize idx = 0; idx < length(lhs); ++idx)
-		if (lhs[idx] != rhs.Ptr[idx])
+		if (lhs[idx] != rhs[idx])
 			return false;
 
 	return true;
 }
 
 inline
-ssize avail_space(String const str) {
-	StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
-	return header->Capacity - header->Length;
+ssize avail_space(String const& str) {
+	StringHeader const& header = *rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
+	return header.Capacity - header.Length;
 }
 
 inline
-char* back(String* str) {
-	return & (*str)[length(* str) - 1];
+char& back(String& str) {
+	return str.Data[length(str) - 1];
 }
 
 inline
-bool contains(String const str, StrC substring)
+bool contains(String const& str, StrC substring)
 {
-	StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
+	StringHeader const& header = *rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
 
-	if (substring.Len > header->Length)
+	if (substring.Len > header.Length)
 		return false;
 
-	ssize main_len = header->Length;
-	ssize sub_len  = substring.Len;
+	ssize main_len = header.Length;
+	ssize sub_len = substring.Len;
 
 	for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
 	{
-		if (str_compare(str + idx, substring.Ptr, sub_len) == 0)
+		if (str_compare(str.Data + idx, substring.Ptr, sub_len) == 0)
 			return true;
 	}
 
@@ -364,19 +343,19 @@ bool contains(String const str, StrC substring)
 }
 
 inline
-bool contains(String const str, String const substring)
+bool contains(String const& str, String const& substring)
 {
-	StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
+	StringHeader const& header = *rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
 
-	if (length(substring) > header->Length)
+	if (length(substring) > header.Length)
 		return false;
 
-	ssize main_len = header->Length;
-	ssize sub_len  = length(substring);
+	ssize main_len = header.Length;
+	ssize sub_len = length(substring);
 
 	for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
 	{
-		if (str_compare(str + idx, substring, sub_len) == 0)
+		if (str_compare(str.Data + idx, substring.Data, sub_len) == 0)
 			return true;
 	}
 
@@ -384,47 +363,46 @@ bool contains(String const str, String const substring)
 }
 
 inline
-ssize capacity(String const str) {
-   StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
-   return header->Capacity;
+ssize capacity(String const& str) {
+   StringHeader const& header = *rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
+   return header.Capacity;
 }
 
 inline
-void clear(String str) {
-   get_header(str)->Length = 0;
+void clear(String& str) {
+   get_header(str).Length = 0;
 }
 
 inline
-String duplicate(String const str, AllocatorInfo allocator) {
+String duplicate(String const& str, AllocatorInfo allocator) {
    return string_make_length(allocator, str, length(str));
 }
 
 inline
-void free(String* str) {
-	GEN_ASSERT(str != nullptr);
-	if (! (* str))
-		return;
+void free(String& str) {
+   if (!str.Data)
+   	return;
 
-	StringHeader* header = get_header(* str);
-	GEN_NS free(header->Allocator, header);
+   StringHeader& header = get_header(str);
+   GEN_NS free(header.Allocator, &header);
 }
 
 inline
-StringHeader* get_header(String str) {
-   return (StringHeader*)(scast(char*, str) - sizeof(StringHeader));
+StringHeader& get_header(String& str) {
+   return *(StringHeader*)(str.Data - sizeof(StringHeader));
 }
 
 inline
-ssize length(String const str)
+ssize length(String const& str)
 {
    StringHeader const& header = *rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
    return header.Length;
 }
 
 inline
-bool make_space_for(String* str, char const* to_append, ssize add_len)
+bool make_space_for(String& str, char const* to_append, ssize add_len)
 {
-	ssize available = avail_space(* str);
+	ssize available = avail_space(str);
 
 	if (available >= add_len) {
 		return true;
@@ -435,12 +413,12 @@ bool make_space_for(String* str, char const* to_append, ssize add_len)
 		void* ptr;
 		void* new_ptr;
 
-		AllocatorInfo allocator = get_header(* str)->Allocator;
-		StringHeader* header    = nullptr;
+		AllocatorInfo allocator = get_header(str).Allocator;
+		StringHeader* header = nullptr;
 
-		new_len  = string_grow_formula(length(* str) + add_len);
-		ptr      = get_header(* str);
-		old_size = size_of(StringHeader) + length(* str) + 1;
+		new_len = string_grow_formula(length(str) + add_len);
+		ptr = &get_header(str);
+		old_size = size_of(StringHeader) + length(str) + 1;
 		new_size = size_of(StringHeader) + new_len + 1;
 
 		new_ptr = resize(allocator, ptr, old_size, new_size);
@@ -450,17 +428,16 @@ bool make_space_for(String* str, char const* to_append, ssize add_len)
 
 		header = rcast(StringHeader*, new_ptr);
 		header->Allocator = allocator;
-		header->Capacity  = new_len;
+		header->Capacity = new_len;
 
-		char** Data = rcast(char**, str);
-		* Data = rcast(char*, header + 1);
+		str.Data = rcast(char*, header + 1);
 
 		return true;
 	}
 }
 
 inline
-b32 starts_with(String const str, StrC substring) {
+b32 starts_with(String const& str, StrC substring) {
 	if (substring.Len > length(str))
 	return false;
 
@@ -469,7 +446,7 @@ b32 starts_with(String const str, StrC substring) {
 }
 
 inline
-b32 starts_with(String const str, String substring) {
+b32 starts_with(String const& str, String substring) {
 	if (length(substring) > length(str))
 		return false;
 
@@ -478,7 +455,7 @@ b32 starts_with(String const str, String substring) {
 }
 
 inline
-void skip_line(String str)
+void skip_line(String& str)
 {
 #define current (*scanner)
 	char* scanner = str.Data;
@@ -494,23 +471,23 @@ void skip_line(String str)
 
 	mem_move(str.Data, scanner, new_length);
 
-	StringHeader* header = get_header(str);
+	StringHeader* header = &get_header(str);
 	header->Length = new_length;
 #undef current
 }
 
 inline
-void strip_space(String str)
+void strip_space(String& str)
 {
-   char* write_pos = str;
-   char* read_pos  = str;
+   char* write_pos = str.Data;
+   char* read_pos = str.Data;
 
-   while (* read_pos)
+   while (*read_pos)
    {
-   	if (! char_is_space(* read_pos))
+   	if (!char_is_space(*read_pos))
    	{
-   		* write_pos = * read_pos;
-   		  write_pos++;
+   		*write_pos = *read_pos;
+   		write_pos++;
    	}
    	read_pos++;
    }
@@ -518,11 +495,11 @@ void strip_space(String str)
    write_pos[0] = '\0';  // Null-terminate the modified string
 
    // Update the length if needed
-   get_header(str)->Length = write_pos - str.Data;
+   get_header(str).Length = write_pos - str.Data;
 }
 
 inline
-void trim(String str, char const* cut_set)
+void trim(String& str, char const* cut_set)
 {
    ssize len = 0;
 
@@ -542,16 +519,16 @@ void trim(String str, char const* cut_set)
 
    str.Data[len] = '\0';
 
-   get_header(str)->Length = len;
+   get_header(str).Length = len;
 }
 
 inline
-void trim_space(String str) {
+void trim_space(String& str) {
    trim(str, " \t\r\n\v\f");
 }
 
 inline
-String visualize_whitespace(String const str)
+String visualize_whitespace(String const& str)
 {
 	StringHeader* header = (StringHeader*)(scast(char const*, str) - sizeof(StringHeader));
 	String        result = string_make_reserve(header->Allocator, length(str) * 2); // Assume worst case for space requirements.
@@ -559,25 +536,25 @@ String visualize_whitespace(String const str)
 	for (auto c : str) switch (c)
 	{
 		case ' ':
-			append(& result, txt("·"));
+			append(result, txt("·"));
 		break;
 		case '\t':
-			append(& result, txt("→"));
+			append(result, txt("→"));
 		break;
 		case '\n':
-			append(& result, txt("↵"));
+			append(result, txt("↵"));
 		break;
 		case '\r':
-			append(& result, txt("⏎"));
+			append(result, txt("⏎"));
 		break;
 		case '\v':
-			append(& result, txt("⇕"));
+			append(result, txt("⇕"));
 		break;
 		case '\f':
-			append(& result, txt("⌂"));
+			append(result, txt("⌂"));
 		break;
 		default:
-			append(& result, c);
+			append(result, c);
 		break;
 	}
 

project/helpers/helper.hpp

@@ -13,7 +13,7 @@ CodeBody gen_ecode( char const* path )
 	char  scratch_mem[kilobytes(1)];
 	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
 
-	file_read_contents( allocator_info( & scratch), zero_terminate, path );
+	file_read_contents( allocator_info(scratch), zero_terminate, path );
 
 	CSV_Object csv_nodes;
 	csv_parse( &csv_nodes, scratch_mem, GlobalAllocator, false );
@@ -23,12 +23,11 @@ CodeBody gen_ecode( char const* path )
 	String enum_entries   = string_make_reserve( GlobalAllocator, kilobytes(1) );
 	String to_str_entries = string_make_reserve( GlobalAllocator, kilobytes(1) );
 
-	for ( ADT_Node& node : enum_strs )
+	for ( ADT_Node node : enum_strs )
 	{
 		char const* code = node.string;
-
-		append_fmt( & enum_entries, "%s,\n", code );
-		append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", code, code );
+		append_fmt( enum_entries, "%s,\n", code );
+		append_fmt( to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", code, code );
 	}
 
 	CodeEnum enum_code = parse_enum(gen::token_fmt_impl((3 + 1) / 2, "entries", (StrC)enum_entries, "enum Type : u32 { <entries> NumTypes };"));
@@ -60,7 +59,7 @@ CodeBody gen_eoperator( char const* path )
 	char scratch_mem[kilobytes(4)];
 	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
 
-	file_read_contents( allocator_info(& scratch), zero_terminate, path );
+	file_read_contents( allocator_info(scratch), zero_terminate, path );
 
 	CSV_Object csv_nodes;
 	csv_parse( &csv_nodes, scratch_mem, GlobalAllocator, false );
@@ -76,8 +75,8 @@ CodeBody gen_eoperator( char const* path )
 		char const* enum_str     = enum_strs[idx].string;
 		char const* entry_to_str = str_strs [idx].string;
 
-		append_fmt( & enum_entries, "%s,\n", enum_str );
-		append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
+		append_fmt( enum_entries, "%s,\n", enum_str );
+		append_fmt( to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
 	}
 
 	CodeEnum  enum_code = parse_enum(token_fmt("entries", (StrC)enum_entries, stringize(
@@ -116,7 +115,7 @@ CodeBody gen_especifier( char const* path )
 	char scratch_mem[kilobytes(4)];
 	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
 
-	file_read_contents( allocator_info(& scratch), zero_terminate, path );
+	file_read_contents( allocator_info(scratch), zero_terminate, path );
 
 	CSV_Object csv_nodes;
 	csv_parse( &csv_nodes, scratch_mem, GlobalAllocator, false );
@@ -132,8 +131,8 @@ CodeBody gen_especifier( char const* path )
 		char const* enum_str     = enum_strs[idx].string;
 		char const* entry_to_str = str_strs [idx].string;
 
-		append_fmt( & enum_entries, "%s,\n", enum_str );
-		append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
+		append_fmt( enum_entries, "%s,\n", enum_str );
+		append_fmt( to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
 	}
 
 	CodeEnum  enum_code = parse_enum(token_fmt("entries", (StrC)enum_entries, stringize(
@@ -221,7 +220,7 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path )
 	char  scratch_mem[kilobytes(16)];
 	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
 
-	AllocatorInfo scratch_info = allocator_info(& scratch);
+	AllocatorInfo scratch_info = allocator_info(scratch);
 
 	FileContents enum_content = file_read_contents( scratch_info, zero_terminate, etok_path );
 
@@ -249,8 +248,8 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path )
 		char const* enum_str     = enum_strs[idx].string;
 		char const* entry_to_str = enum_str_strs [idx].string;
 
-		append_fmt( & enum_entries, "%s,\n", enum_str );
-		append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
+		append_fmt( enum_entries, "%s,\n", enum_str );
+		append_fmt( to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
 	}
 
 	for ( usize idx = 0; idx < num(attribute_strs); idx++ )
@@ -258,14 +257,14 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path )
 		char const* attribute_str = attribute_strs[idx].string;
 		char const* entry_to_str  = attribute_str_strs [idx].string;
 
-		append_fmt( & attribute_entries, "Attribute_%s,\n", attribute_str );
-		append_fmt( & to_str_attributes, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
-		append_fmt( & attribute_define_entries, "Entry( Attribute_%s, \"%s\" )", attribute_str, entry_to_str );
+		append_fmt( attribute_entries, "Attribute_%s,\n", attribute_str );
+		append_fmt( to_str_attributes, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
+		append_fmt( attribute_define_entries, "Entry( Attribute_%s, \"%s\" )", attribute_str, entry_to_str );
 
 		if ( idx < num(attribute_strs) - 1 )
-			append( & attribute_define_entries, " \\\n");
+			append( attribute_define_entries, " \\\n");
 		else
-			append( & attribute_define_entries, "\n");
+			append( attribute_define_entries, "\n");
 	}
 
 #pragma push_macro("GEN_DEFINE_ATTRIBUTE_TOKENS")
@@ -343,17 +342,68 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path )
 
 CodeBody gen_ast_inlines()
 {
-#pragma push_macro("GEN_NS")
 #pragma push_macro("rcast")
 #pragma push_macro("log_failure")
-#pragma push_macro("CodeInvalid")
-#undef GEN_NS
 #undef rcast
 #undef log_failure
-#undef CodeInvalid
 	char const* code_impl_tmpl = stringize(
 		\n
 		inline
+		char const* <typename>::debug_str()
+		{
+			if ( ast == nullptr )
+				return "Code::debug_str: AST is null!";
+
+			return rcast(AST*, ast)->debug_str();
+		}
+		inline
+		Code <typename>::duplicate()
+		{
+			if ( ast == nullptr )
+			{
+				log_failure("Code::duplicate: Cannot duplicate code, AST is null!");
+				return Code::Invalid;
+			}
+
+			return { rcast(AST*, ast)->duplicate() };
+		}
+		inline
+		bool <typename>::is_body()
+		{
+			if ( ast == nullptr )
+			{
+				return rcast(AST*, ast)->is_body();
+			}
+			return false;
+		}
+		inline
+		bool <typename>::is_equal( Code other )
+		{
+			if ( ast == nullptr || other.ast == nullptr )
+			{
+				// Just check if they're both null.
+				// log_failure( "Code::is_equal: Cannot compare code, AST is null!" );
+				return ast == nullptr && other.ast == nullptr;
+			}
+			return rcast(AST*, ast)->is_equal( other.ast );
+		}
+		inline
+		bool <typename>::is_valid()
+		{
+			return (AST*) ast != nullptr && rcast( AST*, ast)->Type != CodeT::Invalid;
+		}
+		inline
+		void <typename>::set_global()
+		{
+			if ( ast == nullptr )
+			{
+				log_failure("Code::set_global: Cannot set code as global, AST is null!");
+				return;
+			}
+
+			rcast(AST*, ast)->Parent = Code::Global.ast;
+		}
+		inline
 		<typename>& <typename>::operator =( Code other )
 		{
 			if ( other.ast && other->Parent )
@@ -366,6 +416,16 @@ CodeBody gen_ast_inlines()
 			return *this;
 		}
 		inline
+		bool <typename>::operator ==( Code other )
+		{
+			return (AST*) ast == other.ast;
+		}
+		inline
+		bool <typename>::operator !=( Code other )
+		{
+			return (AST*) ast != other.ast;
+		}
+		inline
 		<typename>::operator bool()
 		{
 			return ast != nullptr;
@@ -395,8 +455,6 @@ CodeBody gen_ast_inlines()
 		}
 		\n
 	);
-#pragma pop_macro("GEN_NS")
-#pragma pop_macro("CodeInvalid")
 
 	CodeBody impl_code          = parse_global_body( token_fmt( "typename", StrC name(Code),               code_impl_tmpl ));
 	CodeBody impl_code_body     = parse_global_body( token_fmt( "typename", StrC name(CodeBody),           code_impl_tmpl ));

scripts/build.ci.ps1

@@ -226,30 +226,6 @@ if ( $c_library )
 			write-host "`nc_library generator completed in $($time_taken.TotalMilliseconds) ms"
 		}
 	Pop-Location
-
-	$unit       = join-path $path_c_library "gen.c"
-	$executable = join-path $path_build     "gen_c_library_test.exe"
-
-	if ($vendor -eq "clang") {
-		$compiler_args += "-x"
-		$compiler_args += "c"
-	} elseif ($vendor -eq "msvc") {
-		$compiler_args += "/TC"
-	}
-
-	build-simple $path_build $includes $compiler_args $linker_args $unit $executable
-
-	Push-Location $path_c_library
-		if ( Test-Path( $executable ) ) {
-			write-host "`nRunning c_library test"
-			$time_taken = Measure-Command { & $executable
-					| ForEach-Object {
-						write-host `t $_ -ForegroundColor Green
-					}
-				}
-			write-host "`nc_library generator completed in $($time_taken.TotalMilliseconds) ms"
-		}
-	Pop-Location
 }
 
 if ( $unreal )