minor fixees

- CodeParam -> CodeParams
- interfaces array weren't being used in parse_class_struct
- added enum_underlying_sig

.vscode/bookmarks.json

@@ -1,14 +0,0 @@
-{
-	"files": [
-		{
-			"path": "project/auxillary/vis_ast/dependencies/temp/raylib-master/src/rcamera.h",
-			"bookmarks": [
-				{
-					"line": 140,
-					"column": 14,
-					"label": ""
-				}
-			]
-		}
-	]
-}

.vscode/c_cpp_properties.json

@@ -3,7 +3,7 @@
         {
             "name": "Bootstrap",
             "includePath": [
-                "${workspaceFolder}/project/**"
+                "${workspaceFolder}/base/**"
             ],
             "defines": [
                 "_DEBUG",
@@ -20,7 +20,7 @@
             "windowsSdkVersion": "10.0.19041.0",
             "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
             "intelliSenseMode": "msvc-x64",
-            "compileCommands": "C:\\projects\\gencpp\\.vscode\\tasks.json",
+            "compileCommands": "${workspaceFolder}/.vscode/tasks.json",
             "compilerArgs": [
                 "/EHsc-",
                 "/GR-",
@@ -47,12 +47,12 @@
             "windowsSdkVersion": "10.0.19041.0",
             "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
             "intelliSenseMode": "msvc-x64",
-            "compileCommands": "C:\\projects\\gencpp\\.vscode\\tasks.json"
+            "compileCommands": "${workspaceFolder}/.vscode/tasks.json"
         },
         {
             "name": "Win32 clang",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/base/**"
             ],
             "defines": [
                 "_DEBUG",
@@ -65,9 +65,9 @@
                 "INTELLISENSE_DIRECTIVES"
             ],
             "windowsSdkVersion": "10.0.19041.0",
-            "compilerPath": "C:/Users/Ed/scoop/apps/llvm/current/bin/clang++.exe",
+            "compilerPath": "clang++.exe",
             "intelliSenseMode": "windows-clang-x64",
-            "compileCommands": ".vscode/tasks.json"
+            "compileCommands": "${workspaceFolder}/.vscode/tasks.json"
         }
     ],
     "version": 4

.vscode/launch.json

@@ -4,39 +4,20 @@
 	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 	"version": "0.2.0",
 	"configurations": [
-		{
-			"type": "lldb",
-			"request": "launch",
-			"name": "Debug gentime lldb",
-			"program": "${workspaceFolder}/test/test.exe",
-			"args": [],
-			"cwd": "${workspaceFolder}/test/",
-			"postRunCommands": [
-			]
-		},
 		{
 			"type": "cppvsdbg",
 			"request": "launch",
-			"name": "Debug gentime vsdbg",
-			"program": "${workspaceFolder}/test/build/test.exe",
+			"name": "Debug base vsdbg",
+			"program": "${workspaceFolder}/base/build/base.exe",
 			"args": [],
-			"cwd": "${workspaceFolder}/test/",
-			"visualizerFile": "${workspaceFolder}/scripts/gencpp.natvis"
-		},
-		{
-			"type": "cppvsdbg",
-			"request": "launch",
-			"name": "Debug bootstrap vsdbg",
-			"program": "${workspaceFolder}/project/build/bootstrap.exe",
-			"args": [],
-			"cwd": "${workspaceFolder}/project/",
+			"cwd": "${workspaceFolder}/base/",
 			"visualizerFile": "${workspaceFolder}/scripts/gencpp.natvis"
 		},
 		{
 			"type": "cppvsdbg",
 			"request": "launch",
 			"name": "Debug singleheader vsdbg",
-			"program": "${workspaceFolder}/singleheader/build/gencpp_singleheader.exe",
+			"program": "${workspaceFolder}/singleheader/build/singleheader.exe",
 			"args": [],
 			"cwd": "${workspaceFolder}/singleheader/",
 			"visualizerFile": "${workspaceFolder}/scripts/gencpp.natvis"
@@ -49,24 +30,6 @@
 			"args": [],
 			"cwd": "${workspaceFolder}/unreal_engine/",
 			"visualizerFile": "${workspaceFolder}/scripts/gencpp.natvis"
-		},
-		{
-			"type": "cppvsdbg",
-			"request": "launch",
-			"name": "Debug raylib refactor vsdbg",
-			"program": "${workspaceFolder}/project/auxillary/vis_ast/dependencies/raylib/build/raylib_refactor.exe",
-			"args": [],
-			"cwd": "${workspaceFolder}/project/auxillary/vis_ast/dependencies/temp/raylib-master/src/",
-			"visualizerFile": "${workspaceFolder}/scripts/gencpp.natvis"
-		},
-		{
-			"type": "cppvsdbg",
-			"request": "launch",
-			"name": "Debug VIS AST",
-			"program": "${workspaceFolder}/project/auxillary/vis_ast/binaries/vis_ast.exe",
-			"args": [],
-			"cwd": "${workspaceFolder}/project/auxillary/vis_ast/binaries/",
-			"visualizerFile": "${workspaceFolder}/scripts/gencpp.natvis"
 		}
 	]
 }

Readme.md

@@ -2,15 +2,28 @@
 
 An attempt at simple staged metaprogramming for C/C++.
 
-The library API is a composition of code element constructors, and a non-standards-compliant single-pass C/C++ parser.
+The library API is a composition of code element constructors, and a non-standards-compliant single-pass C/C++ parser.  
 These build up a code AST to then serialize with a file builder, or can be traversed for staged-reflection of C/C++ code.
 
-This code base attempts follow the [handmade philosophy](https://handmade.network/manifesto).  
-Its not meant to be a black box metaprogramming utility, it should be easy to intergrate into a user's project domain.  
+This code base attempts follow the [handmade philosophy](https://handmade.network/manifesto).
+Its not meant to be a black box metaprogramming utility, it should be easy to intergrate into a user's project domain.
+
+## Documentation
+
+* [docs - General](./docs/Readme.md): Overview and additional docs
+  * [AST_Design](./docs/AST_Design.md): Overvie of ASTs
+  * [AST Types](./docs/AST_Types.md): Listing of all AST types along with their Code type interface.
+  * [Parsing](./docs/Parsing.md): Overview of the parsing interface.
+  * [Parser Algo](./docs/Parser_Algo.md): In-depth breakdown of the parser's implementation.
+* [base](./base/Readme.md): Essential (base) library.
+* [gen_c_library](./gen_c_library/): C11 library variant generation (single header and segmeented).
+* [gen_segmented](./gen_segmented/): Segemented C++ (`gen.<hpp/cpp>`, `gen.dep.<hpp/cpp>`) generation
+* [gen_singleheader](./gen_singleheader/): Singlehader C++ generation `gen.hpp`
+* [gen_unreal_engine](./gen_unreal_engine/): Unreal Engine thirdparty code generation.
 
 ## Notes
 
-**On Partial Hiatus: Life has got me tackling other issues..**  
+**On Partial Hiatus: Life has got me tackling other issues..**
 I will be passively updating the library with bug fixes and minor improvements as I use it for my personal projects.  
 There won't be any major reworks or features to this thing for a while.
 
@@ -21,10 +34,6 @@ The library can already be used to generate code just fine, but the parser is wh
 
 A `natvis` and `natstepfilter` are provided in the scripts directory (its outdated, I'll update this readme when its not).
 
-***The editor and scanner have not been implemented yet. The scanner will come first, then the editor.***
-
-A C variant is hosted [here](https://github.com/Ed94/genc); I will complete it when this library is feature complete, it should be easier to make than this...
-
 ## Usage
 
 A metaprogram is built to generate files before the main program is built. We'll term runtime for this program as `GEN_TIME`. The metaprogram's core implementation are within `gen.hpp` and `gen.cpp` in the project directory.
@@ -114,7 +123,7 @@ Code header = code_str(
 
 `name` is a helper macro for providing a string literal with its size, intended for the name parameter of functions.  
 `code` is a helper macro for providing a string literal with its size, but intended for code string parameters.  
-`args` is a helper macro for providing the number of arguments to varadic constructors.
+`args` is a helper macro for providing the number of arguments to varadic constructors.  
 `code_str` is a helper macro for writting `untyped_str( code( <content> ))`
 
 All three constrcuton interfaces will generate the following C code:
@@ -128,7 +137,7 @@ struct ArrayHeader
 };
 ```
 
-**Note: The formatting shown here is not how it will look. For your desired formatting its recommended to run a pass through the files with an auto-formatter.**
+**Note: The formatting shown here is not how it will look. For your desired formatting its recommended to run a pass through the files with an auto-formatter.**  
 *(The library currently uses clang-format for formatting, beware its pretty slow...)*
 
 ## Building

base/Readme.md

@@ -0,0 +1,154 @@
+## Navigation
+
+# base
+
+[Top](../Readme.md)
+
+* [docs](../docs/Readme.md)
+
+The library is fragmented into a series of headers and source files meant to be scanned in and then generated to a standard target format, or a user's desires.
+
+Standard formats:
+
+* **base**: Files are in granular pieces separated into four directories:
+  * **dependencies**: Originally from the c-zpl library and modified thereafter.
+  * **components**: The essential definitions of the library.
+  * **helpers**: Contains helper functionality used by base and other libraries to regenerate or generate the other library formats.
+    * `base_codegen.hpp`: Helps with self-hosted code generation of enums, and operator overload inlines of the code types.
+    * `<push/pop>.<name>.inline.<hpp>`: macros that are meant to be injected at specific locations of the library.
+    * `misc.hpp`: Misc functionality used by the library generation metaprograms.
+    * `undef.macros.h`: Undefines all macros from library that original were intended to leak into user code.
+  * **auxillary**: Non-essential tooling:
+    * `Builder`: Similar conceptually to Jai programming language's *builder*, just opens a file and prepares a string buffer to serialize code into (`builder_print`, `builder_print_fmt`). Then write & close the file when completed (`builder_write`).
+    * **`Scanner`**: Interface to load up `Code` from files two basic funcctions are currently provided.
+      * `scan_file`: Used mainly by the library format generators to directly scan files into untyped `Code` (raw string content, pre-formatted no AST parsed).
+      * `parse_file`: Used to read file and then parsed to populate a `CodeBody` AST.
+      * CSV parsing via one or two columns simplified.
+* **gen_segemetned**: Dependencies go into gen.dep.{hpp/cpp} and components into gen.{hpp/cpp}
+* **gen_singleheader**: Everything into a single file: gen.hpp
+* **gen_unreal_engine**: Like gen_segemented but the library is modified slightly to compile as a thirdparty library within an Unreal Engine plugin or module.
+* **gen_c_library**: The library is heavily modifed into C11 compliant code. A segemented and single-header set of variants are generatd.
+
+Code not making up the core library is located in `auxiliary/<auxiliary_name>.<hpp/cpp>`. These are optional extensions or tools for the library.
+
+## Dependencies
+
+The project has no external dependencies beyond:
+
+* `errno.h`
+* `stat.h`
+* `stdarg.h`
+* `stddef.h`
+* `stdio.h`
+* `copyfile.h` (Mac)
+* `types.h`    (Linux)
+* `sys/man.h`  (Linux)
+* `fcntl.h`    (POSXIX Filesystem)
+* `unistd.h`   (Linux/Mac)
+* `intrin.h`   (Windows)
+* `io.h`       (Windows with gcc)
+* `windows.h`  (Windows)
+
+Dependencies for the project are wrapped within `GENCPP_ROLL_OWN_DEPENDENCIES` (Defining it will disable them).
+The majority of the dependency's implementation was derived from the [c-zpl library](https://github.com/zpl-c/zpl).
+
+See the following files for any updates:
+
+* [`platform.hpp`](./dependencies/platform.hpp)
+* [`src_start.cpp`](./dependencies/src_start.cpp)
+* [`filesystem.cpp`](./dependencies/filesystem.cpp)
+* [`memory.cpp`](./dependencies/memory.cpp)
+
+## Conventions
+
+This library was written in a subset of C++ where the following are not used at all:
+
+* RAII (Constructors/Destructors), lifetimes are managed using named static or regular functions.
+* Language provide dynamic dispatch, RTTI
+* Object-Oriented Inheritance
+* 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.
+
+Member function support or free-functions with reference object passing are wrapped in `! GEN_C_LIKE CPP` preprocess conditionals.
+
+## C++ template usage
+
+There are only 4 template definitions in the entire library (C++ versions). (`Array<Type>`, `Hashtable<Type>`, `swap<Type>`, and `tmpl_cast<CodeT>(CodeT code)`)
+
+Two generic templated containers are used throughout the library:
+
+* `template< class Type> struct Array`
+* `template< class Type> struct HashTable`
+
+`tmpl_cast<CodeT>(CodeT code)` is just an alternative way to explicitly cast to code. Its usage is wrapped in a macro called `cast` for the base library (needed for interoperability with C).
+
+`template< class Type> swap( Type& a, Type& b)` is used over a macro.
+
+Otherwise the library is free of any templates.
+
+## Macro usage
+
+Since this is a meta-programming library, it was desired to keep both templates and macros (especially macros) usage very limited.
+
+Most macros are defined within [macros.hpp](./dependencies/macros.hpp). 
+
+The most advanced macro usage is `num_args` which is a helper for counting the number of arguments of another macro.
+
+Any large macros used implementing the gen interface or parser are going to be phased out in favor of just forcinlined functions.  
+*(Unless there is a hot-path that requires them)*
+
+The vast majority of macros should be single-line subsitutions that either add:
+
+* Improvements to searching
+* Inteniality of keyword usage
+* A  feature that only the preprocessor has (ex: function name reflection or stringifying)
+* Compatibility of statements or expressions bewteen C & C++ that cannot be parsed by gencpp itself.
+* Masking highly verbose syntax (the latter is getting phased out).
+
+[gen_c_library](../gen_c_library/) has the most advanced set of macros for c11's generic selection.
+
+* A significant amount of explicit code geneeration is utilized to keep abuse of the preprocessor to the absolute minimum.
+* There is a heavy set of documentation inlined wth them; their naming is also highly verbose and explicit.
+* See its documentation for more information.
+
+## On base code generation
+
+There are ***five*** header files which are automatically generated using [base_codegen.hpp](./helpers/base_codegen.hpp) by [base.cpp](./base.cpp). They are all located in [components/gen](./components/gen/).
+
+* [`ecodetypes.hpp`](./components/gen/ecode.hpp): `CodeType` enum definition and related implementaiton. Generation is based off of [`ECodeType.csv](./enums/ECodeTypes.csv).
+* [`especifier.hpp`](./components/gen/especifier.hpp): `Specifier` enum definition, etc. Generated using [`ESpecifier.csv`](./enums/ESpecifier.csv).
+* [`eoperator.hpp`](./components/gen/eoperator.hpp): `Operator` enum definition, etc. Generated using [`EOperator.hpp`](./enums/EOperator.csv).
+* [`etoktype.cpp`](./components/gen/etoktype.cpp): `TokType` enum defininition, etc. Used by the lexer and parser backend. Uses two csvs:
+  * [`ETokType.csv`](./enums/ETokType.csv): Provides the enum entries and their strinng ids.
+  * [`AttributeTokens.csv`](./enums/AttributeTokens.csv): Provides tokens entries that should be considered as attributes  by the lexer and parser. Sspecfiically macro attributes such as those use for exporting symbols.
+* [`ast_inlines.hpp`](./components/gen/ast_inlines.hpp): Member trivial `operator` definitions for C++ code types. Does not use a csv.
+
+[`misc.hpp`](./helpers/misc.hpp): Has shared functions used by the library generation meta-programs throughout this codebase.
+
+## 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.
+
+## Extending the library
+
+This library is relatively very small (for parsing C++), and can be extended without much hassle.
+
+The convention you'll see used throughout the upfront interface of the library is as follows:
+
+1. Check name or parameters to make sure they are valid for the construction requested
+2. Create a code object using `make_code`.
+3. Populate immediate fields (Name, Type, ModuleFlags, etc)
+4. Populate sub-entires using `add_entry`. If using the default serialization function `to_string`, follow the order at which entires are expected to appear (there is a strong ordering expected).
+
+Names or Content fields are interned strings and thus showed be cached using `get_cached_string` if its desired to preserve that behavior.
+
+`def_operator` is the most sophisticated upfront constructor as it has multiple permutations of definitions that could be created that are not trivial to determine if valid.
+
+The parser is documented under [`docs/Parsing.md`](../docs/Parsing.md) and [`docs/Parser_Algo.md`](../docs/Parser_Algo.md). Extending it is more serious.
+
+## A note on compilation and runtime generation speed
+
+The library is designed to be fast to compile and generate code at runtime as fast as resonable possible on a debug build.
+Its recommended that your metaprogam be compiled using a single translation unit (unity build).

base/auxillary/builder.cpp

@@ -2,7 +2,9 @@
 #	include "builder.hpp"
 #endif
 
-Builder Builder::open( char const* path )
+#pragma region Builder
+
+Builder builder_open( char const* path )
 {
 	Builder result;
 
@@ -19,41 +21,39 @@ Builder Builder::open( char const* path )
 	return result;
 }
 
-void Builder::pad_lines( s32 num )
+void builder_pad_lines( Builder* builder, s32 num )
 {
-	string_append_strc( & Buffer, txt("\n") );
+	string_append_strc( & builder->Buffer, txt("\n") );
 }
 
-void Builder::print( Code code )
+void builder_print( Builder* builder, Code code )
 {
 	String   str = code_to_string(code);
 	// const ssize len = str.length();
 	// log_fmt( "%s - print: %.*s\n", File.filename, len > 80 ? 80 : len, str.Data );
-	string_append_string( & Buffer, str );
+	string_append_string( & builder->Buffer, str );
 }
 
-void Builder::print_fmt( char const* fmt, ... )
+void builder_print_fmt_va( Builder* builder, char const* fmt, va_list va )
 {
 	ssize   res;
 	char buf[ GEN_PRINTF_MAXLEN ] = { 0 };
 
-	va_list va;
-	va_start( va, fmt );
 	res = str_fmt_va( buf, count_of( buf ) - 1, fmt, va ) - 1;
-	va_end( va );
 
-	// log_fmt( "$%s - print_fmt: %.*s\n", File.filename, res > 80 ? 80 : res, buf );
-	string_append_c_str_len( (String*) & Buffer, (char const*)buf, res);
+	string_append_c_str_len( (String*) & (builder->Buffer), (char const*)buf, res);
 }
 
-void Builder::write()
+void builder_write(Builder* builder)
 {
-	b32 result = file_write( & File, Buffer, string_length(Buffer) );
+	b32 result = file_write( & builder->File, builder->Buffer, string_length(builder->Buffer) );
 
 	if ( result == false )
-		log_failure("gen::File::write - Failed to write to file: %s\n", file_name( & File ) );
+		log_failure("gen::File::write - Failed to write to file: %s\n", file_name( & builder->File ) );
 
-	log_fmt( "Generated: %s\n", File.filename );
-	file_close( & File );
-	string_free(& Buffer);
+	log_fmt( "Generated: %s\n", builder->File.filename );
+	file_close( & builder->File );
+	string_free(& builder->Buffer);
 }
+
+#pragma endregion Builder

base/auxillary/builder.hpp

@@ -0,0 +1,70 @@
+#ifdef GEN_INTELLISENSE_DIRECTIVES
+#	pragma once
+#	include "helpers/push_ignores.inline.hpp"
+#	include "components/header_start.hpp"
+#	include "components/types.hpp"
+#	include "components/gen/ecode.hpp"
+#	include "components/gen/eoperator.hpp"
+#	include "components/gen/especifier.hpp"
+#	include "components/ast.hpp"
+#	include "components/code_types.hpp"
+#	include "components/ast_types.hpp"
+#	include "components/interface.hpp"
+#	include "components/inlines.hpp"
+#	include "components/gen/ast_inlines.hpp"
+#	include "components/header_end.hpp"
+using namespace gen;
+#endif
+
+#pragma region Builder
+
+struct Builder;
+typedef struct Builder Builder;
+
+Builder builder_open        ( char const* path );
+void    builder_pad_lines   ( Builder* builder, s32 num );
+void    builder_print       ( Builder* builder, Code code );
+void    builder_print_fmt_va( Builder* builder, char const* fmt, va_list va );
+void    builder_print_fmt   ( Builder* builder, char const* fmt, ... ) {
+	va_list va;
+	va_start( va, fmt );
+	builder_print_fmt_va( builder, fmt, va );
+	va_end( va );
+}
+void builder_write( Builder* builder );
+
+struct Builder
+{
+	FileInfo File;
+	String   Buffer;
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+	forceinline static Builder open( char const* path ) { return builder_open(path); }
+
+	forceinline void pad_lines( s32 num ) { return builder_pad_lines(this, num); }
+
+	forceinline void print( Code code )                { return builder_print(this, code); }
+	forceinline void print_fmt( char const* fmt, ... ) {
+		va_list va;
+		va_start( va, fmt );
+		builder_print_fmt_va( this, fmt, va );
+		va_end( va );
+	}
+
+	forceinline void write() { return builder_write(this); }
+#endif
+};
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+void    builder_pad_lines( Builder& builder, s32 num )    { return builder_pad_lines(& builder, num); }
+void    builder_print    ( Builder& builder, Code code )  { return builder_print(& builder, code); }
+void    builder_write    ( Builder& builder )             { return builder_write(& builder ); }
+void    builder_print_fmt( Builder& builder, char const* fmt, ...) {
+	va_list va;
+	va_start( va, fmt );
+	builder_print_fmt_va( & builder, fmt, va );
+	va_end( va );
+}
+#endif
+
+#pragma endregion Builder

base/auxillary/gen_template.hpp

@@ -1,6 +1,18 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "../gen.hpp"
+#	include "helpers/push_ignores.inline.hpp"
+#	include "components/header_start.hpp"
+#	include "components/types.hpp"
+#	include "components/gen/ecode.hpp"
+#	include "components/gen/eoperator.hpp"
+#	include "components/gen/especifier.hpp"
+#	include "components/ast.hpp"
+#	include "components/code_types.hpp"
+#	include "components/ast_types.hpp"
+#	include "components/interface.hpp"
+#	include "components/inlines.hpp"
+#	include "components/gen/ast_inlines.hpp"
+#	include "components/header_end.hpp"
 #endif
 
 /*

base/auxillary/scanner.cpp

@@ -1,12 +1,9 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
-#	pragma once
-#	include "gen.hpp"
+#	include "scanner.hpp"
 #endif
 
-// This is a simple file reader that reads the entire file into memory.
-// It has an extra option to skip the first few lines for undesired includes.
-// This is done so that includes can be kept in dependency and component files so that intellisense works.
-inline
+#pragma region Scanner
+
 Code scan_file( char const* path )
 {
 	FileInfo file;
@@ -119,41 +116,33 @@ Code scan_file( char const* path )
 	return untyped_str( string_to_strc(str) );
 }
 
-#if 0
-struct CodeFile
-{
-	using namespace Parser;
-
-	String              FilePath;
-	TokArray            Tokens;
-	Array<ParseFailure> ParseFailures;
-	Code                CodeRoot;
-};
-
-namespace Parser
-{
-	struct ParseFailure
-	{
-		String Reason;
-		Code   Node;
-	};
+CodeBody parse_file( const char* path ) {
+	FileContents file    = file_read_contents( GlobalAllocator, true, path );
+	StrC         content = { file.size, (char const*)file.data };
+	CodeBody     code    = parse_global_body( content );
+	log_fmt("\nParsed: %s\n", path);
+	return code;
 }
 
-CodeFile scan_file( char const* path )
-{
-	using namespace Parser;
-
-	CodeFile
-	result = {};
-	result.FilePath = String::make( GlobalAllocator, path );
-
-	Code code = scan_file( path );
-	result.CodeRoot = code;
-
-	ParseContext context = parser_get_last_context();
-	result.Tokens        = context.Tokens;
-	result.ParseFailures = context.Failures;
+CSV_Column parse_csv_one_column(AllocatorInfo allocator, char const* path) {
+	FileContents content   = file_read_contents( allocator, file_zero_terminate, path );
+	Arena        csv_arena = arena_init_from_memory(content.data, content.size);
 
+	CSV_Column result;
+	csv_parse( & result.ADT, rcast(char*, content.data), allocator, false );
+	result.Content = result.ADT.nodes[0].nodes;
 	return result;
 }
-#endif
+
+CSV_Columns2 parse_csv_two_columns(AllocatorInfo allocator, char const* path) {
+	FileContents content   = file_read_contents( allocator, file_zero_terminate, path );
+	Arena        csv_arena = arena_init_from_memory(content.data, content.size);
+
+	CSV_Columns2 result;
+	csv_parse( & result.ADT, rcast(char*, content.data), allocator, false );
+	result.Col_1 = result.ADT.nodes[0].nodes;
+	result.Col_2 = result.ADT.nodes[1].nodes;
+	return result;
+}
+
+#pragma endregion Scanner

base/auxillary/scanner.hpp

@@ -0,0 +1,46 @@
+#ifdef GEN_INTELLISENSE_DIRECTIVES
+#	pragma once
+#	include "helpers/push_ignores.inline.hpp"
+#	include "components/header_start.hpp"
+#	include "components/types.hpp"
+#	include "components/gen/ecode.hpp"
+#	include "components/gen/eoperator.hpp"
+#	include "components/gen/especifier.hpp"
+#	include "components/ast.hpp"
+#	include "components/code_types.hpp"
+#	include "components/ast_types.hpp"
+#	include "components/interface.hpp"
+#	include "components/inlines.hpp"
+#	include "components/gen/ast_inlines.hpp"
+#	include "components/header_end.hpp"
+#endif
+
+#pragma region Scanner
+
+// This is a simple file reader that reads the entire file into memory.
+// It has an extra option to skip the first few lines for undesired includes.
+// This is done so that includes can be kept in dependency and component files so that intellisense works.
+Code scan_file( char const* path );
+
+CodeBody parse_file( const char* path );
+
+// The follow is basic support for light csv parsing (use it as an example)
+// Make something robust if its more serious.
+
+typedef struct CSV_Column CSV_Column;
+struct CSV_Column {
+	CSV_Object      ADT;
+	Array(ADT_Node) Content;
+};
+
+typedef struct CSV_Columns2 CSV_Columns2;
+struct CSV_Columns2 {
+	CSV_Object      ADT;
+	Array(ADT_Node) Col_1;
+	Array(ADT_Node) Col_2;
+};
+
+CSV_Column parse_csv_one_column(AllocatorInfo allocator, char const* path);
+CSV_Columns2 parse_csv_two_columns(AllocatorInfo allocator, char const* path);
+
+#pragma endregion Scanner

base/base.cpp

@@ -0,0 +1,68 @@
+#define GEN_DEFINE_LIBRARY_CODE_CONSTANTS
+#define GEN_ENFORCE_STRONG_CODE_TYPES
+#define GEN_EXPOSE_BACKEND
+#define GEN_C_LIKE_CPP 1
+#include "gen.cpp"
+#include "helpers/push_ignores.inline.hpp"
+
+#include <stdlib.h>
+
+GEN_NS_BEGIN
+#include "helpers/base_codegen.hpp"
+#include "helpers/misc.hpp"
+GEN_NS_END
+
+using namespace gen;
+
+constexpr char const* path_format_style = "../scripts/.clang-format";
+constexpr char const* scratch_file      = "build/scratch.hpp";
+
+Code format( Code code ) {
+	return code_refactor_and_format(code, scratch_file, nullptr, path_format_style );
+}
+
+constexpr char const* generation_notice =
+"// This file was generated automatially by gencpp's bootstrap.cpp "
+"(See: https://github.com/Ed94/gencpp)\n\n";
+
+int gen_main()
+{
+	gen::init();
+
+	CodeBody gen_component_header = def_global_body( args(
+		def_preprocess_cond( PreprocessCond_IfDef, txt("GEN_INTELLISENSE_DIRECTIVES") ),
+		pragma_once,
+		def_include(txt("components/types.hpp")),
+		preprocess_endif,
+		fmt_newline,
+		untyped_str( to_strc_from_c_str(generation_notice) )
+	));
+
+	CodeBody ecode       = gen_ecode     ( "enums/ECodeTypes.csv" );
+	CodeBody eoperator   = gen_eoperator ( "enums/EOperator.csv" );
+	CodeBody especifier  = gen_especifier( "enums/ESpecifier.csv" );
+	CodeBody ast_inlines = gen_ast_inlines();
+
+	Builder header_ecode = builder_open( "components/gen/ecodetypes.hpp" );
+	builder_print( & header_ecode, gen_component_header );
+	builder_print( & header_ecode, format(ecode) );
+	builder_write( & header_ecode);
+
+	Builder header_eoperator = builder_open( "components/gen/eoperator.hpp" );
+	builder_print( & header_eoperator, gen_component_header );
+	builder_print( & header_eoperator, format(eoperator) );
+	builder_write( & header_eoperator );
+
+	Builder header_especifier = builder_open( "components/gen/especifier.hpp" );
+	builder_print( & header_especifier, gen_component_header );
+	builder_print( & header_especifier, format(especifier) );
+	builder_write( & header_especifier);
+
+	Builder header_ast_inlines = builder_open( "components/gen/ast_inlines.hpp" );
+	builder_print( & header_ast_inlines, gen_component_header );
+	builder_print( & header_ast_inlines, format(ast_inlines) );
+	builder_write( & header_ast_inlines);
+
+	gen::deinit();
+	return 0;
+}

base/components/ast.cpp

@@ -497,7 +497,7 @@ void code_to_string_ptr( Code self, String* result )
 		break;
 
 		case CT_Parameters:
-			params_to_string_ref(cast(CodeParam, self), result );
+			params_to_string_ref(cast(CodeParams, self), result );
 		break;
 
 		case CT_Preprocess_Define:

base/components/ast.hpp

@@ -37,7 +37,7 @@ struct AST_Module;
 struct AST_NS;
 struct AST_Operator;
 struct AST_OpCast;
-struct AST_Param;
+struct AST_Params;
 struct AST_Pragma;
 struct AST_PreprocessCond;
 struct AST_Specifiers;
@@ -85,86 +85,150 @@ struct AST_Union;
 struct AST_Using;
 struct AST_Var;
 
-#if GEN_COMPILER_C
-#define Define_Code(Type) typedef AST_##Type* Code##Type
-#else
-#define Define_Code(Type) struct Code##Type
-#endif
-
 #if GEN_COMPILER_C
 typedef AST* Code;
 #else
 struct Code;
 #endif
 
-Define_Code(Body);
-// These are to offer ease of use and optionally strong type safety for the AST.
-Define_Code(Attributes);
-// struct CodeBaseClass;
-Define_Code(Comment);
-Define_Code(Class);
-Define_Code(Constructor);
-Define_Code(Define);
-Define_Code(Destructor);
-Define_Code(Enum);
-Define_Code(Exec);
-Define_Code(Extern);
-Define_Code(Include);
-Define_Code(Friend);
-Define_Code(Fn);
-Define_Code(Module);
-Define_Code(NS);
-Define_Code(Operator);
-Define_Code(OpCast);
-Define_Code(Param);
-Define_Code(PreprocessCond);
-Define_Code(Pragma);
-Define_Code(Specifiers);
-
-#if GEN_EXECUTION_EXPRESSION_SUPPORT
-Define_Code(Expr);
-Define_Code(Expr_Assign);
-Define_Code(Expr_Alignof);
-Define_Code(Expr_Binary);
-Define_Code(Expr_CStyleCast);
-Define_Code(Expr_FunctionalCast);
-Define_Code(Expr_CppCast);
-Define_Code(Expr_Element);
-Define_Code(Expr_ProcCall);
-Define_Code(Expr_Decltype);
-Define_Code(Expr_Comma);
-Define_Code(Expr_AMS); // Access Member Symbol
-Define_Code(Expr_Sizeof);
-Define_Code(Expr_Subscript);
-Define_Code(Expr_Ternary);
-Define_Code(Expr_UnaryPrefix);
-Define_Code(Expr_UnaryPostfix);
-
-Define_Code(Stmt);
-Define_Code(Stmt_Break);
-Define_Code(Stmt_Case);
-Define_Code(Stmt_Continue);
-Define_Code(Stmt_Decl);
-Define_Code(Stmt_Do);
-Define_Code(Stmt_Expr);
-Define_Code(Stmt_Else);
-Define_Code(Stmt_If);
-Define_Code(Stmt_For);
-Define_Code(Stmt_Goto);
-Define_Code(Stmt_Label);
-Define_Code(Stmt_Switch);
-Define_Code(Stmt_While);
+#if GEN_COMPILER_C
+typedef AST_Body*           CodeBody;
+typedef AST_Attributes*     CodeAttributes;
+typedef AST_Comment*        CodeComment;
+typedef AST_Class*          CodeClass;
+typedef AST_Constructor*    CodeConstructor;
+typedef AST_Define*         CodeDefine;
+typedef AST_Destructor*     CodeDestructor;
+typedef AST_Enum*           CodeEnum;
+typedef AST_Exec*           CodeExec;
+typedef AST_Extern*         CodeExtern;
+typedef AST_Include*        CodeInclude;
+typedef AST_Friend*         CodeFriend;
+typedef AST_Fn*             CodeFn;
+typedef AST_Module*         CodeModule;
+typedef AST_NS*             CodeNS;
+typedef AST_Operator*       CodeOperator;
+typedef AST_OpCast*         CodeOpCast;
+typedef AST_Params*         CodeParams;
+typedef AST_PreprocessCond* CodePreprocessCond;
+typedef AST_Pragma*         CodePragma;
+typedef AST_Specifiers*     CodeSpecifiers;
+#else
+struct CodeBody;
+struct CodeAttributes;
+struct CodeComment;
+struct CodeClass;
+struct CodeConstructor;
+struct CodeDefine;
+struct CodeDestructor;
+struct CodeEnum;
+struct CodeExec;
+struct CodeExtern;
+struct CodeInclude;
+struct CodeFriend;
+struct CodeFn;
+struct CodeModule;
+struct CodeNS;
+struct CodeOperator;
+struct CodeOpCast;
+struct CodeParams;
+struct CodePreprocessCond;
+struct CodePragma;
+struct CodeSpecifiers;
 #endif
 
-Define_Code(Struct);
-Define_Code(Template);
-Define_Code(Typename);
-Define_Code(Typedef);
-Define_Code(Union);
-Define_Code(Using);
-Define_Code(Var);
+#if GEN_EXECUTION_EXPRESSION_SUPPORT
 
-#undef Define_Code
+#if GEN_COMPILER_C
+typedef AST_Expr*                CodeExpr;
+typedef AST_Expr_Assign*         CodeExpr_Assign;
+typedef AST_Expr_Alignof*        CodeExpr_Alignof;
+typedef AST_Expr_Binary*         CodeExpr_Binary;
+typedef AST_Expr_CStyleCast*     CodeExpr_CStyleCast;
+typedef AST_Expr_FunctionalCast* CodeExpr_FunctionalCast;
+typedef AST_Expr_CppCast*        CodeExpr_CppCast;
+typedef AST_Expr_Element*        CodeExpr_Element;
+typedef AST_Expr_ProcCall*       CodeExpr_ProcCall;
+typedef AST_Expr_Decltype*       CodeExpr_Decltype;
+typedef AST_Expr_Comma*          CodeExpr_Comma;
+typedef AST_Expr_AMS*            CodeExpr_AMS; // Access Member Symbol
+typedef AST_Expr_Sizeof*         CodeExpr_Sizeof;
+typedef AST_Expr_Subscript*      CodeExpr_Subscript;
+typedef AST_Expr_Ternary*        CodeExpr_Ternary;
+typedef AST_Expr_UnaryPrefix*    CodeExpr_UnaryPrefix;
+typedef AST_Expr_UnaryPostfix*   CodeExpr_UnaryPostfix;
+#else
+struct CodeExpr;
+struct CodeExpr_Assign;
+struct CodeExpr_Alignof;
+struct CodeExpr_Binary;
+struct CodeExpr_CStyleCast;
+struct CodeExpr_FunctionalCast;
+struct CodeExpr_CppCast;
+struct CodeExpr_Element;
+struct CodeExpr_ProcCall;
+struct CodeExpr_Decltype;
+struct CodeExpr_Comma;
+struct CodeExpr_AMS; // Access Member Symbol
+struct CodeExpr_Sizeof;
+struct CodeExpr_Subscript;
+struct CodeExpr_Ternary;
+struct CodeExpr_UnaryPrefix;
+struct CodeExpr_UnaryPostfix;
+#endif
+
+#if GEN_COMPILER_C
+typedef AST_Stmt*          CodeStmt;
+typedef AST_Stmt_Break*    CodeStmt_Break;
+typedef AST_Stmt_Case*     CodeStmt_Case;
+typedef AST_Stmt_Continue* CodeStmt_Continue;
+typedef AST_Stmt_Decl*     CodeStmt_Decl;
+typedef AST_Stmt_Do*       CodeStmt_Do;
+typedef AST_Stmt_Expr*     CodeStmt_Expr;
+typedef AST_Stmt_Else*     CodeStmt_Else;
+typedef AST_Stmt_If*       CodeStmt_If;
+typedef AST_Stmt_For*      CodeStmt_For;
+typedef AST_Stmt_Goto*     CodeStmt_Goto;
+typedef AST_Stmt_Label*    CodeStmt_Label;
+typedef AST_Stmt_Switch*   CodeStmt_Switch;
+typedef AST_Stmt_While*    CodeStmt_While;
+#else
+struct CodeStmt;
+struct CodeStmt_Break;
+struct CodeStmt_Case;
+struct CodeStmt_Continue;
+struct CodeStmt_Decl;
+struct CodeStmt_Do;
+struct CodeStmt_Expr;
+struct CodeStmt_Else;
+struct CodeStmt_If;
+struct CodeStmt_For;
+struct CodeStmt_Goto;
+struct CodeStmt_Label;
+struct CodeStmt_Switch;
+struct CodeStmt_While;
+#endif
+
+// GEN_EXECUTION_EXPRESSION_SUPPORT
+#endif
+
+#if GEN_COMPILER_C
+typedef AST_Struct*   CodeStruct;
+typedef AST_Template* CodeTemplate;
+typedef AST_Typename* CodeTypename;
+typedef AST_Typedef*  CodeTypedef;
+typedef AST_Union*    CodeUnion;
+typedef AST_Using*    CodeUsing;
+typedef AST_Var*      CodeVar;
+#else
+struct CodeStruct;
+struct CodeTemplate;
+struct CodeTypename;
+struct CodeTypedef;
+struct CodeUnion;
+struct CodeUsing;
+struct CodeVar;
+#endif
 
 GEN_NS_PARSER_BEGIN
 
@@ -245,18 +309,6 @@ struct Code
 
 	Code& operator ++();
 
-	// TODO(Ed) : Remove this overload.
-	auto& operator*()
-	{
-		local_persist thread_local
-		Code NullRef = { nullptr };
-
-		if ( ast == nullptr )
-			return NullRef;
-
-		return *this;
-	}
-
 #ifdef GEN_ENFORCE_STRONG_CODE_TYPES
 #	define operator explicit operator
 #endif
@@ -278,7 +330,7 @@ struct Code
 	operator CodeNS() const;
 	operator CodeOperator() const;
 	operator CodeOpCast() const;
-	operator CodeParam() const;
+	operator CodeParams() const;
 	operator CodePragma() const;
 	operator CodePreprocessCond() const;
 	operator CodeSpecifiers() const;
@@ -358,7 +410,7 @@ struct AST
 			union {
 				Code  NextVar;          // Variable; Possible way to handle comma separated variables declarations. ( , NextVar->Specs NextVar->Name NextVar->ArrExpr = NextVar->Value )
 				Code  SuffixSpecs;      // Only used with typenames, to store the function suffix if typename is function signature. ( May not be needed )
-				Code  PostNameMacro;     // Only used with parameters for specifically UE_REQUIRES (Thanks Unreal)
+				Code  PostNameMacro;    // Only used with parameters for specifically UE_REQUIRES (Thanks Unreal)
 			};
 		};
 		StringCached  Content;          // Attributes, Comment, Execution, Include
@@ -391,7 +443,7 @@ struct AST
 		Operator      Op;
 		AccessSpec    ParentAccess;
 		s32           NumEntries;
-		s32           VarConstructorInit;  // Used by variables to know that initialization is using a constructor expression instead of an assignment expression.
+		s32           VarParenthesizedInit;  // Used by variables to know that initialization is using a constructor expression instead of an assignment expression.
 	};
 };
 static_assert( sizeof(AST) == AST_POD_Size, "ERROR: AST is not size of AST_POD_Size" );

base/components/ast_types.hpp

@@ -127,7 +127,7 @@ struct AST_Constructor
 			char           _PAD_PROPERTIES_ [ sizeof(AST*) * 1 ];
 			CodeSpecifiers Specs;
 			Code           InitializerList;
-			CodeParam      Params;
+			CodeParams     Params;
 			Code           Body;
 			char 		   _PAD_PROPERTIES_2_ [ sizeof(AST*) * 2 ];
 		};
@@ -550,7 +550,7 @@ struct AST_Fn
 			CodeAttributes  Attributes;
 			CodeSpecifiers  Specs;
 			CodeTypename    ReturnType;
-			CodeParam 	    Params;
+			CodeParams 	    Params;
 			CodeBody        Body;
 			char 	        _PAD_PROPERTIES_ [ sizeof(AST*) ];
 		};
@@ -613,7 +613,7 @@ struct AST_Operator
 			CodeAttributes  Attributes;
 			CodeSpecifiers  Specs;
 			CodeTypename    ReturnType;
-			CodeParam 	    Params;
+			CodeParams 	    Params;
 			CodeBody        Body;
 			char 	        _PAD_PROPERTIES_ [ sizeof(AST*) ];
 		};
@@ -639,9 +639,9 @@ struct AST_OpCast
 			char 	        _PAD_PROPERTIES_[ sizeof(AST*)  ];
 			CodeSpecifiers  Specs;
 			CodeTypename    ValueType;
-			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
-			CodeBody       Body;
-			char 	       _PAD_PROPERTIES_3_[ sizeof(AST*) ];
+			char 	        _PAD_PROPERTIES_2_[ sizeof(AST*) ];
+			CodeBody        Body;
+			char 	        _PAD_PROPERTIES_3_[ sizeof(AST*) ];
 		};
 	};
 	StringCached      Name;
@@ -654,7 +654,7 @@ struct AST_OpCast
 };
 static_assert( sizeof(AST_OpCast) == sizeof(AST), "ERROR: AST_OpCast is not the same size as AST");
 
-struct AST_Param
+struct AST_Params
 {
 	union {
 		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
@@ -669,15 +669,15 @@ struct AST_Param
 		};
 	};
 	StringCached      Name;
-	CodeParam         Last;
-	CodeParam         Next;
+	CodeParams        Last;
+	CodeParams        Next;
 	Token*            Tok;
 	Code              Parent;
 	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) ];
 	s32               NumEntries;
 };
-static_assert( sizeof(AST_Param) == sizeof(AST), "ERROR: AST_Param is not the same size as AST");
+static_assert( sizeof(AST_Params) == sizeof(AST), "ERROR: AST_Params is not the same size as AST");
 
 struct AST_Pragma
 {
@@ -971,7 +971,7 @@ struct AST_Template
 		struct
 		{
 			char 	       _PAD_PROPERTIES_[ sizeof(AST*) * 4 ];
-			CodeParam 	   Params;
+			CodeParams 	   Params;
 			Code           Declaration;
 			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
@@ -1000,7 +1000,7 @@ struct AST_Type
 			CodeSpecifiers  Specs;
 			Code            QualifierID;
 			// CodeTypename ReturnType;      // Only used for function signatures
-			// CodeParam    Params;          // Only used for function signatures
+			// CodeParams    Params;          // Only used for function signatures
 			Code            ArrExpr;
 			// CodeSpecifiers SpecsFuncSuffix; // Only used for function signatures
 		};
@@ -1017,7 +1017,6 @@ struct AST_Type
 static_assert( sizeof(AST_Type) == sizeof(AST), "ERROR: AST_Type is not the same size as AST");
 #endif
 
-// TODO(Ed): Add support for preserving the typename's keyword qualifier (struct, class, enum, etc), mostly needed for C.
 struct AST_Typename
 {
 	union {
@@ -1028,7 +1027,7 @@ struct AST_Typename
 			CodeAttributes Attributes;
 			CodeSpecifiers Specs;
 			CodeTypename   ReturnType;      // Only used for function signatures
-			CodeParam      Params;          // Only used for function signatures
+			CodeParams     Params;          // Only used for function signatures
 			Code           ArrExpr;
 			CodeSpecifiers SpecsFuncSuffix; // Only used for function signatures
 		};
@@ -1140,7 +1139,7 @@ struct AST_Var
 	Code                   Parent;
 	CodeType               Type;
 	ModuleFlag             ModuleFlags;
-	s32                    VarConstructorInit;
+	s32                    VarParenthesizedInit;
 };
 static_assert( sizeof(AST_Var) == sizeof(AST), "ERROR: AST_Var is not the same size as AST");
 

base/components/code_serialization.cpp

@@ -197,7 +197,7 @@ void class_to_string_def( CodeClass self, String* result )
 
 		while ( interface )
 		{
-			string_append_fmt( result, ", %S", typename_to_string(interface) );
+			string_append_fmt( result, ", public %S", typename_to_string(interface) );
 			interface = interface->Next ? cast(CodeTypename, interface->Next) : NullCode;
 		}
 	}
@@ -346,7 +346,7 @@ void enum_to_string_def(CodeEnum self, String* result )
 				, body_to_string(self->Body)
 			);
 		else if ( self->UnderlyingTypeMacro )
-			string_append_fmt( result, "%SC %S\n\n{\n%S\n}"
+			string_append_fmt( result, "%SC %S\n{\n%S\n}"
 				, self->Name
 				, code_to_string(self->UnderlyingTypeMacro)
 				, body_to_string(self->Body)
@@ -863,7 +863,7 @@ void opcast_to_string_fwd(CodeOpCast self, String* result )
 		string_append_fmt( result, "operator %S();\n", typename_to_string(self->ValueType) );
 }
 
-String params_to_string(CodeParam self)
+String params_to_string(CodeParams self)
 {
 	GEN_ASSERT(self);
 	GEN_ASSERT(self);
@@ -872,7 +872,7 @@ String params_to_string(CodeParam self)
 	return result;
 }
 
-void params_to_string_ref( CodeParam self, String* result )
+void params_to_string_ref( CodeParams self, String* result )
 {
 	GEN_ASSERT(self);
 	GEN_ASSERT(result);
@@ -904,7 +904,7 @@ void params_to_string_ref( CodeParam self, String* result )
 
 	if ( self->NumEntries - 1 > 0 )
 	{
-		for ( CodeParam param = begin_CodeParam(self->Next); param != end_CodeParam(self->Next); param = next_CodeParam(self->Next, param) )
+		for ( CodeParams param = begin_CodeParams(self->Next); param != end_CodeParams(self->Next); param = next_CodeParams(self->Next, param) )
 		{
 			string_append_fmt( result, ", %S", params_to_string(param) );
 		}
@@ -1385,7 +1385,7 @@ void var_to_string_ref(CodeVar self, String* result )
 
 		if ( self->Value )
 		{
-			if ( self->VarConstructorInit )
+			if ( self->VarParenthesizedInit )
 				string_append_fmt( result, "( %S ", code_to_string(self->Value) );
 			else
 				string_append_fmt( result, " = %S", code_to_string(self->Value) );
@@ -1395,7 +1395,7 @@ void var_to_string_ref(CodeVar self, String* result )
 		if ( self->NextVar )
 			string_append_fmt( result, ", %S", var_to_string(self->NextVar) );
 
-		if ( self->VarConstructorInit )
+		if ( self->VarParenthesizedInit )
 			string_append_strc( result, txt(" )"));
 
 		return;
@@ -1431,7 +1431,7 @@ void var_to_string_ref(CodeVar self, String* result )
 
 		if ( self->Value )
 		{
-			if ( self->VarConstructorInit )
+			if ( self->VarParenthesizedInit )
 				string_append_fmt( result, "( %S ", code_to_string(self->Value) );
 			else
 				string_append_fmt( result, " = %S", code_to_string(self->Value) );
@@ -1440,7 +1440,7 @@ void var_to_string_ref(CodeVar self, String* result )
 		if ( self->NextVar )
 			string_append_fmt( result, ", %S", var_to_string(self->NextVar) );
 
-		if ( self->VarConstructorInit )
+		if ( self->VarParenthesizedInit )
 			string_append_strc( result, txt(" )"));
 
 		if ( self->InlineCmt )
@@ -1471,7 +1471,7 @@ void var_to_string_ref(CodeVar self, String* result )
 
 	if ( self->Value )
 	{
-		if ( self->VarConstructorInit )
+		if ( self->VarParenthesizedInit )
 			string_append_fmt( result, "( %S ", code_to_string(self->Value) );
 		else
 			string_append_fmt( result, " = %S", code_to_string(self->Value) );
@@ -1480,7 +1480,7 @@ void var_to_string_ref(CodeVar self, String* result )
 	if ( self->NextVar )
 		string_append_fmt( result, ", %S", var_to_string( self->NextVar) );
 
-	if ( self->VarConstructorInit )
+	if ( self->VarParenthesizedInit )
 		string_append_strc( result, txt(" )"));
 
 	string_append_strc( result, txt(";") );

base/components/code_types.hpp

@@ -32,15 +32,15 @@ String class_to_string    ( CodeClass self );
 void   class_to_string_def( CodeClass self, String* result );
 void   class_to_string_fwd( CodeClass self, String* result );
 
-void      params_append       (CodeParam params, CodeParam param );
-CodeParam params_get          (CodeParam params, s32 idx);
-bool      params_has_entries  (CodeParam params );
-String    params_to_string    (CodeParam params );
-void      params_to_string_ref(CodeParam params, String* result );
+void       params_append       (CodeParams params, CodeParams param );
+CodeParams params_get          (CodeParams params, s32 idx);
+bool       params_has_entries  (CodeParams params );
+String     params_to_string    (CodeParams params );
+void       params_to_string_ref(CodeParams params, String* result );
 
-CodeParam begin_CodeParam(CodeParam params);
-CodeParam end_CodeParam  (CodeParam params);
-CodeParam next_CodeParam (CodeParam params, CodeParam entry_iter);
+CodeParams begin_CodeParams(CodeParams params);
+CodeParams end_CodeParams  (CodeParams params);
+CodeParams next_CodeParams (CodeParams params, CodeParams entry_iter);
 
 bool   specifiers_append       (CodeSpecifiers specifiers, Specifier spec);
 s32    specifiers_has          (CodeSpecifiers specifiers, Specifier spec);
@@ -188,28 +188,28 @@ struct CodeClass
 	AST_Class* ast;
 };
 
-struct CodeParam
+struct CodeParams
 {
 #if ! GEN_C_LIKE_CPP
-	Using_Code( CodeParam );
-	forceinline void      append( CodeParam other );
-	forceinline CodeParam get( s32 idx );
+	Using_Code( CodeParams );
+	forceinline void      append( CodeParams other );
+	forceinline CodeParams get( s32 idx );
 	forceinline bool      has_entries();
 	forceinline String    to_string();
 	forceinline void      to_string( String& result );
 
-	forceinline CodeParam begin() { return begin_CodeParam(* this); }
-	forceinline CodeParam end()   { return end_CodeParam(* this); }
+	forceinline CodeParams begin() { return begin_CodeParams(* this); }
+	forceinline CodeParams end()   { return end_CodeParams(* this); }
 #endif
-	Using_CodeOps( CodeParam );
+	Using_CodeOps( CodeParams );
 	forceinline operator Code()       { return { (AST*)ast }; }
-	forceinline CodeParam operator*() { return * this; }
-	forceinline AST_Param* operator->() {
+	forceinline CodeParams operator*() { return * this; }
+	forceinline AST_Params* operator->() {
 		GEN_ASSERT(ast);
 		return ast;
 	}
-	CodeParam& operator++();
-	AST_Param* ast;
+	CodeParams& operator++();
+	AST_Params* ast;
 };
 
 struct CodeSpecifiers
@@ -951,7 +951,7 @@ struct InvalidCode_ImplictCaster
     operator CodeNS            () const { return cast(CodeNS,             Code_Invalid); }
     operator CodeOperator      () const { return cast(CodeOperator,       Code_Invalid); }
     operator CodeOpCast        () const { return cast(CodeOpCast,         Code_Invalid); }
-    operator CodeParam         () const { return cast(CodeParam,          Code_Invalid); }
+    operator CodeParams        () const { return cast(CodeParams,          Code_Invalid); }
     operator CodePragma        () const { return cast(CodePragma,         Code_Invalid); }
     operator CodePreprocessCond() const { return cast(CodePreprocessCond, Code_Invalid); }
     operator CodeSpecifiers    () const { return cast(CodeSpecifiers,     Code_Invalid); }
@@ -984,7 +984,7 @@ struct NullCode_ImplicitCaster
     operator CodeNS            () const { return {nullptr}; }
     operator CodeOperator      () const { return {nullptr}; }
     operator CodeOpCast        () const { return {nullptr}; }
-    operator CodeParam         () const { return {nullptr}; }
+    operator CodeParams        () const { return {nullptr}; }
     operator CodePragma        () const { return {nullptr}; }
     operator CodePreprocessCond() const { return {nullptr}; }
     operator CodeSpecifiers    () const { return {nullptr}; }
@@ -1011,19 +1011,19 @@ forceinline Code end  ( CodeBody body )                  { return end_CodeBody(b
 forceinline Code next ( CodeBody body, Code entry_iter ) { return next_CodeBody(body, entry_iter); }
 
 forceinline void   add_interface( CodeClass self, CodeTypename interface ) { return class_add_interface(self, interface); }
-forceinline String to_string    ( CodeClass self )                     { return class_to_string(self); }
-forceinline void   to_string_def( CodeClass self, String& result )     { return class_to_string_def(self, & result); }
-forceinline void   to_string_fwd( CodeClass self, String& result )     { return class_to_string_fwd(self, & result); }
+forceinline String to_string    ( CodeClass self )                         { return class_to_string(self); }
+forceinline void   to_string_def( CodeClass self, String& result )         { return class_to_string_def(self, & result); }
+forceinline void   to_string_fwd( CodeClass self, String& result )         { return class_to_string_fwd(self, & result); }
 
-forceinline void      append     (CodeParam params, CodeParam param ) { return params_append(params, param); }
-forceinline CodeParam get        (CodeParam params, s32 idx)          { return params_get(params, idx); }
-forceinline bool      has_entries(CodeParam params )                  { return params_has_entries(params); }
-forceinline String    to_string  (CodeParam params )                  { return params_to_string(params); }
-forceinline void      to_string  (CodeParam params, String& result )  { return params_to_string_ref(params, & result); }
-
-forceinline CodeParam begin(CodeParam params)                       { return begin_CodeParam(params); }
-forceinline CodeParam end  (CodeParam params)                       { return end_CodeParam(params); }
-forceinline CodeParam next (CodeParam params, CodeParam entry_iter) { return next_CodeParam(params, entry_iter); }
+forceinline void      append     (CodeParams params, CodeParams param ) { return params_append(params, param); }
+forceinline CodeParams get        (CodeParams params, s32 idx)          { return params_get(params, idx); }
+forceinline bool      has_entries(CodeParams params )                   { return params_has_entries(params); }
+forceinline String    to_string  (CodeParams params )                   { return params_to_string(params); }
+forceinline void      to_string  (CodeParams params, String& result )   { return params_to_string_ref(params, & result); }
+  
+forceinline CodeParams begin(CodeParams params)                        { return begin_CodeParams(params); }
+forceinline CodeParams end  (CodeParams params)                        { return end_CodeParams(params); }
+forceinline CodeParams next (CodeParams params, CodeParams entry_iter) { return next_CodeParams(params, entry_iter); }
 
 forceinline bool   append   (CodeSpecifiers specifiers, Specifier spec)       { return specifiers_append(specifiers, spec); }
 forceinline s32    has      (CodeSpecifiers specifiers, Specifier spec)       { return specifiers_has(specifiers, spec); }

base/components/gen/ast_inlines.hpp

@@ -520,7 +520,7 @@ inline AST_OpCast* CodeOpCast::operator->()
 	return ast;
 }
 
-inline CodeParam& CodeParam::operator=( Code other )
+inline CodeParams& CodeParams::operator=( Code other )
 {
 	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
@@ -531,7 +531,7 @@ inline CodeParam& CodeParam::operator=( Code other )
 	return *this;
 }
 
-inline CodeParam::operator bool()
+inline CodeParams::operator bool()
 {
 	return ast != nullptr;
 }
@@ -906,9 +906,9 @@ forceinline Code::operator CodeOpCast() const
 	return { (AST_OpCast*)ast };
 }
 
-forceinline Code::operator CodeParam() const
+forceinline Code::operator CodeParams() const
 {
-	return { (AST_Param*)ast };
+	return { (AST_Params*)ast };
 }
 
 forceinline Code::operator CodePragma() const

base/components/header_end.hpp

@@ -24,8 +24,8 @@
 #ifndef GEN_MAX_UNTYPED_STR_LENGTH
 #	define GEN_MAX_UNTYPED_STR_LENGTH megabytes(1)
 #endif
-#ifndef GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE
-#	define GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE kilobytes(8)
+#ifndef TokenMap_FixedArena
+#	define TokenMap_FixedArena FixedArena_8KB
 #endif
 #ifndef GEN_LEX_ALLOCATOR_SIZE
 #	define GEN_LEX_ALLOCATOR_SIZE megabytes(4)
@@ -49,10 +49,12 @@ constexpr s32 SizePer_StringArena       = GEN_SIZE_PER_STRING_ARENA;
 constexpr s32 MaxCommentLineLength      = GEN_MAX_COMMENT_LINE_LENGTH;
 constexpr s32 MaxNameLength             = GEN_MAX_NAME_LENGTH;
 constexpr s32 MaxUntypedStrLength       = GEN_MAX_UNTYPED_STR_LENGTH;
-constexpr s32 TokenFmt_TokenMap_MemSize	= GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE;
+// constexpr s32 TokenFmt_TokenMap_MemSize	= GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE;
 constexpr s32 LexAllocator_Size         = GEN_LEX_ALLOCATOR_SIZE;
 constexpr s32 Builder_StrBufferReserve  = GEN_BUILDER_STR_BUFFER_RESERVE;
 
+extern StrC enum_underlying_sig;
+
 extern Code access_public;
 extern Code access_protected;
 extern Code access_private;
@@ -67,7 +69,7 @@ extern Code fmt_newline;
 
 extern CodePragma pragma_once;
 
-extern CodeParam param_varadic;
+extern CodeParams param_varadic;
 
 extern CodePreprocessCond preprocess_else;
 extern CodePreprocessCond preprocess_endif;

base/components/inlines.hpp

@@ -178,9 +178,9 @@ void class_add_interface( CodeClass self, CodeTypename type )
 }
 #pragma endregion CodeClass
 
-#pragma region CodeParam
+#pragma region CodeParams
 inline
-void params_append( CodeParam appendee, CodeParam other )
+void params_append( CodeParams appendee, CodeParams other )
 {
 	GEN_ASSERT(appendee);
 	GEN_ASSERT(other);
@@ -206,37 +206,37 @@ void params_append( CodeParam appendee, CodeParam other )
 	self->NumEntries++;
 }
 inline
-CodeParam params_get(CodeParam self, s32 idx )
+CodeParams params_get(CodeParams self, s32 idx )
 {
 	GEN_ASSERT(self);
-	CodeParam param = self;
+	CodeParams param = self;
 	do
 	{
 		if ( ++ param != nullptr )
 			return NullCode;
 
-		param = cast(CodeParam, cast(Code, param)->Next);
+		param = cast(CodeParams, cast(Code, param)->Next);
 	}
 	while ( --idx );
 
 	return param;
 }
 forceinline
-bool params_has_entries(CodeParam self)
+bool params_has_entries(CodeParams self)
 {
 	GEN_ASSERT(self);
 	return self->NumEntries > 0;
 }
 #if GEN_COMPILER_CPP
 forceinline
-CodeParam& CodeParam::operator ++()
+CodeParams& CodeParams::operator ++()
 {
 	* this = ast->Next;
 	return * this;
 }
 #endif
 forceinline
-CodeParam begin_CodeParam(CodeParam params)
+CodeParams begin_CodeParams(CodeParams params)
 {
 	if ( params != nullptr )
 		return params;
@@ -244,18 +244,18 @@ CodeParam begin_CodeParam(CodeParam params)
 	return NullCode;
 }
 forceinline
-CodeParam end_CodeParam(CodeParam params)
+CodeParams end_CodeParams(CodeParams params)
 {
-	// return { (AST_Param*) rcast( AST*, ast)->Last };
+	// return { (AST_Params*) rcast( AST*, ast)->Last };
 	return NullCode;
 }
 forceinline
-CodeParam next_CodeParam(CodeParam params, CodeParam param_iter)
+CodeParams next_CodeParams(CodeParams params, CodeParams param_iter)
 {
 	GEN_ASSERT(param_iter);
 	return param_iter->Next;
 }
-#pragma endregion CodeParam
+#pragma endregion CodeParams
 
 #pragma region CodeSpecifiers
 inline

base/components/interface.cpp

@@ -131,7 +131,7 @@ void define_constants()
 	pragma_once->Content = pragma_once->Name;
 	code_set_global((Code)pragma_once);
 
-	param_varadic            = (CodeParam) make_code();
+	param_varadic            = (CodeParams) make_code();
 	param_varadic->Type      = CT_Parameters;
 	param_varadic->Name      = get_cached_string( txt("...") );
 	param_varadic->ValueType = t_empty;
@@ -183,58 +183,38 @@ void define_constants()
 #endif
 #	undef def_constant_code_type
 
-
-#	define def_constant_spec( Type_, ... )                                  \
-		spec_##Type_ = def_specifiers( num_args(__VA_ARGS__), __VA_ARGS__); \
-		code_set_global( cast(Code, spec_##Type_));
-
-#	pragma push_macro("forceinline")
-#	pragma push_macro("global")
-#	pragma push_macro("internal")
-#	pragma push_macro("local_persist")
-#	pragma push_macro("neverinline")
-#	undef forceinline
-#	undef global
-#	undef internal
-#	undef local_persist
-#	undef neverinline
-	def_constant_spec( const,            Spec_Const );
-	def_constant_spec( consteval,        Spec_Consteval );
-	def_constant_spec( constexpr,        Spec_Constexpr );
-	def_constant_spec( constinit,        Spec_Constinit );
-	def_constant_spec( extern_linkage,   Spec_External_Linkage );
-	def_constant_spec( final, 		     Spec_Final );
-	def_constant_spec( forceinline,      Spec_ForceInline );
-	def_constant_spec( global,           Spec_Global );
-	def_constant_spec( inline,           Spec_Inline );
-	def_constant_spec( internal_linkage, Spec_Internal_Linkage );
-	def_constant_spec( local_persist,    Spec_Local_Persist );
-	def_constant_spec( mutable,          Spec_Mutable );
-	def_constant_spec( neverinline,      Spec_NeverInline );
-	def_constant_spec( noexcept,         Spec_NoExceptions );
-	def_constant_spec( override,         Spec_Override );
-	def_constant_spec( ptr,              Spec_Ptr );
-	def_constant_spec( pure,             Spec_Pure )
-	def_constant_spec( ref,              Spec_Ref );
-	def_constant_spec( register,         Spec_Register );
-	def_constant_spec( rvalue,           Spec_RValue );
-	def_constant_spec( static_member,    Spec_Static );
-	def_constant_spec( thread_local,     Spec_Thread_Local );
-	def_constant_spec( virtual, 		 Spec_Virtual );
-	def_constant_spec( volatile, 	     Spec_Volatile)
+	spec_const            = def_specifier( Spec_Const);            code_set_global( cast(Code, spec_const ));
+	spec_consteval        = def_specifier( Spec_Consteval);        code_set_global( cast(Code, spec_consteval ));;
+	spec_constexpr        = def_specifier( Spec_Constexpr);        code_set_global( cast(Code, spec_constexpr ));;
+	spec_constinit        = def_specifier( Spec_Constinit);        code_set_global( cast(Code, spec_constinit ));;
+	spec_extern_linkage   = def_specifier( Spec_External_Linkage); code_set_global( cast(Code, spec_extern_linkage ));;
+	spec_final            = def_specifier( Spec_Final);            code_set_global( cast(Code, spec_final ));;
+	spec_forceinline      = def_specifier( Spec_ForceInline);      code_set_global( cast(Code, spec_forceinline ));;
+	spec_global           = def_specifier( Spec_Global);           code_set_global( cast(Code, spec_global ));;
+	spec_inline           = def_specifier( Spec_Inline);           code_set_global( cast(Code, spec_inline ));;
+	spec_internal_linkage = def_specifier( Spec_Internal_Linkage); code_set_global( cast(Code, spec_internal_linkage ));;
+	spec_local_persist    = def_specifier( Spec_Local_Persist);    code_set_global( cast(Code, spec_local_persist ));;
+	spec_mutable          = def_specifier( Spec_Mutable);          code_set_global( cast(Code, spec_mutable ));;
+	spec_neverinline      = def_specifier( Spec_NeverInline);      code_set_global( cast(Code, spec_neverinline ));;
+	spec_noexcept         = def_specifier( Spec_NoExceptions);     code_set_global( cast(Code, spec_noexcept ));;
+	spec_override         = def_specifier( Spec_Override);         code_set_global( cast(Code, spec_override ));;
+	spec_ptr              = def_specifier( Spec_Ptr);              code_set_global( cast(Code, spec_ptr ));;
+	spec_pure             = def_specifier( Spec_Pure);             code_set_global( cast(Code, spec_pure ));
+	spec_ref              = def_specifier( Spec_Ref);              code_set_global( cast(Code, spec_ref ));;
+	spec_register         = def_specifier( Spec_Register);         code_set_global( cast(Code, spec_register ));;
+	spec_rvalue           = def_specifier( Spec_RValue);           code_set_global( cast(Code, spec_rvalue ));;
+	spec_static_member    = def_specifier( Spec_Static);           code_set_global( cast(Code, spec_static_member ));;
+	spec_thread_local     = def_specifier( Spec_Thread_Local);     code_set_global( cast(Code, spec_thread_local ));;
+	spec_virtual          = def_specifier( Spec_Virtual);          code_set_global( cast(Code, spec_virtual ));;
+	spec_volatile         = def_specifier( Spec_Volatile);         code_set_global( cast(Code, spec_volatile ));
 
 	spec_local_persist = def_specifiers( 1, Spec_Local_Persist );
 	code_set_global(cast(Code, spec_local_persist));
 
-#	pragma pop_macro("forceinline")
-#	pragma pop_macro("global")
-#	pragma pop_macro("internal")
-#	pragma pop_macro("local_persist")
-#	pragma pop_macro("neverinline")
-
-#	pragma push_macro("enum_underlying")
-	array_append(PreprocessorDefines, txt("enum_underlying("));
-#	pragma pop_macro("enum_underlying")
+	if (enum_underlying_sig.Len == 0) {
+		enum_underlying_sig = txt("enum_underlying(");
+	}
+	array_append(PreprocessorDefines, enum_underlying_sig);
 
 #	undef def_constant_spec
 }
@@ -260,22 +240,22 @@ void init()
 	}
 
 	if (Allocator_DataArrays.Proc == nullptr) {
-		Allocator_DataArrays = heap();
+		Allocator_DataArrays = GlobalAllocator;
 	}
 	if (Allocator_CodePool.Proc == nullptr ) {
-		Allocator_CodePool = heap();
+		Allocator_CodePool = GlobalAllocator;
 	}
 	if (Allocator_Lexer.Proc == nullptr) {
-		Allocator_Lexer = heap();
+		Allocator_Lexer = GlobalAllocator;
 	}
 	if (Allocator_StringArena.Proc == nullptr) {
-		Allocator_StringArena = heap();
+		Allocator_StringArena = GlobalAllocator;
 	}
 	if (Allocator_StringTable.Proc == nullptr) {
-		Allocator_StringTable = heap();
+		Allocator_StringTable = GlobalAllocator;
 	}
 	if (Allocator_TypeTable.Proc == nullptr) {
-		Allocator_TypeTable = heap();
+		Allocator_TypeTable = GlobalAllocator;
 	}
 
 	// Setup the arrays

base/components/interface.hpp

@@ -60,16 +60,19 @@ struct Opts_def_struct {
 	s32            num_interfaces;
 	ModuleFlag     mflags;
 };
-CodeClass def_class( StrC name, Opts_def_struct otps GEN_PARAM_DEFAULT );
+CodeClass def_class( StrC name, Opts_def_struct opts GEN_PARAM_DEFAULT );
 
 struct Opts_def_constructor {
-	CodeParam params;
+	CodeParams params;
 	Code      initializer_list;
 	Code      body;
 };
 CodeConstructor def_constructor( Opts_def_constructor opts GEN_PARAM_DEFAULT );
 
-CodeDefine def_define( StrC name, StrC content );
+struct Opts_def_define {
+	b32 dont_append_preprocess_defines;
+};
+CodeDefine def_define( StrC name, StrC content, Opts_def_define opts GEN_PARAM_DEFAULT );
 
 struct Opts_def_destructor {
 	Code           body;
@@ -83,6 +86,7 @@ struct Opts_def_enum {
 	EnumT          specifier;
 	CodeAttributes attributes;
 	ModuleFlag     mflags;
+	Code           type_macro;
 };
 CodeEnum def_enum( StrC name, Opts_def_enum opts GEN_PARAM_DEFAULT );
 
@@ -91,7 +95,7 @@ CodeExtern def_extern_link( StrC name, CodeBody body );
 CodeFriend def_friend     ( Code symbol );
 
 struct Opts_def_function {
-	CodeParam       params;
+	CodeParams      params;
 	CodeTypename    ret_type;
 	CodeBody        body;
 	CodeSpecifiers  specs;
@@ -108,7 +112,7 @@ CodeModule  def_module   ( StrC name,                Opts_def_module    opts GEN
 CodeNS      def_namespace( StrC name, CodeBody body, Opts_def_namespace opts GEN_PARAM_DEFAULT );
 
 struct Opts_def_operator {
-	CodeParam       params;
+	CodeParams      params;
 	CodeTypename    ret_type;
 	CodeBody        body;
 	CodeSpecifiers  specifiers;
@@ -124,7 +128,7 @@ struct Opts_def_operator_cast {
 CodeOpCast def_operator_cast( CodeTypename type, Opts_def_operator_cast opts GEN_PARAM_DEFAULT );
 
 struct Opts_def_param { Code value; };
-CodeParam  def_param ( CodeTypename type, StrC name, Opts_def_param opts GEN_PARAM_DEFAULT );
+CodeParams  def_param ( CodeTypename type, StrC name, Opts_def_param opts GEN_PARAM_DEFAULT );
 CodePragma def_pragma( StrC directive );
 
 CodePreprocessCond def_preprocess_cond( EPreprocessCond type, StrC content );
@@ -134,7 +138,7 @@ CodeSpecifiers def_specifier( Specifier specifier );
 CodeStruct def_struct( StrC name, Opts_def_struct opts GEN_PARAM_DEFAULT );
 
 struct Opts_def_template { ModuleFlag mflags; };
-CodeTemplate def_template( CodeParam params, Code definition, Opts_def_template opts GEN_PARAM_DEFAULT );
+CodeTemplate def_template( CodeParams params, Code definition, Opts_def_template opts GEN_PARAM_DEFAULT );
 
 struct Opts_def_type {
 	ETypenameTag   type_tag;
@@ -193,8 +197,8 @@ CodeBody       def_global_body     ( s32 num, ... );
 CodeBody       def_global_body     ( s32 num, Code* codes );
 CodeBody       def_namespace_body  ( s32 num, ... );
 CodeBody       def_namespace_body  ( s32 num, Code* codes );
-CodeParam      def_params          ( s32 num, ... );
-CodeParam      def_params          ( s32 num, CodeParam* params );
+CodeParams     def_params          ( s32 num, ... );
+CodeParams     def_params          ( s32 num, CodeParams* params );
 CodeSpecifiers def_specifiers      ( s32 num, ... );
 CodeSpecifiers def_specifiers      ( s32 num, Specifier* specs );
 CodeBody       def_struct_body     ( s32 num, ... );
@@ -272,57 +276,70 @@ StrC token_fmt_impl( ssize, ... );
 
 Code untyped_str      ( StrC content);
 Code untyped_fmt      ( char const* fmt, ... );
-Code untyped_token_fmt( char const* fmt, s32 num_tokens, ... );
+Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... );
 
 #pragma endregion Untyped text
 
 #pragma region Macros
 
+#ifndef gen_main
+#define gen_main main
+#endif
+
+#ifndef name
+//	Convienence for defining any name used with the gen api.
+//  Lets you provide the length and string literal to the functions without the need for the DSL.
+#define name( Id_ )   { sizeof(stringize( Id_ )) - 1, stringize(Id_) }
+#endif
+
+#ifndef code
+//  Same as name just used to indicate intention of literal for code instead of names.
+#define code( ... ) { sizeof(stringize(__VA_ARGS__)) - 1, stringize( __VA_ARGS__ ) }
+#endif
+
+#ifndef args
+// Provides the number of arguments while passing args inplace.
+#define args( ... ) num_args( __VA_ARGS__ ), __VA_ARGS__
+#endif
+
+#ifndef code_str
+// Just wrappers over common untyped code definition constructions.
+#define code_str( ... ) GEN_NS untyped_str( code( __VA_ARGS__ ) )
+#endif
+
+#ifndef code_fmt
+#define code_fmt( ... ) GEN_NS untyped_str( token_fmt( __VA_ARGS__ ) )
+#endif
+
+#ifndef parse_fmt
+#define parse_fmt( type, ... ) GEN_NS parse_##type( token_fmt( __VA_ARGS__ ) )
+#endif
+
 #ifndef token_fmt
-#	define gen_main main
-
-#	define __ NullCode
-
-	//	Convienence for defining any name used with the gen api.
-	//  Lets you provide the length and string literal to the functions without the need for the DSL.
-#	define name( Id_ )   { sizeof(stringize( Id_ )) - 1, stringize(Id_) }
-
-	//  Same as name just used to indicate intention of literal for code instead of names.
-#	define code( ... ) { sizeof(stringize(__VA_ARGS__)) - 1, stringize( __VA_ARGS__ ) }
-
-	// Provides the number of arguments while passing args inplace.
-#	define args( ... ) num_args( __VA_ARGS__ ), __VA_ARGS__
-
-	// Just wrappers over common untyped code definition constructions.
-#	define code_str( ... ) GEN_NS untyped_str( code( __VA_ARGS__ ) )
-#	define code_fmt( ... ) GEN_NS untyped_str( token_fmt( __VA_ARGS__ ) )
-
-#	define parse_fmt( type, ... ) GEN_NS parse_##type( token_fmt( __VA_ARGS__ ) )
-
-	/*
-	Takes a format string (char const*) and a list of tokens (StrC) and returns a StrC of the formatted string.
-	Tokens are provided in '<'identifier'>' format where '<' '>' are just angle brackets (you can change it in token_fmt_va)
-	---------------------------------------------------------
-		Example - A string with:
-			typedef <type> <name> <name>;
-		Will have a token_fmt arguments populated with:
-			"type", strc_for_type,
-			"name", strc_for_name,
-		and:
-			stringize( typedef <type> <name> <name>; )
-	-----------------------------------------------------------
-	So the full call for this example would be:
-		token_fmt(
-			"type", strc_for_type
-		,	"name", strc_for_name
-		,	stringize(
-			typedef <type> <name> <name>
-		));
-	!----------------------------------------------------------
-	! Note: token_fmt_va is whitespace sensitive for the tokens.
-	! This can be alleviated by skipping whitespace between brackets but it was choosen to not have that implementation by default.
-	*/
-#	define token_fmt( ... ) GEN_NS token_fmt_impl( (num_args( __VA_ARGS__ ) + 1) / 2, __VA_ARGS__ )
+/*
+Takes a format string (char const*) and a list of tokens (StrC) and returns a StrC of the formatted string.
+Tokens are provided in '<'identifier'>' format where '<' '>' are just angle brackets (you can change it in token_fmt_va)
+---------------------------------------------------------
+	Example - A string with:
+		typedef <type> <name> <name>;
+	Will have a token_fmt arguments populated with:
+		"type", strc_for_type,
+		"name", strc_for_name,
+	and:
+		stringize( typedef <type> <name> <name>; )
+-----------------------------------------------------------
+So the full call for this example would be:
+	token_fmt(
+		"type", strc_for_type
+	,	"name", strc_for_name
+	,	stringize(
+		typedef <type> <name> <name>
+	));
+!----------------------------------------------------------
+! Note: token_fmt_va is whitespace sensitive for the tokens.
+! This can be alleviated by skipping whitespace between brackets but it was choosen to not have that implementation by default.
+*/
+#define token_fmt( ... ) GEN_NS token_fmt_impl( (num_args( __VA_ARGS__ ) + 1) / 2, __VA_ARGS__ )
 #endif
 
 #pragma endregion Macros

base/components/interface.parsing.cpp

@@ -19,7 +19,7 @@ CodeClass parse_class( StrC def )
 
 	Context.Tokens = toks;
 	push_scope();
-	CodeClass result = (CodeClass) parse_class_struct( Tok_Decl_Class );
+	CodeClass result = (CodeClass) parse_class_struct( Tok_Decl_Class, parser_not_inplace_def );
 	parser_pop(& Context);
 	return result;
 }
@@ -35,8 +35,8 @@ CodeConstructor parse_constructor( StrC def )
 
 	// TODO(Ed): Constructors can have prefix attributes
 
-	CodeSpecifiers specifiers;
-	Specifier      specs_found[ 16 ] { Spec_NumSpecifiers };
+	CodeSpecifiers specifiers = NullCode;
+	Specifier      specs_found[ 16 ] = { Spec_NumSpecifiers };
 	s32            NumSpecifiers = 0;
 
 	while ( left && tok_is_specifier(currtok) )
@@ -80,7 +80,7 @@ CodeConstructor parse_constructor( StrC def )
 	}
 
 	Context.Tokens         = toks;
-	CodeConstructor result = parse_constructor( specifiers );
+	CodeConstructor result = parser_parse_constructor( specifiers );
 	return result;
 }
 
@@ -97,7 +97,7 @@ CodeDestructor parse_destructor( StrC def )
 	// TODO(Ed): Destructors can have virtual
 
 	Context.Tokens        = toks;
-	CodeDestructor result = parse_destructor();
+	CodeDestructor result = parser_parse_destructor(NullCode);
 	return result;
 }
 
@@ -114,7 +114,7 @@ CodeEnum parse_enum( StrC def )
 	}
 
 	Context.Tokens = toks;
-	return parse_enum( parser_not_inplace_def);
+	return parser_parse_enum( parser_not_inplace_def);
 }
 
 CodeBody parse_export_body( StrC def )
@@ -127,7 +127,7 @@ CodeBody parse_export_body( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_export_body();
+	return parser_parse_export_body();
 }
 
 CodeExtern parse_extern_link( StrC def )
@@ -140,7 +140,7 @@ CodeExtern parse_extern_link( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_extern_link();
+	return parser_parse_extern_link();
 }
 
 CodeFriend parse_friend( StrC def )
@@ -153,7 +153,7 @@ CodeFriend parse_friend( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_friend();
+	return parser_parse_friend();
 }
 
 CodeFn parse_function( StrC def )
@@ -166,7 +166,7 @@ CodeFn parse_function( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return (CodeFn) parse_function();
+	return (CodeFn) parser_parse_function();
 }
 
 CodeBody parse_global_body( StrC def )
@@ -195,7 +195,7 @@ CodeNS parse_namespace( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_namespace();
+	return parser_parse_namespace();
 }
 
 CodeOperator parse_operator( StrC def )
@@ -208,7 +208,7 @@ CodeOperator parse_operator( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return (CodeOperator) parse_operator();
+	return (CodeOperator) parser_parse_operator();
 }
 
 CodeOpCast parse_operator_cast( StrC def )
@@ -221,7 +221,7 @@ CodeOpCast parse_operator_cast( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_operator_cast();
+	return parser_parse_operator_cast(NullCode);
 }
 
 CodeStruct parse_struct( StrC def )
@@ -235,7 +235,7 @@ CodeStruct parse_struct( StrC def )
 
 	Context.Tokens = toks;
 	push_scope();
-	CodeStruct result = (CodeStruct) parse_class_struct( Tok_Decl_Struct );
+	CodeStruct result = (CodeStruct) parse_class_struct( Tok_Decl_Struct, parser_not_inplace_def );
 	parser_pop(& Context);
 	return result;
 }
@@ -250,7 +250,7 @@ CodeTemplate parse_template( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_template();
+	return parser_parse_template();
 }
 
 CodeTypename parse_type( StrC def )
@@ -263,7 +263,7 @@ CodeTypename parse_type( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_type( parser_not_from_template, nullptr);
+	return parser_parse_type( parser_not_from_template, nullptr);
 }
 
 CodeTypedef parse_typedef( StrC def )
@@ -276,7 +276,7 @@ CodeTypedef parse_typedef( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_typedef();
+	return parser_parse_typedef();
 }
 
 CodeUnion parse_union( StrC def )
@@ -289,7 +289,7 @@ CodeUnion parse_union( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_union( parser_not_inplace_def);
+	return parser_parse_union( parser_not_inplace_def);
 }
 
 CodeUsing parse_using( StrC def )
@@ -302,7 +302,7 @@ CodeUsing parse_using( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_using();
+	return parser_parse_using();
 }
 
 CodeVar parse_variable( StrC def )
@@ -315,15 +315,31 @@ CodeVar parse_variable( StrC def )
 		return InvalidCode;
 
 	Context.Tokens = toks;
-	return parse_variable();
+	return parser_parse_variable();
 }
 
 // Undef helper macros
-#	undef check_parse_args
-#	undef currtok
-#	undef prevtok
-#   undef nexttok
-#	undef eat
-#	undef left
-#	undef check
-#	undef push_scope
+#undef check_parse_args
+#undef currtok_noskip
+#undef currtok
+#undef peektok
+#undef prevtok
+#undef nexttok
+#undef nexttok_noskip
+#undef eat
+#undef left
+#undef check
+#undef push_scope
+#undef def_assign
+
+// Here for C Variant
+#undef lex_dont_skip_formatting
+#undef lex_skip_formatting
+
+#undef parser_inplace_def
+#undef parser_not_inplace_def
+#undef parser_dont_consume_braces
+#undef parser_consume_braces
+#undef parser_not_from_template
+#undef parser_use_parenthesis
+#undef parser_strip_formatting_dont_preserve_newlines

base/components/interface.untyped.cpp

@@ -9,11 +9,11 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 	ssize       remaining = buf_size;
 
 	local_persist
-	FixedArena<TokenFmt_TokenMap_MemSize> tok_map_arena;
+	TokenMap_FixedArena tok_map_arena;
 	fixed_arena_init( & tok_map_arena);
 
 	local_persist
-	HashTable(StrC) tok_map;
+	StringTable tok_map;
 	{
 		tok_map = hashtable_init(StrC, fixed_arena_allocator_info(& tok_map_arena) );
 
@@ -113,7 +113,7 @@ Code untyped_str( StrC content )
 	result->Type    = CT_Untyped;
 	result->Content = result->Name;
 
-	if ( result->Name == nullptr )
+	if ( result->Name.Len == 0 )
 	{
 		log_failure( "untyped_str: could not cache string" );
 		return InvalidCode;
@@ -138,13 +138,16 @@ Code untyped_fmt( char const* fmt, ...)
 	ssize length = str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va);
 	va_end(va);
 
+	StrC buf_str      = { str_len_capped(fmt, MaxNameLength), fmt };
+    StrC uncapped_str = { length, buf };
+
 	Code
 	result          = make_code();
-	result->Name    = get_cached_string( { str_len_capped(fmt, MaxNameLength), fmt } );
+	result->Name    = get_cached_string( buf_str );
 	result->Type    = CT_Untyped;
-	result->Content = get_cached_string( { length, buf } );
+	result->Content = get_cached_string( uncapped_str );
 
-	if ( result->Name == nullptr )
+	if ( result->Name.Len == 0 )
 	{
 		log_failure( "untyped_fmt: could not cache string" );
 		return InvalidCode;
@@ -153,7 +156,7 @@ Code untyped_fmt( char const* fmt, ...)
 	return result;
 }
 
-Code untyped_token_fmt( s32 num_tokens, ... )
+Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... )
 {
 	if ( num_tokens == 0 )
 	{
@@ -165,17 +168,19 @@ Code untyped_token_fmt( s32 num_tokens, ... )
 	char buf[GEN_PRINTF_MAXLEN] = { 0 };
 
 	va_list va;
-	va_start(va, num_tokens);
+	va_start(va, fmt);
 	ssize length = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num_tokens, va);
 	va_end(va);
 
+	StrC buf_str = { length, buf };
+
 	Code
 	result          = make_code();
-	result->Name    = get_cached_string( { length, buf } );
+	result->Name    = get_cached_string( buf_str );
 	result->Type    = CT_Untyped;
 	result->Content = result->Name;
 
-	if ( result->Name == nullptr )
+	if ( result->Name.Len == 0 )
 	{
 		log_failure( "untyped_fmt: could not cache string" );
 		return InvalidCode;

base/components/interface.upfront.cpp

@@ -12,7 +12,8 @@ enum OpValidateResult : u32
 	OpValResult_Member
 };
 
-OpValidateResult operator__validate( Operator op, CodeParam params_code, CodeTypename ret_type, CodeSpecifiers specifier )
+internal neverinline
+OpValidateResult operator__validate( Operator op, CodeParams params_code, CodeTypename ret_type, CodeSpecifiers specifier )
 {
 	if ( op == Op_Invalid )
 	{
@@ -390,7 +391,7 @@ OpValidateResult operator__validate( Operator op, CodeParam params_code, CodeTyp
 }
 
 #define null_check( Context_, Code_ )                                                         \
-	if ( Code_ != nullptr )                                                                   \
+	if ( Code_ == nullptr )                                                                   \
 	{                                                                                         \
 		log_failure( "gen::" stringize(Context_) ": " stringize(Code_) " provided is null" ); \
 		return InvalidCode;                                                                   \
@@ -416,7 +417,6 @@ OpValidateResult operator__validate( Operator op, CodeParam params_code, CodeTyp
 	return InvalidCode;
 #pragma endregion Helper Marcos
 
-
 /*
 The implementaiton of the upfront constructors involves doing three things:
 * Validate the arguments given to construct the intended type of AST is valid.
@@ -497,7 +497,7 @@ CodeComment def_comment( StrC content )
 
 CodeConstructor def_constructor( Opts_def_constructor p )
 {
-	CodeParam params           = p.params;
+	CodeParams params          = p.params;
 	Code      initializer_list = p.initializer_list;
 	Code      body             = p.body;
 
@@ -615,7 +615,7 @@ CodeClass def_class( StrC name, Opts_def_struct p )
 	return result;
 }
 
-CodeDefine def_define( StrC name, StrC content )
+CodeDefine def_define( StrC name, StrC content, Opts_def_define p )
 {
 	name_check( def_define, name );
 
@@ -639,6 +639,17 @@ CodeDefine def_define( StrC name, StrC content )
 	else
 		result->Content = get_cached_string( string_to_strc(string_fmt_buf(GlobalAllocator, "%SC\n", content)) );
 
+	b32 append_preprocess_defines = ! p.dont_append_preprocess_defines;
+	if ( append_preprocess_defines ) { 
+		// Add the define to PreprocessorDefines for usage in parsing
+		s32 lex_id_len = 0;
+		for (; lex_id_len < result->Name.Len; ++ lex_id_len ) {
+			if ( result->Name.Ptr[lex_id_len] == '(' )
+				break;
+		}
+		StrC lex_id = { lex_id_len, result->Name.Ptr };
+		array_append(PreprocessorDefines, lex_id );
+	}
 	return result;
 }
 
@@ -689,6 +700,7 @@ CodeEnum def_enum( StrC name, Opts_def_enum p )
 	EnumT          specifier  = p.specifier;
 	CodeAttributes attributes = p.attributes;
 	ModuleFlag     mflags     = p.mflags;
+	Code           type_macro = p.type_macro;
 
 	name_check( def_enum, name );
 
@@ -740,6 +752,10 @@ CodeEnum def_enum( StrC name, Opts_def_enum p )
 	{
 		result->UnderlyingType = type;
 	}
+	else if ( type_macro )
+	{
+		result->UnderlyingTypeMacro = type_macro;
+	}
 	else if ( result->Type != CT_Enum_Class_Fwd && result->Type != CT_Enum_Fwd )
 	{
 		log_failure( "gen::def_enum: enum forward declaration must have an underlying type" );
@@ -818,7 +834,7 @@ CodeFriend def_friend( Code declaration )
 
 CodeFn def_function( StrC name, Opts_def_function p )
 {
-	CodeParam       params     = p.params;
+	CodeParams      params     = p.params;
 	CodeTypename    ret_type   = p.ret_type;
 	CodeBody        body       = p.body;
 	CodeSpecifiers  specifiers = p.specs;
@@ -958,7 +974,7 @@ CodeNS def_namespace( StrC name, CodeBody body, Opts_def_namespace p )
 
 CodeOperator def_operator( Operator op, StrC nspace, Opts_def_operator p )
 {
-	CodeParam       params_code = p.params;
+	CodeParams      params_code = p.params;
 	CodeTypename    ret_type    = p.ret_type;
 	CodeBody        body        = p.body;
 	CodeSpecifiers  specifiers  = p.specifiers;
@@ -1082,7 +1098,7 @@ CodeOpCast def_operator_cast( CodeTypename type, Opts_def_operator_cast p )
 	return result;
 }
 
-CodeParam def_param( CodeTypename type, StrC name, Opts_def_param p )
+CodeParams def_param( CodeTypename type, StrC name, Opts_def_param p )
 {
 	name_check( def_param, name );
 	null_check( def_param, type );
@@ -1099,8 +1115,8 @@ CodeParam def_param( CodeTypename type, StrC name, Opts_def_param p )
 		return InvalidCode;
 	}
 
-	CodeParam
-	result       = (CodeParam) make_code();
+	CodeParams
+	result       = (CodeParams) make_code();
 	result->Type = CT_Parameters;
 	result->Name = get_cached_string( name );
 
@@ -1236,7 +1252,7 @@ CodeStruct def_struct( StrC name, Opts_def_struct p )
 	return result;
 }
 
-CodeTemplate def_template( CodeParam params, Code declaration, Opts_def_template p )
+CodeTemplate def_template( CodeParams params, Code declaration, Opts_def_template p )
 {
 	null_check( def_template, declaration );
 
@@ -2053,7 +2069,7 @@ CodeBody def_namespace_body( s32 num, Code* codes )
 	return result;
 }
 
-CodeParam def_params( s32 num, ... )
+CodeParams def_params( s32 num, ... )
 {
 	def_body_start( def_params );
 
@@ -2061,7 +2077,7 @@ CodeParam def_params( s32 num, ... )
 	va_start(va, num);
 
 	Code_POD  pod   = va_arg(va, Code_POD);
-	CodeParam param = pcast( CodeParam, pod );
+	CodeParams param = pcast( CodeParams, pod );
 
 	null_check( def_params, param );
 
@@ -2071,12 +2087,12 @@ CodeParam def_params( s32 num, ... )
 		return InvalidCode;
 	}
 
-	CodeParam result = (CodeParam) code_duplicate(param);
+	CodeParams result = (CodeParams) code_duplicate(param);
 
 	while ( -- num )
 	{
 		pod   = va_arg(va, Code_POD);
-		param = pcast( CodeParam, pod );
+		param = pcast( CodeParams, pod );
 
 		if ( param->Type != CT_Parameters )
 		{
@@ -2091,7 +2107,7 @@ CodeParam def_params( s32 num, ... )
 	return result;
 }
 
-CodeParam def_params( s32 num, CodeParam* codes )
+CodeParams def_params( s32 num, CodeParams* codes )
 {
 	def_body_code_array_start( def_params );
 
@@ -2108,11 +2124,11 @@ CodeParam def_params( s32 num, CodeParam* codes )
 		return InvalidCode;                                                                                            \
 	}
 
-	CodeParam current = (CodeParam)code_duplicate(* codes);
+	CodeParams current = (CodeParams)code_duplicate(* codes);
 	check_current(current);
 
-	CodeParam
-	result            = (CodeParam) make_code();
+	CodeParams
+	result            = (CodeParams) make_code();
 	result->Name      = current->Name;
 	result->Type      = current->Type;
 	result->ValueType = current->ValueType;

base/components/lexer.cpp

@@ -113,7 +113,7 @@ struct TokArray
 	s32          Idx;
 };
 
-bool lex__eat( TokType type );
+bool lex__eat( TokArray* self, TokType type );
 
 Token* lex_current(TokArray* self, bool skip_formatting )
 {
@@ -663,6 +663,10 @@ TokArray lex( StrC content )
 
 		switch ( current )
 		{
+			if (array_back(Lexer_Tokens)->Length > 100 ) {
+				__debugbreak();
+			}
+
 			case '#':
 			{
 				s32 result = lex_preprocessor_directive( ctx );

base/components/static_data.cpp

@@ -1,6 +1,6 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #pragma once
-#include "gen.hpp"
+#include "../gen.hpp"
 #endif
 
 #pragma region StaticData
@@ -28,6 +28,8 @@ global AllocatorInfo Allocator_TypeTable   = {0};
 
 #pragma region Constants
 
+global StrC enum_underlying_sig;
+
 global Code access_public;
 global Code access_protected;
 global Code access_private;
@@ -40,7 +42,7 @@ global Code module_private_fragment;
 
 global Code fmt_newline;
 
-global CodeParam param_varadic;
+global CodeParams param_varadic;
 
 global CodePragma pragma_once;
 

base/dependencies/basic_types.hpp

@@ -1,6 +1,5 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "platform.hpp"
 #	include "macros.hpp"
 #endif
 

base/dependencies/containers.hpp

@@ -440,8 +440,6 @@ bool array_set_capacity(Array<Type>* array, usize new_capacity)
 
 #pragma endregion Array
 
-// TODO(Ed) : This thing needs ALOT of work.
-
 #pragma region HashTable
 #define HashTable(Type) HashTable<Type>
 

base/dependencies/debug.cpp

@@ -1,7 +1,5 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "debug.hpp"
-#	include "basic_types.hpp"
 #   include "src_start.cpp"
 #endif
 

base/dependencies/debug.hpp

@@ -1,6 +1,9 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
+#	include "dependencies/platform.hpp"
+#	include "dependencies/macros.hpp"
 #	include "basic_types.hpp"
+#	include "macros.hpp"
 #endif
 
 #pragma region Debug

base/dependencies/macros.hpp

@@ -0,0 +1,287 @@
+#ifdef GEN_INTELLISENSE_DIRECTIVES
+#   pragma once
+#	include "platform.hpp"
+#endif
+
+#pragma region Macros
+
+#ifndef global
+#define global        static    // Global variables
+#endif
+#ifndef internal
+#define internal      static    // Internal linkage
+#endif
+#ifndef local_persist
+#define local_persist static    // Local Persisting variables
+#endif
+
+#ifndef bit
+#define bit( Value )                             ( 1 << Value )
+#define bitfield_is_equal( Type, Field, Mask ) ( (scast(Type, Mask) & scast(Type, Field)) == scast(Type, Mask) )
+#endif
+
+// Mainly intended for forcing the base library to utilize only C-valid constructs or type coercion
+#ifndef GEN_C_LIKE_CPP
+#define GEN_C_LIKE_CPP 0
+#endif
+
+#if GEN_COMPILER_CPP
+#	ifndef cast
+#	define cast( type, value ) (tmpl_cast<type>( value ))
+#	endif
+#else
+#	ifndef cast
+#	define cast( type, value )  ( (type)(value) )
+#	endif
+#endif
+
+#if GEN_COMPILER_CPP
+#	ifndef ccast
+#	define ccast( type, value ) ( const_cast< type >( (value) ) )
+#	endif
+#	ifndef pcast
+#	define pcast( type, value ) ( * reinterpret_cast< type* >( & ( value ) ) )
+#	endif
+#	ifndef rcast
+#	define rcast( type, value ) reinterpret_cast< type >( value )
+#	endif
+#	ifndef scast
+#	define scast( type, value ) static_cast< type >( value )
+#	endif
+#else
+#	ifndef ccast
+#	define ccast( type, value ) ( (type)(value) )
+#	endif
+#	ifndef pcast
+#	define pcast( type, value ) ( * (type*)(& value) )
+#	endif
+#	ifndef rcast
+#	define rcast( type, value ) ( (type)(value) )
+#	endif
+#	ifndef scast
+#	define scast( type, value ) ( (type)(value) )
+#	endif
+#endif
+
+#ifndef stringize
+#define stringize_va( ... ) #__VA_ARGS__
+#define stringize( ... )    stringize_va( __VA_ARGS__ )
+#endif
+
+#ifndef do_once
+#define do_once( statement ) for ( local_persist b32 once = true; once; once = false, (statement) )
+
+#define do_once_start      \
+	do                     \
+	{                      \
+		local_persist      \
+		bool done = false; \
+		if ( done )        \
+			break;         \
+		done = true;
+
+#define do_once_end        \
+	}                      \
+	while(0);
+#endif
+
+#ifndef labeled_scope_start
+#define labeled_scope_start if ( false ) {
+#define labeled_scope_end   }
+#endif
+
+#ifndef         compiler_decorated_func_name
+#   ifdef COMPILER_CLANG
+#       define  compiler_decorated_func_name __PRETTY_NAME__
+#   elif defined(COMPILER_MSVC)
+#   	define compiler_decorated_func_name __FUNCDNAME__
+#   endif
+#endif
+
+#ifndef num_args_impl
+
+// This is essentially an arg couneter version of GEN_SELECT_ARG macros
+// See section : _Generic function overloading for that usage (explains this heavier case)
+
+#define num_args_impl( _0,                                 \
+		_1,  _2,  _3,  _4,  _5,  _6,  _7,  _8,  _9, _10,   \
+		_11, _12, _13, _14, _15, _16, _17, _18, _19, _20,  \
+		_21, _22, _23, _24, _25, _26, _27, _28, _29, _30,  \
+		_31, _32, _33, _34, _35, _36, _37, _38, _39, _40,  \
+		_41, _42, _43, _44, _45, _46, _47, _48, _49, _50,  \
+		_51, _52, _53, _54, _55, _56, _57, _58, _59, _60,  \
+		_61, _62, _63, _64, _65, _66, _67, _68, _69, _70,  \
+		_71, _72, _73, _74, _75, _76, _77, _78, _79, _80,  \
+		_81, _82, _83, _84, _85, _86, _87, _88, _89, _90,  \
+		_91, _92, _93, _94, _95, _96, _97, _98, _99, _100, \
+		N, ...                                             \
+	) N
+
+// ## deletes preceding comma if _VA_ARGS__ is empty (GCC, Clang)
+#define num_args(...)                            \
+	num_args_impl(_, ## __VA_ARGS__,             \
+		100, 99, 98, 97, 96, 95, 94, 93, 92, 91, \
+		 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, \
+		 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, \
+		 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, \
+		 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, \
+		 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, \
+		 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, \
+		 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, \
+		 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, \
+		 10,  9,  8,  7,  6,  5,  4,  3,  2,  1, \
+		 0                                       \
+	)
+#endif
+
+#ifndef clamp
+#define clamp( x, lower, upper )      min( max( ( x ), ( lower ) ), ( upper ) )
+#endif
+#ifndef count_of
+#define count_of( x )                 ( ( size_of( x ) / size_of( 0 [ x ] ) ) / ( ( ssize )( ! ( size_of( x ) % size_of( 0 [ x ] ) ) ) ) )
+#endif
+#ifndef is_between
+#define is_between( x, lower, upper ) ( ( ( lower ) <= ( x ) ) && ( ( x ) <= ( upper ) ) )
+#endif
+#ifndef size_of
+#define size_of( x )                  ( ssize )( sizeof( x ) )
+#endif
+
+#ifndef max
+#define max( a, b ) ( (a > b) ? (a) : (b) )
+#endif
+#ifndef min
+#define min( a, b ) ( (a < b) ? (a) : (b) )
+#endif
+
+#if GEN_COMPILER_MSVC || GEN_COMPILER_TINYC
+#	define offset_of( Type, element ) ( ( GEN_NS( ssize ) ) & ( ( ( Type* )0 )->element ) )
+#else
+#	define offset_of( Type, element ) __builtin_offsetof( Type, element )
+#endif
+
+#ifndef        forceinline
+#	if GEN_COMPILER_MSVC
+#		define forceinline __forceinline
+#		define neverinline __declspec( noinline )
+#	elif GEN_COMPILER_GCC
+#		define forceinline inline __attribute__((__always_inline__))
+#		define neverinline __attribute__( ( __noinline__ ) )
+#	elif GEN_COMPILER_CLANG
+#	if __has_attribute(__always_inline__)
+#		define forceinline inline __attribute__((__always_inline__))
+#		define neverinline __attribute__( ( __noinline__ ) )
+#	else
+#		define forceinline
+#		define neverinline
+#	endif
+#	else
+#		define forceinline
+#		define neverinline
+#	endif
+#endif
+
+#ifndef        neverinline
+#	if GEN_COMPILER_MSVC
+#		define neverinline __declspec( noinline )
+#	elif GEN_COMPILER_GCC
+#		define neverinline __attribute__( ( __noinline__ ) )
+#	elif GEN_COMPILER_CLANG
+#	if __has_attribute(__always_inline__)
+#		define neverinline __attribute__( ( __noinline__ ) )
+#	else
+#		define neverinline
+#	endif
+#	else
+#		define neverinline
+#	endif
+#endif
+
+#if GEN_COMPILER_C
+#ifndef static_assert
+#undef  static_assert
+    #if GEN_COMPILER_C && __STDC_VERSION__ >= 201112L
+        #define static_assert(condition, message) _Static_assert(condition, message)
+    #else
+        #define static_assert(condition, message) typedef char static_assertion_##__LINE__[(condition)?1:-1]
+	#endif
+#endif
+#endif
+
+#if GEN_COMPILER_CPP
+// Already Defined
+#elif GEN_COMPILER_C && __STDC_VERSION__ >= 201112L
+#	define thread_local _Thread_local
+#elif GEN_COMPILER_MSVC
+#	define thread_local __declspec(thread)
+#elif GEN_COMPILER_CLANG
+#	define thread_local __thread
+#else
+#	error "No thread local support"
+#endif
+
+#if ! defined(typeof) && (!GEN_COMPILER_C || __STDC_VERSION__ < 202311L)
+#	if ! GEN_COMPILER_C
+#		define typeof decltype
+#	elif defined(_MSC_VER)
+#		define typeof(x) __typeof__(x)
+#	elif defined(__GNUC__) || defined(__clang__)
+#		define typeof(x) __typeof__(x)
+#	else
+#		error "Compiler not supported"
+#	endif
+#endif
+
+#ifndef GEN_API_C_BEGIN
+#	if GEN_COMPILER_C
+#		define GEN_API_C_BEGIN
+#		define GEN_API_C_END
+#	else
+#		define GEN_API_C_BEGIN extern "C" {
+#		define GEN_API_C_END   }
+#	endif
+#endif
+
+#if GEN_COMPILER_C
+#	if __STDC_VERSION__ >= 202311L
+#		define enum_underlying(type) : type
+#	else
+#		define enum_underlying(type)
+#   endif
+#else
+#	define enum_underlying(type) : type
+#endif
+
+#if GEN_COMPILER_C
+#	ifndef nullptr
+#		define nullptr NULL
+#	endif
+
+#	ifndef GEN_REMOVE_PTR
+#		define GEN_REMOVE_PTR(type) typeof(* ( (type) NULL) )
+#	endif
+#endif
+
+#if ! defined(GEN_PARAM_DEFAULT) && GEN_COMPILER_CPP
+#	define GEN_PARAM_DEFAULT = {}
+#else
+#	define GEN_PARAM_DEFAULT
+#endif
+
+#if GEN_COMPILER_CPP
+    #define struct_init(type, value) {value}
+#else
+    #define struct_init(type, value) {value}
+#endif
+
+#if 0
+#ifndef GEN_OPTIMIZE_MAPPINGS_BEGIN
+#	define GEN_OPTIMIZE_MAPPINGS_BEGIN _pragma(optimize("gt", on))
+#	define GEN_OPITMIZE_MAPPINGS_END   _pragma(optimize("", on))
+#endif
+#else
+#	define GEN_OPTIMIZE_MAPPINGS_BEGIN
+#	define GEN_OPITMIZE_MAPPINGS_END
+#endif
+
+#pragma endregion Macros

base/dependencies/memory.hpp

@@ -215,7 +215,7 @@ struct Arena
 #endif
 };
 
-#if GEN_COMPILER_CPP
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
 forceinline AllocatorInfo allocator_info(Arena& arena )                 { return arena_allocator_info(& arena); }
 forceinline Arena         init_sub      (Arena& parent, ssize size)     { return arena_init_sub( & parent, size); }
 forceinline ssize         alignment_of  (Arena& arena, ssize alignment) { return arena_alignment_of( & arena, alignment); }
@@ -319,6 +319,7 @@ struct FixedArena;
 template<s32 Size> FixedArena<Size> fixed_arena_init();
 template<s32 Size> AllocatorInfo    fixed_arena_allocator_info(FixedArena<Size>* fixed_arena );
 template<s32 Size> ssize            fixed_arena_size_remaining(FixedArena<Size>* fixed_arena, ssize alignment);
+template<s32 Size> void             fixed_arena_free(FixedArena<Size>* fixed_arena);
 
 #if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
 template<s32 Size> AllocatorInfo    allocator_info( FixedArena<Size>& fixed_arena )                { return allocator_info(& fixed_arena); }

base/dependencies/parsing.cpp

@@ -1111,4 +1111,6 @@ String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delimi
 	return output;
 }
 
+#undef _adt_fprintf
+
 #pragma endregion CSV

base/dependencies/parsing.hpp

@@ -1,5 +1,6 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
+#	include "timing.hpp"
 #endif
 
 #pragma region ADT

base/dependencies/platform.hpp

@@ -29,12 +29,6 @@
 #	ifndef GEN_SYSTEM_MACOS
 #		define GEN_SYSTEM_MACOS 1
 #	endif
-#	include <TargetConditionals.h>
-#	if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
-#		ifndef GEN_SYSTEM_IOS
-#			define GEN_SYSTEM_IOS 1
-#		endif
-#	endif
 #elif defined( __unix__ )
 #	ifndef GEN_SYSTEM_UNIX
 #		define GEN_SYSTEM_UNIX 1

base/dependencies/printing.cpp

@@ -1,7 +1,5 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "filesystem.hpp"
-#	include "strings.hpp"
 #	include "string_ops.cpp"
 #endif
 

base/dependencies/src_start.cpp

@@ -1,4 +1,5 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
+#	pragma once
 #	include "header_start.hpp"
 #endif
 

base/dependencies/string_ops.cpp

@@ -1,6 +1,5 @@
 #ifdef GEN_INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "string_ops.hpp"
 #	include "debug.cpp"
 #endif
 

base/dependencies/strings.hpp

@@ -626,7 +626,7 @@ StrC string_to_strc(String str) {
 }
 
 inline
-void trim(String str, char const* cut_set)
+void string_trim(String str, char const* cut_set)
 {
 	ssize len = 0;
 
@@ -650,12 +650,12 @@ void trim(String str, char const* cut_set)
 }
 
 forceinline
-void trim_space(String str) {
-	trim(str, " \t\r\n\v\f");
+void string_trim_space(String str) {
+	string_trim(str, " \t\r\n\v\f");
 }
 
 inline
-String visualize_whitespace(String const str)
+String string_visualize_whitespace(String const str)
 {
 	StringHeader* header = (StringHeader*)(scast(char const*, str) - sizeof(StringHeader));
 	String        result = string_make_reserve(header->Allocator, string_length(str) * 2); // Assume worst case for space requirements.

base/gen.cpp

@@ -37,6 +37,9 @@ GEN_NS_BEGIN
 #include "components/interface.parsing.cpp"
 #include "components/interface.untyped.cpp"
 
+#include "auxillary/builder.cpp"
+#include "auxillary/scanner.cpp"
+
 GEN_NS_END
 
 #include "helpers/pop_container_defines.inline.hpp"

base/gen.dep.cpp

@@ -13,5 +13,6 @@ GEN_NS_BEGIN
 #include "dependencies/strings.cpp"
 #include "dependencies/filesystem.cpp"
 #include "dependencies/timing.cpp"
+#include "dependencies/parsing.cpp"
 
 GEN_NS_END

base/gen.dep.hpp

@@ -16,5 +16,6 @@ GEN_NS_BEGIN
 #include "dependencies/strings.hpp"
 #include "dependencies/filesystem.hpp"
 #include "dependencies/timing.hpp"
+#include "dependencies/parsing.hpp"
 
 GEN_NS_END

base/gen.hpp

@@ -17,7 +17,7 @@
 GEN_NS_BEGIN
 
 #include "components/types.hpp"
-#include "components/gen/ecode.hpp"
+#include "components/gen/ecodetypes.hpp"
 #include "components/gen/eoperator.hpp"
 #include "components/gen/especifier.hpp"
 
@@ -31,6 +31,9 @@ GEN_NS_BEGIN
 #include "components/gen/ast_inlines.hpp"
 #include "components/header_end.hpp"
 
+#include "auxillary/builder.hpp"
+#include "auxillary/scanner.hpp"
+
 GEN_NS_END
 
 #include "helpers/pop_container_defines.inline.hpp"

base/gencpp.refactor

@@ -18,6 +18,8 @@
 // Precedence (highest to lowest):
 // word, namespace, regex
 
+// TODO(ED): THIS IS VERY OUTDATED
+
 // Gen Macro namespace
 // namespace GEN_, new_namespace_
 

base/helpers/base_codegen.hpp

@@ -1,51 +1,38 @@
 #pragma once
 
-#include "gen.hpp"
-
-GEN_NS_BEGIN
-#include "dependencies/parsing.hpp"
-GEN_NS_END
+#if GEN_INTELLISENSE_DIRECTIVES
+#	include "../gen.hpp"
+#	include "misc.hpp"
 
 using namespace gen;
+#endif
 
 CodeBody gen_ecode( char const* path, bool use_c_definition = false )
 {
-	char  scratch_mem[kilobytes(4)];
-	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
-
-	file_read_contents( arena_allocator_info( & scratch), file_zero_terminate, path );
-
-	CSV_Object csv_nodes;
-	csv_parse( &csv_nodes, scratch_mem, GlobalAllocator, false );
-
-	Array<ADT_Node> enum_strs    = csv_nodes.nodes[0].nodes;
-	Array<ADT_Node> keyword_strs = csv_nodes.nodes[1].nodes;
+	FixedArena_32KB scratch; fixed_arena_init(& scratch);
+	AllocatorInfo   scratch_info = fixed_arena_allocator_info(& scratch);
 
+	CSV_Columns2 csv_enum         = parse_csv_two_columns( scratch_info, path );
 	String enum_entries           = string_make_reserve( GlobalAllocator, kilobytes(1) );
 	String to_str_entries         = string_make_reserve( GlobalAllocator, kilobytes(1) );
 	String to_keyword_str_entries = string_make_reserve( GlobalAllocator, kilobytes(1) );
 
-	for ( ssize idx = 0; idx < array_num(enum_strs); ++ idx )
-	{
-		char const* code    = enum_strs   [idx].string;
-		char const* keyword = keyword_strs[idx].string;
-
+	for ( ssize idx = 0; idx < array_num(csv_enum.Col_1); ++ idx ) 	{
+		char const* code    = csv_enum.Col_1[idx].string;
+		char const* keyword = csv_enum.Col_2[idx].string;
 		// TODO(Ed): to_str_entries and the others in here didn't have proper sizing of the StrC slice.
-
 		string_append_fmt( & enum_entries,           "CT_%s,\n", code );
 		string_append_fmt( & to_str_entries,         "{ sizeof(\"%s\"), \"%s\" },\n", code, code );
 		string_append_fmt( & to_keyword_str_entries, "{ sizeof(\"%s\") - 1, \"%s\" },\n", keyword, keyword );
 	}
 
 	CodeEnum enum_code;
-	if (use_c_definition)
-	{
+	if (use_c_definition) {
 		enum_code = parse_enum(token_fmt_impl((3 + 1) / 2, "entries", string_to_strc(enum_entries),
 			"enum CodeType enum_underlying(u32) { <entries> CT_NumTypes, CT_UnderlyingType = GEN_U32_MAX };"
 		));
 	}
-	else
-	{
+	else {
 		enum_code = parse_enum(token_fmt_impl((3 + 1) / 2, "entries", string_to_strc(enum_entries),
 			"enum CodeType : u32 { <entries> CT_NumTypes, CT_UnderlyingType = GEN_U32_MAX };"
 		));
@@ -53,7 +40,7 @@ CodeBody gen_ecode( char const* path, bool use_c_definition = false )
 
 #pragma push_macro("local_persist")
 #undef local_persist
-	StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(enum_strs) ));
+	StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) ));
 	CodeBody to_str_fns = parse_global_body( token_fmt(
 		"entries",  string_to_strc(to_str_entries)
 	,	"keywords", string_to_strc(to_keyword_str_entries)
@@ -84,16 +71,14 @@ CodeBody gen_ecode( char const* path, bool use_c_definition = false )
 	CodeBody result = def_body(CT_Global_Body);
 	body_append(result, enum_code);
 
-	if (use_c_definition)
-	{
+	if (use_c_definition) {
 		CodeTypedef code_t = parse_typedef(code(typedef enum CodeType CodeType; ));
 		body_append(result, code_t);
 	}
 
 	body_append(result, to_str_fns);
 
-	if (! use_c_definition)
-	{
+	if (! use_c_definition) {
 		#pragma push_macro("forceinline")
 		#undef forceinline
 		CodeBody alias_mappings = parse_global_body(code(
@@ -108,24 +93,16 @@ CodeBody gen_ecode( char const* path, bool use_c_definition = false )
 
 CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
 {
-	char scratch_mem[kilobytes(4)];
-	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
+	FixedArena_16KB scratch; fixed_arena_init(& scratch);
+	AllocatorInfo   scratch_info = fixed_arena_allocator_info(& scratch);
 
-	file_read_contents( arena_allocator_info(& scratch), file_zero_terminate, path );
+	CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path );
+	String enum_entries   = string_make_reserve( GlobalAllocator, 32 );
+	String to_str_entries = string_make_reserve( GlobalAllocator, 32 );
 
-	CSV_Object csv_nodes;
-	csv_parse( &csv_nodes, scratch_mem, GlobalAllocator, false );
-
-	Array<ADT_Node> enum_strs = csv_nodes.nodes[0].nodes;
-	Array<ADT_Node> str_strs  = csv_nodes.nodes[1].nodes;
-
-	String enum_entries   = string_make_reserve( GlobalAllocator, kilobytes(1) );
-	String to_str_entries = string_make_reserve( GlobalAllocator, kilobytes(1) );
-
-	for (usize idx = 0; idx < array_num(enum_strs); idx++)
-	{
-		char const* enum_str     = enum_strs[idx].string;
-		char const* entry_to_str = str_strs [idx].string;
+	for (usize idx = 0; idx < array_num(csv_enum.Col_1); idx++) {
+		char const* enum_str     = csv_enum.Col_1[idx].string;
+		char const* entry_to_str = csv_enum.Col_2[idx].string;
 
 		string_append_fmt( & enum_entries, "Op_%s,\n", enum_str );
 		string_append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
@@ -160,7 +137,7 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
 
 #pragma push_macro("local_persist")
 #undef local_persist
-	StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(enum_strs) ));
+	StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) ));
 	CodeFn to_str   = parse_function(token_fmt(
 		"entries", string_to_strc(to_str_entries)
 	,	"num",     lookup_size
@@ -180,8 +157,7 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
 
 	CodeBody result = def_body(CT_Global_Body);
 	body_append(result, enum_code);
-	if ( use_c_definition )
-	{
+	if ( use_c_definition ) {
 		CodeTypedef operator_t = parse_typedef(code( typedef enum Operator Operator; ));
 		body_append(result, operator_t);
 	}
@@ -203,24 +179,17 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
 
 CodeBody gen_especifier( char const* path, bool use_c_definition = false )
 {
-	char scratch_mem[kilobytes(4)];
-	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
+	FixedArena_16KB scratch; fixed_arena_init(& scratch);
+	AllocatorInfo   scratch_info = fixed_arena_allocator_info(& scratch);
 
-	file_read_contents( arena_allocator_info(& scratch), file_zero_terminate, path );
+	CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path );
+	String enum_entries   = string_make_reserve( scratch_info, kilobytes(1) );
+	String to_str_entries = string_make_reserve( scratch_info, kilobytes(1) );
 
-	CSV_Object csv_nodes;
-	csv_parse( &csv_nodes, scratch_mem, GlobalAllocator, false );
-
-	Array<ADT_Node> enum_strs = csv_nodes.nodes[0].nodes;
-	Array<ADT_Node> str_strs  = csv_nodes.nodes[1].nodes;
-
-	String enum_entries   = string_make_reserve( GlobalAllocator, kilobytes(1) );
-	String to_str_entries = string_make_reserve( GlobalAllocator, kilobytes(1) );
-
-	for (usize idx = 0; idx < array_num(enum_strs); idx++)
+	for (usize idx = 0; idx < array_num(csv_enum.Col_1); idx++)
 	{
-		char const* enum_str     = enum_strs[idx].string;
-		char const* entry_to_str = str_strs [idx].string;
+		char const* enum_str     = csv_enum.Col_1[idx].string;
+		char const* entry_to_str = csv_enum.Col_2[idx].string;
 
 		string_append_fmt( & enum_entries, "Spec_%s,\n", enum_str );
 		string_append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
@@ -271,7 +240,7 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
 #undef do_once_end
 #undef forceinline
 #undef neverinline
-	StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(enum_strs) ));
+	StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) ));
 	CodeFn to_str   = parse_function(token_fmt(
 		"entries", string_to_strc(to_str_entries)
 	,	"num",     lookup_size
@@ -351,31 +320,29 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
 
 CodeBody gen_etoktype( char const* etok_path, char const* attr_path, bool use_c_definition = false )
 {
-	char  scratch_mem[kilobytes(16)];
-	Arena scratch = arena_init_from_memory( scratch_mem, sizeof(scratch_mem) );
-
-	AllocatorInfo scratch_info = arena_allocator_info(& scratch);
+	FixedArena_64KB scratch; fixed_arena_init(& scratch);
+	AllocatorInfo   scratch_info = fixed_arena_allocator_info(& scratch);
 
 	FileContents enum_content = file_read_contents( scratch_info, file_zero_terminate, etok_path );
 
 	CSV_Object csv_enum_nodes;
-	csv_parse( &csv_enum_nodes, rcast(char*, enum_content.data), GlobalAllocator, false );
+	csv_parse( &csv_enum_nodes, rcast(char*, enum_content.data), scratch_info, false );
 
 	FileContents attrib_content = file_read_contents( scratch_info, file_zero_terminate, attr_path );
 
 	CSV_Object csv_attr_nodes;
-	csv_parse( &csv_attr_nodes, rcast(char*, attrib_content.data), GlobalAllocator, false );
+	csv_parse( &csv_attr_nodes, rcast(char*, attrib_content.data), scratch_info, false );
 
 	Array<ADT_Node> enum_strs          = csv_enum_nodes.nodes[0].nodes;
 	Array<ADT_Node> enum_str_strs      = csv_enum_nodes.nodes[1].nodes;
 	Array<ADT_Node> attribute_strs     = csv_attr_nodes.nodes[0].nodes;
 	Array<ADT_Node> attribute_str_strs = csv_attr_nodes.nodes[1].nodes;
 
-	String enum_entries             = string_make_reserve( GlobalAllocator, kilobytes(2) );
-	String to_str_entries           = string_make_reserve( GlobalAllocator, kilobytes(4) );
-	String attribute_entries        = string_make_reserve( GlobalAllocator, kilobytes(2) );
-	String to_str_attributes        = string_make_reserve( GlobalAllocator, kilobytes(4) );
-	String attribute_define_entries = string_make_reserve( GlobalAllocator, kilobytes(4) );
+	String enum_entries             = string_make_reserve( scratch_info, kilobytes(2) );
+	String to_str_entries           = string_make_reserve( scratch_info, kilobytes(4) );
+	String attribute_entries        = string_make_reserve( scratch_info, kilobytes(2) );
+	String to_str_attributes        = string_make_reserve( scratch_info, kilobytes(4) );
+	String attribute_define_entries = string_make_reserve( scratch_info, kilobytes(4) );
 
 	for (usize idx = 0; idx < array_num(enum_strs); idx++)
 	{
@@ -569,7 +536,7 @@ CodeBody gen_ast_inlines()
 	CodeBody impl_code_ns       = parse_global_body( token_fmt( "typename", StrC name(CodeNS),             code_impl_tmpl ));
 	CodeBody impl_code_op       = parse_global_body( token_fmt( "typename", StrC name(CodeOperator),       code_impl_tmpl ));
 	CodeBody impl_code_opcast   = parse_global_body( token_fmt( "typename", StrC name(CodeOpCast),         code_impl_tmpl ));
-	CodeBody impl_code_param    = parse_global_body( token_fmt( "typename", StrC name(CodeParam),          code_impl_tmpl ));
+	CodeBody impl_code_params   = parse_global_body( token_fmt( "typename", StrC name(CodeParams),         code_impl_tmpl ));
 	CodeBody impl_code_pragma   = parse_global_body( token_fmt( "typename", StrC name(CodePragma),         code_impl_tmpl ));
 	CodeBody impl_code_precond  = parse_global_body( token_fmt( "typename", StrC name(CodePreprocessCond), code_impl_tmpl ));
 	CodeBody impl_code_specs    = parse_global_body( token_fmt( "typename", StrC name(CodeSpecifiers),     code_impl_tmpl ));
@@ -632,7 +599,7 @@ CodeBody gen_ast_inlines()
 	CodeBody impl_cast_ns        = parse_global_body( token_fmt( "typename", StrC name(NS),             cast_tmpl ));
 	CodeBody impl_cast_op        = parse_global_body( token_fmt( "typename", StrC name(Operator),       cast_tmpl ));
 	CodeBody impl_cast_opcast    = parse_global_body( token_fmt( "typename", StrC name(OpCast),         cast_tmpl ));
-	CodeBody impl_cast_param     = parse_global_body( token_fmt( "typename", StrC name(Param),          cast_tmpl ));
+	CodeBody impl_cast_params    = parse_global_body( token_fmt( "typename", StrC name(Params),         cast_tmpl ));
 	CodeBody impl_cast_pragma    = parse_global_body( token_fmt( "typename", StrC name(Pragma),         cast_tmpl ));
 	CodeBody impl_cast_precond   = parse_global_body( token_fmt( "typename", StrC name(PreprocessCond), cast_tmpl ));
 	CodeBody impl_cast_specs     = parse_global_body( token_fmt( "typename", StrC name(Specifiers),     cast_tmpl ));
@@ -665,7 +632,7 @@ CodeBody gen_ast_inlines()
 		impl_code_ns,
 		impl_code_op,
 		impl_code_opcast,
-		impl_code_param,
+		impl_code_params,
 		impl_code_pragma,
 		impl_code_precond,
 		impl_code_specs,
@@ -699,7 +666,7 @@ CodeBody gen_ast_inlines()
 		impl_cast_ns,
 		impl_cast_op,
 		impl_cast_opcast,
-		impl_cast_param,
+		impl_cast_params,
 		impl_cast_pragma,
 		impl_cast_precond,
 		impl_cast_specs,

base/helpers/misc.hpp

@@ -0,0 +1,80 @@
+#pragma once
+
+#ifdef GEN_INTELLISENSE_DIRECTIVES
+#	define GEN_DEFINE_LIBRARY_CODE_CONSTANTS
+#	define GEN_ENFORCE_STRONG_CODE_TYPES
+#	define GEN_EXPOSE_BACKEND
+#	include "gen.hpp"
+#	include "helpers/push_ignores.inline.hpp"
+#	include "helpers/helper.hpp"
+#	include "auxillary/builder.hpp"
+#	include "auxillary/builder.cpp"
+#	include "auxillary/scanner.hpp"
+
+#include <stdlib.h>
+
+using namespace gen;
+#endif
+
+// Will format a file with the given style at the provided path.
+// Assumes clang-format is defined in an user-exposed or system enviornment PATH.
+void clang_format_file( char const* path, char const* style_path )
+{
+	GEN_ASSERT_NOT_NULL(path);
+	String resolved_path = string_make_strc(GlobalAllocator, to_strc_from_c_str(path));
+	String style_arg;
+	if (style_path) {
+		style_arg = string_make_strc(GlobalAllocator, txt("-style=file:"));
+		string_append_fmt( & style_arg, "%s ", style_path );
+	}
+
+	StrC clang_format      = txt("clang-format ");
+	StrC cf_format_inplace = txt("-i ");
+	StrC cf_verbose        = txt("-verbose ");
+
+	String command = string_make_strc( GlobalAllocator, clang_format );
+	string_append_strc( & command, cf_format_inplace );
+	string_append_strc( & command, cf_verbose );
+	string_append_string( & command, style_arg );
+	string_append_string( & command, resolved_path );
+	system( command );
+}
+
+// Will refactor a file with the given script at the provided path.
+// Assumes refactor is defined in an user-exposed or system enviornment PATH.
+// (See: ./gencpp/scripts/build.ci.ps1 for how)
+void refactor_file( char const* path, char const* refactor_script )
+{
+	GEN_ASSERT_NOT_NULL(path);
+	GEN_ASSERT_NOT_NULL(refactor_script);
+
+	String command = string_make_strc(GlobalAllocator, txt("refactor "));
+	// string_append_strc( & command, txt("-debug ") );
+	string_append_strc( & command, txt("-num=1 ") );
+	string_append_fmt( & command, "-src=%s ", path );
+	string_append_fmt( & command,"-spec=%s ", refactor_script );
+	system(command);
+	log_fmt("\n");
+}
+
+// Does either of the above or both to the provided code.
+// Code returned will be untyped content (its be serialized)
+Code code_refactor_and_format( Code code, char const* scratch_path, char const* refactor_script, char const* clang_format_sytle_path )
+{
+	GEN_ASSERT(code);
+	GEN_ASSERT_NOT_NULL(scratch_path);
+	Builder scratch_file = builder_open( scratch_path );
+	builder_print( & scratch_file, code);
+	builder_write(& scratch_file);
+
+	if (refactor_script) {
+		refactor_file(scratch_path, refactor_script);
+	}
+	if ( clang_format_sytle_path ) {
+		clang_format_file(scratch_path, clang_format_sytle_path);
+	}
+
+	Code result = scan_file( scratch_path );
+	::remove(scratch_path);
+	return result;
+}

base/helpers/undef.macros.h

@@ -0,0 +1,203 @@
+// This undefines the macros used by the gen library
+#undef GEN_TIME
+
+#undef GEN_ARCH_64_BIT
+#undef GEN_ARCH_32_BIT
+
+#undef GEN_SYSTEM_ANDROID
+#undef GEN_SYSTEM_CYGWIN
+#undef GEN_SYSTEM_EMSCRIPTEN
+#undef GEN_SYSTEM_FREEBSD
+#undef GEN_SYSTEM_IOS
+#undef GEN_SYSTEM_LINUX
+#undef GEN_SYSTEM_MACOS
+#undef GEN_SYSTEM_OPENBSD
+#undef GEN_SYSTEM_OSX
+#undef GEN_SYSTEM_UNIX
+#undef GEN_SYSTEM_WINDOWS
+
+#undef GEN_COMPILER_CLANG
+#undef GEN_COMPILER_GCC
+#undef GEN_COMPILER_MSVC
+
+#undef GEN_HAS_ATTRIBUTE
+
+#undef GEN_COMPILER_C
+#undef GEN_COMPILER_CPP
+
+#undef GEN_DONT_USE_NAMESPACE
+#undef GEN_NS_PARSER_BEGIN
+#undef GEN_NS_PARSER_END
+#undef GEN_USING_NS_PARSER
+#undef GEN_NS_PARSER
+#undef GEN_NS
+#undef GEN_NS_BEGIN
+#undef GEN_NS_END
+
+#undef GEN_C_LIKE_CPP
+
+#undef global
+#undef internal
+#undef local_persist
+
+#undef bit
+#undef bitfield_is_equal
+
+#undef cast
+
+#undef ccast
+#undef scast
+#undef rcast
+#undef pcast
+
+#undef stringize
+#undef do_once
+#undef do_once_start
+#undef do_once_end
+#undef labeled_scope_start
+#undef labeled_scope_end
+#undef compiler_decorated_func_name
+#undef num_args_impl
+#undef num_args
+#undef clamp
+#undef count_of
+#undef is_between
+#undef size_of
+#undef max
+#undef min
+#undef offset_of
+#undef forceinline
+#undef neverinline
+#undef static_assert
+#undef thread_local
+#undef typeof
+
+#undef GEN_API_C_BEGIN
+#undef GEN_API_C_END
+
+#undef enum_underlying
+#undef nullptr
+#undef GEN_PARAM_DEFAULT
+#undef struct_init
+
+#undef GEN_OPTIMIZE_MAPPINGS_BEGIN
+#undef GEN_OPITMIZE_MAPPINGS_END
+
+#undef GEN_U8_MIN
+#undef GEN_U8_MAX
+#undef GEN_I8_MIN
+#undef GEN_I8_MAX
+#undef GEN_U16_MIN
+#undef GEN_U16_MAX
+#undef GEN_I16_MIN
+#undef GEN_I16_MAX
+#undef GEN_U32_MIN
+#undef GEN_U32_MAX
+#undef GEN_I32_MIN
+#undef GEN_I32_MAX
+#undef GEN_U64_MIN
+#undef GEN_U64_MAX
+#undef GEN_I64_MIN
+#undef GEN_I64_MAX
+#undef GEN_USIZE_MIN
+#undef GEN_USIZE_MAX
+#undef GEN_ISIZE_MIN
+#undef GEN_ISIZE_MAX
+#undef GEN_USIZE_MIN
+#undef GEN_USIZE_MAX
+#undef GEN_ISIZE_MIN
+#undef GEN_ISIZE_MAX
+#undef GEN_F32_MIN
+#undef GEN_F32_MAX
+#undef GEN_F64_MIN
+#undef GEN_F64_MAX
+
+#undef to_uptr
+#undef to_sptr
+#undef to_mem_ptr
+#undef to_mem_ptr_const
+
+#undef kilobytes
+#undef megabytes
+#undef gigabytes
+#undef terabytes
+
+#undef GEN__ONES
+#undef GEN__HIGHS
+#undef GEN__HAS_ZERO
+#undef GEN_DEFAULT_MEMORY_ALIGNMENT
+#undef GEN_DEFAULT_ALLOCATOR_FLAGS
+
+#undef zero_item
+#undef zero_array
+
+#undef alloc_item
+#undef alloc_array
+
+#undef malloc
+#undef mfree
+
+#undef GEN_DEBUG_TRAP
+#undef GEN_ASSERT
+#undef GEN_ASSERT_MSG
+#undef GEN_ASSERT_NOT_NULL
+#undef GEN_PANIC
+#undef GEN_FATAL
+
+#undef GEN_FILE_OPEN_PROC
+#undef GEN_FILE_READ_AT_PROC
+#undef GEN_FILE_WRITE_AT_PROC
+#undef GEN_FILE_SEEK_PROC
+#undef GEN_FILE_CLOSE_PROC
+
+#undef GEN_PRINTF_MAXLEN
+
+#undef _strlen
+#undef _printf_err
+#undef _printf_err_va
+#undef _strlen
+#undef _printf_err
+#undef _printf_err_va
+
+#undef Array
+#undef get_array_underlying_type
+#undef HashTable
+#undef get_hashtable_underlying_type
+
+#undef txt
+
+#undef NOMINMAX
+#undef VC_EXTRALEAN
+#undef WIN32_LEAN_AND_MEAN
+#undef WIN32_MEAN_AND_LEAN
+
+#undef GEN_DEFINE_ATTRIBUTE_TOKENS
+
+#undef GEN_AST_BODY_CLASS_UNALLOWED_TYPES
+#undef GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES
+#undef GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
+#undef GEN_AST_BODY_EXPORT_UNALLOWED_TYPES
+#undef GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES
+#undef GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES
+
+#undef GEN_GLOBAL_BUCKET_SIZE
+#undef GEN_CODEPOOL_NUM_BLOCKS
+#undef GEN_SIZE_PER_STRING_ARENA
+#undef GEN_MAX_COMMENT_LINE_LENGTH
+#undef GEN_MAX_NAME_LENGTH
+#undef GEN_MAX_UNTYPED_STR_LENGTH
+#undef TokenMap_FixedArena
+#undef GEN_LEX_ALLOCATOR_SIZE
+#undef GEN_BUILDER_STR_BUFFER_RESERVE
+
+#undef log_failure
+
+#undef gen_main
+#undef name
+#undef code
+#undef args
+#undef code_str
+#undef code_fmt
+#undef token_fmt
+#undef parse_fmt
+#undef token_fmt

docs/AST_Design.md

@@ -1,44 +1,58 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 ## Current Design
 
 `AST` is the actual managed node object for the library.  
 Its raw and really not meant to be used directly.
 
 All user interaction must be with its pointer so the type they deal with is `AST*`.  
-For user-facing code, they should never be giveen a nullptr. Instead, they should be given a designated `Invalid` AST node.
+In order to abstract away constant use of `AST*` its wrapped in a Code type which can be either:
 
-In order to abstract away constant use of `AST*`, I wanted to provide a wrapper for it.
-
-The simpliest being just a type alias.
-
-```cpp
-using Code = AST*;
+When its the [C generated variant of the library](../gen_c_library/)
+```c
+typedef AST* Code;
+tyepdef AST_<name>* Code<name>;
+...
 ```
 
-This is what the genc library would have to use due to its constraints of a langauge.  
-The actual content per type of AST is covered within [AST_Types.md](AST_Types.md).
-
-These are pure PODS that just have the lay members relevant to the type of AST node they represent.  
-Each of them has a Code type alias specific to it.
-
-Again, the simpliest case for these would be a type alias.
+**or**
 
+For C++:
 ```cpp
-using struct AST_Typedef CodeTypedef;
+struct Code {
+    AST* ast;
+};
+struct Code<name> {
+    ...
+
+    AST_<name>* ast;
+};
 ```
 
-As of November 21st, 2023, the AST has had a strict layout for how its content is laid out.  
-This will be abandoned during its redesign that will occur starting with support for statments & expressions for either execution and type declarations.  
-Having a strict layout is too resctrictive vs allowing each AST type to have maximum control over the layout.
+The full definitions of all asts are within:
 
-The redesign will occur after the following todos are addressed:
+* [`ast.hpp`](../base/components/ast.hpp)
+* [`ast_types.hpp`](../base/components/ast_types.hpp)
+* [`code_types.hpp`](../base/components/ast_types.hpp)
 
-* [Improvements Lexer & Token struct#27](https://github.com/Ed94/gencpp/issues/27)
-* [Generalize AST Flags to a single 4-byte flag#42](https://github.com/Ed94/gencpp/issues/42)
-* [AST-Code Object Redesign.#38](https://github.com/Ed94/gencpp/issues/38)
-* [Code-AST Documentation#40](https://github.com/Ed94/gencpp/issues/40)
-* [AST::debug_str() improvements#33](https://github.com/Ed94/gencpp/issues/33)
-* [AST::is_equal implemented and works with singleheader-test#31](https://github.com/Ed94/gencpp/issues/31)
-* [Parser : Add ability to have a parse failure and continue with errors recorded.#35](https://github.com/Ed94/gencpp/issues/35)
-* [Scanner : Add CodeFile#29](https://github.com/Ed94/gencpp/issues/29)
-* [Auxiliary : AST visual debugger#36](https://github.com/Ed94/gencpp/issues/36)
+The C/C++ interface procedures are located with `ast.hpp` (for the Code type), and `code_types.hpp` for all others.
 
+## Serialization
+
+All code types can either serialize using a function of the pattern:
+
+```c
+String <prefix>_to_string(Code code);
+// or
+<prefix>_to_string(Code code, String& result);
+```
+
+Where the first generates strings allocated using Allocator_StringArena and the other appends an existing strings with their backed allocator.
+
+Serialization of for the AST is defined for `Code` in [`ast.chpp`](../base/components/ast.cpp) with `code_to_string_ptr` & `code_to_string`.  
+Serializtion for the rest of the code types is within [`code_serialization.cpp`](../base/components/code_serialization.cpp).  
+Gencpp's serialization does not provide coherent formatting of the code. The user should use a formatter after serializing.

docs/AST_Types.md

@@ -1,10 +1,16 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 # AST Types Documentation
 
 While the Readme for docs covers the data layout per AST, this will focus on the AST types avaialble, and their nuances.
 
 ## Body
 
-These are containers representing a scope body of a definition that can be of the following `ECode` type:
+These are containers representing a scope body of a definition that can be of the following `CodeType` type:
 
 * Class_Body
 * Enum_Body
@@ -19,11 +25,11 @@ These are containers representing a scope body of a definition that can be of th
 Fields:
 
 ```cpp
+StringCached   Name;
 Code           Front;
 Code           Back;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 s32            NumEntries;
 ```
@@ -31,14 +37,15 @@ s32            NumEntries;
 The `Front` member represents the start of the link list and `Back` the end.
 NumEntries is the number of entries in the body.
 
-Parent should have a compatible ECode type for the type of defintion used.
+Parent should have a compatible CodeType type for the type of defintion used.
 
 Serialization:
 
 Will output only the entries, the braces are handled by the parent.
 
 ```cpp
-<Front>...
+<Front>
+...
 <Back>
 ```
 
@@ -50,11 +57,11 @@ Fields:
 
 ```cpp
 StringCached   Content;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -74,11 +81,11 @@ Fields:
 
 ```cpp
 StringCached   Content;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -102,11 +109,11 @@ CodeComment    InlineCmt;  // Only supported by forward declarations
 CodeAttributes Attributes;
 CodeType       ParentType;
 CodeBody       Body;
-CodeType       Prev;       // Used to store references to interfaces
-CodeType       Next;       // Used to store references to interfaces
-parser::Token* Tok;
-Code           Parent;
 StringCached   Name;
+CodeType       Prev;
+CodeType       Next;
+Token*         Tok;
+Code           Parent;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 AccessSpec     ParentAccess;
@@ -125,7 +132,7 @@ Serialization:
 };
 ```
 
-You'll notice that only one parent type is supported only with parent access. This library only supports single inheritance, the rest must be done through interfaces.
+You'll notice that only one parent type is supported only with parent access. This library only supports single inheritance, the rest are assumed to be interfaces and are given public acess specifiers.
 
 ## Constructor
 
@@ -134,13 +141,13 @@ Fields:
 ```cpp
 CodeComment    InlineCmt;  // Only supported by forward declarations
 Code           InitializerList;
-CodeParam      Params;
+CodeParams     Params;
 Code           Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -172,11 +179,11 @@ Fields:
 
 ```cpp
 StringCached   Content;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -194,11 +201,11 @@ Fields:
 CodeComment    InlineCmt;
 CodeSpecifiers Specs;
 Code           Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -229,24 +236,28 @@ Fields:
 CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeType       UnderlyingType;
+Code           UnderlyingTypeMacro;
 CodeBody       Body;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
 StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
 
+UnderlyingTypeMacro is a macro the library natively supports: `enum_underlying(type)` that is meant to behave as a wrapper for underlying type assignment.  
+The `enum_underlying_sig` is a `StrC` global var that can be set which will be defined within `PreprocessorDefines` and used in `parser_parse_enum` to identify a valid macro.
+
 Serialization:
 
 ```cpp
 // Enum_Fwd
-<ModuleFlags> enum class <Name> : <UnderlyingType>; <InlineCmt>
+<ModuleFlags> enum class <Name> : <UnderlyingType> or <UnderlyingTypeMacro> ; <InlineCmt>
 
 // Enum
-<ModuleFlags> <enum or enum class> <Name> : <UnderlyingType>
+<ModuleFlags> <enum or enum class> <Name> : <UnderlyingType> or <UnderlyingTypeMacro>
 {
     <Body>
 };
@@ -261,11 +272,11 @@ Fields:
 
 ```cpp
 StringCached   Content;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -281,11 +292,11 @@ Fields:
 
 ```cpp
 CodeBody       Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -304,11 +315,11 @@ Fields:
 
 ```cpp
 StringCached   Content;
+StringCached   Name;
 Code           Prev;
 Code           Next;
 Code           Parent;
-parser::Token* Tok;
-StringCached   Name;
+Token*         Tok;
 CodeT          Type;
 ```
 
@@ -327,11 +338,11 @@ Fields:
 ```cpp
 CodeComment    InlineCmt;
 Code           Declaration;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -350,13 +361,13 @@ CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeSpecifiers Specs;
 CodeType       ReturnType;
-CodeParam      Params;
+CodeParams     Params;
 CodeBody       Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -379,11 +390,11 @@ Serialization:
 Fields:
 
 ```cpp
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -400,11 +411,11 @@ Fields:
 
 ```cpp
 CodeBody       Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -418,7 +429,7 @@ Serialization:
 }
 ```
 
-## Operator Overload
+## Operator Overload (Operator)
 
 Fields:
 
@@ -427,13 +438,13 @@ CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeSpecifiers Specs;
 CodeType       ReturnType;
-CodeParam      Params;
+CodeParams     Params;
 CodeBody       Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 OperatorT      Op;
@@ -452,7 +463,7 @@ Serialization:
 }
 ```
 
-## Operator Cast Overload ( User-Defined Type Conversion )
+## Operator Cast Overload ( User-Defined Type Conversion, OpCast )
 
 Fields:
 
@@ -461,11 +472,11 @@ CodeComment    InlineCmt;
 CodeSpecifiers Specs;
 CodeType       ValueType;
 CodeBody       Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -482,7 +493,7 @@ Serialization:
 }
 ```
 
-## Parameters (AST_Param)
+## Parameters (AST_Params)
 
 Fields:
 
@@ -490,11 +501,12 @@ Fields:
 CodeType       ValueType;
 Code           Macro;
 Code           Value;
-CodeParam      Last;
-CodeParam      Next;
-parser::Token* Tok;
-Code           Parent;
+Code           PostNameMacro;
 StringCached   Name;
+CodeParams     Last;
+CodeParams     Next;
+Token*         Tok;
+Code           Parent;
 CodeT          Type;
 s32            NumEntries;
 ```
@@ -504,7 +516,7 @@ Serialization:
 ```cpp
 <Macro>, <Next> ... <Last>
 
-<Macro> <ValueType> <Name>, <Next>... <Last>
+<Macro> <ValueType> <Name> <PostNameMacro> = <Value>, <Next>... <Last>
 ```
 
 ## Pragma
@@ -513,11 +525,11 @@ Fields:
 
 ```cpp
 StringCached   Content;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -533,11 +545,11 @@ Fields:
 
 ```cpp
 StringCached  Content;
+StringCached  Name;
 Code          Prev;
 Code          Next;
-paser::Token* Tok;
+Token*        Tok;
 Code          Parent;
-StringCached  Name;
 CodeT         Type;
 ```
 
@@ -554,11 +566,11 @@ Fields:
 ```cpp
 SpecifierT     ArrSpecs[ AST_ArrSpecs_Cap ];
 CodeSpecifiers NextSpecs;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 s32            NumEntries;
 ```
@@ -574,13 +586,13 @@ Serialization:
 Fields:
 
 ```cpp
-CodeParam      Params;
+CodeParams     Params;
 Code           Declaration;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -603,23 +615,30 @@ Fields:
 CodeAttributes Attributes;
 CodeSpecifiers Specs;
 CodeReturnType ReturnType;
-CodeParam      Params;
+CodeParams     Params;
 Code           ArrExpr;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
 StringCached   Name;
 CodeT          Type;
 b32            IsParamPack;
+ETypenameTag   TypeTag;
 ```
 
 Serialization:
 
 ```cpp
-<Attributes> <Name> <Specs> <IsParamPack ?: ...>
+<Attributes> <TypeTag> <Name> <Specs> <IsParamPack ?: ...> 
+// Function
+<Attributes> <ReturnType> <Name> <Params> <Specs>
 ```
 
+`<Name>` currently has the full serialization of anything with
+
+*Note: ArrExpr is not used in serialization by `typename_to_string_ref` its instead handled by a parent AST's serailization (variable, typedef, using).*
+
 ## Typedef
 
 Behave as usual except function or macro typedefs.  
@@ -630,11 +649,11 @@ Fields:
 ```cpp
 CodeComment   InlineCmt;
 Code          UnderlyingType;
+StringCached  Name;
 Code          Prev;
 Code          Next;
-parse::Token* Tok
+Token*        Tok
 Code          Parent;
-StringCached  Name;
 CodeT         Type;
 ModuleFlag    ModuleFlags;
 b32           IsFunction;
@@ -644,11 +663,16 @@ Serialization:
 
 ```cpp
 // Regular
-<ModuleFlags> typedef <UnderlyingType> <Name>; <InlineCmt>
+<ModuleFlags> typedef <UnderlyingType> <Name> <UnderlyingType-ArrExpr>; <InlineCmt>
 
 // Functions
-<ModuleFlags> typedef <ReturnType> <Name>( <Parameters> ); <InlineCmt>
-<ModuleFlags> typedef <ReturnType> ( <Expression that yeilds an Identifier signature> )( <Parameters> ); <InlineCmt>
+
+// Currently:
+<ModuleFlags> typedef <UnderlyingType (Serialized expression)>; <InlineCmt>
+
+// Desired: Not handled yet
+<ModuleFlags> typedef <UnderlyingType->ReturnType> UnderlyingType->Name> <UnderlyingType-ArrExpr> ( <UnderlyingType->Parameters> ); <InlineCmt>
+<ModuleFlags> typedef <UnderlyingType->ReturnType> ( <Name->Namespace> for<Specs->has(Spec_Ptr) ?: *> <UnderlyingType->Name> <UnderlyingType-ArrExpr> ) ( <UnderlyingType->Parameters> ); <InlineCmt>
 ```
 
 ## Union
@@ -658,11 +682,11 @@ Fields:
 ```cpp
 CodeAttributes Attributes;
 CodeBody       Body;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -684,11 +708,11 @@ Fields:
 CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeType       UnderlyingType;
+StringCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -716,14 +740,15 @@ CodeSpecifiers Specs;
 CodeType       ValueType;
 Code           BitfieldSize;
 Code           Value;
+StringCached   Name;
 CodeVar        NextVar;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
+s32            VarParenthesizedInit;
 ```
 
 Serialization:
@@ -734,4 +759,7 @@ Serialization:
 
 // Bitfield
 <ModuleFlags> <Attributes> <Specs> <ValueType> <Name> : <BitfieldSize> = <Value>, NextVar ...; <InlineCmt>
+
+// VarParenthesizedInit
+<Attributes> <Specs> <ValueType> <Name>( <Value>, NextVar ... ); <InlineCmt>
 ```

docs/Parser_Algo.md

@@ -1,3 +1,9 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 # Parser's Algorithim
 
 gencpp uses a hand-written recursive descent parser. Both the lexer and parser currently handle a full C/C++ file in a single pass.
@@ -7,7 +13,7 @@ gencpp uses a hand-written recursive descent parser. Both the lexer and parser c
 ### Lexer
 
 The lex procedure does the lexical pass of content provided as a `StrC` type.
-The tokens are stored (for now) in `gen::parser::Tokens`.
+The tokens are stored (for now) in `gen::parser::Lexer_Tokens`.
 
 Fields:
 
@@ -16,7 +22,7 @@ Array<Token> Arr;
 s32          Idx;
 ```
 
-What token types are supported can be found in [ETokType.csv](../project/enums/ETokType.csv) you can also find the token types in [ETokType.h](../project/components/gen/etoktype.cpp) , which is the generated enum from the csv file.
+What token types are supported can be found in [ETokType.csv](../base/enums/ETokType.csv) you can also find the token types in [ETokType.h](../base/components/gen/etoktype.cpp) , which is the generated enum from the csv file.
 
 Tokens are defined with the struct `gen::parser::Token`:
 

docs/Parsing.md

@@ -1,10 +1,16 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 # Parsing
 
-The library features a naive parser tailored for only what the library needs to construct the supported syntax of C++ into its AST.
+The library features a naive single-pass parser tailored for only what the library needs to construct the supported syntax of C++ into its AST for *"front-end"* meta-programming purposes.
 
-This parser does not, and should not do the compiler's job. By only supporting this minimal set of features, the parser is kept (so far) around ~5600 loc. I hope to keep it under 10k loc worst case.
+This parser does not, and should not do the compiler's job. By only supporting this minimal set of features, the parser is kept (so far) around ~7000 loc. I hope to keep it under 10k loc worst case.
 
-You can think of this parser of a frontend parser vs a semantic parser. Its intuitively similar to WYSIWYG. What you precerive as the syntax from the user-side before the compiler gets a hold of it, is what you get.
+You can think of this parser as *frontend parser* vs a *semantic parser*. Its intuitively similar to WYSIWYG. What you ***precerive*** as the syntax from the user-side before the compiler gets a hold of it, is what you get.
 
 User exposed interface:
 
@@ -47,10 +53,11 @@ The keywords supported for the preprocessor are:
 * endif
 * pragma
 
-Each directive `#` line is considered one preproecessor unit, and will be treated as one Preprocessor AST. *These ASTs will be considered members or entries of braced scope they reside within*.  
+Each directive `#` line is considered one preproecessor unit, and will be treated as one Preprocessor AST. 
 If a directive is used with an unsupported keyword its will be processed as an untyped AST.
 
-The preprocessor lines are stored as members of their associated scope they are parsed within. ( Global, Namespace, Class/Struct )
+The preprocessor lines are stored as members of their associated scope they are parsed within. ( Global, Namespace, Class/Struct )  
+***Again (Its not standard): These ASTs will be considered members or entries of braced scope they reside within***
 
 Any preprocessor definition abuse that changes the syntax of the core language is unsupported and will fail to parse if not kept within an execution scope (function body, or expression assignment).  
 Exceptions:
@@ -59,6 +66,8 @@ Exceptions:
   * Disable with: `#define GEN_PARSER_DISABLE_MACRO_FUNCTION_SIGNATURES`
 * typedefs allow for a preprocessed macro: `typedef MACRO();`
   * Disable with: `#define GEN_PARSER_DISABLE_MACRO_TYPEDEF`
+* Macros can behave as typenames
+* There is some macro support in paramters for functions or templates *(Specifically added to support parsing Unreal Engine source)*.
 
 *(Exceptions are added on an on-demand basis)*
 *(See functions `parse_operator_function_or_variable` and `parse_typedef` )*
@@ -67,15 +76,23 @@ Adding your own exceptions is possible by simply modifying the parser to allow f
 
 *Note: You could interpret this strictness as a feature. This would allow the user to see if their codebase or a third-party's codebase some some egregious preprocessor abuse.*
 
+If a macro is not defined withint e scope of parsing a set of files, it can be defined beforehand by:
+
+* Appending the [`PreprocessorDefines`](https://github.com/Ed94/gencpp/blob/a18b5b97aa5cfd20242065cbf53462a623cd18fa/base/components/header_end.hpp#L137) array.
+  * For functional macros a "(" just needs to be added after the name like: `<name>(` so that it will tokenize its arguments as part of the token during lexing.
+* Defining a CodeDefine using `def_define`. The definition will be processed by the interface for user into `PreprocessorDefines`.
+  * This can be prevented by setting the optional prameter `dont_append_preprocess_defines`.
+
 The lexing and parsing takes shortcuts from whats expected in the standard.
 
 * Numeric literals are not checked for validity.
-* The parse API treats any execution scope definitions with no validation and are turned into untyped Code ASTs.
+* The parse API treats any execution scope definitions with no validation and are turned into untyped Code ASTs. (There is a [todo](https://github.com/Ed94/gencpp/issues/49) to add support)
   * *This includes the assignment of variables.*
 * Attributes ( `[[]]` (standard), `__declspec` (Microsoft), or `__attribute__` (GNU) )
   * Assumed to *come before specifiers* (`const`, `constexpr`, `extern`, `static`, etc) for a function or right afterthe return type.
   * Or in the usual spot for class, structs, (*right after the declaration keyword*)
   * typedefs have attributes with the type (`parse_type`)
 * Parsing attributes can be extended to support user defined macros by defining `GEN_DEFINE_ATTRIBUTE_TOKENS` (see `gen.hpp` for the formatting)
+  * This is useful for example: parsing Unreal `Module_API` macros.
 
 Empty lines used throughout the file are preserved for formatting purposes during ast serialization.

docs/Readme.md

@@ -1,64 +1,42 @@
-## Documentation
+# General Docs
 
-The project has no external dependencies beyond:
+[Top](../Readme.md)
 
-* `errno.h`
-* `stat.h`
-* `stdarg.h`
-* `stddef.h`
-* `stdio.h`
-* `copyfile.h` (Mac)
-* `types.h`    (Linux)
-* `unistd.h`   (Linux/Mac)
-* `intrin.h`   (Windows)
-* `io.h`       (Windows with gcc)
-* `windows.h`  (Windows)
+Contains:
 
-Dependencies for the project are wrapped within `GENCPP_ROLL_OWN_DEPENDENCIES` (Defining it will disable them).  
-The majority of the dependency's implementation was derived from the [c-zpl library](https://github.com/zpl-c/zpl).
+* [AST_Design](./AST_Design.md): Overvie of ASTs
+* [AST Types](./AST_Types.md): Listing of all AST types along with their Code type interface.
+* [Parsing](./Parsing.md): Overview of the parsing interface.
+* [Parser Algo](./Parser_Algo.md): In-depth breakdown of the parser's implementation.
 
-This library was written in a subset of C++ where the following are not used at all:
-
-* RAII (Constructors/Destructors), lifetimes are managed using named static or regular functions.
-* Language provide dynamic dispatch, RTTI
-* Object-Oriented Inheritance
-* 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:
-
-* `template< class Type> struct Array`
-* `template< class Type> struct HashTable`
-
-Both Code and AST definitions have a `template< class Type> Code/AST :: cast()`. Its just an alternative way to explicitly cast to each other.
-
-`template< class Type> swap( Type& a, Type& b)` is used over a macro.
-
-Otherwise the library is free of any templates.
-
-### *WHAT IS NOT PROVIDED*
+### *CURRENTLY UNSUPPORTED*
 
 **There is no support for validating expressions.**  
-Its difficult to parse without enough benefits (At the metaprogramming level).  
-I plan to add this only at the tail of the project parsing milestone.
+Its a [todo](https://github.com/Ed94/gencpp/issues/49)
 
-**Only trivial template support is provided.**  
-The intention is for only simple, non-recursive substitution.  
-The parameters of the template are treated like regular parameter AST entries.  
+**Only trivial template support is provided.**
+The intention is for only simple, non-recursive substitution.
+The parameters of the template are treated like regular parameter AST entries.
 This means that the typename entry for the parameter AST would be either:
 
 * `class`
 * `typename`
 * A fundamental type, function, or pointer type.
 
-Anything beyond this usage is not supported by parse_template for arguments (at least not intentionally).  
-Use at your own mental peril.
+***Concepts and Constraints are not supported***  
+Its a [todo](https://github.com/Ed94/gencpp/issues/21)
 
-*Concepts and Constraints are not supported, its usage is non-trivial substitution.*
+### Feature Macros:
+
+* `GEN_DEFINE_ATTRIBUTE_TOKENS` : Allows user to define their own attribute macros for use in parsing.
+  * This can be generated using base.cpp.
+* `GEN_DEFINE_LIBRARY_CORE_CONSTANTS` : Optional typename codes as they are non-standard to C/C++ and not necessary to library usage
+* `GEN_DONT_ENFORCE_GEN_TIME_GUARD` : By default, the library ( gen.hpp/ gen.cpp ) expects the macro `GEN_TIME` to be defined, this disables that.
+* `GEN_ENFORCE_STRONG_CODE_TYPES` : Enforces casts to filtered code types.
+* `GEN_EXPOSE_BACKEND` : Will expose symbols meant for internal use only.
+* `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.
+* `GEN_C_LIKE_PP` : Setting to `<true or 1>` Will prevent usage of function defnitions using references and structs with member functions. Structs will still have user-defined operator conversions, for-range support, and other operator overloads
 
 ### The Data & Interface
 
@@ -67,87 +45,33 @@ As mentioned in root readme, the user is provided Code objects by calling the co
 The AST is managed by the library and provided to the user via its interface.  
 However, the user may specifiy memory configuration.
 
-Data layout of AST struct (Subject to heavily change with upcoming redesign):
+[Data layout of AST struct (Subject to heavily change with upcoming todos)](../base/components/ast.hpp#L396-461)  
 
-```cpp
-union {
-    struct
-    {
-        AST*      InlineCmt;       // Class, Constructor, Destructor, Enum, Friend, Functon, Operator, OpCast, Struct, Typedef, Using, Variable
-        AST*      Attributes;      // Class, Enum, Function, Struct, Typedef, Union, Using, Variable
-        AST*      Specs;           // Destructor, Function, Operator, Typename, Variable
-        union {
-            AST*  InitializerList; // Constructor
-            AST*  ParentType;      // Class, Struct, ParentType->Next has a possible list of interfaces.
-            AST*  ReturnType;      // Function, Operator, Typename
-            AST*  UnderlyingType;  // Enum, Typedef
-            AST*  ValueType;       // Parameter, Variable
-        };
-        union {
-            AST*  Macro;           // Parameters
-            AST*  BitfieldSize;    // Variable (Class/Struct Data Member)
-            AST*  Params;          // Constructor, Function, Operator, Template, Typename
-        };
-        union {
-            AST*  ArrExpr;          // Typename
-            AST*  Body;             // Class, Constructr, Destructor, Enum, Function, Namespace, Struct, Union
-            AST*  Declaration;      // Friend, Template
-            AST*  Value;            // Parameter, Variable
-        };
-        union {
-            AST*  NextVar;          // Variable; Possible way to handle comma separated variables declarations. ( , NextVar->Specs NextVar->Name NextVar->ArrExpr = NextVar->Value )
-            AST*  SpecsFuncSuffix;  // Only used with typenames, to store the function suffix if typename is function signature.
-        };
-    };
-    StringCached  Content;          // Attributes, Comment, Execution, Include
-    struct {
-        SpecifierT ArrSpecs[AST_ArrSpecs_Cap]; // Specifiers
-        AST*       NextSpecs;                   // Specifiers
-    };
-};
-union {
-    AST* Prev;
-    AST* Front;
-    AST* Last;
-};
-union {
-    AST* Next;
-    AST* Back;
-};
-AST*              Parent;
-StringCached      Name;
-CodeT             Type;
-ModuleFlag        ModuleFlags;
-union {
-    b32           IsFunction;  // Used by typedef to not serialize the name field.
-    b32           IsParamPack; // Used by typename to know if type should be considered a parameter pack.
-    OperatorT     Op;
-    AccessSpec    ParentAccess;
-    s32           NumEntries;
-};
-s32               Token;       // Handle to the token, stored in the CodeFile (Otherwise unretrivable)
-```
+https://github.com/Ed94/gencpp/blob/eea4ebf5c40d5d87baa465abfb1be30845b2377e/base/components/ast.hpp#L396-L461
 
-*`CodeT` is a typedef for `ECode::Type` which has an underlying type of `u32`*  
+*`CodeType` is enum taggin the type of code. Has an underlying type of `u32`*  
 *`OperatorT` is a typedef for `EOperator::Type` which has an underlying type of `u32`*  
 *`StringCahced` is a typedef for `String const`, to denote it is an interned string*  
-*`String` is the dynamically allocated string type for the library*
+*`String` is the dynamically allocated string type for the library*  
 
-AST widths are setup to be AST_POD_Size.
+AST widths are setup to be AST_POD_Size.  
 The width dictates how much the static array can hold before it must give way to using an allocated array:
 
 ```cpp
 constexpr static
-usize ArrSpecs_Cap =
+int AST_ArrSpecs_Cap =
 (
     AST_POD_Size
-    - sizeof(AST*) * 3
+    - sizeof(Code)
     - sizeof(StringCached)
-    - sizeof(CodeT)
+    - sizeof(Code) * 2
+    - sizeof(Token*)
+    - sizeof(Code)
+    - sizeof(CodeType)
     - sizeof(ModuleFlag)
     - sizeof(u32)
 )
-/ sizeof(SpecifierT) -1; // -1 for 4 extra bytes (Odd num of AST*)
+/ sizeof(Specifier) - 1;
 ```
 
 *Ex: If the AST_POD_Size is 128 the capacity of the static array is 20.*
@@ -156,7 +80,7 @@ Data Notes:
 
 * The allocator definitions used are exposed to the user incase they want to dictate memory usage
   * You'll find the memory handling in `init`, `deinit`, `reset`, `gen_string_allocator`, `get_cached_string`, `make_code`.
-  * Allocators are defined with the `AllocatorInfo` structure found in `dependencies\memory.hpp`
+  * Allocators are defined with the `AllocatorInfo` structure found in [`memory.hpp`](../base/dependencies/memory.hpp)
   * Most of the work is just defining the allocation procedure:
 
 ```cpp
@@ -164,30 +88,30 @@ Data Notes:
 ```
 
 * ASTs are wrapped for the user in a Code struct which is a wrapper for a AST* type.
-* Both AST and Code have member symbols but their data layout is enforced to be POD types.
+* Code types have member symbols but their data layout is enforced to be POD types.
 * This library treats memory failures as fatal.
 * Cached Strings are stored in their own set of arenas. AST constructors use cached strings for names, and content.
   * `StringArenas`, `StringCache`, `Allocator_StringArena`, and `Allocator_StringTable` are the associated containers or allocators.
 * Strings used for serialization and file buffers are not contained by those used for cached strings.
   * They are currently using `GlobalAllocator`, which are tracked array of arenas that grows as needed (adds buckets when one runs out).
   * Memory within the buckets is not reused, so its inherently wasteful.
-  * I will be augmenting the single arena with a simple slag allocator.
-* Linked lists used children nodes on bodies, and parameters.
+  * I will be augmenting the default allocator with virtual memory & a slab allocator in the [future](https://github.com/Ed94/gencpp/issues/12)
+* Intrusive linked lists used children nodes on bodies, and parameters.
 * Its intended to generate the AST in one go and serialize after. The constructors and serializer are designed to be a "one pass, front to back" setup.
-* Allocations can be tuned by defining the folloiwng macros:
+* Allocations can be tuned by defining the folloiwng macros (will be moved to runtime configuration in the future):
   * `GEN_GLOBAL_BUCKET_SIZE` : Size of each bucket area for the global allocator
   * `GEN_CODEPOOL_NUM_BLOCKS` : Number of blocks per code pool in the code allocator
   * `GEN_SIZE_PER_STRING_ARENA` : Size per arena used with string caching.
   * `GEN_MAX_COMMENT_LINE_LENGTH` : Longest length a comment can have per line.
   * `GEN_MAX_NAME_LENGTH` : Max length of any identifier.
   * `GEN_MAX_UNTYPED_STR_LENGTH` : Max content length for any untyped code.
-  * `GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE` : token_fmt_va uses local_persit memory of this size for the hashtable.
+  * `TokenMap_FixedArena` : token_fmt_va uses local_persit memory of this arena type for the hashtable.
   * `GEN_LEX_ALLOCATOR_SIZE`
   * `GEN_BUILDER_STR_BUFFER_RESERVE`
 
 The following CodeTypes are used which the user may optionally use strong typing with if they enable: `GEN_ENFORCE_STRONG_CODE_TYPES`
 
-* CodeBody : Has support for `for-range` iterating across Code objects.
+* CodeBody : Has support for `for : range` iterating across Code objects.
 * CodeAttributes
 * CodeComment
 * CodeClass
@@ -204,13 +128,13 @@ The following CodeTypes are used which the user may optionally use strong typing
 * CodeNS
 * CodeOperator
 * CodeOpCast
-* CodeParam : Has support for `for-range` iterating across parameters.
+* CodeParams : Has support for `for : range` iterating across parameters.
 * CodePreprocessCond
 * CodePragma
-* CodeSpecifiers : Has support for `for-range` iterating across specifiers.
+* CodeSpecifiers : Has support for `for : range` iterating across specifiers.
 * CodeStruct
 * CodeTemplate
-* CodeType
+* CodeTypename
 * CodeTypedef
 * CodeUnion
 * CodeUsing
@@ -295,6 +219,7 @@ Code <name>
 ```
 
 When using the body functions, its recommended to use the args macro to auto determine the number of arguments for the varadic:
+
 ```cpp
 def_global_body( args( ht_entry, array_ht_entry, hashtable ));
 
@@ -302,7 +227,7 @@ def_global_body( args( ht_entry, array_ht_entry, hashtable ));
 def_global_body( 3, ht_entry, array_ht_entry, hashtable );
 ```
 
-If a more incremental approach is desired for the body ASTs, `Code def_body( CodeT type )` can be used to create an empty body.  
+If a more incremental approach is desired for the body ASTs, `Code def_body( CodeT type )` can be used to create an empty body.
 When the members have been populated use: `AST::validate_body` to verify that the members are valid entires for that type.
 
 ### Parse construction
@@ -354,7 +279,7 @@ Interface :
 * untyped_fmt
 * untyped_token_fmt
 
-During serialization any untyped Code AST has its string value directly injected inline of whatever context the content existed as an entry within.  
+During serialization any untyped Code AST has its string value directly injected inline of whatever context the content existed as an entry within.
 Even though these are not validated from somewhat correct c/c++ syntax or components, it doesn't mean that Untyped code can be added as any component of a Code AST:
 
 * Untyped code cannot have children, thus there cannot be recursive injection this way.
@@ -375,6 +300,7 @@ Code <name> = untyped_str( code(
 ```
 
 Optionally, `code_str`, and `code_fmt` macros can be used so that the code macro doesn't have to be used:
+
 ```cpp
 Code <name> = code_str( <some code without "" quotes > )
 ```
@@ -404,8 +330,8 @@ The following are provided predefined by the library as they are commonly used:
 * `module_global_fragment`
 * `module_private_fragment`
 * `fmt_newline`
-* `param_varaidc` (Used for varadic definitions)
 * `pragma_once`
+* `param_varaidc` (Used for varadic definitions)
 * `preprocess_else`
 * `preprocess_endif`
 * `spec_const`
@@ -421,6 +347,7 @@ The following are provided predefined by the library as they are commonly used:
 * `spec_local_persist` (local_persist macro)
 * `spec_mutable`
 * `spec_neverinline`
+* `spec_noexcept`
 * `spec_override`
 * `spec_ptr`
 * `spec_pure`
@@ -452,8 +379,8 @@ Optionally the following may be defined if `GEN_DEFINE_LIBRARY_CODE_CONSTANTS` i
 * `t_u16`
 * `t_u32`
 * `t_u64`
-* `t_sw` (ssize_t)
-* `t_uw` (size_t)
+* `t_ssize` (ssize_t)
+* `t_usize` (size_t)
 * `t_f32`
 * `t_f64`
 
@@ -471,14 +398,11 @@ and have the desired specifiers assigned to them beforehand.
 
 ## Code generation and modification
 
-There are three provided auxillary interfaces:
+There are two provided auxillary interfaces:
 
 * Builder
-* Editor
 * Scanner
 
-Editor and Scanner are disabled by default, use `GEN_FEATURE_EDITOR` and `GEN_FEATURE_SCANNER` to enable them.
-
 ### Builder is a similar object to the jai language's string_builder
 
 * The purpose of it is to generate a file.
@@ -488,4 +412,8 @@ Editor and Scanner are disabled by default, use `GEN_FEATURE_EDITOR` and `GEN_FE
 
 ### Scanner Auxillary Interface
 
-Provides *(eventually)* `scan_file` to automatically populate a CodeFile which contains a parsed AST (`Code`) of the file, with any contextual failures that are reported from the parser.
+* The purpose is to scan or parse files
+* Some with two basic functions to convert a fil to code: `scan_file` and `parse_file`
+  * `scan_file`: Merely grabs the file and stores it in an untyped Code.
+  * `parse_file`: Will parse the file using `parse_global_body` and return a `CodeBody`.
+* Two basic functions for grabbing columns from a CSV: `parse_csv_one_column` and `parse_csv_two_columns`

gen_c_library/Readme.md

@@ -0,0 +1,23 @@
+## Navigation
+
+# base
+
+[Top](../Readme.md)
+
+* [docs](../docs/Readme.md)
+
+# C Library Generation
+
+`c_library.cpp` generates both *segemnted* and *singleheader* variants of the library compliant with C11.
+
+The output will be in the `gen_segmented/gen` directory (if the directory does not exist, it will create it).
+
+If using the library's provided build scripts:
+
+```ps1
+.\build.ps1 <compiler> <debug or omit> c_library
+```
+
+All free from tag identifiers will be prefixed with `gen_` or `GEN_` as the namespace. This can either be changed after generation with a `.refactor` script (or your preferred subst method), OR by modifying c_library.refactor.
+
+**If c_library.refactor is modified you may need to modify c_library.cpp and its [components](./components/). As some of the container generation relies on that prefix.**

gen_c_library/c_library.cpp

@@ -3,22 +3,16 @@
 #define GEN_DEFINE_LIBRARY_CODE_CONSTANTS
 #define GEN_ENFORCE_STRONG_CODE_TYPES
 #define GEN_EXPOSE_BACKEND
-#include "../project/gen.cpp"
-
+#include "gen.cpp"
 #include "helpers/push_ignores.inline.hpp"
-#include "helpers/helper.hpp"
+
+#include <stdlib.h>
 
 GEN_NS_BEGIN
-#include "helpers/push_container_defines.inline.hpp"
-#include "dependencies/parsing.cpp"
-#include "helpers/pop_container_defines.inline.hpp"
+#include "helpers/base_codegen.hpp"
+#include "helpers/misc.hpp"
 GEN_NS_END
 
-#include "auxillary/builder.hpp"
-#include "auxillary/builder.cpp"
-#include "auxillary/scanner.hpp"
-
-
 #include "components/memory.fixed_arena.hpp"
 #include "components/misc.hpp"
 #include "components/containers.array.hpp"
@@ -52,55 +46,22 @@ constexpr StrC implementation_guard_end = txt(R"(
 #pragma endregion GENCPP IMPLEMENTATION GUARD
 )");
 
-void format_file( char const* path )
-{
-	String resolved_path = String::make(GlobalAllocator, to_strc_from_c_str(path));
+#define path_refactor_script "./c_library.refactor"
+#define path_format_style    "../scripts/.clang-format "
+#define scratch_file         "gen/scratch.hpp"
+#define path_base            "../base/"
 
-	String style_arg = String::make(GlobalAllocator, txt("-style=file:"));
-	style_arg.append("../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 );
-	command.append( cf_format_inplace );
-	command.append( cf_verbose );
-	command.append( style_arg );
-	command.append( resolved_path );
-		log_fmt("\tRunning clang-format on file:\n");
-		system( command );
-		log_fmt("\tclang-format finished reformatting.\n");
-	#undef cf_cmd
-	#undef cf_format_inplace
-	#undef cf_style
-	#undef cf_verbse
+Code refactor( Code code ) {
+	return code_refactor_and_format(code, scratch_file, path_refactor_script, nullptr );
 }
-
-Code format_code_to_untyped( Code code )
-{
-	Builder ecode_file_temp = Builder::open("gen/scratch.hpp");
-	ecode_file_temp.print(code);
-	ecode_file_temp.write();
-	format_file("gen/scratch.hpp");
-	Code result = scan_file( "gen/scratch.hpp" );
-	remove("gen/scratch.hpp");
-	return result;
-}
-
-CodeBody parse_file( const char* path )
-{
-	FileContents file = file_read_contents( GlobalAllocator, true, path );
-	CodeBody     code = parse_global_body( { file.size, (char const*)file.data } );
-	log_fmt("\nParsed: %s\n", path);
-	return code;
+Code refactor_and_format( Code code ) {
+	return code_refactor_and_format(code, scratch_file, path_refactor_script, path_format_style );
 }
 
 constexpr bool helper_use_c_definition = true;
 
 int gen_main()
 {
-#define project_dir "../project/"
 	gen::init();
 
 	PreprocessorDefines.append(txt("GEN_API_C_BEGIN"));
@@ -114,25 +75,26 @@ int gen_main()
 	PreprocessorDefines.append(txt("Using_CodeOps("));
 	PreprocessorDefines.append(txt("GEN_OPTIMIZE_MAPPINGS_BEGIN"));
 	PreprocessorDefines.append(txt("GEN_OPITMIZE_MAPPINGS_END"));
-	//PreprocessorDefines.append(txt("GEN_EXECUTION_EXPRESSION_SUPPORT"));
 	PreprocessorDefines.append(txt("GEN_PARAM_DEFAULT"));
+	//PreprocessorDefines.append(txt("GEN_EXECUTION_EXPRESSION_SUPPORT"));
 
-	Code push_ignores           = scan_file( project_dir "helpers/push_ignores.inline.hpp" );
-	Code pop_ignores            = scan_file( project_dir "helpers/pop_ignores.inline.hpp" );
+	Code push_ignores           = scan_file( path_base "helpers/push_ignores.inline.hpp" );
+	Code pop_ignores            = scan_file( path_base "helpers/pop_ignores.inline.hpp" );
 	Code c_library_header_start = scan_file( "components/header_start.hpp" );
 
 // Header Content: Reflection and Generation
 
 #pragma region Resolve Dependencies
-	Code header_platform     = scan_file( project_dir "dependencies/platform.hpp" );
-	Code header_macros       = scan_file( project_dir "dependencies/macros.hpp" );
-	Code header_basic_types  = scan_file( project_dir "dependencies/basic_types.hpp" );
-	Code header_debug        = scan_file( project_dir "dependencies/debug.hpp" );
-	Code header_string_ops   = scan_file( project_dir "dependencies/string_ops.hpp" );
-	Code header_hashing      = scan_file( project_dir "dependencies/hashing.hpp" );
-	Code header_timing       = scan_file( project_dir "dependencies/timing.hpp" );
+	Code header_platform       = scan_file( path_base "dependencies/platform.hpp" );
+	Code header_macros         = scan_file( path_base "dependencies/macros.hpp" );
+	Code header_generic_macros = scan_file(           "components/generic_macros.hpp" );
+	Code header_basic_types    = scan_file( path_base "dependencies/basic_types.hpp" );
+	Code header_debug          = scan_file( path_base "dependencies/debug.hpp" );
+	Code header_string_ops     = scan_file( path_base "dependencies/string_ops.hpp" );
+	Code header_hashing        = scan_file( path_base "dependencies/hashing.hpp" );
+	Code header_timing         = scan_file( path_base "dependencies/timing.hpp" );
 
-	CodeBody parsed_header_memory = parse_file( project_dir "dependencies/memory.hpp" );
+	CodeBody parsed_header_memory = parse_file( path_base "dependencies/memory.hpp" );
 	CodeBody header_memory        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_header_memory.begin(); entry != parsed_header_memory.end(); ++ entry ) switch (entry->Type)
 	{
@@ -176,6 +138,7 @@ int gen_main()
 			CodeTemplate tmpl = cast(CodeTemplate, entry);
 			if ( tmpl->Declaration->Name.contains(txt("swap")))
 			{
+				log_fmt("SWAPPED");
 				CodeBody macro_swap = parse_global_body( txt(R"(
 #define swap( a, b )        \
 do                          \
@@ -231,7 +194,7 @@ do                          \
 		break;
 		case CT_Preprocess_If:
 		{
-			b32 found = ignore_preprocess_cond_block(txt("! GEN_C_LIKE_CPP"), entry, parsed_header_memory, header_memory );
+			b32 found = ignore_preprocess_cond_block(txt("GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP"), entry, parsed_header_memory, header_memory );
 			if (found) break;
 
 			header_memory.append(entry);
@@ -261,7 +224,7 @@ do                          \
 		break;
 	}
 
-	CodeBody parsed_header_printing = parse_file( project_dir "dependencies/printing.hpp" );
+	CodeBody parsed_header_printing = parse_file( path_base "dependencies/printing.hpp" );
 	CodeBody header_printing        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_header_printing.begin(); entry != parsed_header_printing.end(); ++ entry ) switch (entry->Type)
 	{
@@ -289,10 +252,10 @@ do                          \
 		break;
 	}
 
-	Code array_ssize         = gen_array(txt("ssize"), txt("Array_ssize"));
-	Code array_string_cached = gen_array(txt("StringCached"), txt("Array_StringCached"));
+	Code array_ssize         = gen_array(txt("gen_ssize"), txt("Array_gen_ssize"));
+	Code array_string_cached = gen_array(txt("gen_StringCached"), txt("Array_gen_StringCached"));
 
-	CodeBody parsed_header_strings = parse_file( project_dir "dependencies/strings.hpp" );
+	CodeBody parsed_header_strings = parse_file( path_base "dependencies/strings.hpp" );
 	CodeBody header_strings        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_header_strings.begin(); entry != parsed_header_strings.end(); ++ entry ) switch (entry->Type)
 	{
@@ -383,7 +346,7 @@ do                          \
 			CodeTypedef td = cast(CodeTypedef, entry);
 			if (td->Name.contains(name_string_table))
 			{
-				CodeBody ht = gen_hashtable(txt("StrC"), name_string_table);
+				CodeBody ht = gen_hashtable(txt("gen_StrC"), name_string_table);
 				header_strings.append(ht);
 				break;
 			}
@@ -396,9 +359,9 @@ do                          \
 		break;
 	}
 
-	CodeBody array_u8 = gen_array(txt("u8"), txt("Array_u8"));
+	CodeBody array_u8 = gen_array(txt("gen_u8"), txt("Array_gen_u8"));
 
-	CodeBody parsed_header_filesystem = parse_file( project_dir "dependencies/filesystem.hpp" );
+	CodeBody parsed_header_filesystem = parse_file( path_base "dependencies/filesystem.hpp" );
 	CodeBody header_filesystem        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_header_filesystem.begin(); entry != parsed_header_filesystem.end(); ++ entry ) switch (entry->Type)
 	{
@@ -455,9 +418,9 @@ do                          \
 		break;
 	}
 
-	CodeBody array_adt_node = gen_array(txt("ADT_Node"), txt("Array_ADT_Node"));
+	CodeBody array_adt_node = gen_array(txt("gen_ADT_Node"), txt("Array_gen_ADT_Node"));
 
-	CodeBody parsed_header_parsing = parse_file( project_dir "dependencies/parsing.hpp" );
+	CodeBody parsed_header_parsing = parse_file( path_base "dependencies/parsing.hpp" );
 	CodeBody header_parsing        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_header_parsing.begin(); entry != parsed_header_parsing.end(); ++ entry ) switch (entry->Type)
 	{
@@ -478,8 +441,8 @@ do                          \
 				header_parsing.append(fmt_newline);
 
 				// Add ADT_Node forward and typedef early.
-				CodeStruct  adt_node_fwd     = parse_struct(code( struct ADT_Node; ));
-				CodeTypedef adt_node_typedef = parse_typedef(code( typedef struct ADT_Node ADT_Node; ));
+				CodeStruct  adt_node_fwd     = parse_struct(code( struct gen_ADT_Node; ));
+				CodeTypedef adt_node_typedef = parse_typedef(code( typedef struct gen_ADT_Node gen_ADT_Node; ));
 				header_parsing.append(adt_node_fwd);
 				header_parsing.append(adt_node_typedef);
 
@@ -552,11 +515,11 @@ do                          \
 	// Only has operator overload definitions that C doesn't need.
 	// CodeBody ast_inlines = gen_ast_inlines();
 
-	CodeBody ecode       = gen_ecode     ( project_dir "enums/ECodeTypes.csv", helper_use_c_definition );
-	CodeBody eoperator   = gen_eoperator ( project_dir "enums/EOperator.csv",  helper_use_c_definition );
-	CodeBody especifier  = gen_especifier( project_dir "enums/ESpecifier.csv", helper_use_c_definition );
+	CodeBody ecode       = gen_ecode     ( path_base "enums/ECodeTypes.csv", helper_use_c_definition );
+	CodeBody eoperator   = gen_eoperator ( path_base "enums/EOperator.csv",  helper_use_c_definition );
+	CodeBody especifier  = gen_especifier( path_base "enums/ESpecifier.csv", helper_use_c_definition );
 
-	CodeBody parsed_types = parse_file( project_dir "components/types.hpp" );
+	CodeBody parsed_types = parse_file( path_base "components/types.hpp" );
 	CodeBody types        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_types.begin(); entry != parsed_types.end(); ++ entry ) switch(entry->Type)
 	{
@@ -628,7 +591,7 @@ do                          \
 	// Used to track which functions need generic selectors.
 	Array(CodeFn) code_c_interface = array_init_reserve<CodeFn>(GlobalAllocator, 16);
 
-	CodeBody parsed_ast = parse_file( project_dir "components/ast.hpp" );
+	CodeBody parsed_ast = parse_file( path_base "components/ast.hpp" );
 	CodeBody ast        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_ast.begin(); entry != parsed_ast.end(); ++ entry ) switch (entry->Type)
 	{
@@ -644,12 +607,15 @@ do                          \
 		case CT_Preprocess_If:
 		{
 			CodePreprocessCond cond = cast(CodePreprocessCond, entry);
-			if (cond->Content.contains(txt("GEN_COMPILER_C")))
+			if (cond->Content.is_equal(txt("GEN_COMPILER_C")))
 			{
-				//++ entry;         //
-				//ast.append(entry) // typedef
-				//for ( ; entry != parsed_ast.end() && entry->Type != CT_Preprocess_EndIf; ++ entry) {}
-				//++ entry;        // Consume endif
+				++ entry; // #if
+				for ( ; entry != parsed_ast.end() && entry->Type != CT_Preprocess_Else; ++ entry) {
+					ast.append(entry);
+				}
+				for ( ; entry != parsed_ast.end() && entry->Type != CT_Preprocess_EndIf; ++ entry) {}
+				++ entry;        // Consume endif
+				continue;
 			}
 
 			b32 found = ignore_preprocess_cond_block(txt("GEN_COMPILER_CPP"), entry, parsed_ast, ast);
@@ -783,7 +749,7 @@ R"(#define AST_ArrSpecs_Cap \
 		txt("CodeOperator"),
 		txt("CodeOpCast"),
 		txt("CodePragma"),
-		txt("CodeParam"),
+		txt("CodeParams"),
 		txt("CodePreprocessCond"),
 		txt("CodeSpecifiers"),
 		txt("CodeTemplate"),
@@ -794,7 +760,7 @@ R"(#define AST_ArrSpecs_Cap \
 		txt("CodeVar"),
 	};
 
-	CodeBody parsed_code_types = parse_file( project_dir "components/code_types.hpp" );
+	CodeBody parsed_code_types = parse_file( path_base "components/code_types.hpp" );
 	CodeBody code_types        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_code_types.begin(); entry != parsed_code_types.end(); ++ entry ) switch( entry->Type )
 	{
@@ -835,7 +801,7 @@ R"(#define AST_ArrSpecs_Cap \
 				// Resolve generic's arguments
 				b32    has_args   = fn->Params->NumEntries > 1;
 				String params_str = String::make_reserve(GlobalAllocator, 32);
-				for (CodeParam param = fn->Params->Next; param != fn->Params.end(); ++ param) {
+				for (CodeParams param = fn->Params->Next; param != fn->Params.end(); ++ param) {
 					// We skip the first parameter as its always going to be the code for selection
 					if (param->Next == nullptr) {
 						params_str.append_fmt( "%SC", param->Name );
@@ -896,7 +862,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
-	CodeBody parsed_ast_types = parse_file( project_dir "components/ast_types.hpp" );
+	CodeBody parsed_ast_types = parse_file( path_base "components/ast_types.hpp" );
 	CodeBody ast_types        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_ast_types.begin(); entry != parsed_ast_types.end(); ++ entry ) switch( entry->Type )
 	{
@@ -927,7 +893,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 						StrC cpp_size = to_strc_from_c_str(conversion_buf);
 						union_entry->ValueType->ArrExpr = untyped_str( cpp_size );
 						union_entry->InlineCmt          = untyped_str(token_fmt("arr_exp", arr_exp,
-							"// Had to hardcode _PAD_ because (<arr_exp>) was 67 bytes in C (Injected C++ size_of(AST_<Type>::_PAD_) from C++ side)\n"
+							"// Had to hardcode _PAD_ because (<arr_exp>) was 67 bytes in C\n"
 						));
 					}
 				}
@@ -943,7 +909,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
-	CodeBody parsed_interface = parse_file( project_dir "components/interface.hpp" );
+	CodeBody parsed_interface = parse_file( path_base "components/interface.hpp" );
 	CodeBody interface        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_interface.begin(); entry != parsed_interface.end(); ++ entry ) switch( entry->Type )
 	{
@@ -970,7 +936,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 			}
 
 			b32 handled= false;
-			for ( CodeParam opt_param : fn->Params ) if (opt_param->ValueType->Name.starts_with(txt("Opts_")))
+			for ( CodeParams opt_param : fn->Params ) if (opt_param->ValueType->Name.starts_with(txt("Opts_")))
 			{
 				// Convert the definition to use a default struct: https://vxtwitter.com/vkrajacic/status/1749816169736073295
 				StrC prefix      = txt("def_");
@@ -980,7 +946,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 				// Resolve define's arguments
 				b32    has_args   = fn->Params->NumEntries > 1;
 				String params_str = String::make_reserve(GlobalAllocator, 32);
-				for (CodeParam other_param = fn->Params; other_param != opt_param; ++ other_param) {
+				for (CodeParams other_param = fn->Params; other_param != opt_param; ++ other_param) {
 					if ( other_param == opt_param ) {
 						params_str.append_fmt( "%SC", other_param->Name );
 						break;
@@ -1032,7 +998,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
-	CodeBody parsed_inlines = parse_file( project_dir "components/inlines.hpp" );
+	CodeBody parsed_inlines = parse_file( path_base "components/inlines.hpp" );
 	CodeBody inlines        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_inlines.begin(); entry != parsed_inlines.end(); ++ entry ) switch( entry->Type )
 	{
@@ -1067,8 +1033,65 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
+	CodeBody parsed_header_builder = parse_file( path_base "auxillary/builder.hpp" );
+	CodeBody header_builder        = def_body(CT_Global_Body);
+	for ( Code entry = parsed_header_builder.begin(); entry != parsed_header_builder.end(); ++ entry ) switch( entry->Type )
+	{
+		case CT_Preprocess_IfDef:
+		{
+			b32 found = ignore_preprocess_cond_block(txt("GEN_INTELLISENSE_DIRECTIVES"), entry, parsed_header_builder, header_builder );
+			if (found) break;
+
+			header_builder.append(entry);
+		}
+		break;
+
+		case CT_Preprocess_If:
+		{
+			b32 found = ignore_preprocess_cond_block(txt("GEN_COMPILER_CPP"), entry, parsed_header_builder, header_builder );
+			if (found) break;
+
+			found = ignore_preprocess_cond_block(txt("GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP"), entry, parsed_header_builder, header_builder );
+			if (found) break;
+
+			header_builder.append(entry);
+		}
+		break;
+
+		case CT_Struct:
+		{
+			CodeBody body     = cast(CodeBody, entry->Body);
+			CodeBody new_body = def_body(CT_Struct_Body);
+			for ( Code body_entry = body.begin(); body_entry != body.end(); ++ body_entry ) switch(body_entry->Type)
+			{
+				case CT_Preprocess_If:
+				{
+					b32 found = ignore_preprocess_cond_block(txt("GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP"), body_entry, body, new_body );
+					if (found) break;
+
+					new_body.append(body_entry);
+				}
+				break;
+
+				default:
+					new_body.append(body_entry);
+				break;
+			}
+			if ( new_body->NumEntries > 0 ) {
+				entry->Body = new_body;
+			}
+
+			header_builder.append(entry);
+		}
+		break;
+
+		default:
+			header_builder.append(entry);
+		break;
+	}
+
 	s32 idx = 0;
-	CodeBody parsed_header_end = parse_file( project_dir "components/header_end.hpp" );
+	CodeBody parsed_header_end = parse_file( path_base "components/header_end.hpp" );
 	CodeBody header_end        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_header_end.begin(); entry != parsed_header_end.end(); ++ entry, ++ idx ) switch( entry->Type )
 	{
@@ -1106,30 +1129,31 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 // Source Content : Reflection and Generation
 
 #pragma region Resolve Dependencies
-	Code src_impl_start = scan_file( project_dir "dependencies/src_start.cpp" );
-	Code src_debug      = scan_file( project_dir "dependencies/debug.cpp" );
-	Code src_string_ops = scan_file( project_dir "dependencies/string_ops.cpp" );
-	Code src_printing   = scan_file( project_dir "dependencies/printing.cpp" );
-	Code src_memory     = scan_file( project_dir "dependencies/memory.cpp" );
-	Code src_hashing    = scan_file( project_dir "dependencies/hashing.cpp" );
-	Code src_strings    = scan_file( project_dir "dependencies/strings.cpp" );
-	Code src_filesystem = scan_file( project_dir "dependencies/filesystem.cpp" );
-	Code src_timing     = scan_file( project_dir "dependencies/timing.cpp" );
+	Code src_dep_start  = scan_file( path_base "dependencies/src_start.cpp" );
+	Code src_debug      = scan_file( path_base "dependencies/debug.cpp" );
+	Code src_string_ops = scan_file( path_base "dependencies/string_ops.cpp" );
+	Code src_printing   = scan_file( path_base "dependencies/printing.cpp" );
+	Code src_memory     = scan_file( path_base "dependencies/memory.cpp" );
+	Code src_hashing    = scan_file( path_base "dependencies/hashing.cpp" );
+	Code src_strings    = scan_file( path_base "dependencies/strings.cpp" );
+	Code src_filesystem = scan_file( path_base "dependencies/filesystem.cpp" );
+	Code src_timing     = scan_file( path_base "dependencies/timing.cpp" );
 #pragma endregion Resolve Dependencies
 
 #pragma region Resolve Components
-	CodeBody array_arena = gen_array(txt("Arena"), txt("Array_Arena"));
-	CodeBody array_pool  = gen_array(txt("Pool"), txt("Array_Pool"));
-	CodeBody array_token = gen_array(txt("Token"), txt("Array_Token"));
+	CodeBody array_arena = gen_array(txt("gen_Arena"), txt("Array_gen_Arena"));
+	CodeBody array_pool  = gen_array(txt("gen_Pool"),  txt("Array_gen_Pool"));
+	CodeBody array_token = gen_array(txt("gen_Token"), txt("Array_gen_Token"));
 
-	Code src_static_data 	    = scan_file( project_dir "components/static_data.cpp" );
-	Code src_ast_case_macros    = scan_file( project_dir "components/ast_case_macros.cpp" );
-	Code src_code_serialization = scan_file( project_dir "components/code_serialization.cpp" );
-	Code src_interface          = scan_file( project_dir "components/interface.cpp" );
-	Code src_parsing_interface  = scan_file( project_dir "components/interface.parsing.cpp" );
-	Code src_untyped            = scan_file( project_dir "components/interface.untyped.cpp" );
+	Code src_start              = scan_file(           "components/src_start.c" );
+	Code src_static_data 	      = scan_file( path_base "components/static_data.cpp" );
+	Code src_ast_case_macros    = scan_file( path_base "components/ast_case_macros.cpp" );
+	Code src_code_serialization = scan_file( path_base "components/code_serialization.cpp" );
+	Code src_interface          = scan_file( path_base "components/interface.cpp" );
+	Code src_parsing_interface  = scan_file( path_base "components/interface.parsing.cpp" );
+	Code src_untyped            = scan_file( path_base "components/interface.untyped.cpp" );
 
-	CodeBody parsed_src_ast = parse_file( project_dir "components/ast.cpp" );
+	CodeBody parsed_src_ast = parse_file( path_base "components/ast.cpp" );
 	CodeBody src_ast        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_src_ast.begin(); entry != parsed_src_ast.end(); ++ entry ) switch( entry ->Type )
 	{
@@ -1164,7 +1188,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
-	CodeBody parsed_src_upfront = parse_file( project_dir "components/interface.upfront.cpp" );
+	CodeBody parsed_src_upfront = parse_file( path_base "components/interface.upfront.cpp" );
 	CodeBody src_upfront        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_src_upfront.begin(); entry != parsed_src_upfront.end(); ++ entry ) switch( entry ->Type )
 	{
@@ -1187,9 +1211,9 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 			CodeFn fn = cast(CodeFn, entry);
 			Code prev = entry->Prev;
 
-			for ( CodeParam arr_param : fn->Params )
+			for ( CodeParams arr_param : fn->Params )
 				if (	fn->Name.starts_with(txt("def_"))
-					&&	(		arr_param->ValueType->Name.starts_with(txt("Specifier"))
+					&&	(		(arr_param->ValueType->Name.starts_with(txt("Specifier")) && fn->Params->NumEntries > 1)
 							||	arr_param->ValueType->Name.starts_with(txt("Code")) )
 				)
 				{
@@ -1199,7 +1223,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 					postfix_arr.free();
 				}
 
-			for ( CodeParam opt_param : fn->Params ) if (opt_param->ValueType->Name.starts_with(txt("Opts_")))
+			for ( CodeParams opt_param : fn->Params ) if (opt_param->ValueType->Name.starts_with(txt("Opts_")))
 			{
 				StrC prefix      = txt("def_");
 				StrC actual_name = { fn->Name.Len  - prefix.Len, fn->Name.Ptr + prefix.Len };
@@ -1217,9 +1241,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
-	// CodeBody hashtable_strc = gen_hashtable(txt("StrC"), txt("HashTable_StrC"));
-
-	CodeBody parsed_src_lexer = parse_file( project_dir "components/lexer.cpp" );
+	CodeBody parsed_src_lexer = parse_file( path_base "components/lexer.cpp" );
 	CodeBody src_lexer        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_src_lexer.begin(); entry != parsed_src_lexer.end(); ++ entry ) switch( entry ->Type )
 	{
@@ -1311,7 +1333,9 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		break;
 	}
 
-	CodeBody parsed_src_parser = parse_file( project_dir "components/parser.cpp" );
+	CodeBody array_code_typename = gen_array(txt("gen_CodeTypename"), txt("Array_gen_CodeTypename"));
+
+	CodeBody parsed_src_parser = parse_file( path_base "components/parser.cpp" );
 	CodeBody src_parser        = def_body(CT_Global_Body);
 	for ( Code entry = parsed_src_parser.begin(); entry != parsed_src_parser.end(); ++ entry ) switch( entry ->Type )
 	{
@@ -1327,9 +1351,27 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		case CT_Struct:
 		{
 			CodeTypedef tdef = parse_typedef(token_fmt("name", entry->Name, stringize( typedef struct <name> <name>; )));
-			src_parser.append(entry);
 			src_parser.append(tdef);
+			src_parser.append(entry);
 		}
+		break;
+
+		case CT_Variable:
+		{
+			CodeVar var = cast(CodeVar, entry);
+			if (var->Specs && var->Specs.has(Spec_Constexpr) > -1) {
+				Code define_ver = untyped_str(token_fmt(
+						"name",  var->Name
+					,	"value", var->Value->Content
+					,	"type",  var->ValueType.to_string().to_strc()
+					,	"#define <name> (<type>) <value>\n"
+				));
+				src_parser.append(define_ver);
+				continue;
+			}
+			src_parser.append(entry);
+		}
+		break;
 
 		default:
 			src_parser.append(entry);
@@ -1356,10 +1398,76 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		containers.append( fmt_newline);
 	}
 
-// Printing : Everything below is jsut serialization & formatting ot a single-file.
+// Printing : Everything below is jsut serialization & formatting to a singleheader file & segmented set of files
 
+#pragma region Refactored / Formatted
+ 	Code r_header_platform     = refactor(header_platform);
+	Code r_header_macros       = refactor(header_macros);
+	Code r_header_basic_types  = refactor(header_basic_types);
+	Code r_header_debug        = refactor(header_debug);
+	Code rf_header_memory      = refactor_and_format(header_memory);
+	Code rf_header_printing    = refactor_and_format(header_printing);
+	Code r_header_string_ops   = refactor(header_string_ops);
+	Code rf_containers         = refactor_and_format(containers);
+	Code r_header_hashing      = refactor(header_hashing);
+	Code rf_header_strings     = refactor_and_format(header_strings);
+	Code rf_header_filesystem  = refactor_and_format(header_filesystem);
+	Code r_header_timing       = refactor(header_timing);
+	Code rf_header_parsing     = refactor_and_format(header_parsing);
+
+	Code rf_types      = refactor_and_format(types);
+	Code rf_ecode      = refactor_and_format(ecode);
+	Code rf_eoperator  = refactor_and_format(eoperator);
+	Code rf_especifier = refactor_and_format(especifier);
+	Code rf_ast        = refactor_and_format(ast);
+	Code rf_code_types = refactor_and_format(code_types);
+	Code rf_ast_types  = refactor_and_format(ast_types);
+
+	Code rf_interface = refactor_and_format(interface);
+	Code rf_inlines   = refactor_and_format(inlines);
+
+	Code rf_array_string_cached = refactor_and_format(array_string_cached);
+	Code rf_header_end          = refactor_and_format(header_end);
+	Code rf_header_builder      = refactor_and_format(header_builder);
+	Code rf_header_scanner      = refactor_and_format( scan_file( path_base "auxillary/scanner.hpp" ));
+
+	Code r_src_dep_start  = refactor(src_dep_start);
+	Code r_src_debug      = refactor(src_debug);
+	Code r_src_string_ops = refactor(src_string_ops);
+	Code r_src_printing   = refactor(src_printing);
+	Code r_src_memory     = refactor(src_memory);
+	Code r_src_hashing    = refactor(src_hashing);
+	Code r_src_strings    = refactor(src_strings);
+	Code r_src_filesystem = refactor(src_filesystem);
+	Code r_src_timing     = refactor(src_timing);
+
+	Code rf_src_parsing = refactor_and_format( scan_file( path_base "dependencies/parsing.cpp" ));
+
+	Code rf_array_arena           = refactor_and_format(array_arena);
+	Code rf_array_pool            = refactor_and_format(array_pool);
+	Code r_src_static_data        = refactor(src_static_data);
+	Code r_src_ast_case_macros    = refactor(src_ast_case_macros);
+	Code r_src_ast                = refactor(src_ast);
+	Code r_src_code_serialization = refactor(src_code_serialization);
+
+	Code r_src_interface        = refactor(src_interface);
+	Code r_src_upfront          = refactor_and_format(src_upfront);
+	Code r_src_lexer            = refactor_and_format(src_lexer);
+	Code rf_array_code_typename = refactor_and_format(array_code_typename);
+ 	Code rf_src_parser          = refactor_and_format(src_parser);
+	Code r_src_parsing          = refactor(src_parsing_interface);
+	Code r_src_untyped          = refactor(src_untyped);
+	
+	CodeBody etoktype    = gen_etoktype( path_base "enums/ETokType.csv", path_base "enums/AttributeTokens.csv", helper_use_c_definition );
+	Code     rf_etoktype = refactor_and_format(etoktype);
+
+	Code rf_src_builder = refactor_and_format( scan_file( path_base "auxillary/builder.cpp" ));
+	Code rf_src_scanner = refactor_and_format( scan_file( path_base "auxillary/scanner.cpp" ));
+#pragma endregion Refactored / Formatted
+
+#pragma region Singleheader
 	Builder
-	header = Builder::open( "gen/gen.h" );
+	header = Builder::open( "gen/gen_singleheader.h" );
 	header.print_fmt( generation_notice );
 	header.print_fmt("#pragma once\n\n");
 	header.print( push_ignores );
@@ -1370,25 +1478,23 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 	{
 	#pragma region Print Dependencies
 		header.print_fmt( roll_own_dependencies_guard_start );
-		header.print( header_platform );
+		header.print( r_header_platform );
 		header.print_fmt( "\nGEN_NS_BEGIN\n" );
 
-		header.print( header_macros );
-		header.print( header_basic_types );
-		header.print( header_debug );
-		header.print( format_code_to_untyped(header_memory) );
-		header.print( format_code_to_untyped(header_printing));
-		header.print( header_string_ops );
+		header.print( r_header_macros );
+		header.print( header_generic_macros );
+		header.print( r_header_basic_types );
+		header.print( r_header_debug );
+		header.print( rf_header_memory );
+		header.print( rf_header_printing);
+		header.print( r_header_string_ops );
 		header.print( fmt_newline);
-		header.print( format_code_to_untyped(containers));
-		header.print( header_hashing );
-		header.print( format_code_to_untyped(header_strings));
-		header.print( format_code_to_untyped(header_filesystem));
-		header.print( header_timing );
-
-		header.print_fmt( "\n#pragma region Parsing\n" );
-		header.print( format_code_to_untyped(header_parsing) );
-		header.print_fmt( "#pragma endregion Parsing\n\n" );
+		header.print( rf_containers);
+		header.print( r_header_hashing );
+		header.print( rf_header_strings);
+		header.print( rf_header_filesystem);
+		header.print( r_header_timing );
+		header.print(rf_header_parsing );
 
 		header.print_fmt( "\nGEN_NS_END\n" );
 		header.print_fmt( roll_own_dependencies_guard_end );
@@ -1401,35 +1507,36 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 		header.print_fmt( "GEN_API_C_BEGIN\n\n" );
 
 		header.print_fmt("#pragma region Types\n");
-		header.print( format_code_to_untyped(types) );
+		header.print( rf_types );
 		header.print( fmt_newline );
-		header.print( format_code_to_untyped( ecode ));
+		header.print( rf_ecode );
 		header.print( fmt_newline );
-		header.print( format_code_to_untyped( eoperator ));
+		header.print( rf_eoperator );
 		header.print( fmt_newline );
-		header.print( format_code_to_untyped( especifier ));
+		header.print( rf_especifier );
 		header.print_fmt("#pragma endregion Types\n\n");
 
 		header.print_fmt("#pragma region AST\n");
-		header.print( format_code_to_untyped(ast) );
-		header.print( format_code_to_untyped(code_types) );
-		header.print( format_code_to_untyped(ast_types) );
+		header.print( rf_ast );
+		header.print( rf_code_types );
+		header.print( rf_ast_types );
 		header.print_fmt("\n#pragma endregion AST\n");
 
-		header.print( format_code_to_untyped(interface) );
+		header.print( rf_interface );
+		header.print(fmt_newline);
 
 		header.print_fmt("#pragma region Inlines\n");
-		header.print( format_code_to_untyped(inlines) );
+		header.print( rf_inlines );
 		header.print_fmt("#pragma endregion Inlines\n");
 
 		header.print(fmt_newline);
-		header.print( format_code_to_untyped(array_string_cached));
-		header.print(fmt_newline);
+		header.print( rf_array_string_cached );
 
-		header.print( format_code_to_untyped(header_end) );
+		header.print( rf_header_end );
+		header.print( rf_header_builder );
+		header.print( rf_header_scanner );
 
 		header.print_fmt( "\nGEN_API_C_END\n" );
-
 		header.print_fmt( "GEN_NS_END\n\n" );
 	#pragma endregion Print Compoennts
 	}
@@ -1440,71 +1547,209 @@ R"(#define <interface_name>( code ) _Generic( (code), \
 
 	#pragma region Print Dependencies
 		header.print_fmt( roll_own_dependencies_guard_start );
-		header.print_fmt( "GEN_NS_BEGIN\n\n");
+		header.print_fmt( "GEN_NS_BEGIN\n");
+		header.print_fmt( "GEN_API_C_BEGIN\n" );
 
-		header.print( src_impl_start );
-		header.print( src_debug );
-		header.print( src_string_ops );
-		header.print( src_printing );
-		header.print( src_memory );
-		header.print( src_hashing );
-		header.print( src_strings );
-		header.print( src_filesystem );
-		header.print( src_timing );
-
-		header.print_fmt( "\n#pragma region Parsing\n" );
-		header.print( scan_file( project_dir "dependencies/parsing.cpp" ) );
-		header.print_fmt( "#pragma endregion Parsing\n\n" );
+		header.print( r_src_dep_start );
+		header.print( r_src_debug );
+		header.print( r_src_string_ops );
+		header.print( r_src_printing );
+		header.print( r_src_memory );
+		header.print( r_src_hashing );
+		header.print( r_src_strings );
+		header.print( r_src_filesystem );
+		header.print( r_src_timing );
+		header.print( rf_src_parsing );
 
 		header.print_fmt( "GEN_NS_END\n");
 		header.print_fmt( roll_own_dependencies_guard_end );
 	#pragma endregion Print Dependencies
 
 	#pragma region Print Components
-		CodeBody etoktype = gen_etoktype( project_dir "enums/ETokType.csv", project_dir "enums/AttributeTokens.csv", helper_use_c_definition );
-
 		header.print_fmt( "\nGEN_NS_BEGIN\n");
 
-		header.print( format_code_to_untyped(array_arena));
 		header.print( fmt_newline);
-		header.print( format_code_to_untyped(array_pool));
+		header.print( rf_array_arena );
+		header.print( fmt_newline);
+		header.print( rf_array_pool);
 
-		header.print( src_static_data );
+		header.print( r_src_static_data );
 		header.print( fmt_newline);
 
 		header.print_fmt( "#pragma region AST\n\n" );
-		header.print( src_ast_case_macros );
-		header.print( src_ast );
-		header.print( src_code_serialization );
+		header.print( r_src_ast_case_macros );
+		header.print( r_src_ast );
+		header.print( r_src_code_serialization );
 		header.print_fmt( "#pragma endregion AST\n\n" );
 
 		header.print_fmt( "#pragma region Interface\n" );
-		header.print( src_interface );
-		header.print( format_code_to_untyped(src_upfront) );
+		header.print( r_src_interface );
+		header.print( r_src_upfront );
 		header.print_fmt( "\n#pragma region Parsing\n\n" );
-		header.print( format_code_to_untyped(etoktype) );
-		header.print( format_code_to_untyped(src_lexer) );
-		header.print( format_code_to_untyped(src_parser) );
-		// header.print( parsing_interface );
+		header.print( rf_etoktype );
+		header.print( r_src_lexer );
+		header.print( fmt_newline);
+		header.print( rf_array_code_typename );
+		header.print( fmt_newline);
+		header.print( rf_src_parser );
+		header.print( r_src_parsing );
 		header.print_fmt( "\n#pragma endregion Parsing\n" );
-		// header.print( untyped );
-		 header.print_fmt( "\n#pragma endregion Interface\n\n");
+		header.print( r_src_untyped );
+		header.print_fmt( "\n#pragma endregion Interface\n\n");
 
-		// header.print_fmt( "#pragma region Builder\n" );
-		// header.print( scan_file( project_dir "auxillary/builder.cpp"  ) );
-		// header.print_fmt( "\n#pragma endregion Builder\n\n" );
+		header.print( rf_src_builder );
+		header.print( rf_src_scanner );
 
-		// header.print_fmt( "\n#pragma region Scanner\n" );
-		// header.print( scan_file( project_dir "auxillary/scanner.hpp" ) );
-		// header.print_fmt( "#pragma endregion Scanner\n\n" );
+		header.print_fmt( "GEN_API_C_END\n" );
 	#pragma endregion Print Components
 
 		header.print_fmt( implementation_guard_end );
 	}
 	header.print( pop_ignores );
 	header.write();
+#pragma endregion Singleheader
+
+#pragma region Segmented
+	// gen_dep.h
+	{
+		Builder header = Builder::open( "gen/gen.dep.h");
+		builder_print_fmt( header, generation_notice );
+		builder_print_fmt( header, "// This file is intended to be included within gen.hpp (There is no pragma diagnostic ignores)\n" );
+		header.print( r_header_platform );
+		header.print_fmt( "\nGEN_NS_BEGIN\n" );
+
+		header.print( r_header_macros );
+		header.print( header_generic_macros );
+		header.print( r_header_basic_types );
+		header.print( r_header_debug );
+		header.print( rf_header_memory );
+		header.print( rf_header_printing);
+		header.print( r_header_string_ops );
+		header.print( fmt_newline);
+		header.print( rf_containers);
+		header.print( r_header_hashing );
+		header.print( rf_header_strings);
+		header.print( rf_header_filesystem);
+		header.print( r_header_timing );
+		header.print(rf_header_parsing );
+
+		header.print_fmt( "\nGEN_NS_END\n" );
+		header.write();
+	}
+	// gen_dep.c
+	{
+		Builder src = Builder::open( "gen/gen.dep.c" );
+		src.print_fmt( "GEN_NS_BEGIN\n");
+		src.print_fmt( "GEN_API_C_BEGIN\n" );
+
+		builder_print_fmt(src, generation_notice );
+		builder_print_fmt( src, "// This file is intended to be included within gen.cpp (There is no pragma diagnostic ignores)\n" );
+		src.print( r_src_dep_start );
+		src.print( r_src_debug );
+		src.print( r_src_string_ops );
+		src.print( r_src_printing );
+		src.print( r_src_memory );
+		src.print( r_src_hashing );
+		src.print( r_src_strings );
+		src.print( r_src_filesystem );
+		src.print( r_src_timing );
+		src.print( rf_src_parsing );
+
+		src.print_fmt( "GEN_NS_END\n");
+		src.write();
+	}
+	// gen.h
+	{
+		Builder header = builder_open( "gen/gen.h" );
+		builder_print_fmt( header, generation_notice );
+		builder_print_fmt( header, "#pragma once\n\n" );
+		builder_print( header, push_ignores );
+		header.print( c_library_header_start );
+		header.print( scan_file( "components/header_seg_includes.h" ));
+		header.print( fmt_newline );
+		header.print_fmt( "GEN_NS_BEGIN\n" );
+		header.print_fmt( "GEN_API_C_BEGIN\n\n" );
+
+		header.print_fmt("#pragma region Types\n");
+		header.print( rf_types );
+		header.print( fmt_newline );
+		header.print( rf_ecode );
+		header.print( fmt_newline );
+		header.print( rf_eoperator );
+		header.print( fmt_newline );
+		header.print( rf_especifier );
+		header.print_fmt("#pragma endregion Types\n\n");
+
+		header.print_fmt("#pragma region AST\n");
+		header.print( rf_ast );
+		header.print( rf_code_types );
+		header.print( rf_ast_types );
+		header.print_fmt("\n#pragma endregion AST\n");
+
+		header.print( rf_interface );
+		header.print(fmt_newline);
+
+		header.print_fmt("#pragma region Inlines\n");
+		header.print( rf_inlines );
+		header.print_fmt("#pragma endregion Inlines\n");
+
+		header.print(fmt_newline);
+		header.print( rf_array_string_cached );
+
+		header.print( rf_header_end );
+		header.print( rf_header_builder );
+		header.print( rf_header_scanner );
+
+		header.print_fmt( "\nGEN_API_C_END\n" );
+		header.print_fmt( "GEN_NS_END\n\n" );
+		builder_print( header, pop_ignores );
+		builder_write(header);
+	}
+	// gen.c
+	{
+		Builder src = Builder::open( "gen/gen.c" );
+		builder_print_fmt( src, generation_notice );
+		builder_print( src, push_ignores );
+		builder_print( src, src_start );
+		src.print_fmt( "\nGEN_NS_BEGIN\n");
+
+		src.print( fmt_newline);
+		src.print( rf_array_arena );
+		src.print( fmt_newline);
+		src.print( rf_array_pool);
+
+		src.print( r_src_static_data );
+		src.print( fmt_newline);
+
+		src.print_fmt( "#pragma region AST\n\n" );
+		src.print( r_src_ast_case_macros );
+		src.print( r_src_ast );
+		src.print( r_src_code_serialization );
+		src.print_fmt( "#pragma endregion AST\n\n" );
+
+		src.print_fmt( "#pragma region Interface\n" );
+		src.print( r_src_interface );
+		src.print( r_src_upfront );
+		src.print_fmt( "\n#pragma region Parsing\n\n" );
+		src.print( rf_etoktype );
+		src.print( r_src_lexer );
+		src.print( fmt_newline);
+		src.print( rf_array_code_typename );
+		src.print( fmt_newline);
+		src.print( rf_src_parser );
+		src.print( r_src_parsing );
+		src.print_fmt( "\n#pragma endregion Parsing\n" );
+		src.print( r_src_untyped );
+		src.print_fmt( "\n#pragma endregion Interface\n\n");
+
+		src.print( rf_src_builder );
+		src.print( rf_src_scanner );
+
+		src.print_fmt( "GEN_API_C_END\n" );
+		src.write();
+	}
+#pragma endregion Segmented
 
 	gen::deinit();
 	return 0;
-#undef project_dir
 }

gen_c_library/c_library.refactor

@@ -0,0 +1,543 @@
+ __VERSION 1
+
+// not       : Ignore
+// include   : #includes
+// word      : Alphanumeric or underscore
+// namespace : Prefix search and replace (c-namspaces).
+// regex     : Unavailable in __VERSION 1.
+
+// Precedence (highest to lowest):
+// word, namespace, regex
+
+// Gen Macro namespace
+// namespace GEN_, new_namespace_
+
+// c_library.refactor
+// Used to prefix all exposed identifiers with the gen_namespace by c_library.cpp using ./gencpp/scripts/helpers/refactor.exe
+
+// Macros
+
+word global,                       gen_global
+word internal,                     gen_internal
+word local_persist,                gen_local_persist
+word bit,                          gen_bit
+word bitfield_is_equal,            gen_bitfield_is_equal
+word cast,                         gen_cast
+word ccast,                        gen_ccast
+word pcast,                        gen_pcast
+word rcast,                        gen_rcast
+word scast,                        gen_scast
+word stringize_va,                 gen_stringize_va
+word stringize,                    gen_stringize
+word do_once,                      gen_do_once
+word do_once_start,                gen_do_once_start
+word do_once_end,                  gen_do_once_end
+word labeled_scope_start,          gen_labeled_scope_start
+word labeled_scope_end,            gen_labeled_scope_end
+word compiler_decorated_func_name, gen_compiler_decorated_func_name
+word num_args_impl,                gen_num_args_impl
+word num_args,                     gen_num_args
+word clamp,                        gen_clamp
+word count_of,                     gen_count_of
+word is_between,                   gen_is_between
+word size_of,                      gen_size_of
+word max,                          gen_max
+word min,                          gen_min
+word offset_of,                    gen_offset_of
+word forceinline,                  gen_forceinline
+word neverinline,                  gen_neverinline
+word static_assert,                gen_static_assert
+word thread_local,                 gen_thread_local
+word typeof,                       gen_typeof
+word enum_underlying,              gen_enum_underlying
+word nullptr,                      gen_nullptr
+word struct_init,                  gen_struct_init
+word hash,                         gen_hash
+
+// Basic Types
+
+word u8,               gen_u8
+word s8,               gen_s8
+word u16,              gen_u16
+word s16,              gen_s16
+word u32,              gen_u32
+word s32,              gen_s32
+word u64,              gen_u64
+word s64,              gen_s64
+word usize,            gen_usize
+word ssize,            gen_ssize
+word sptr,             gen_sptr
+word uptr,             gen_uptr
+word f32,              gen_f32
+word f64,              gen_f64
+word b8,               gen_b8
+word b16,              gen_b16
+word b32,              gen_b32
+word mem_ptr,          gen_mem_ptr
+word mem_ptr_const,    gen_mem_ptr_const
+word to_uptr,          gen_to_uptr
+word to_sptr,          gen_to_sptr
+word to_mem_ptr,       gen_to_mem_ptr
+word to_mem_ptr_const, gen_to_mem_ptr_const
+
+// Debug
+
+word assert_handler, gen_assert_handler
+word assert_crash,   gen_assert_crash
+word process_exit,   gen_process_exit
+
+// Memory
+
+word kilobytes, gen_kilobytes
+word megabytes, gen_megabytes
+word gigabytes, gen_gigabytes
+word terabytes, gen_terabytes
+
+word swap, gen_swap
+
+word is_power_of_two,        gen_is_power_of_two
+word align_forward,          gen_align_forward
+word align_forward_by_value, gen_align_forward_by_value
+word pointer_add,            gen_pointer_add
+word pointer_add_const,      gen_pointer_add_const
+word pointer_diff,           gen_pointer_diff
+word mem_copy,               gen_mem_copy
+word mem_find,               gen_mem_find
+word mem_move,               gen_mem_move
+word mem_set,                gen_mem_set
+word zero_size,              gen_zero_size
+word zero_item,              gen_zero_item
+word zero_array,             gen_zero_array
+
+word AllocType,     gen_AllocType
+word AllocatorProc, gen_AllocatorProc
+word AllocatorInfo, gen_AllocatorInfo
+word AllocFlag,     gen_AllocFlag
+
+word alloc,          gen_alloc
+word alloc_align,    gen_alloc_align
+word allocator_free, gen_allocator_free
+word free_all,       gen_free_all
+word resize,         gen_resize
+word resize_align,   gen_resize_align
+word alloc_item,     gen_alloc_item
+word alloc_array,    gen_alloc_array
+
+word heap_stats_init,        gen_heap_stats_init
+word heap_stats_used_memory, gen_heap_stats_used_memory
+word heap_stats_alloc_count, gen_heap_stats_alloc_count
+word heap_stats_check,       gen_heap_stats_check
+word default_resize_align,   gen_default_resize_align
+
+word heap_allocator_proc, gen_heap_allocator_proc
+word heap,                gen_heap
+word malloc,              gen_malloc
+word mfree,               gen_mfree
+
+word VirtualMemory,            gen_VirtualMemory
+word vm_from_memory,           gen_vm_from_memory
+word vm_alloc,                 gen_vm_alloc
+word vm_free,                  gen_vm_free
+word vm_trim,                  gen_vm_trim
+word vm_purge,                 gen_vm_purge
+word virtual_memory_page_size, gen_virtual_memory_page_size
+
+// Memory: Arena
+
+word Arena, gen_Arena
+namespace arena_, gen_arena_
+
+// word arena_allocator_info
+// word arena_init_from_memory
+// word arena_init_from_allocator
+// word arena_init_sub
+// word arena_alignment_of
+// word arena_check
+// word arena_size_remaining
+
+// Memory: FixedArena
+
+namespace FixedArena_,  gen_FixedArena_
+namespace fixed_arena_, gen_fixed_arena_
+
+// Memory: Pool
+
+word Pool, gen_Pool
+namespace pool_, gen_pool_
+
+// Printing
+
+namespace str_, gen_str_
+
+word PrintF_Buffer,     gen_PrintF_Buffer
+word Msg_Invalid_Value, gen_Msg_Invalid_Value
+word log_fmt,           gen_log_fmt
+
+// String Ops
+
+namespace char_, gen_char_
+
+word digit_to_int,      gen_digit_to_int
+word hex_digit_to_init, gen_hex_digit_to_init
+word i64_to_str,        gen_i64_to_str
+word u64_to_str,        gen_u64_to_str
+
+// Containers
+
+namespace GENERIC_SLOT_, GEN_GENERIC_SLOT_
+
+word Array, gen_Array
+word Array_ssize, gen_Array_gen_ssize
+
+word ArrayHeader, gen_ArrayHeader
+
+namespace Array_, gen_Array_
+namespace array_, gen_array_
+
+word HashTable, gen_HashTable
+
+namespace HashTable_, gen_HashTable_
+namespace hashtable_, gen_hashtable_
+
+namespace HT_,      gen_HT_
+namespace HTE_,     gen_HTE_
+namespace arr_hte_, gen_arr_hte_
+namespace Arr_HTE_, gen_Arr_HTE_
+
+// Hashing
+
+word crc32, gen_crc32
+word crc64, gen_crc64
+
+// Strings
+
+word StrC, gen_StrC
+
+word to_strc_from_c_str, gen_to_strc_from_c_str
+
+namespace strc_, gen_strc_
+
+word cast_to_strc, gen_cast_to_strc
+
+word StringHeader, gen_StringHeader
+word String,       gen_String
+
+namespace string_, gen_string_
+
+word StringCached, gen_StringCached
+
+word StringTable, gen_StringTable
+
+namespace StringTable_, gen_StringTable_
+
+// File Handling
+
+word FileModeFlag,   gen_FileModeFlag
+word SeekWhenceType, gen_SeekWhenceType
+word FileError,      gen_FileError
+word FileDescriptor, gen_FileDescriptor
+word FileMode,       gen_FileMode
+word FileOperations, gen_FileOperations
+word FileOperations, gen_FileOperations
+
+default_file_operations
+
+word FileTime, word FileTime
+
+word DirType,          gen_DirType
+word DirInfo,          gen_DirInfo
+word DirEntry,         gen_DirEntry
+word DirInfo,          gen_DirInfo
+word FileInfo,         gen_FileInfo
+word FileStandardType, gen_FileStandardType
+
+namespace file_, gen_file_
+
+word gen_FileContents, gen_FileContents
+
+// Timing
+
+word read_cpu_time_stamp_counter, gen_read_cpu_time_stamp_counter
+word time_rel,                    gen_time_rel
+word time_rel_ms,                 gen_time_rel_ms
+
+// Parsing
+
+// Parsing: ADT
+
+word ADT_Node,        gen_ADT_Node
+word ADT_Type,        gen_ADT_Type
+word ADT_Props,       gen_ADT_Props
+word ADT_NamingStyle, gen_ADT_NamingStyle
+word ADT_AssignStyle, gen_ADT_AssignStyle
+word ADT_DelimStyle,  gen_ADT_DelimStyle
+word ADT_Error,       gen_ADT_Error
+word ADT_Node,        gen_ADT_Node
+
+namespace adt_, gen_adt_
+
+word CSV_Error,  gen_CSV_Error
+word CSV_Object, gen_CSV_Object
+
+namespace csv_, gen_csv_
+
+// Types.hpp
+
+word log_failure, gen_log_failure
+
+word AccessSpec,         gen_AccessSpec
+word access_spec_to_str, gen_access_spec_to_str
+
+word CodeFlag, gen_CodeFlag
+word EnumDecl, gen_EnumDecl
+
+word ModuleFlag,         gen_ModuleFlag
+word module_flag_to_str, gen_module_flag_to_str
+
+word EPreprocessCond, gen_EPreprocessCOnd
+word ETypenameTag,    gen_ETypenameTag
+
+word CodeType, gen_CodeType
+
+word codetype_to_str,         gen_codetype_to_str
+word codetype_to_keyword_str, gen_codetype_to_keyword_str
+
+word Operator,        gen_Operator
+word operator_to_str, gen_operator_to_str
+
+word Specifier,        gen_Specifier
+word spec_to_str,      gen_spec_to_str
+word spec_is_trailing, gen_spec_is_trailing
+// word strc_to_specifier, gen_strc_to_specifier
+
+// AST
+
+word AST, gen_AST
+
+namespace AST_, gen_AST_
+
+word Code,  gen_Code
+word Token, gen_Token
+
+word CodeBody,           gen_CodeBody
+word CodeAttributes,     gen_CodeAttributes
+word CodeComment,        gen_CodeComment
+word CodeClass,          gen_CodeClass
+word CodeConstructor,    gen_CodeConstructor
+word CodeDefine,         gen_CodeDefine
+word CodeDestructor,     gen_CodeDestructor
+word CodeEnum,           gen_CodeEnum
+word CodeExec,           gen_CodeExec
+word CodeExtern,         gen_CodeExtern
+word CodeInclude,        gen_CodeInclude
+word CodeFriend,         gen_CodeFriend
+word CodeFn,             gen_CodeFn
+word CodeModule,         gen_CodeModule
+word CodeNS,             gen_CodeNS
+word CodeOperator,       gen_CodeOperator
+word CodeOpCast,         gen_CodeOpCast
+word CodePragma,         gen_CodePragma
+word CodeParams,         gen_CodeParams
+word CodePreprocessCond, gen_CodePreprocessCond
+word CodeSpecifiers,     gen_CodeSpecifiers
+word CodeTemplate,       gen_CodeTemplate
+word CodeTypename,       gen_CodeTypename
+word CodeTypedef,        gen_CodeTypedef
+word CodeUnion,          gen_CodeUnion
+word CodeUsing,          gen_CodeUsing
+word CodeVar,            gen_CodeVar
+
+// Code Interface
+
+namespace code_, gen_code_
+
+word Code_Global,  gen_Code_Global
+word Code_Invalid, gen_Code_Invalid
+
+word Code_POD, gen_Code_POD
+
+word AST_POD_Size,     gen_AST_POD_Size
+word AST_ArrSpecs_Cap, gen_AST_ArrSpecs_Cap
+
+word InvalidCode, gen_InvalidCode
+word NullCode,    gen_NullCode
+
+namespace begin_, gen_begin_
+namespace end_,   gen_end_
+namespace next_,  gen_next_
+
+namespace body_,       gen_body_
+namespace class_,      gen_class_
+namespace params_,     gen_params_
+namespace specifiers_, gen_specifiers_
+namespace struct_,     gen_struct_
+namespace attributes_, gen_attributes_
+namespace comment_,    gen_comment_
+namespace constructor, gen_constructor_
+namespace define_,     gen_define_
+namespace destructor,  gen_destructor_
+namespace enum_,       gen_enum_
+namespace exec_,       gen_exec_
+namespace extern_,     gen_extern_
+namespace include_,    gen_include_
+namespace friend_,     gen_friend_
+namespace fn_,         gen_fn_
+namespace module_,     gen_module_
+namespace code_op,     gen_code_op_
+namespace opcast_,     gen_opcast_
+namespace pragma_,     gen_pragma_
+namespace preprocess_, gen_preprocess_
+namespace template_,   gen_template_
+namespace typename_,   gen_typename_
+namespace typedef_,    gen_typedef_
+namesapce union_,      gen_union_
+namespace using_,      gen_using_
+namespace var_,        gen_var_
+
+// Gen Interface
+
+word init,   gen_init
+word deinit, gen_deinit
+word reset,  gen_reset
+
+word get_cached_string, gen_get_cached_string
+
+word make_code, gen_make_code
+
+namespace set_allocator_, gen_set_allocator_
+
+namespace def_,     gen_def_
+namespace parse_,   gen_parse_
+namespace token_,   gen_token_
+namespace untyped_, gen_untyped_
+
+// Constants
+
+word TokenMap_FixedArena, gen_TokenMap_FixedArena
+word InitSize_DataArrays, gen_InitSize_DataArrays
+
+word Global_BucketSize,   gen_Global_BucketSize
+word CodePool_NumBlocks,  gen_CodePool_NumBlocks
+word SizePer_StringArena, gen_SizePer_StringArena
+
+word MaxCommentLineLength, gen_MaxCommentLineLength
+word MaxNameLength,        gen_MaxNameLength
+word MaxUntypedStrLength,  gen_MaxUntypedStrLength
+
+word LexAllocator_Size,        gen_LexAllocator_Size
+word Builder_StrBufferReserve, gen_Builder_StrBufferReserve
+
+word access_public,    gen_access_public
+word access_protected, gen_access_protected
+word access_private,   gen_access_private
+
+word attrib_api_export, gen_attrib_api_export
+word attrib_api_import, gen_attrib_api_import
+
+word module_global_fragment,  gen_module_global_fragment
+word module_private_fragment, gen_module_private_fragment
+
+word fmt_newline,     gen_fmt_newline
+word pragma_once,     gen_pragma_once
+word param_varadic,   gen_param_varadic
+word preprocess_else, gen_preprocess_else
+
+namespace spec_, gen_spec_
+namespace t_,    gen_t_
+
+word PreprocessorDefines, gen_PreprocessorDefines
+
+// Backend
+
+word GlobalAllocator,         gen_GlobalAllocator
+word Global_AllocatorBuckets, gen_Global_AllocatorBuckets
+word CodePools,               gen_CodePools
+word StringArenas,            gen_StringArenas
+word StringCache,             gen_StringCache
+word LexArena,                gen_LexArena
+word Allocator_DataArrays,    gen_Allocator_DataArrays
+word Allocator_CodePool,      gen_Allocator_CodePool
+word Allocator_Lexer,         gen_Allocator_Lexer
+word Allocator_StringArena,   gen_Allocator_StringArena
+word Allocator_StringTable,   gen_Allocator_StringTable
+word Allocator_TypeTable,     gen_Allocator_TypeTable
+
+// Builder
+
+word      Builder,  gen_Builder
+namespace builder_, gen_builder_
+
+// Implementation (prviate)
+
+word _format_info, gen__format_info
+
+namespace _print_,          gen__print_
+word      _heap_stats,      gen__heap_stats
+word      _heap_alloc_info, gen__heap_alloc_info
+
+word _crc32_table, gen__crc32_table
+word _crc64_table, gen__crc64_table
+
+word _alloc_utf8_to_ucs2, gen__alloc_utf8_to_ucs2
+
+word _win32_file_seek,  gen__win32_file_seek
+word _win32_file_read,  gen__win32_file_read
+word _win32_file_write, gen__win32_file_write
+word _win32_file_close, gen__win32_file_close
+word _win32_file_open,  gen__win32_file_open
+
+word _posix_file_seek,  gen__posix_file_seek
+word _posix_file_read,  gen__posix_file_read
+word _posix_file_write, gen__posix_file_write
+word _posix_file_close, gen__posix_file_close
+word _posix_file_open,  gen__posix_file_open
+
+word _dirinfo_free_entry, gen__dirinfo_free_entry
+word _std_file_set,       gen__std_file_set
+
+word _memory_fd, gen__memory_fd
+
+word _file_stream_fd_make, gen__file_stream_fd_make
+word _file_stream_from_fd, gen__file_stream_from_fd
+word _memory_file_seek,    gen__memory_file_seek
+word _memory_file_read,    gen__memory_file_read
+word _memory_file_write,   gen__memory_file_write
+word _memory_file_close,   gen__memory_file_close
+
+word _unix_gettime, gen__unix_gettime
+word _adt_fprintf,  gen__adt_fprintf
+
+word _adt_get_value, gen__adt_get_value
+word _adt_get_field, gen__adt_get_field
+
+word _csv_write_record, gen__csv_write_record
+word _csv_write_header, gen__csv_write_header
+
+word Global_Allocator_Proc, gen_Global_Allocator_Proc
+word define_constants,      gen_define_constants
+word operator__validate,    gen_operator__validate
+
+word parser_init,   gen_parser_init
+word parser_deinit, gen_parser_deinit
+
+word TokType,         gen_TokType
+word toktype_to_str,  gen_toktype_to_str
+// word strc_to_toktype, gen_strc_to_toktype
+word NullToken,       gen_NullToken
+
+namespace tok_, gen_tok_
+
+word TokArray, gen_TokArray
+
+namespace lex_,   gen_lex_
+namespace Lexer_, gen_Lexer_
+
+word LexContext, gen_LexContext
+word lex,        gen_lex
+
+word StackNode,    gen_StackNode
+word ParseContext, gen_ParseContext
+
+// namespace parse_, gen_parse_
+
+namespace parser_, gen_parser_

gen_c_library/components/containers.array.hpp

@@ -1,6 +1,5 @@
 #pragma once
-
-#include "../project/gen.hpp"
+#include "gen.hpp"
 
 using namespace gen;
 
@@ -21,7 +20,7 @@ CodeBody gen_array_base()
 
 	Code grow_formula = untyped_str( txt( "#define array_grow_formula( value ) ( 2 * value + 8 )\n" ));
 	Code get_header   = untyped_str( txt( "#define array_get_header( self ) ( (ArrayHeader*)( self ) - 1)\n" ));
-	Code type_define  = untyped_str( txt( "#define Array(Type) Array_##Type\n"));
+	Code type_define  = untyped_str( txt( "#define Array(Type) gen_Array_##Type\n"));
 
 	Code array_begin = def_define(txt("array_begin(array)"),       code( (array) ));
 	Code array_end   = def_define(txt("array_end(array)"),         code( (array + array_get_header(array)->Num ) ));

gen_c_library/components/containers.hashtable.hpp

@@ -1,6 +1,5 @@
 #pragma once
-
-#include "../project/gen.hpp"
+#include "gen.hpp"
 #include "containers.array.hpp"
 
 using namespace gen;

gen_c_library/components/generic_macros.hpp

@@ -0,0 +1,115 @@
+
+#pragma region _Generic Macros
+//   ____                       _        ______                _   _                ____                  _                 __ _
+//  / ___}                     (_)      |  ____}              | | (_)              / __ \                | |               | |(_)
+// | | ___  ___ _ __   ___ _ __ _  ___  | |__ _   _ _ __   ___| |_ _  ___  _ __   | |  | |_   _____ _ __ | | ___   __ _  __| | _ _ __   __ _
+// | |{__ |/ _ \ '_ \ / _ \ '__} |/ __| |  __} | | | '_ \ / __} __} |/ _ \| '_ \  | |  | \ \ / / _ \ '_ \| |/ _ \ / _` |/ _` || | '_ \ / _` |
+// | |__j |  __/ | | |  __/ |  | | (__  | |  | |_| | | | | (__| l_| | (_) | | | | | l__| |\ V /  __/ | | | | (_) | (_| | (_| || | | | | (_| |
+//  \____/ \___}_l l_l\___}_l  l_l\___| l_l   \__,_l_l l_l\___}\__}_l\___/l_l l_l  \____/  \_/ \___}_l l_l_l\___/ \__,_l\__,_l|_|_| |_|\__, |
+// This implemnents macros for utilizing "The Naive Extendible _Generic Macro" explained in:                                            __| |
+// https://github.com/JacksonAllan/CC/blob/main/articles/Better_C_Generics_Part_1_The_Extendible_Generic.md                            {___/
+// Since gencpp is used to generate the c-library, it was choosen over the more novel implementations to keep the macros as easy to understand and unobfuscated as possible.
+
+#define GEN_COMMA_OPERATOR , // The comma operator is used by preprocessor macros to delimit arguments, so we have to represent it via a macro to prevent parsing incorrectly.
+
+// Helper macros for argument selection
+#define GEN_SELECT_ARG_1( _1, ... ) _1 // <-- Of all th args passed pick _1.
+#define GEN_SELECT_ARG_2( _1, _2, ... ) _2 // <-- Of all the args passed pick _2.
+#define GEN_SELECT_ARG_3( _1, _2, _3, ... ) _3 // etc..
+
+#define GEN_GENERIC_SEL_ENTRY_TYPE             GEN_SELECT_ARG_1 // Use the arg expansion macro to select arg 1 which should have the type.
+#define GEN_GENERIC_SEL_ENTRY_FUNCTION         GEN_SELECT_ARG_2 // Use the arg expansion macro to select arg 2 which should have the function.
+#define GEN_GENERIC_SEL_ENTRY_COMMA_DELIMITER  GEN_SELECT_ARG_3 // Use the arg expansion macro to select arg 3 which should have the comma delimiter ','.
+
+#define GEN_RESOLVED_FUNCTION_CALL // Just used to indicate where the call "occurs"
+
+// ----------------------------------------------------------------------------------------------------------------------------------
+// GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( macro ) includes a _Generic slot only if the specified macro is defined (as type, function_name).
+// It takes advantage of the fact that if the macro is defined, then the expanded text will contain a comma.
+// Expands to ',' if it can find (type): (function) <comma_operator: ',' >
+// Where GEN_GENERIC_SEL_ENTRY_COMMA_DELIMITER is specifically looking for that <comma> ,
+#define GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( slot_exp ) GEN_GENERIC_SEL_ENTRY_COMMA_DELIMITER( slot_exp, GEN_GENERIC_SEL_ENTRY_TYPE( slot_exp, ): GEN_GENERIC_SEL_ENTRY_FUNCTION( slot_exp, ) GEN_COMMA_OPERATOR, , )
+//                                                          ^ Selects the comma                              ^ is the type                             ^ is the function                             ^ Insert a comma
+// The slot won't exist if that comma is not found.                                                                                                                                                  |
+
+// For the occastion where an expression didn't resolve to a selection option the "default: <value>" will be set to:
+typedef struct GENCPP_NO_RESOLVED_GENERIC_SELECTION GENCPP_NO_RESOLVED_GENERIC_SELECTION;
+struct GENCPP_NO_RESOLVED_GENERIC_SELECTION {
+	void* _THE_VOID_SLOT_;
+};
+GENCPP_NO_RESOLVED_GENERIC_SELECTION const gen_generic_selection_fail = {0};
+// Which will provide the message:  error: called object type 'struct NO_RESOLVED_GENERIC_SELECTION' is not a function or function pointer
+// ----------------------------------------------------------------------------------------------------------------------------------
+
+// Below are generated on demand for an overlaod depdendent on a type:
+// ----------------------------------------------------------------------------------------------------------------------------------
+#define GEN_FUNCTION_GENERIC_EXAMPLE( selector_arg ) _Generic(       \
+(selector_arg), /* Select Via Expression*/                           \
+  /* Extendibility slots: */                                         \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 ) \
+	default: gen_generic_selection_fail                              \
+) GEN_RESOLVED_FUNCTION_CALL( selector_arg )
+// ----------------------------------------------------------------------------------------------------------------------------------
+
+// Then each definiton of a function has an associated define:
+#// #define GENERIC_SLOT_<#>_<generic identifier> <typename>, <function_to_resolve>
+
+// Then somehwere later on
+// <etc> <return_type> <function_id> ( <arguments> ) { <implementation> }
+
+// Concrete example:
+
+// To add support for long:
+#define GENERIC_SLOT_1_gen_example_hash long, gen_example_hash__P_long
+size_t gen_example_hash__P_long( long val ) { return val * 2654435761ull; }
+
+// To add support for long long:
+#define GENERIC_SLOT_2_gen_example_hash  long long, gen_example_hash__P_long_long
+size_t gen_example_hash__P_long_long( long long val ) { return val * 2654435761ull; }
+
+// If using an Editor with support for syntax hightlighting macros: HASH__ARGS_SIG_1 and HASH_ARGS_SIG_2 should show color highlighting indicating the slot is enabled,
+// or, "defined" for usage during the compilation pass that handles the _Generic instrinsic.
+#define gen_hash_example( function_arguments ) _Generic(       \
+(function_arguments), /* Select Via Expression*/               \
+  /* Extendibility slots: */                                   \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_1 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_2 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_3 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_4 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_5 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_6 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_7 ) \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_8 ) \
+	default: gen_generic_selection_fail                        \
+) GEN_RESOLVED_FUNCTION_CALL( function_arguments )
+
+// Additional Variations:
+
+// If the function takes more than one argument the following is used:
+#define GEN_FUNCTION_GENERIC_EXAMPLE_VARADIC( selector_arg, ... ) _Generic( \
+(selector_arg),                                                             \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 )        \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_2 )        \
+	/* ... */                                                               \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT(FunctionID__ARGS_SIG_N )         \
+	default: gen_generic_selection_fail                                     \
+) GEN_RESOLVED_FUNCTION_CALL( selector_arg, __VA_ARG__ )
+
+// If the function does not take the arugment as a parameter:
+#define GEN_FUNCTION_GENERIC_EXAMPLE_DIRECT_TYPE( selector_arg ) _Generic( \
+( GEN_TYPE_TO_EXP(selector_arg) ),                                         \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 )       \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_2 )       \
+	/* ... */                                                              \
+	GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT(FunctionID__ARGS_SIG_N )        \
+	default: gen_generic_selection_fail                                    \
+) GEN_RESOLVED_FUNCTION_CALL()
+
+// Used to keep the _Generic keyword happy as bare types are not considered "expressions"
+#define GEN_TYPE_TO_EXP(type) (* (type*)NULL)
+// Instead of using this macro, you'll see it directly expanded by the code generation.
+
+// typedef void* GEN_GenericExampleType;
+// GEN_FUNCTION_GENERIC_EXAMPLE_DIRECT_TYPE( GEN_GenericExampleType );
+#pragma endregion _Generic Macros

gen_c_library/components/header_seg_includes.h

@@ -0,0 +1,9 @@
+#if ! defined(GEN_DONT_ENFORCE_GEN_TIME_GUARD) && ! defined(GEN_TIME)
+#	error Gen.h : GEN_TIME not defined
+#endif
+
+//! If its desired to roll your own dependencies, define GEN_ROLL_OWN_DEPENDENCIES before including this file.
+// Dependencies are derived from the c-zpl library: https://github.com/zpl-c/zpl
+#ifndef GEN_ROLL_OWN_DEPENDENCIES
+#	include "gen.dep.h"
+#endif

gen_c_library/components/memory.fixed_arena.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "../project/gen.hpp"
+#include "gen.hpp"
 
 using namespace gen;
 
@@ -29,6 +29,11 @@ CodeBody gen_fixed_arenas()
 		{
 			return arena_size_remaining( & fixed_arena->arena, alignment);
 		}
+
+		inline
+		void fixed_arena_free_<Name>(FixedArena_<Name>* fixed_arena) {
+			arena_free( & fixed_arena->arena);
+		}
 	);
 
 	CodeBody arena_struct_1kb   = parse_global_body( token_fmt_impl( 3, "Name", txt("1KB"),   "Size", txt("kilobytes(1)"),   template_struct ));
@@ -84,7 +89,7 @@ CodeBody gen_fixed_arenas()
 	result.append(arena_interface_2mb);
 	result.append(arena_interface_4mb);
 
-	CodeDefine def = def_define(txt("fixed_arena_allocator_info(fixed_arena)"), code({ arena_allocator_proc, & fixed_arena.arena }) );
+	CodeDefine def = def_define(txt("fixed_arena_allocator_info(fixed_arena)"), txt("( (AllocatorInfo) { arena_allocator_proc, & (fixed_arena)->arena } )"));
 	result.append(def);
 	result.append(fmt_newline);
 
@@ -103,7 +108,23 @@ CodeBody gen_fixed_arenas()
     FixedArena_2MB*   : fixed_arena_init_2MB,      \
     FixedArena_4MB*   : fixed_arena_init_4MB,      \
 	default           : gen_generic_selection_fail \
-) GEN_RESOLVED_FUNCTION_CALL(& expr)
+) GEN_RESOLVED_FUNCTION_CALL(expr)
+
+#define fixed_arena_free(expr) _Generic((expr),    \
+    FixedArena_1KB*   : fixed_arena_free_1KB,      \
+    FixedArena_4KB*   : fixed_arena_free_4KB,      \
+    FixedArena_8KB*   : fixed_arena_free_8KB,      \
+    FixedArena_16KB*  : fixed_arena_free_16KB,     \
+    FixedArena_32KB*  : fixed_arena_free_32KB,     \
+    FixedArena_64KB*  : fixed_arena_free_64KB,     \
+    FixedArena_128KB* : fixed_arena_free_128KB,    \
+    FixedArena_256KB* : fixed_arena_free_256KB,    \
+    FixedArena_512KB* : fixed_arena_free_512KB,    \
+    FixedArena_1MB*   : fixed_arena_free_1MB,      \
+    FixedArena_2MB*   : fixed_arena_free_2MB,      \
+    FixedArena_4MB*   : fixed_arena_free_4MB,      \
+	default           : gen_generic_selection_fail \
+)	GEN_RESOLVED_FUNCTION_CALL(expr)
 
 #define fixed_arena_size_remaining(expr, alignment) _Generic((expr), \
     FixedArena_1KB*   : fixed_arena_size_remaining_1KB,              \
@@ -119,7 +140,7 @@ CodeBody gen_fixed_arenas()
     FixedArena_2MB*   : fixed_arena_size_remaining_2MB,              \
     FixedArena_4MB*   : fixed_arena_size_remaining_4MB,              \
 	default           : gen_generic_selection_fail                   \
-)	GEN_RESOLVED_FUNCTION_CALL(& expr, alignment)
+)	GEN_RESOLVED_FUNCTION_CALL(expr, alignment)
 )"
 	)));
 

gen_c_library/components/misc.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "../project/gen.hpp"
+#include "gen.hpp"
 
 using namespace gen;
 
@@ -174,7 +174,7 @@ CodeFn rename_function_to_unique_symbol(CodeFn fn, StrC optional_prefix = txt(""
 
     // Add parameter types to create a unique signature
     bool first_param = true;
-    for (CodeParam param = fn->Params; param.ast; param = param->Next)
+    for (CodeParams param = fn->Params; param.ast; param = param->Next)
     {
         if (param->ValueType)
         {

gen_c_library/components/src_start.c

@@ -0,0 +1,11 @@
+#if ! defined(GEN_DONT_ENFORCE_GEN_TIME_GUARD) && ! defined(GEN_TIME)
+#	error Gen.hpp : GEN_TIME not defined
+#endif
+
+#include "gen.h"
+
+//! If its desired to roll your own dependencies, define GEN_ROLL_OWN_DEPENDENCIES before including this file.
+//! Dependencies are derived from the c-zpl library: https://github.com/zpl-c/zpl
+#ifndef GEN_ROLL_OWN_DEPENDENCIES
+#	include "gen.dep.c"
+#endif

gen_c_library/gen.c

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

gen_segmented/Readme.md

@@ -0,0 +1,21 @@
+## Navigation
+
+# base
+
+[Top](../Readme.md)
+
+* [docs](../docs/Readme.md)
+
+# Segemented Library Generation
+
+The principal (user) files are `gen.hpp` and `gen.cpp`.
+They contain includes for its various components: `components/<component_name>.<hpp/cpp>`
+
+Dependencies are bundled into `gen.dep.<hpp/cpp>`. They are included in `gen.<hpp/cpp>` before component includes.
+Just like the `gen.<hpp/cpp>` they include their components: `dependencies/<dependency_name>.<hpp/cpp>`
+
+If using the library's provided build scripts:
+
+```ps1
+.\build.ps1 <compiler> <debug or omit> segmented
+```

gen_segmented/segmented.cpp

@@ -0,0 +1,287 @@
+// Includes are exposed to base directory
+
+#define GEN_DEFINE_LIBRARY_CODE_CONSTANTS
+#define GEN_ENFORCE_STRONG_CODE_TYPES
+#define GEN_EXPOSE_BACKEND
+#define GEN_C_LIKE_CPP 1
+#include "gen.cpp"
+#include "helpers/push_ignores.inline.hpp"
+
+#include <stdlib.h>
+
+GEN_NS_BEGIN
+#include "helpers/base_codegen.hpp"
+#include "helpers/misc.hpp"
+GEN_NS_END
+
+using namespace gen;
+
+constexpr char const* generation_notice =
+"// This file was generated automatially by gencpp's bootstrap.cpp "
+"(See: https://github.com/Ed94/gencpp)\n\n";
+
+#include <cstdlib>   // for system()
+
+#define path_format_style "../scripts/.clang-format "
+#define scratch_file      "gen/scratch.hpp"
+#define path_base         "../base/"
+
+Code format( Code code ) {
+	return code_refactor_and_format(code, scratch_file, nullptr, path_format_style );
+}
+
+int gen_main()
+{
+	gen::init();
+
+	Code push_ignores = scan_file( (path_base "helpers/push_ignores.inline.hpp") );
+	Code pop_ignores  = scan_file( (path_base "helpers/pop_ignores.inline.hpp") );
+
+	// gen_dep.hpp
+	{
+		Code platform     = scan_file( path_base "dependencies/platform.hpp" );
+		Code macros 	  = scan_file( path_base "dependencies/macros.hpp" );
+		Code basic_types  = scan_file( path_base "dependencies/basic_types.hpp" );
+		Code debug        = scan_file( path_base "dependencies/debug.hpp" );
+		Code memory	      = scan_file( path_base "dependencies/memory.hpp" );
+		Code string_ops   = scan_file( path_base "dependencies/string_ops.hpp" );
+		Code printing     = scan_file( path_base "dependencies/printing.hpp" );
+		Code containers   = scan_file( path_base "dependencies/containers.hpp" );
+		Code hashing 	  = scan_file( path_base "dependencies/hashing.hpp" );
+		Code strings      = scan_file( path_base "dependencies/strings.hpp" );
+		Code filesystem   = scan_file( path_base "dependencies/filesystem.hpp" );
+		Code timing       = scan_file( path_base "dependencies/timing.hpp" );
+		Code parsing      = scan_file( path_base "dependencies/parsing.hpp" );
+
+		Builder _header = builder_open( "gen/gen.dep.hpp");
+		Builder* header = & _header;
+		builder_print_fmt( header, generation_notice );
+		builder_print_fmt( header, "// This file is intended to be included within gen.hpp (There is no pragma diagnostic ignores)\n" );
+		builder_print( header, platform );
+		builder_print_fmt( header, "\nGEN_NS_BEGIN\n" );
+
+		builder_print( header, macros );
+		builder_print( header, basic_types );
+		builder_print( header, debug );
+		builder_print( header, memory );
+		builder_print( header, string_ops );
+		builder_print( header, printing );
+		builder_print( header, containers );
+		builder_print( header, hashing );
+		builder_print( header, strings );
+		builder_print( header, filesystem );
+		builder_print( header, timing );
+		builder_print( header, parsing );
+
+		builder_print_fmt( header, "\nGEN_NS_END\n" );
+		builder_write(header);
+	}
+
+	// gen_dep.cpp
+	{
+		Code src_start  = scan_file( path_base "dependencies/src_start.cpp" );
+		Code debug      = scan_file( path_base "dependencies/debug.cpp" );
+		Code string_ops = scan_file( path_base "dependencies/string_ops.cpp" );
+		Code printing   = scan_file( path_base "dependencies/printing.cpp" );
+		Code memory     = scan_file( path_base "dependencies/memory.cpp" );
+		Code hashing    = scan_file( path_base "dependencies/hashing.cpp" );
+		Code strings    = scan_file( path_base "dependencies/strings.cpp" );
+		Code filesystem = scan_file( path_base "dependencies/filesystem.cpp" );
+		Code timing     = scan_file( path_base "dependencies/timing.cpp" );
+		Code parsing    = scan_file( path_base "dependencies/parsing.cpp" );
+
+		Builder _src = builder_open( "gen/gen.dep.cpp" );
+		Builder* src = & _src;
+		builder_print_fmt(src, generation_notice );
+		builder_print_fmt( src, "// This file is intended to be included within gen.cpp (There is no pragma diagnostic ignores)\n" );
+		builder_print( src, src_start );
+		builder_print_fmt( src, "\nGEN_NS_BEGIN\n" );
+
+		builder_print( src, debug );
+		builder_print( src, string_ops );
+		builder_print( src, printing );
+		builder_print( src, hashing );
+		builder_print( src, memory );
+		builder_print( src, strings );
+		builder_print( src, filesystem );
+		builder_print( src, timing );
+		builder_print( src, parsing );
+
+		builder_print_fmt( src, "\nGEN_NS_END\n" );
+		builder_write(src);
+	}
+
+	CodeBody gen_component_header = def_global_body( args(
+		def_preprocess_cond( PreprocessCond_IfDef, txt("GEN_INTELLISENSE_DIRECTIVES") ),
+		pragma_once,
+		def_include(txt("components/types.hpp")),
+		preprocess_endif,
+		fmt_newline,
+		untyped_str( to_strc_from_c_str(generation_notice) )
+	));
+
+	// gen.hpp
+	{
+		Code header_start = scan_file( path_base "components/header_start.hpp" );
+		Code types        = scan_file( path_base "components/types.hpp" );
+		Code ast          = scan_file( path_base "components/ast.hpp" );
+		Code ast_types    = scan_file( path_base "components/ast_types.hpp" );
+		Code code_types   = scan_file( path_base "components/code_types.hpp" );
+		Code interface    = scan_file( path_base "components/interface.hpp" );
+		Code inlines      = scan_file( path_base "components/inlines.hpp" );
+		Code header_end   = scan_file( path_base "components/header_end.hpp" );
+
+		CodeBody ecode       = gen_ecode     ( path_base "enums/ECodeTypes.csv" );
+		CodeBody eoperator   = gen_eoperator ( path_base "enums/EOperator.csv" );
+		CodeBody especifier  = gen_especifier( path_base "enums/ESpecifier.csv" );
+		CodeBody ast_inlines = gen_ast_inlines();
+
+		Builder _header = builder_open( "gen/gen.hpp" );
+		Builder* header = & _header;
+		builder_print_fmt( header, generation_notice );
+		builder_print_fmt( header, "#pragma once\n\n" );
+		builder_print( header, push_ignores );
+		builder_print( header, header_start );
+		builder_print_fmt( header, "\nGEN_NS_BEGIN\n\n" );
+
+		builder_print_fmt(header, "#pragma region Types\n" );
+		builder_print( header, types );
+		builder_print( header, fmt_newline);
+		builder_print( header, format(ecode) );
+		builder_print( header, fmt_newline);
+		builder_print( header, format(eoperator) );
+		builder_print( header, fmt_newline);
+		builder_print( header, format(especifier) );
+		builder_print( header, fmt_newline);
+		builder_print_fmt( header, "#pragma endregion Types\n\n" );
+
+		builder_print_fmt( header, "#pragma region AST\n" );
+		builder_print( header, ast );
+		builder_print( header, code_types );
+		builder_print( header, ast_types );
+		builder_print_fmt( header, "\n#pragma endregion AST\n" );
+
+		builder_print( header, interface );
+
+		builder_print_fmt( header, "\n#pragma region Inlines\n" );
+		builder_print( header, inlines );
+		builder_print( header, fmt_newline );
+		builder_print( header, format(ast_inlines) );
+		builder_print( header, fmt_newline );
+		builder_print_fmt( header, "#pragma endregion Inlines\n" );
+
+		builder_print( header, header_end );
+		builder_print_fmt( header, "GEN_NS_END\n\n" );
+		builder_print( header, pop_ignores );
+		builder_write(header);
+	}
+
+	// gen.cpp
+	{
+		Code        src_start          = scan_file( path_base "components/src_start.cpp" );
+		Code        static_data 	   = scan_file( path_base "components/static_data.cpp" );
+		Code        ast_case_macros    = scan_file( path_base "components/ast_case_macros.cpp" );
+		Code        ast			       = scan_file( path_base "components/ast.cpp" );
+		Code        code_serialization = scan_file( path_base "components/code_serialization.cpp" );
+		Code        interface	       = scan_file( path_base "components/interface.cpp" );
+		Code        upfront 	       = scan_file( path_base "components/interface.upfront.cpp" );
+		Code        lexer              = scan_file( path_base "components/lexer.cpp" );
+		Code        parser             = scan_file( path_base "components/parser.cpp" );
+		Code 	    parsing_interface  = scan_file( path_base "components/interface.parsing.cpp" );
+		Code        untyped 	       = scan_file( path_base "components/interface.untyped.cpp" );
+
+		CodeBody etoktype         = gen_etoktype( path_base "enums/ETokType.csv", path_base "enums/AttributeTokens.csv" );
+		CodeBody nspaced_etoktype = def_global_body( args(
+			etoktype
+		));
+		Code formatted_toktype = format(nspaced_etoktype);
+
+		Builder _src = builder_open( "gen/gen.cpp" );
+		Builder* src = & _src;
+		builder_print_fmt( src, generation_notice );
+		builder_print( src, push_ignores );
+		builder_print( src, src_start );
+		builder_print_fmt( src, "\nGEN_NS_BEGIN\n");
+
+		builder_print( src, static_data );
+
+		builder_print_fmt( src, "\n#pragma region AST\n\n" );
+		builder_print( src, ast_case_macros );
+		builder_print( src, ast );
+		builder_print( src, code_serialization );
+		builder_print_fmt( src, "\n#pragma endregion AST\n" );
+
+		builder_print_fmt( src, "\n#pragma region Interface\n" );
+		builder_print( src, interface );
+		builder_print( src, upfront );
+		builder_print_fmt( src, "\n#pragma region Parsing\n\n" );
+		builder_print( src, formatted_toktype );
+		builder_print( src, lexer );
+		builder_print( src, parser );
+		builder_print( src, parsing_interface );
+		builder_print_fmt( src, "\n#pragma endregion Parsing\n\n" );
+		builder_print( src, untyped );
+		builder_print_fmt( src, "#pragma endregion Interface\n\n" );
+
+		builder_print_fmt( src, "GEN_NS_END\n\n");
+		builder_print( src, pop_ignores );
+		builder_write(src);
+	}
+
+	// gen_builder.hpp
+	{
+		Code builder = scan_file( path_base "auxillary/builder.hpp" );
+
+		Builder header = builder_open( "gen/gen.builder.hpp" );
+		builder_print_fmt( & header, generation_notice );
+		builder_print_fmt( & header, "#pragma once\n\n" );
+		builder_print( & header, def_include( txt("gen.hpp") ));
+		builder_print_fmt( & header, "\nGEN_NS_BEGIN\n" );
+		builder_print( & header, builder );
+		builder_print_fmt( & header, "GEN_NS_END\n" );
+		builder_write( & header);
+	}
+
+	// gen_builder.cpp
+	{
+		Code builder = scan_file( path_base "auxillary/builder.cpp" );
+
+		Builder src = builder_open( "gen/gen.builder.cpp" );
+		builder_print_fmt( & src, generation_notice );
+		builder_print( & src, def_include( txt("gen.builder.hpp") ) );
+		builder_print_fmt( & src, "\nGEN_NS_BEGIN\n" );
+		builder_print( & src,  builder );
+		builder_print_fmt( & src, "\nGEN_NS_END\n" );
+		builder_write( & src);
+	}
+
+	// gen_scanner.hpp
+	{
+		Code scanner = scan_file( path_base "auxillary/scanner.hpp" );
+
+		Builder header = builder_open( "gen/gen.scanner.hpp" );
+		builder_print_fmt( & header, generation_notice );
+		builder_print_fmt( & header, "#pragma once\n\n" );
+		builder_print( & header, def_include( txt("gen.hpp") ) );
+		builder_print_fmt( & header, "\nGEN_NS_BEGIN\n" );
+		builder_print( & header, scanner );
+		builder_print_fmt( & header, "\nGEN_NS_END\n" );
+		builder_write(& header);
+	}
+
+	// gen_scanner.cpp
+	{
+		Code scanner = scan_file( path_base "auxillary/scanner.cpp" );
+
+		Builder src = builder_open( "gen/gen.scanner.cpp" );
+		builder_print_fmt( & src, generation_notice );
+		builder_print( & src, def_include( txt("gen.scanner.hpp") ) );
+		builder_print_fmt( & src, "\nGEN_NS_BEGIN\n" );
+		builder_print( & src, scanner );
+		builder_print_fmt( & src, "GEN_NS_END\n" );
+		builder_write( & src);
+	}
+
+	gen::deinit();
+	return 0;
+}

gen_singleheader/Readme.md

@@ -1,4 +1,18 @@
+## Navigation
+
+# base
+
+[Top](../Readme.md)
+
+* [docs](../docs/Readme.md)
+
 # Singleheader
 
 Creates a single header file version of the library using `singleheader.cpp`.
 Follows the same convention seen in the gb, stb, and zpl libraries.
+
+If using the library's provided build scripts:
+
+```ps1
+.\build.ps1 <compiler> <debug or omit> singleheader
+```

gen_singleheader/components/header_start.hpp

@@ -3,17 +3,23 @@
 
 	See Readme.md for more information from the project repository.
 
-	Public Address:
-	https://github.com/Ed94/gencpp
-
-	This is a single header variant of the library.
 	Define GEN_IMPLEMENTATION before including this file in a single compilation unit.
 
-	! ----------------------------------------------------------------------- VERSION: v0.20-Alpha !
-	! ============================================================================================ !
-	! WARNING: THIS IS AN ALPHA VERSION OF THE LIBRARY, USE AT YOUR OWN DISCRETION                 !
-	! NEVER DO CODE GENERATION WITHOUT AT LEAST HAVING CONTENT IN A CODEBASE UNDER VERSION CONTROL !
-	! ============================================================================================ !
+	Public Address:
+	https://github.com/Ed94/gencpp  --------------------------------------------------------------.
+	|   _____                               _____ _                       _                        |
+	|  / ____)                             / ____} |                     | |                       |
+	| | / ___  ___ _ __   ___ _ __  _ __  | {___ | |__ _ _, __ _, ___  __| |                       |
+	| | |{_  |/ _ \ '_ \ / __} '_ l| '_ l `\___ \| __/ _` |/ _` |/ _ \/ _` |                       |
+	| | l__j | ___/ | | | {__; |+l } |+l | ____) | l| (_| | {_| | ___/ (_| |                       |
+	|  \_____|\___}_l |_|\___} ,__/| ,__/ (_____/ \__\__/_|\__, |\___}\__,_l                       |
+	|     Singleheader       | |   | |                      __} |                                  |
+	|                        l_l   l_l                     {___/                                   |
+	! ----------------------------------------------------------------------- VERSION: v0.20-Alpha |
+	! ============================================================================================ |
+	! WARNING: THIS IS AN ALPHA VERSION OF THE LIBRARY, USE AT YOUR OWN DISCRETION                 |
+	! NEVER DO CODE GENERATION WITHOUT AT LEAST HAVING CONTENT IN A CODEBASE UNDER VERSION CONTROL |
+	! ============================================================================================ /
 */
 #if ! defined(GEN_DONT_ENFORCE_GEN_TIME_GUARD) && ! defined(GEN_TIME)
 #	error Gen.hpp : GEN_TIME not defined

gen_singleheader/singleheader.cpp

@@ -2,20 +2,15 @@
 #define GEN_ENFORCE_STRONG_CODE_TYPES
 #define GEN_EXPOSE_BACKEND
 #include "gen.cpp"
-
 #include "helpers/push_ignores.inline.hpp"
-#include "helpers/helper.hpp"
+
+#include <stdlib.h>
 
 GEN_NS_BEGIN
-#include "dependencies/parsing.cpp"
+#include "helpers/base_codegen.hpp"
+#include "helpers/misc.hpp"
 GEN_NS_END
 
-#include "auxillary/builder.hpp"
-#include "auxillary/builder.cpp"
-#include "auxillary/scanner.hpp"
-
-#include <cstdlib>   // for system()
-
 using namespace gen;
 
 constexpr char const* generation_notice =
@@ -49,49 +44,20 @@ global bool generate_builder = true;
 global bool generate_editor  = true;
 global bool generate_scanner = true;
 
-void format_file( char const* path )
-{
-	String resolved_path = String::make(GlobalAllocator, to_str(path));
+#define path_format_style "../scripts/.clang-format "
+#define scratch_file      "gen/scratch.hpp"
+#define path_base         "../base/"
 
-	String style_arg = String::make(GlobalAllocator, txt("-style=file:"));
-	style_arg.append("../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 );
-	command.append( cf_format_inplace );
-	command.append( cf_verbose );
-	command.append( style_arg );
-	command.append( resolved_path );
-		log_fmt("\tRunning clang-format on file:\n");
-		system( command );
-		log_fmt("\tclang-format finished reformatting.\n");
-	#undef cf_cmd
-	#undef cf_format_inplace
-	#undef cf_style
-	#undef cf_verbse
-}
-
-Code dump_to_scratch_and_retireve( Code code )
-{
-	Builder ecode_file_temp = Builder::open("gen/scratch.hpp");
-	ecode_file_temp.print(code);
-	ecode_file_temp.write();
-	format_file("gen/scratch.hpp");
-	Code result = scan_file( "gen/scratch.hpp" );
-	remove("gen/scratch.hpp");
-	return result;
+Code format( Code code ) {
+	return code_refactor_and_format(code, scratch_file, nullptr, path_format_style );
 }
 
 int gen_main()
 {
-#define project_dir "../project/"
 	gen::init();
 
-	Code push_ignores        = scan_file( project_dir "helpers/push_ignores.inline.hpp" );
-	Code pop_ignores         = scan_file( project_dir "helpers/pop_ignores.inline.hpp" );
+	Code push_ignores        = scan_file( path_base "helpers/push_ignores.inline.hpp" );
+	Code pop_ignores         = scan_file( path_base "helpers/pop_ignores.inline.hpp" );
 	Code single_header_start = scan_file( "components/header_start.hpp" );
 
 	Builder
@@ -106,18 +72,18 @@ int gen_main()
 
 		if ( generate_gen_dep )
 		{
-			Code platform     = scan_file( project_dir "dependencies/platform.hpp" );
-			Code macros       = scan_file( project_dir "dependencies/macros.hpp" );
-			Code basic_types  = scan_file( project_dir "dependencies/basic_types.hpp" );
-			Code debug        = scan_file( project_dir "dependencies/debug.hpp" );
-			Code memory	      = scan_file( project_dir "dependencies/memory.hpp" );
-			Code string_ops   = scan_file( project_dir "dependencies/string_ops.hpp" );
-			Code printing     = scan_file( project_dir "dependencies/printing.hpp" );
-			Code containers   = scan_file( project_dir "dependencies/containers.hpp" );
-			Code hashing 	  = scan_file( project_dir "dependencies/hashing.hpp" );
-			Code strings      = scan_file( project_dir "dependencies/strings.hpp" );
-			Code filesystem   = scan_file( project_dir "dependencies/filesystem.hpp" );
-			Code timing       = scan_file( project_dir "dependencies/timing.hpp" );
+			Code platform     = scan_file( path_base "dependencies/platform.hpp" );
+			Code macros       = scan_file( path_base "dependencies/macros.hpp" );
+			Code basic_types  = scan_file( path_base "dependencies/basic_types.hpp" );
+			Code debug        = scan_file( path_base "dependencies/debug.hpp" );
+			Code memory	      = scan_file( path_base "dependencies/memory.hpp" );
+			Code string_ops   = scan_file( path_base "dependencies/string_ops.hpp" );
+			Code printing     = scan_file( path_base "dependencies/printing.hpp" );
+			Code containers   = scan_file( path_base "dependencies/containers.hpp" );
+			Code hashing 	  = scan_file( path_base "dependencies/hashing.hpp" );
+			Code strings      = scan_file( path_base "dependencies/strings.hpp" );
+			Code filesystem   = scan_file( path_base "dependencies/filesystem.hpp" );
+			Code timing       = scan_file( path_base "dependencies/timing.hpp" );
 
 			header.print_fmt( roll_own_dependencies_guard_start );
 			header.print( platform );
@@ -135,11 +101,8 @@ int gen_main()
 			header.print( filesystem );
 			header.print( timing );
 
-			if ( generate_scanner )
-			{
-				header.print_fmt( "\n#pragma region Parsing\n" );
-				header.print( scan_file( project_dir "dependencies/parsing.hpp" ) );
-				header.print_fmt( "#pragma endregion Parsing\n\n" );
+			if ( generate_scanner ) {
+				header.print( scan_file( path_base "dependencies/parsing.hpp" ) );
 			}
 
 			header.print_fmt( "GEN_NS_END\n" );
@@ -147,17 +110,17 @@ int gen_main()
 			header.print( fmt_newline );
 		}
 
-		Code types      = scan_file( project_dir "components/types.hpp" );
-		Code ast        = scan_file( project_dir "components/ast.hpp" );
-		Code ast_types  = scan_file( project_dir "components/ast_types.hpp" );
-		Code code_types = scan_file( project_dir "components/code_types.hpp" );
-		Code interface  = scan_file( project_dir "components/interface.hpp" );
-		Code inlines 	= scan_file( project_dir "components/inlines.hpp" );
-		Code header_end = scan_file( project_dir "components/header_end.hpp" );
+		Code types      = scan_file( path_base "components/types.hpp" );
+		Code ast        = scan_file( path_base "components/ast.hpp" );
+		Code ast_types  = scan_file( path_base "components/ast_types.hpp" );
+		Code code_types = scan_file( path_base "components/code_types.hpp" );
+		Code interface  = scan_file( path_base "components/interface.hpp" );
+		Code inlines 	= scan_file( path_base "components/inlines.hpp" );
+		Code header_end = scan_file( path_base "components/header_end.hpp" );
 
-		CodeBody ecode       = gen_ecode     ( project_dir "enums/ECodeTypes.csv" );
-		CodeBody eoperator   = gen_eoperator ( project_dir "enums/EOperator.csv" );
-		CodeBody especifier  = gen_especifier( project_dir "enums/ESpecifier.csv" );
+		CodeBody ecode       = gen_ecode     ( path_base "enums/ECodeTypes.csv" );
+		CodeBody eoperator   = gen_eoperator ( path_base "enums/EOperator.csv" );
+		CodeBody especifier  = gen_especifier( path_base "enums/ESpecifier.csv" );
 		CodeBody ast_inlines = gen_ast_inlines();
 
 		header.print_fmt( "GEN_NS_BEGIN\n\n" );
@@ -165,11 +128,11 @@ int gen_main()
 		header.print_fmt("#pragma region Types\n");
 		header.print( types );
 		header.print( fmt_newline );
-		header.print( dump_to_scratch_and_retireve( ecode ));
+		header.print( format( ecode ));
 		header.print( fmt_newline );
-		header.print( dump_to_scratch_and_retireve( eoperator ));
+		header.print( format( eoperator ));
 		header.print( fmt_newline );
-		header.print( dump_to_scratch_and_retireve( especifier ));
+		header.print( format( especifier ));
 		header.print( fmt_newline );
 		header.print_fmt("#pragma endregion Types\n\n");
 
@@ -183,17 +146,14 @@ int gen_main()
 
 		header.print_fmt( "\n#pragma region Inlines\n" );
 		header.print( inlines );
-		header.print( dump_to_scratch_and_retireve( ast_inlines ));
+		header.print( format( ast_inlines ));
 		header.print( fmt_newline );
 		header.print_fmt( "#pragma endregion Inlines\n" );
 
 		header.print( header_end );
 
-		if ( generate_builder )
-		{
-			header.print_fmt( "\n#pragma region Builder\n" );
-			header.print( scan_file( project_dir "auxillary/builder.hpp" ) );
-			header.print_fmt( "#pragma endregion Builder\n" );
+		if ( generate_builder ) {
+			header.print( scan_file( path_base "auxillary/builder.hpp" ) );
 		}
 
 		header.print_fmt( "GEN_NS_END\n" );
@@ -205,15 +165,15 @@ int gen_main()
 
 		if ( generate_gen_dep )
 		{
-			Code impl_start = scan_file( project_dir "dependencies/src_start.cpp" );
-			Code debug      = scan_file( project_dir "dependencies/debug.cpp" );
-			Code string_ops = scan_file( project_dir "dependencies/string_ops.cpp" );
-			Code printing   = scan_file( project_dir "dependencies/printing.cpp" );
-			Code memory     = scan_file( project_dir "dependencies/memory.cpp" );
-			Code hashing    = scan_file( project_dir "dependencies/hashing.cpp" );
-			Code strings    = scan_file( project_dir "dependencies/strings.cpp" );
-			Code filesystem = scan_file( project_dir "dependencies/filesystem.cpp" );
-			Code timing     = scan_file( project_dir "dependencies/timing.cpp" );
+			Code impl_start = scan_file( path_base "dependencies/src_start.cpp" );
+			Code debug      = scan_file( path_base "dependencies/debug.cpp" );
+			Code string_ops = scan_file( path_base "dependencies/string_ops.cpp" );
+			Code printing   = scan_file( path_base "dependencies/printing.cpp" );
+			Code memory     = scan_file( path_base "dependencies/memory.cpp" );
+			Code hashing    = scan_file( path_base "dependencies/hashing.cpp" );
+			Code strings    = scan_file( path_base "dependencies/strings.cpp" );
+			Code filesystem = scan_file( path_base "dependencies/filesystem.cpp" );
+			Code timing     = scan_file( path_base "dependencies/timing.cpp" );
 
 			header.print_fmt( roll_own_dependencies_guard_start );
 			header.print_fmt( "GEN_NS_BEGIN\n\n");
@@ -228,10 +188,9 @@ int gen_main()
 			header.print( filesystem );
 			header.print( timing );
 
-			if ( generate_scanner )
-			{
+			if ( generate_scanner ) {
 				header.print_fmt( "\n#pragma region Parsing\n" );
-				header.print( scan_file( project_dir "dependencies/parsing.cpp" ) );
+				header.print( scan_file( path_base "dependencies/parsing.cpp" ) );
 				header.print_fmt( "#pragma endregion Parsing\n\n" );
 			}
 
@@ -239,18 +198,18 @@ int gen_main()
 			header.print_fmt( roll_own_dependencies_guard_end );
 		}
 
-		Code static_data 	   = scan_file( project_dir "components/static_data.cpp" );
-		Code ast_case_macros   = scan_file( project_dir "components/ast_case_macros.cpp" );
-		Code ast               = scan_file( project_dir "components/ast.cpp" );
-		Code code              = scan_file( project_dir "components/code_serialization.cpp" );
-		Code interface         = scan_file( project_dir "components/interface.cpp" );
-		Code upfront           = scan_file( project_dir "components/interface.upfront.cpp" );
-		Code lexer             = scan_file( project_dir "components/lexer.cpp" );
-		Code parser            = scan_file( project_dir "components/parser.cpp" );
-		Code parsing_interface = scan_file( project_dir "components/interface.parsing.cpp" );
-		Code untyped           = scan_file( project_dir "components/interface.untyped.cpp" );
+		Code static_data 	   = scan_file( path_base "components/static_data.cpp" );
+		Code ast_case_macros   = scan_file( path_base "components/ast_case_macros.cpp" );
+		Code ast               = scan_file( path_base "components/ast.cpp" );
+		Code code              = scan_file( path_base "components/code_serialization.cpp" );
+		Code interface         = scan_file( path_base "components/interface.cpp" );
+		Code upfront           = scan_file( path_base "components/interface.upfront.cpp" );
+		Code lexer             = scan_file( path_base "components/lexer.cpp" );
+		Code parser            = scan_file( path_base "components/parser.cpp" );
+		Code parsing_interface = scan_file( path_base "components/interface.parsing.cpp" );
+		Code untyped           = scan_file( path_base "components/interface.untyped.cpp" );
 
-		CodeBody etoktype      = gen_etoktype( project_dir "enums/ETokType.csv", project_dir "enums/AttributeTokens.csv" );
+		CodeBody etoktype      = gen_etoktype( path_base "enums/ETokType.csv", path_base "enums/AttributeTokens.csv" );
 		CodeNS   parser_nspace = def_namespace( name(parser), def_namespace_body( args(etoktype)) );
 
 		header.print_fmt( "\nGEN_NS_BEGIN\n");
@@ -266,7 +225,7 @@ int gen_main()
 		header.print( interface );
 		header.print( upfront );
 		header.print_fmt( "\n#pragma region Parsing\n\n" );
-		header.print( dump_to_scratch_and_retireve(parser_nspace) );
+		header.print( format(parser_nspace) );
 		header.print( lexer );
 		header.print( parser );
 		header.print( parsing_interface );
@@ -274,29 +233,18 @@ int gen_main()
 		header.print( untyped );
 		header.print_fmt( "\n#pragma endregion Interface\n\n");
 
-		if ( generate_builder )
-		{
-			header.print_fmt( "#pragma region Builder\n" );
-			header.print( scan_file( project_dir "auxillary/builder.cpp"  ) );
-			header.print_fmt( "\n#pragma endregion Builder\n\n" );
+		if ( generate_builder ) {
+			header.print( scan_file( path_base "auxillary/builder.cpp"  ) );
 		}
 
 		// Scanner header depends on implementation
-		if ( generate_scanner )
-		{
-			header.print_fmt( "\n#pragma region Scanner\n" );
-			header.print( scan_file( project_dir "auxillary/scanner.hpp" ) );
-			header.print_fmt( "#pragma endregion Scanner\n\n" );
+		if ( generate_scanner ) {
+			header.print( scan_file( path_base "auxillary/scanner.hpp" ) );
 		}
 
-#if 0
-		if ( generate_scanner )
-		{
-			header.print_fmt( "#pragma region Scanner\n\n" );
-			header.print( scan_file( project_dir "auxillary/scanner.cpp" ) );
-			header.print_fmt( "#pragma endregion Scanner\n\n" );
+		if ( generate_scanner ) {
+			header.print( scan_file( path_base "auxillary/scanner.cpp" ) );
 		}
-#endif
 
 		header.print_fmt( "GEN_NS_END\n");
 
@@ -308,5 +256,4 @@ int gen_main()
 
 	gen::deinit();
 	return 0;
-#undef project_dir
 }

gen_unreal_engine/Readme.md

@@ -1,3 +1,17 @@
+## Navigation
+
+# base
+
+[Top](../Readme.md)
+
+* [docs](../docs/Readme.md)
+
 # Unreal Engine Version Generator
 
-This generates a variant of gencpp thats compatiable with use as a thirdparty module within a plugin or module of an Unreal Project or the Engine itself.
+This generates a variant of gencpp thats compatiable with use as a thirdparty module within a plugin or module of an Unreal Project or the Engine itself.
+
+If using the library's provided build scripts:
+
+```ps1
+.\build.ps1 <compiler> <debug or omit> unreal
+```