ed/gencpp
1
0
Fork 0
mirror of https://github.com/Ed94/gencpp.git synced 2025-10-30 14:30:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: ed:v0.20-Alpha
Branches Tags
ed:main ed:dev ed:Ed94-patch-1 ed:defines_n_macros_upgrades ed:string_distinctings_refactor ed:de_oop ed:broken_changes ed:preprocessor_support ed:parser_context_stack ed:designchanges_to_bettercodetypes
ed:v0.25-Alpha ed:v0.24-Alpha ed:v0.23-Alpha ed:v0.22-Alpha ed:v0.21-Alpha ed:v0.20-Alpha ed:v0.19-Alpha ed:v0.18-Alpha ed:v0.17-Alpha ed:v0.16-Alpha ed:v0.15-Alpha ed:v0.14-Alpha ed:v0.13-Alpha ed:v0.12-Alpha ed:v0.11-Alpha ed:v0.10-Alpha ed:v0.9-Alpha ed:v0.8-Alpha ed:v0.7-Alpha ed:v0.6-Alpha ed:v0.5-alpha ed:v0.4-Alpha ed:V0.3-Alpha ed:V0.1-Alpha ed:V0.2-Alpha
...
compare: ed:e3172057d3173c0e78f75b1e4b9a65f7803ebe57
Branches Tags
ed:dev ed:main ed:Ed94-patch-1 ed:defines_n_macros_upgrades ed:string_distinctings_refactor ed:de_oop ed:broken_changes ed:preprocessor_support ed:parser_context_stack ed:designchanges_to_bettercodetypes
ed:v0.25-Alpha ed:v0.24-Alpha ed:v0.23-Alpha ed:v0.22-Alpha ed:v0.21-Alpha ed:v0.20-Alpha ed:v0.19-Alpha ed:v0.18-Alpha ed:v0.17-Alpha ed:v0.16-Alpha ed:v0.15-Alpha ed:v0.14-Alpha ed:v0.13-Alpha ed:v0.12-Alpha ed:v0.11-Alpha ed:v0.10-Alpha ed:v0.9-Alpha ed:v0.8-Alpha ed:v0.7-Alpha ed:v0.6-Alpha ed:v0.5-alpha ed:v0.4-Alpha ed:V0.3-Alpha ed:V0.1-Alpha ed:V0.2-Alpha

7 Commits
v0.20-Alph ... e3172057d3

Author SHA1 Message Date
Ed_
e3172057d3 working to towards https://github.com/Ed94/gencpp/issues/56 2024-12-12 12:55:15 -05:00
Ed_
8d48da0b9e reduced macro usage in lexer.cpp 2024-12-12 11:56:16 -05:00
Ed_
30dea2e9fd reduce 'large macro' usage in ast.cpp and interface.cpp 
Properly disabled GEN_DEBUG_TRAP in non-debug builds
 2024-12-12 11:35:50 -05:00
Ed_
633879d35f more typo correction 2024-12-12 10:42:01 -05:00
Ed_
831b52129d readme fixes 2024-12-12 10:27:55 -05:00
Ed_
55427822a0 Proofing docs 2024-12-12 10:24:21 -05:00
Ed_
71b7320e1c codestruct mssing frm c_library.reefactor 2024-12-11 16:00:39 -05:00
61 changed files with 2667 additions and 3286 deletions
Expand all files Collapse all files

0
.vscode/bookmarks.json vendored
View File

31
Readme.md
View File

@@ -6,39 +6,36 @@ The library API is a composition of code element constructors, and a non-standar
These build up a code AST to then serialize with a file builder, or can be traversed for staged-reflection of C/C++ code. 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). 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. Its not meant to be a black box metaprogramming utility, it should be easy to integrate into a user's project domain.
## Documentation ## Documentation
* [docs - General](./docs/Readme.md): Overview and additional docs * [docs - General](./docs/Readme.md): Overview and additional docs
* [AST_Design](./docs/AST_Design.md): Overvie of ASTs * [AST_Design](./docs/AST_Design.md): Overview of ASTs
* [AST Types](./docs/AST_Types.md): Listing of all AST types along with their Code type interface. * [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. * [Parsing](./docs/Parsing.md): Overview of the parsing interface.
* [Parser Algo](./docs/Parser_Algo.md): In-depth breakdown of the parser's implementation. * [Parser Algo](./docs/Parser_Algo.md): In-depth breakdown of the parser's implementation.
* [base](./base/Readme.md): Essential (base) library. * [base](./base/Readme.md): Essential (base) library.
* [gen_c_library](./gen_c_library/): C11 library variant generation (single header and segmeented). * [gen_c_library](./gen_c_library/): C11 library variant generation (single header and segmented).
* [gen_segmented](./gen_segmented/): Segemented C++ (`gen.<hpp/cpp>`, `gen.dep.<hpp/cpp>`) generation * [gen_segmented](./gen_segmented/): Segmented C++ (`gen.<hpp/cpp>`, `gen.dep.<hpp/cpp>`) generation
* [gen_singleheader](./gen_singleheader/): Singlehader C++ generation `gen.hpp` * [gen_singleheader](./gen_singleheader/): Singlehader C++ generation `gen.hpp`
* [gen_unreal_engine](./gen_unreal_engine/): Unreal Engine thirdparty code generation. * [gen_unreal_engine](./gen_unreal_engine/): Unreal Engine thirdparty code generation.
## Notes ## Notes
**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.
This project is still in development (very much an alpha state), so expect bugs and missing features. This project is still in development (very much an alpha state), so expect bugs and missing features.
See [issues](https://github.com/Ed94/gencpp/issues) for a list of known bugs or todos. See [issues](https://github.com/Ed94/gencpp/issues) for a list of known bugs or todos.
The library can already be used to generate code just fine, but the parser is where the most work is needed. If your C++ isn't "down to earth" expect issues. The library can already be used to generate code just fine, but the parser is where the most work is needed. If your C++ isn't "down to earth" expect issues.
A `natvis` and `natstepfilter` are provided in the scripts directory (its outdated, I'll update this readme when its not). A `natvis` and `natstepfilter` are provided in the scripts directory (its outdated, I'll update this readme when its not).
*Minor update: I've been using [RAD Debugger](https://github.com/EpicGamesExt/raddebugger) with this and the code structures should be easy to debug even without natvis.*
## Usage ## 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. 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.
`gen.cpp` \`s `main()` is defined as `gen_main()` which the user will have to define once for their program. There they will dictate everything that should be generated. `gen.cpp` \`s `main()` is defined as `gen_main()` which the user will have to define once for their program. There they may reflect and/or generate code.
In order to keep the locality of this code within the same files the following pattern may be used (although this pattern isn't the best to use): In order to keep the locality of this code within the same files the following pattern may be used (although this pattern isn't the best to use):
@@ -98,8 +95,8 @@ Validation through ast construction.
Code header = parse_struct( code( Code header = parse_struct( code(
struct ArrayHeader struct ArrayHeader
{ {
usize Num; usize Num;
usize Capacity; usize Capacity;
allocator Allocator; allocator Allocator;
}; };
)); ));
@@ -114,8 +111,8 @@ No validation, just glorified text injection.
Code header = code_str( Code header = code_str(
struct ArrayHeader struct ArrayHeader
{ {
usize Num; usize Num;
usize Capacity; usize Capacity;
allocator Allocator; allocator Allocator;
}; };
); );
@@ -124,15 +121,15 @@ Code header = code_str(
`name` is a helper macro for providing a string literal with its size, intended for the name parameter of functions. `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. `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> ))` `code_str` is a helper macro for writing `untyped_str( code( <content> ))`
All three constrcuton interfaces will generate the following C code: All three construction interfaces will generate the following C code:
```cpp ```cpp
struct ArrayHeader struct ArrayHeader
{ {
usize Num; usize Num;
usize Capacity; usize Capacity;
allocator Allocator; allocator Allocator;
}; };
``` ```

16
base/Readme.md
View File

@@ -13,11 +13,11 @@ Standard formats:
* **base**: Files are in granular pieces separated into four directories: * **base**: Files are in granular pieces separated into four directories:
* **dependencies**: Originally from the c-zpl library and modified thereafter. * **dependencies**: Originally from the c-zpl library and modified thereafter.
* **components**: The essential definitions of the library. * **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. * **helpers**: Contains helper functionality used by base and the variant library generators.
* `base_codegen.hpp`: Helps with self-hosted code generation of enums, and operator overload inlines of the code types. * `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. * `<push/pop>.<name>.inline.<hpp>`: macros that are meant to be injected at specific locations of the library file/s.
* `misc.hpp`: Misc functionality used by the library generation metaprograms. * `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. * `undef.macros.h`: Undefines all macros from library.
* **auxillary**: Non-essential tooling: * **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`). * `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. * **`Scanner`**: Interface to load up `Code` from files two basic funcctions are currently provided.
@@ -127,6 +127,14 @@ There are ***five*** header files which are automatically generated using [base_
[`misc.hpp`](./helpers/misc.hpp): Has shared functions used by the library generation meta-programs throughout this codebase. [`misc.hpp`](./helpers/misc.hpp): Has shared functions used by the library generation meta-programs throughout this codebase.
If using the library's provided build scripts:
```ps1
.\build.ps1 <compiler> <debug or omit> base
```
Will refresh those files.
## On multi-threading ## 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. 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.
@@ -146,7 +154,7 @@ Names or Content fields are interned strings and thus showed be cached using `ge
`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. `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. The parser is documented under [`docs/Parsing.md`](../docs/Parsing.md) and [`docs/Parser_Algo.md`](../docs/Parser_Algo.md).
## A note on compilation and runtime generation speed ## A note on compilation and runtime generation speed

16
base/auxillary/builder.cpp
View File

@@ -15,7 +15,7 @@ Builder builder_open( char const* path )
return result; return result;
} }
result.Buffer = string_make_reserve( GlobalAllocator, Builder_StrBufferReserve ); result.Buffer = strbuilder_make_reserve( GlobalAllocator, Builder_StrBufferReserve );
// log_fmt("$Builder - Opened file: %s\n", result.File.filename ); // log_fmt("$Builder - Opened file: %s\n", result.File.filename );
return result; return result;
@@ -23,15 +23,15 @@ Builder builder_open( char const* path )
void builder_pad_lines( Builder* builder, s32 num ) void builder_pad_lines( Builder* builder, s32 num )
{ {
string_append_strc( & builder->Buffer, txt("\n") ); strbuilder_append_str( & builder->Buffer, txt("\n") );
} }
void builder_print( Builder* builder, Code code ) void builder_print( Builder* builder, Code code )
{ {
String str = code_to_string(code); StrBuilder str = code_to_string(code);
// const ssize len = str.length(); // const ssize len = str.length();
// log_fmt( "%s - print: %.*s\n", File.filename, len > 80 ? 80 : len, str.Data ); // log_fmt( "%s - print: %.*s\n", File.filename, len > 80 ? 80 : len, str.Data );
string_append_string( & builder->Buffer, str ); strbuilder_append_string( & builder->Buffer, str );
} }
void builder_print_fmt_va( Builder* builder, char const* fmt, va_list va ) void builder_print_fmt_va( Builder* builder, char const* fmt, va_list va )
@@ -39,21 +39,21 @@ void builder_print_fmt_va( Builder* builder, char const* fmt, va_list va )
ssize res; ssize res;
char buf[ GEN_PRINTF_MAXLEN ] = { 0 }; char buf[ GEN_PRINTF_MAXLEN ] = { 0 };
res = str_fmt_va( buf, count_of( buf ) - 1, fmt, va ) - 1; res = c_str_fmt_va( buf, count_of( buf ) - 1, fmt, va ) - 1;
string_append_c_str_len( (String*) & (builder->Buffer), (char const*)buf, res); strbuilder_append_c_str_len( (StrBuilder*) & (builder->Buffer), (char const*)buf, res);
} }
void builder_write(Builder* builder) void builder_write(Builder* builder)
{ {
b32 result = file_write( & builder->File, builder->Buffer, string_length(builder->Buffer) ); b32 result = file_write( & builder->File, builder->Buffer, strbuilder_length(builder->Buffer) );
if ( result == false ) if ( result == false )
log_failure("gen::File::write - Failed to write to file: %s\n", file_name( & builder->File ) ); log_failure("gen::File::write - Failed to write to file: %s\n", file_name( & builder->File ) );
log_fmt( "Generated: %s\n", builder->File.filename ); log_fmt( "Generated: %s\n", builder->File.filename );
file_close( & builder->File ); file_close( & builder->File );
string_free(& builder->Buffer); strbuilder_free(& builder->Buffer);
} }
#pragma endregion Builder #pragma endregion Builder

2
base/auxillary/builder.hpp
View File

@@ -36,7 +36,7 @@ void builder_write( Builder* builder );
struct Builder struct Builder
{ {
FileInfo File; FileInfo File;
String Buffer; StrBuilder Buffer;
#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP #if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
forceinline static Builder open( char const* path ) { return builder_open(path); } forceinline static Builder open( char const* path ) { return builder_open(path); }

2
base/auxillary/gen_template.hpp
View File

@@ -32,4 +32,4 @@ CodeFn gen_func_template( CodeTemplate template, ... );
Code gen_class_struct_template( CodeTemplate template, ... ); Code gen_class_struct_template( CodeTemplate template, ... );
Code gen_template( CodeTemplate template, ... ); Code gen_template( CodeTemplate template, ... );
Code gen_template( StrC template, StrC instantiation ); Code gen_template( Str template, Str instantiation );

24
base/auxillary/scanner.cpp
View File

@@ -20,9 +20,9 @@ Code scan_file( char const* path )
GEN_FATAL("scan_file: %s is empty", path ); GEN_FATAL("scan_file: %s is empty", path );
} }
String str = string_make_reserve( GlobalAllocator, fsize ); StrBuilder str = strbuilder_make_reserve( GlobalAllocator, fsize );
file_read( & file, str, fsize ); file_read( & file, str, fsize );
string_get_header(str)->Length = fsize; strbuilder_get_header(str)->Length = fsize;
// Skip GEN_INTELLISENSE_DIRECTIVES preprocessor blocks // Skip GEN_INTELLISENSE_DIRECTIVES preprocessor blocks
// Its designed so that the directive should be the first thing in the file. // Its designed so that the directive should be the first thing in the file.
@@ -31,9 +31,9 @@ Code scan_file( char const* path )
#define current (*scanner) #define current (*scanner)
#define matched 0 #define matched 0
#define move_fwd() do { ++ scanner; -- left; } while (0) #define move_fwd() do { ++ scanner; -- left; } while (0)
const StrC directive_start = txt( "ifdef" ); const Str directive_start = txt( "ifdef" );
const StrC directive_end = txt( "endif" ); const Str directive_end = txt( "endif" );
const StrC def_intellisense = txt("GEN_INTELLISENSE_DIRECTIVES" ); const Str def_intellisense = txt("GEN_INTELLISENSE_DIRECTIVES" );
bool found_directive = false; bool found_directive = false;
char const* scanner = (char const*)str; char const* scanner = (char const*)str;
@@ -49,7 +49,7 @@ Code scan_file( char const* path )
if ( ! found_directive ) if ( ! found_directive )
{ {
if ( left && str_compare_len( scanner, directive_start.Ptr, directive_start.Len ) == matched ) if ( left && c_str_compare_len( scanner, directive_start.Ptr, directive_start.Len ) == matched )
{ {
scanner += directive_start.Len; scanner += directive_start.Len;
left -= directive_start.Len; left -= directive_start.Len;
@@ -57,7 +57,7 @@ Code scan_file( char const* path )
while ( left && char_is_space( current ) ) while ( left && char_is_space( current ) )
move_fwd(); move_fwd();
if ( left && str_compare_len( scanner, def_intellisense.Ptr, def_intellisense.Len ) == matched ) if ( left && c_str_compare_len( scanner, def_intellisense.Ptr, def_intellisense.Len ) == matched )
{ {
scanner += def_intellisense.Len; scanner += def_intellisense.Len;
left -= def_intellisense.Len; left -= def_intellisense.Len;
@@ -77,7 +77,7 @@ Code scan_file( char const* path )
continue; continue;
} }
if ( left && str_compare_len( scanner, directive_end.Ptr, directive_end.Len ) == matched ) if ( left && c_str_compare_len( scanner, directive_end.Ptr, directive_end.Len ) == matched )
{ {
scanner += directive_end.Len; scanner += directive_end.Len;
left -= directive_end.Len; left -= directive_end.Len;
@@ -94,12 +94,12 @@ Code scan_file( char const* path )
if ( (scanner + 2) >= ( (char const*) str + fsize ) ) if ( (scanner + 2) >= ( (char const*) str + fsize ) )
{ {
mem_move( str, scanner, left ); mem_move( str, scanner, left );
string_get_header(str)->Length = left; strbuilder_get_header(str)->Length = left;
break; break;
} }
mem_move( str, scanner, left ); mem_move( str, scanner, left );
string_get_header(str)->Length = left; strbuilder_get_header(str)->Length = left;
break; break;
} }
@@ -113,12 +113,12 @@ Code scan_file( char const* path )
} }
file_close( & file ); file_close( & file );
return untyped_str( string_to_strc(str) ); return untyped_str( strbuilder_to_str(str) );
} }
CodeBody parse_file( const char* path ) { CodeBody parse_file( const char* path ) {
FileContents file = file_read_contents( GlobalAllocator, true, path ); FileContents file = file_read_contents( GlobalAllocator, true, path );
StrC content = { file.size, (char const*)file.data }; Str content = { file.size, (char const*)file.data };
CodeBody code = parse_global_body( content ); CodeBody code = parse_global_body( content );
log_fmt("\nParsed: %s\n", path); log_fmt("\nParsed: %s\n", path);
return code; return code;

2
base/base.cpp
View File

@@ -35,7 +35,7 @@ int gen_main()
def_include(txt("components/types.hpp")), def_include(txt("components/types.hpp")),
preprocess_endif, preprocess_endif,
fmt_newline, fmt_newline,
untyped_str( to_strc_from_c_str(generation_notice) ) untyped_str( to_str_from_c_str(generation_notice) )
)); ));
CodeBody ecode = gen_ecode ( "enums/ECodeTypes.csv" ); CodeBody ecode = gen_ecode ( "enums/ECodeTypes.csv" );

605
base/components/ast.cpp
View File

File diff suppressed because it is too large Load Diff

16
base/components/ast.hpp
View File

@@ -252,7 +252,7 @@ template< class Type> forceinline Type tmpl_cast( Code self ) { return * rcast(
#pragma region Code C-Interface #pragma region Code C-Interface
void code_append (Code code, Code other ); void code_append (Code code, Code other );
StrC code_debug_str (Code code); Str code_debug_str (Code code);
Code code_duplicate (Code code); Code code_duplicate (Code code);
Code* code_entry (Code code, u32 idx ); Code* code_entry (Code code, u32 idx );
bool code_has_entries (Code code); bool code_has_entries (Code code);
@@ -260,9 +260,9 @@ bool code_is_body (Code code);
bool code_is_equal (Code code, Code other); bool code_is_equal (Code code, Code other);
bool code_is_valid (Code code); bool code_is_valid (Code code);
void code_set_global (Code code); void code_set_global (Code code);
String code_to_string (Code self ); StrBuilder code_to_string (Code self );
void code_to_string_ptr(Code self, String* result ); void code_to_strbuilder_ptr(Code self, StrBuilder* result );
StrC code_type_str (Code self ); Str code_type_str (Code self );
bool code_validate_body(Code self ); bool code_validate_body(Code self );
#pragma endregion Code C-Interface #pragma endregion Code C-Interface
@@ -278,7 +278,7 @@ struct Code
AST* ast; AST* ast;
# define Using_Code( Typename ) \ # define Using_Code( Typename ) \
forceinline StrC debug_str() { return code_debug_str(* this); } \ forceinline Str debug_str() { return code_debug_str(* this); } \
forceinline Code duplicate() { return code_duplicate(* this); } \ forceinline Code duplicate() { return code_duplicate(* this); } \
forceinline bool is_equal( Code other ) { return code_is_equal(* this, other); } \ forceinline bool is_equal( Code other ) { return code_is_equal(* this, other); } \
forceinline bool is_body() { return code_is_body(* this); } \ forceinline bool is_body() { return code_is_body(* this); } \
@@ -298,9 +298,9 @@ struct Code
forceinline void append(Code other) { return code_append(* this, other); } forceinline void append(Code other) { return code_append(* this, other); }
forceinline Code* entry(u32 idx) { return code_entry(* this, idx); } forceinline Code* entry(u32 idx) { return code_entry(* this, idx); }
forceinline bool has_entries() { return code_has_entries(* this); } forceinline bool has_entries() { return code_has_entries(* this); }
forceinline String to_string() { return code_to_string(* this); } forceinline StrBuilder to_string() { return code_to_string(* this); }
forceinline void to_string(String& result) { return code_to_string_ptr(* this, & result); } forceinline void to_string(StrBuilder& result) { return code_to_strbuilder_ptr(* this, & result); }
forceinline StrC type_str() { return code_type_str(* this); } forceinline Str type_str() { return code_type_str(* this); }
forceinline bool validate_body() { return code_validate_body(*this); } forceinline bool validate_body() { return code_validate_body(*this); }
#endif #endif

12
base/components/ast_case_macros.cpp
View File

@@ -1,4 +1,6 @@
# define GEN_AST_BODY_CLASS_UNALLOWED_TYPES \ // These macros are used in the swtich cases are used within ast.cpp, inteface.upfront.cpp, parser.cpp
# define GEN_AST_BODY_CLASS_UNALLOWED_TYPES \
case CT_PlatformAttributes: \ case CT_PlatformAttributes: \
case CT_Class_Body: \ case CT_Class_Body: \
case CT_Enum_Body: \ case CT_Enum_Body: \
@@ -13,7 +15,7 @@
case CT_Parameters: \ case CT_Parameters: \
case CT_Specifiers: \ case CT_Specifiers: \
case CT_Struct_Body: \ case CT_Struct_Body: \
case CT_Typename: case CT_Typename
# define GEN_AST_BODY_STRUCT_UNALLOWED_TYPES GEN_AST_BODY_CLASS_UNALLOWED_TYPES # define GEN_AST_BODY_STRUCT_UNALLOWED_TYPES GEN_AST_BODY_CLASS_UNALLOWED_TYPES
# define GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES \ # define GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES \
@@ -37,7 +39,7 @@
case CT_Parameters: \ case CT_Parameters: \
case CT_Specifiers: \ case CT_Specifiers: \
case CT_Struct_Body: \ case CT_Struct_Body: \
case CT_Typename: case CT_Typename
# define GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES \ # define GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES \
case CT_Access_Public: \ case CT_Access_Public: \
@@ -55,7 +57,7 @@
case CT_Parameters: \ case CT_Parameters: \
case CT_Specifiers: \ case CT_Specifiers: \
case CT_Struct_Body: \ case CT_Struct_Body: \
case CT_Typename: case CT_Typename
# define GEN_AST_BODY_EXPORT_UNALLOWED_TYPES GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES # define GEN_AST_BODY_EXPORT_UNALLOWED_TYPES GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
# define GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES # define GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
@@ -75,4 +77,4 @@
case CT_Parameters: \ case CT_Parameters: \
case CT_Specifiers: \ case CT_Specifiers: \
case CT_Struct_Body: \ case CT_Struct_Body: \
case CT_Typename: case CT_Typename

832
base/components/code_serialization.cpp
View File

File diff suppressed because it is too large Load Diff

528
base/components/code_types.hpp
View File

@@ -19,24 +19,24 @@
void body_append ( CodeBody body, Code other ); void body_append ( CodeBody body, Code other );
void body_append_body ( CodeBody body, CodeBody other ); void body_append_body ( CodeBody body, CodeBody other );
String body_to_string ( CodeBody body ); StrBuilder body_to_string ( CodeBody body );
void body_to_string_ref ( CodeBody body, String* result ); void body_to_strbuilder_ref ( CodeBody body, StrBuilder* result );
void body_to_string_export( CodeBody body, String* result ); void body_to_strbuilder_export( CodeBody body, StrBuilder* result );
Code begin_CodeBody( CodeBody body); Code begin_CodeBody( CodeBody body);
Code end_CodeBody ( CodeBody body ); Code end_CodeBody ( CodeBody body );
Code next_CodeBody ( CodeBody body, Code entry_iter ); Code next_CodeBody ( CodeBody body, Code entry_iter );
void class_add_interface( CodeClass self, CodeTypename interface ); void class_add_interface( CodeClass self, CodeTypename interface );
String class_to_string ( CodeClass self ); StrBuilder class_to_string ( CodeClass self );
void class_to_string_def( CodeClass self, String* result ); void class_to_strbuilder_def( CodeClass self, StrBuilder* result );
void class_to_string_fwd( CodeClass self, String* result ); void class_to_strbuilder_fwd( CodeClass self, StrBuilder* result );
void params_append (CodeParams params, CodeParams param ); void params_append (CodeParams params, CodeParams param );
CodeParams params_get (CodeParams params, s32 idx); CodeParams params_get (CodeParams params, s32 idx);
bool params_has_entries (CodeParams params ); bool params_has_entries (CodeParams params );
String params_to_string (CodeParams params ); StrBuilder params_to_string (CodeParams params );
void params_to_string_ref(CodeParams params, String* result ); void params_to_strbuilder_ref(CodeParams params, StrBuilder* result );
CodeParams begin_CodeParams(CodeParams params); CodeParams begin_CodeParams(CodeParams params);
CodeParams end_CodeParams (CodeParams params); CodeParams end_CodeParams (CodeParams params);
@@ -45,100 +45,100 @@ CodeParams next_CodeParams (CodeParams params, CodeParams entry_iter);
bool specifiers_append (CodeSpecifiers specifiers, Specifier spec); bool specifiers_append (CodeSpecifiers specifiers, Specifier spec);
s32 specifiers_has (CodeSpecifiers specifiers, Specifier spec); s32 specifiers_has (CodeSpecifiers specifiers, Specifier spec);
s32 specifiers_remove (CodeSpecifiers specifiers, Specifier to_remove ); s32 specifiers_remove (CodeSpecifiers specifiers, Specifier to_remove );
String specifiers_to_string (CodeSpecifiers specifiers); StrBuilder specifiers_to_string (CodeSpecifiers specifiers);
void specifiers_to_string_ref(CodeSpecifiers specifiers, String* result); void specifiers_to_strbuilder_ref(CodeSpecifiers specifiers, StrBuilder* result);
Specifier* begin_CodeSpecifiers(CodeSpecifiers specifiers); Specifier* begin_CodeSpecifiers(CodeSpecifiers specifiers);
Specifier* end_CodeSpecifiers (CodeSpecifiers specifiers); Specifier* end_CodeSpecifiers (CodeSpecifiers specifiers);
Specifier* next_CodeSpecifiers (CodeSpecifiers specifiers, Specifier* spec_iter); Specifier* next_CodeSpecifiers (CodeSpecifiers specifiers, Specifier* spec_iter);
void struct_add_interface(CodeStruct self, CodeTypename interface); void struct_add_interface(CodeStruct self, CodeTypename interface);
String struct_to_string (CodeStruct self); StrBuilder struct_to_string (CodeStruct self);
void struct_to_string_fwd(CodeStruct self, String* result); void struct_to_strbuilder_fwd(CodeStruct self, StrBuilder* result);
void struct_to_string_def(CodeStruct self, String* result); void struct_to_strbuilder_def(CodeStruct self, StrBuilder* result);
String attributes_to_string (CodeAttributes attributes); StrBuilder attributes_to_string (CodeAttributes attributes);
void attributes_to_string_ref(CodeAttributes attributes, String* result); void attributes_to_strbuilder_ref(CodeAttributes attributes, StrBuilder* result);
String comment_to_string (CodeComment comment ); StrBuilder comment_to_string (CodeComment comment );
void comment_to_string_ref(CodeComment comment, String* result ); void comment_to_strbuilder_ref(CodeComment comment, StrBuilder* result );
String constructor_to_string (CodeConstructor constructor); StrBuilder constructor_to_string (CodeConstructor constructor);
void constructor_to_string_def(CodeConstructor constructor, String* result ); void constructor_to_strbuilder_def(CodeConstructor constructor, StrBuilder* result );
void constructor_to_string_fwd(CodeConstructor constructor, String* result ); void constructor_to_strbuilder_fwd(CodeConstructor constructor, StrBuilder* result );
String define_to_string (CodeDefine self); StrBuilder define_to_string (CodeDefine self);
void define_to_string_ref(CodeDefine self, String* result); void define_to_strbuilder_ref(CodeDefine self, StrBuilder* result);
String destructor_to_string (CodeDestructor destructor); StrBuilder destructor_to_string (CodeDestructor destructor);
void destructor_to_string_def(CodeDestructor destructor, String* result ); void destructor_to_strbuilder_def(CodeDestructor destructor, StrBuilder* result );
void destructor_to_string_fwd(CodeDestructor destructor, String* result ); void destructor_to_strbuilder_fwd(CodeDestructor destructor, StrBuilder* result );
String enum_to_string (CodeEnum self); StrBuilder enum_to_string (CodeEnum self);
void enum_to_string_def (CodeEnum self, String* result ); void enum_to_strbuilder_def (CodeEnum self, StrBuilder* result );
void enum_to_string_fwd (CodeEnum self, String* result ); void enum_to_strbuilder_fwd (CodeEnum self, StrBuilder* result );
void enum_to_string_class_def(CodeEnum self, String* result ); void enum_to_strbuilder_class_def(CodeEnum self, StrBuilder* result );
void enum_to_string_class_fwd(CodeEnum self, String* result ); void enum_to_strbuilder_class_fwd(CodeEnum self, StrBuilder* result );
String exec_to_string (CodeExec exec); StrBuilder exec_to_string (CodeExec exec);
void exec_to_string_ref(CodeExec exec, String* result); void exec_to_strbuilder_ref(CodeExec exec, StrBuilder* result);
void extern_to_string(CodeExtern self, String* result); void extern_to_string(CodeExtern self, StrBuilder* result);
String include_to_string (CodeInclude self); StrBuilder include_to_string (CodeInclude self);
void include_to_string_ref(CodeInclude self, String* result); void include_to_strbuilder_ref(CodeInclude self, StrBuilder* result);
String friend_to_string (CodeFriend self); StrBuilder friend_to_string (CodeFriend self);
void friend_to_string_ref(CodeFriend self, String* result); void friend_to_strbuilder_ref(CodeFriend self, StrBuilder* result);
String fn_to_string (CodeFn self); StrBuilder fn_to_string (CodeFn self);
void fn_to_string_def(CodeFn self, String* result); void fn_to_strbuilder_def(CodeFn self, StrBuilder* result);
void fn_to_string_fwd(CodeFn self, String* result); void fn_to_strbuilder_fwd(CodeFn self, StrBuilder* result);
String module_to_string (CodeModule self); StrBuilder module_to_string (CodeModule self);
void module_to_string_ref(CodeModule self, String* result); void module_to_strbuilder_ref(CodeModule self, StrBuilder* result);
String namespace_to_string (CodeNS self); StrBuilder namespace_to_string (CodeNS self);
void namespace_to_string_ref(CodeNS self, String* result); void namespace_to_strbuilder_ref(CodeNS self, StrBuilder* result);
String code_op_to_string (CodeOperator self); StrBuilder code_op_to_string (CodeOperator self);
void code_op_to_string_fwd(CodeOperator self, String* result ); void code_op_to_strbuilder_fwd(CodeOperator self, StrBuilder* result );
void code_op_to_string_def(CodeOperator self, String* result ); void code_op_to_strbuilder_def(CodeOperator self, StrBuilder* result );
String opcast_to_string (CodeOpCast op_cast ); StrBuilder opcast_to_string (CodeOpCast op_cast );
void opcast_to_string_def(CodeOpCast op_cast, String* result ); void opcast_to_strbuilder_def(CodeOpCast op_cast, StrBuilder* result );
void opcast_to_string_fwd(CodeOpCast op_cast, String* result ); void opcast_to_strbuilder_fwd(CodeOpCast op_cast, StrBuilder* result );
String pragma_to_string (CodePragma self); StrBuilder pragma_to_string (CodePragma self);
void pragma_to_string_ref(CodePragma self, String* result); void pragma_to_strbuilder_ref(CodePragma self, StrBuilder* result);
String preprocess_to_string (CodePreprocessCond cond); StrBuilder preprocess_to_string (CodePreprocessCond cond);
void preprocess_to_string_if (CodePreprocessCond cond, String* result ); void preprocess_to_strbuilder_if (CodePreprocessCond cond, StrBuilder* result );
void preprocess_to_string_ifdef (CodePreprocessCond cond, String* result ); void preprocess_to_strbuilder_ifdef (CodePreprocessCond cond, StrBuilder* result );
void preprocess_to_string_ifndef(CodePreprocessCond cond, String* result ); void preprocess_to_strbuilder_ifndef(CodePreprocessCond cond, StrBuilder* result );
void preprocess_to_string_elif (CodePreprocessCond cond, String* result ); void preprocess_to_strbuilder_elif (CodePreprocessCond cond, StrBuilder* result );
void preprocess_to_string_else (CodePreprocessCond cond, String* result ); void preprocess_to_strbuilder_else (CodePreprocessCond cond, StrBuilder* result );
void preprocess_to_string_endif (CodePreprocessCond cond, String* result ); void preprocess_to_strbuilder_endif (CodePreprocessCond cond, StrBuilder* result );
String template_to_string (CodeTemplate self); StrBuilder template_to_string (CodeTemplate self);
void template_to_string_ref(CodeTemplate self, String* result); void template_to_strbuilder_ref(CodeTemplate self, StrBuilder* result);
String typename_to_string (CodeTypename self); StrBuilder typename_to_string (CodeTypename self);
void typename_to_string_ref(CodeTypename self, String* result); void typename_to_strbuilder_ref(CodeTypename self, StrBuilder* result);
String typedef_to_string (CodeTypedef self); StrBuilder typedef_to_string (CodeTypedef self);
void typedef_to_string_ref(CodeTypedef self, String* result ); void typedef_to_strbuilder_ref(CodeTypedef self, StrBuilder* result );
String union_to_string (CodeUnion self); StrBuilder union_to_string (CodeUnion self);
void union_to_string_def(CodeUnion self, String* result); void union_to_strbuilder_def(CodeUnion self, StrBuilder* result);
void union_to_string_fwd(CodeUnion self, String* result); void union_to_strbuilder_fwd(CodeUnion self, StrBuilder* result);
String using_to_string (CodeUsing op_cast ); StrBuilder using_to_string (CodeUsing op_cast );
void using_to_string_ref(CodeUsing op_cast, String* result ); void using_to_strbuilder_ref(CodeUsing op_cast, StrBuilder* result );
void using_to_string_ns (CodeUsing op_cast, String* result ); void using_to_strbuilder_ns (CodeUsing op_cast, StrBuilder* result );
String var_to_string (CodeVar self); StrBuilder var_to_string (CodeVar self);
void var_to_string_ref(CodeVar self, String* result); void var_to_strbuilder_ref(CodeVar self, StrBuilder* result);
#pragma endregion Code Type C-Interface #pragma endregion Code Type C-Interface
@@ -157,9 +157,9 @@ struct CodeBody
forceinline void append( Code other ) { return body_append( *this, other ); } forceinline void append( Code other ) { return body_append( *this, other ); }
forceinline void append( CodeBody body ) { return body_append(*this, body); } forceinline void append( CodeBody body ) { return body_append(*this, body); }
forceinline bool has_entries() { return code_has_entries(* this); } forceinline bool has_entries() { return code_has_entries(* this); }
forceinline String to_string() { return body_to_string(* this); } forceinline StrBuilder to_string() { return body_to_string(* this); }
forceinline void to_string( String& result ) { return body_to_string_ref(* this, & result ); } forceinline void to_string( StrBuilder& result ) { return body_to_strbuilder_ref(* this, & result ); }
forceinline void to_string_export( String& result ) { return body_to_string_export(* this, & result); } forceinline void to_strbuilder_export( StrBuilder& result ) { return body_to_strbuilder_export(* this, & result); }
forceinline Code begin() { return begin_CodeBody(* this); } forceinline Code begin() { return begin_CodeBody(* this); }
forceinline Code end() { return end_CodeBody(* this); } forceinline Code end() { return end_CodeBody(* this); }
@@ -175,9 +175,9 @@ struct CodeClass
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeClass ); Using_Code( CodeClass );
forceinline void add_interface( CodeType interface ); forceinline void add_interface( CodeType interface );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string_def( String& result ); forceinline void to_strbuilder_def( StrBuilder& result );
forceinline void to_string_fwd( String& result ); forceinline void to_strbuilder_fwd( StrBuilder& result );
#endif #endif
Using_CodeOps( CodeClass ); Using_CodeOps( CodeClass );
forceinline operator Code() { return * rcast( Code*, this ); } forceinline operator Code() { return * rcast( Code*, this ); }
@@ -195,8 +195,8 @@ struct CodeParams
forceinline void append( CodeParams other ); forceinline void append( CodeParams other );
forceinline CodeParams get( s32 idx ); forceinline CodeParams get( s32 idx );
forceinline bool has_entries(); forceinline bool has_entries();
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
forceinline CodeParams begin() { return begin_CodeParams(* this); } forceinline CodeParams begin() { return begin_CodeParams(* this); }
forceinline CodeParams end() { return end_CodeParams(* this); } forceinline CodeParams end() { return end_CodeParams(* this); }
@@ -219,8 +219,8 @@ struct CodeSpecifiers
bool append( Specifier spec ) { return specifiers_append(* this, spec); } bool append( Specifier spec ) { return specifiers_append(* this, spec); }
s32 has( Specifier spec ) { return specifiers_has(* this, spec); } s32 has( Specifier spec ) { return specifiers_has(* this, spec); }
s32 remove( Specifier to_remove ) { return specifiers_remove(* this, to_remove); } s32 remove( Specifier to_remove ) { return specifiers_remove(* this, to_remove); }
String to_string() { return specifiers_to_string(* this ); } StrBuilder to_string() { return specifiers_to_string(* this ); }
void to_string( String& result ) { return specifiers_to_string_ref(* this, & result); } void to_string( StrBuilder& result ) { return specifiers_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeSpecifiers); Using_CodeOps(CodeSpecifiers);
forceinline operator Code() { return { (AST*) ast }; } forceinline operator Code() { return { (AST*) ast }; }
@@ -235,8 +235,8 @@ struct CodeAttributes
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code(CodeAttributes); Using_Code(CodeAttributes);
forceinline String to_string() { return attributes_to_string(* this); } forceinline StrBuilder to_string() { return attributes_to_string(* this); }
forceinline void to_string(String& result) { return attributes_to_string_ref(* this, & result); } forceinline void to_string(StrBuilder& result) { return attributes_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeAttributes); Using_CodeOps(CodeAttributes);
operator Code(); operator Code();
@@ -250,8 +250,8 @@ struct CodeComment
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code(CodeComment); Using_Code(CodeComment);
forceinline String to_string() { return comment_to_string (* this); } forceinline StrBuilder to_string() { return comment_to_string (* this); }
forceinline void to_string(String& result) { return comment_to_string_ref(* this, & result); } forceinline void to_string(StrBuilder& result) { return comment_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeComment); Using_CodeOps(CodeComment);
operator Code(); operator Code();
@@ -263,9 +263,9 @@ struct CodeConstructor
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeConstructor ); Using_Code( CodeConstructor );
forceinline String to_string() { return constructor_to_string(* this); } forceinline StrBuilder to_string() { return constructor_to_string(* this); }
forceinline void to_string_def( String& result ) { return constructor_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return constructor_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return constructor_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return constructor_to_strbuilder_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeConstructor); Using_CodeOps(CodeConstructor);
operator Code(); operator Code();
@@ -277,8 +277,8 @@ struct CodeDefine
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeDefine ); Using_Code( CodeDefine );
forceinline String to_string() { return define_to_string(* this); } forceinline StrBuilder to_string() { return define_to_string(* this); }
forceinline void to_string( String& result ) { return define_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return define_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeDefine); Using_CodeOps(CodeDefine);
operator Code(); operator Code();
@@ -290,9 +290,9 @@ struct CodeDestructor
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeDestructor ); Using_Code( CodeDestructor );
forceinline String to_string() { return destructor_to_string(* this); } forceinline StrBuilder to_string() { return destructor_to_string(* this); }
forceinline void to_string_def( String& result ) { return destructor_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return destructor_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return destructor_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return destructor_to_strbuilder_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeDestructor); Using_CodeOps(CodeDestructor);
operator Code(); operator Code();
@@ -304,11 +304,11 @@ struct CodeEnum
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeEnum ); Using_Code( CodeEnum );
forceinline String to_string() { return enum_to_string(* this); } forceinline StrBuilder to_string() { return enum_to_string(* this); }
forceinline void to_string_def( String& result ) { return enum_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return enum_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return enum_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return enum_to_strbuilder_fwd(* this, & result); }
forceinline void to_string_class_def( String& result ) { return enum_to_string_class_def(* this, & result); } forceinline void to_strbuilder_class_def( StrBuilder& result ) { return enum_to_strbuilder_class_def(* this, & result); }
forceinline void to_string_class_fwd( String& result ) { return enum_to_string_class_fwd(* this, & result); } forceinline void to_strbuilder_class_fwd( StrBuilder& result ) { return enum_to_strbuilder_class_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeEnum); Using_CodeOps(CodeEnum);
operator Code(); operator Code();
@@ -320,8 +320,8 @@ struct CodeExec
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code(CodeExec); Using_Code(CodeExec);
forceinline String to_string() { return exec_to_string(* this); } forceinline StrBuilder to_string() { return exec_to_string(* this); }
forceinline void to_string(String& result) { return exec_to_string_ref(* this, & result); } forceinline void to_string(StrBuilder& result) { return exec_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeExec); Using_CodeOps(CodeExec);
operator Code(); operator Code();
@@ -334,7 +334,7 @@ struct CodeExpr
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr ); Using_Code( CodeExpr );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr* operator->(); AST_Expr* operator->();
@@ -345,7 +345,7 @@ struct CodeExpr_Assign
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Assign ); Using_Code( CodeExpr_Assign );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Assign* operator->(); AST_Expr_Assign* operator->();
@@ -356,7 +356,7 @@ struct CodeExpr_Alignof
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Alignof ); Using_Code( CodeExpr_Alignof );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Alignof* operator->(); AST_Expr_Alignof* operator->();
@@ -367,7 +367,7 @@ struct CodeExpr_Binary
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Binary ); Using_Code( CodeExpr_Binary );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Binary* operator->(); AST_Expr_Binary* operator->();
@@ -378,7 +378,7 @@ struct CodeExpr_CStyleCast
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_CStyleCast ); Using_Code( CodeExpr_CStyleCast );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_CStyleCast* operator->(); AST_Expr_CStyleCast* operator->();
@@ -389,7 +389,7 @@ struct CodeExpr_FunctionalCast
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_FunctionalCast ); Using_Code( CodeExpr_FunctionalCast );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_FunctionalCast* operator->(); AST_Expr_FunctionalCast* operator->();
@@ -400,7 +400,7 @@ struct CodeExpr_CppCast
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_CppCast ); Using_Code( CodeExpr_CppCast );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_CppCast* operator->(); AST_Expr_CppCast* operator->();
@@ -411,7 +411,7 @@ struct CodeExpr_Element
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Element ); Using_Code( CodeExpr_Element );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Element* operator->(); AST_Expr_Element* operator->();
@@ -422,7 +422,7 @@ struct CodeExpr_ProcCall
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_ProcCall ); Using_Code( CodeExpr_ProcCall );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_ProcCall* operator->(); AST_Expr_ProcCall* operator->();
@@ -433,7 +433,7 @@ struct CodeExpr_Decltype
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Decltype ); Using_Code( CodeExpr_Decltype );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Decltype* operator->(); AST_Expr_Decltype* operator->();
@@ -444,7 +444,7 @@ struct CodeExpr_Comma
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Comma ); Using_Code( CodeExpr_Comma );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Comma* operator->(); AST_Expr_Comma* operator->();
@@ -455,7 +455,7 @@ struct CodeExpr_AMS
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_AMS ); Using_Code( CodeExpr_AMS );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_AMS* operator->(); AST_Expr_AMS* operator->();
@@ -466,7 +466,7 @@ struct CodeExpr_Sizeof
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Sizeof ); Using_Code( CodeExpr_Sizeof );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Sizeof* operator->(); AST_Expr_Sizeof* operator->();
@@ -477,7 +477,7 @@ struct CodeExpr_Subscript
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Subscript ); Using_Code( CodeExpr_Subscript );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Subscript* operator->(); AST_Expr_Subscript* operator->();
@@ -488,7 +488,7 @@ struct CodeExpr_Ternary
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_Ternary ); Using_Code( CodeExpr_Ternary );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_Ternary* operator->(); AST_Expr_Ternary* operator->();
@@ -499,7 +499,7 @@ struct CodeExpr_UnaryPrefix
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_UnaryPrefix ); Using_Code( CodeExpr_UnaryPrefix );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Expr_UnaryPrefix* operator->(); AST_Expr_UnaryPrefix* operator->();
@@ -510,7 +510,7 @@ struct CodeExpr_UnaryPostfix
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExpr_UnaryPostfix ); Using_Code( CodeExpr_UnaryPostfix );
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
AST* raw(); AST* raw();
operator Code(); operator Code();
@@ -523,7 +523,7 @@ struct CodeExtern
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeExtern ); Using_Code( CodeExtern );
forceinline void to_string( String& result ) { return extern_to_string(* this, & result); } forceinline void to_string( StrBuilder& result ) { return extern_to_string(* this, & result); }
#endif #endif
Using_CodeOps(CodeExtern); Using_CodeOps(CodeExtern);
operator Code(); operator Code();
@@ -535,8 +535,8 @@ struct CodeInclude
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeInclude ); Using_Code( CodeInclude );
String to_string() { return include_to_string(* this); } StrBuilder to_string() { return include_to_string(* this); }
forceinline void to_string( String& result ) { return include_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return include_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeInclude); Using_CodeOps(CodeInclude);
operator Code(); operator Code();
@@ -548,8 +548,8 @@ struct CodeFriend
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeFriend ); Using_Code( CodeFriend );
forceinline String to_string() { return friend_to_string(* this); } forceinline StrBuilder to_string() { return friend_to_string(* this); }
forceinline void to_string( String& result ) { return friend_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return friend_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeFriend); Using_CodeOps(CodeFriend);
operator Code(); operator Code();
@@ -561,9 +561,9 @@ struct CodeFn
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeFn ); Using_Code( CodeFn );
forceinline String to_string() { return fn_to_string(* this); } forceinline StrBuilder to_string() { return fn_to_string(* this); }
forceinline void to_string_def( String& result ) { return fn_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return fn_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return fn_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return fn_to_strbuilder_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeFn); Using_CodeOps(CodeFn);
operator Code(); operator Code();
@@ -575,8 +575,8 @@ struct CodeModule
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeModule ); Using_Code( CodeModule );
forceinline String to_string() { return module_to_string(* this); } forceinline StrBuilder to_string() { return module_to_string(* this); }
forceinline void to_string( String& result ) { return module_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return module_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeModule); Using_CodeOps(CodeModule);
operator Code(); operator Code();
@@ -588,8 +588,8 @@ struct CodeNS
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeNS ); Using_Code( CodeNS );
forceinline String to_string() { return namespace_to_string(* this); } forceinline StrBuilder to_string() { return namespace_to_string(* this); }
forceinline void to_string( String& result ) { return namespace_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return namespace_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeNS); Using_CodeOps(CodeNS);
operator Code(); operator Code();
@@ -601,9 +601,9 @@ struct CodeOperator
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeOperator ); Using_Code( CodeOperator );
forceinline String to_string() { return code_op_to_string(* this); } forceinline StrBuilder to_string() { return code_op_to_string(* this); }
forceinline void to_string_def( String& result ) { return code_op_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return code_op_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return code_op_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return code_op_to_strbuilder_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeOperator); Using_CodeOps(CodeOperator);
operator Code(); operator Code();
@@ -615,9 +615,9 @@ struct CodeOpCast
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeOpCast ); Using_Code( CodeOpCast );
forceinline String to_string() { return opcast_to_string(* this); } forceinline StrBuilder to_string() { return opcast_to_string(* this); }
forceinline void to_string_def( String& result ) { return opcast_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return opcast_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return opcast_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return opcast_to_strbuilder_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeOpCast); Using_CodeOps(CodeOpCast);
operator Code(); operator Code();
@@ -629,8 +629,8 @@ struct CodePragma
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodePragma ); Using_Code( CodePragma );
forceinline String to_string() { return pragma_to_string(* this); } forceinline StrBuilder to_string() { return pragma_to_string(* this); }
forceinline void to_string( String& result ) { return pragma_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return pragma_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps( CodePragma ); Using_CodeOps( CodePragma );
operator Code(); operator Code();
@@ -642,13 +642,13 @@ struct CodePreprocessCond
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodePreprocessCond ); Using_Code( CodePreprocessCond );
forceinline String to_string() { return preprocess_to_string(* this); } forceinline StrBuilder to_string() { return preprocess_to_string(* this); }
forceinline void to_string_if( String& result ) { return preprocess_to_string_if(* this, & result); } forceinline void to_strbuilder_if( StrBuilder& result ) { return preprocess_to_strbuilder_if(* this, & result); }
forceinline void to_string_ifdef( String& result ) { return preprocess_to_string_ifdef(* this, & result); } forceinline void to_strbuilder_ifdef( StrBuilder& result ) { return preprocess_to_strbuilder_ifdef(* this, & result); }
forceinline void to_string_ifndef( String& result ) { return preprocess_to_string_ifndef(* this, & result); } forceinline void to_strbuilder_ifndef( StrBuilder& result ) { return preprocess_to_strbuilder_ifndef(* this, & result); }
forceinline void to_string_elif( String& result ) { return preprocess_to_string_elif(* this, & result); } forceinline void to_strbuilder_elif( StrBuilder& result ) { return preprocess_to_strbuilder_elif(* this, & result); }
forceinline void to_string_else( String& result ) { return preprocess_to_string_else(* this, & result); } forceinline void to_strbuilder_else( StrBuilder& result ) { return preprocess_to_strbuilder_else(* this, & result); }
forceinline void to_string_endif( String& result ) { return preprocess_to_string_endif(* this, & result); } forceinline void to_strbuilder_endif( StrBuilder& result ) { return preprocess_to_strbuilder_endif(* this, & result); }
#endif #endif
Using_CodeOps( CodePreprocessCond ); Using_CodeOps( CodePreprocessCond );
operator Code(); operator Code();
@@ -661,8 +661,8 @@ struct CodeStmt
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt ); Using_Code( CodeStmt );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt* operator->(); AST_Stmt* operator->();
@@ -673,8 +673,8 @@ struct CodeStmt_Break
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Break ); Using_Code( CodeStmt_Break );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Break* operator->(); AST_Stmt_Break* operator->();
@@ -685,8 +685,8 @@ struct CodeStmt_Case
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Case ); Using_Code( CodeStmt_Case );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Case* operator->(); AST_Stmt_Case* operator->();
@@ -697,8 +697,8 @@ struct CodeStmt_Continue
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Continue ); Using_Code( CodeStmt_Continue );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Continue* operator->(); AST_Stmt_Continue* operator->();
@@ -709,8 +709,8 @@ struct CodeStmt_Decl
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Decl ); Using_Code( CodeStmt_Decl );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Decl* operator->(); AST_Stmt_Decl* operator->();
@@ -721,8 +721,8 @@ struct CodeStmt_Do
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Do ); Using_Code( CodeStmt_Do );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Do* operator->(); AST_Stmt_Do* operator->();
@@ -733,8 +733,8 @@ struct CodeStmt_Expr
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Expr ); Using_Code( CodeStmt_Expr );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Expr* operator->(); AST_Stmt_Expr* operator->();
@@ -745,8 +745,8 @@ struct CodeStmt_Else
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Else ); Using_Code( CodeStmt_Else );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Else* operator->(); AST_Stmt_Else* operator->();
@@ -757,8 +757,8 @@ struct CodeStmt_If
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_If ); Using_Code( CodeStmt_If );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_If* operator->(); AST_Stmt_If* operator->();
@@ -769,8 +769,8 @@ struct CodeStmt_For
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_For ); Using_Code( CodeStmt_For );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_For* operator->(); AST_Stmt_For* operator->();
@@ -781,8 +781,8 @@ struct CodeStmt_Goto
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Goto ); Using_Code( CodeStmt_Goto );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Goto* operator->(); AST_Stmt_Goto* operator->();
@@ -793,8 +793,8 @@ struct CodeStmt_Label
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Label ); Using_Code( CodeStmt_Label );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Label* operator->(); AST_Stmt_Label* operator->();
@@ -805,8 +805,8 @@ struct CodeStmt_Switch
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_Switch ); Using_Code( CodeStmt_Switch );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_Switch* operator->(); AST_Stmt_Switch* operator->();
@@ -817,8 +817,8 @@ struct CodeStmt_While
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStmt_While ); Using_Code( CodeStmt_While );
forceinline String to_string(); forceinline StrBuilder to_string();
forceinline void to_string( String& result ); forceinline void to_string( StrBuilder& result );
#endif #endif
operator Code(); operator Code();
AST_Stmt_While* operator->(); AST_Stmt_While* operator->();
@@ -830,8 +830,8 @@ struct CodeTemplate
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeTemplate ); Using_Code( CodeTemplate );
forceinline String to_string() { return template_to_string(* this); } forceinline StrBuilder to_string() { return template_to_string(* this); }
forceinline void to_string( String& result ) { return template_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return template_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps( CodeTemplate ); Using_CodeOps( CodeTemplate );
operator Code(); operator Code();
@@ -843,8 +843,8 @@ struct CodeTypename
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeTypename ); Using_Code( CodeTypename );
forceinline String to_string() { return typename_to_string(* this); } forceinline StrBuilder to_string() { return typename_to_string(* this); }
forceinline void to_string( String& result ) { return typename_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return typename_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps( CodeTypename ); Using_CodeOps( CodeTypename );
operator Code(); operator Code();
@@ -856,8 +856,8 @@ struct CodeTypedef
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeTypedef ); Using_Code( CodeTypedef );
forceinline String to_string() { return typedef_to_string(* this); } forceinline StrBuilder to_string() { return typedef_to_string(* this); }
forceinline void to_string( String& result ) { return typedef_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return typedef_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps( CodeTypedef ); Using_CodeOps( CodeTypedef );
operator Code(); operator Code();
@@ -869,9 +869,9 @@ struct CodeUnion
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeUnion ); Using_Code( CodeUnion );
forceinline String to_string() { return union_to_string(* this); } forceinline StrBuilder to_string() { return union_to_string(* this); }
forceinline void to_string_def( String& result ) { return union_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return union_to_strbuilder_def(* this, & result); }
forceinline void to_string_fwd( String& result ) { return union_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return union_to_strbuilder_fwd(* this, & result); }
#endif #endif
Using_CodeOps(CodeUnion); Using_CodeOps(CodeUnion);
operator Code(); operator Code();
@@ -883,9 +883,9 @@ struct CodeUsing
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeUsing ); Using_Code( CodeUsing );
forceinline String to_string() { return using_to_string(* this); } forceinline StrBuilder to_string() { return using_to_string(* this); }
forceinline void to_string( String& result ) { return using_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return using_to_strbuilder_ref(* this, & result); }
forceinline void to_string_ns( String& result ) { return using_to_string_ns(* this, & result); } forceinline void to_strbuilder_ns( StrBuilder& result ) { return using_to_strbuilder_ns(* this, & result); }
#endif #endif
Using_CodeOps(CodeUsing); Using_CodeOps(CodeUsing);
operator Code(); operator Code();
@@ -897,8 +897,8 @@ struct CodeVar
{ {
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeVar ); Using_Code( CodeVar );
forceinline String to_string() { return var_to_string(* this); } forceinline StrBuilder to_string() { return var_to_string(* this); }
forceinline void to_string( String& result ) { return var_to_string_ref(* this, & result); } forceinline void to_string( StrBuilder& result ) { return var_to_strbuilder_ref(* this, & result); }
#endif #endif
Using_CodeOps(CodeVar); Using_CodeOps(CodeVar);
operator Code(); operator Code();
@@ -911,9 +911,9 @@ struct CodeStruct
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
Using_Code( CodeStruct ); Using_Code( CodeStruct );
forceinline void add_interface( CodeTypename interface ) { return struct_add_interface(* this, interface); } forceinline void add_interface( CodeTypename interface ) { return struct_add_interface(* this, interface); }
forceinline String to_string() { return struct_to_string(* this); } forceinline StrBuilder to_string() { return struct_to_string(* this); }
forceinline void to_string_fwd( String& result ) { return struct_to_string_fwd(* this, & result); } forceinline void to_strbuilder_fwd( StrBuilder& result ) { return struct_to_strbuilder_fwd(* this, & result); }
forceinline void to_string_def( String& result ) { return struct_to_string_def(* this, & result); } forceinline void to_strbuilder_def( StrBuilder& result ) { return struct_to_strbuilder_def(* this, & result); }
#endif #endif
Using_CodeOps( CodeStruct ); Using_CodeOps( CodeStruct );
forceinline operator Code() { return * rcast( Code*, this ); } forceinline operator Code() { return * rcast( Code*, this ); }
@@ -1002,24 +1002,24 @@ GEN_OPTIMIZE_MAPPINGS_BEGIN
forceinline void append ( CodeBody body, Code other ) { return body_append(body, other); } forceinline void append ( CodeBody body, Code other ) { return body_append(body, other); }
forceinline void append ( CodeBody body, CodeBody other ) { return body_append_body(body, other); } forceinline void append ( CodeBody body, CodeBody other ) { return body_append_body(body, other); }
forceinline String to_string ( CodeBody body ) { return body_to_string(body); } forceinline StrBuilder to_string ( CodeBody body ) { return body_to_string(body); }
forceinline void to_string ( CodeBody body, String& result ) { return body_to_string_ref(body, & result); } forceinline void to_string ( CodeBody body, StrBuilder& result ) { return body_to_strbuilder_ref(body, & result); }
forceinline void to_string_export( CodeBody body, String& result ) { return body_to_string_export(body, & result); } forceinline void to_strbuilder_export( CodeBody body, StrBuilder& result ) { return body_to_strbuilder_export(body, & result); }
forceinline Code begin( CodeBody body) { return begin_CodeBody(body); } forceinline Code begin( CodeBody body) { return begin_CodeBody(body); }
forceinline Code end ( CodeBody body ) { return end_CodeBody(body); } forceinline Code end ( CodeBody body ) { return end_CodeBody(body); }
forceinline Code next ( CodeBody body, Code entry_iter ) { return next_CodeBody(body, entry_iter); } 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 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 StrBuilder 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_strbuilder_def( CodeClass self, StrBuilder& result ) { return class_to_strbuilder_def(self, & result); }
forceinline void to_string_fwd( CodeClass self, String& result ) { return class_to_string_fwd(self, & result); } forceinline void to_strbuilder_fwd( CodeClass self, StrBuilder& result ) { return class_to_strbuilder_fwd(self, & result); }
forceinline void append (CodeParams params, CodeParams param ) { return params_append(params, param); } 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 CodeParams get (CodeParams params, s32 idx) { return params_get(params, idx); }
forceinline bool has_entries(CodeParams params ) { return params_has_entries(params); } forceinline bool has_entries(CodeParams params ) { return params_has_entries(params); }
forceinline String to_string (CodeParams params ) { return params_to_string(params); } forceinline StrBuilder 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 void to_string (CodeParams params, StrBuilder& result ) { return params_to_strbuilder_ref(params, & result); }
forceinline CodeParams begin(CodeParams params) { return begin_CodeParams(params); } forceinline CodeParams begin(CodeParams params) { return begin_CodeParams(params); }
forceinline CodeParams end (CodeParams params) { return end_CodeParams(params); } forceinline CodeParams end (CodeParams params) { return end_CodeParams(params); }
@@ -1028,100 +1028,100 @@ forceinline CodeParams next (CodeParams params, CodeParams entry_iter) { return
forceinline bool append (CodeSpecifiers specifiers, Specifier spec) { return specifiers_append(specifiers, spec); } forceinline bool append (CodeSpecifiers specifiers, Specifier spec) { return specifiers_append(specifiers, spec); }
forceinline s32 has (CodeSpecifiers specifiers, Specifier spec) { return specifiers_has(specifiers, spec); } forceinline s32 has (CodeSpecifiers specifiers, Specifier spec) { return specifiers_has(specifiers, spec); }
forceinline s32 remove (CodeSpecifiers specifiers, Specifier to_remove ) { return specifiers_remove(specifiers, to_remove); } forceinline s32 remove (CodeSpecifiers specifiers, Specifier to_remove ) { return specifiers_remove(specifiers, to_remove); }
forceinline String to_string(CodeSpecifiers specifiers) { return specifiers_to_string(specifiers); } forceinline StrBuilder to_string(CodeSpecifiers specifiers) { return specifiers_to_string(specifiers); }
forceinline void to_string(CodeSpecifiers specifiers, String& result) { return specifiers_to_string_ref(specifiers, & result); } forceinline void to_string(CodeSpecifiers specifiers, StrBuilder& result) { return specifiers_to_strbuilder_ref(specifiers, & result); }
forceinline Specifier* begin(CodeSpecifiers specifiers) { return begin_CodeSpecifiers(specifiers); } forceinline Specifier* begin(CodeSpecifiers specifiers) { return begin_CodeSpecifiers(specifiers); }
forceinline Specifier* end (CodeSpecifiers specifiers) { return end_CodeSpecifiers(specifiers); } forceinline Specifier* end (CodeSpecifiers specifiers) { return end_CodeSpecifiers(specifiers); }
forceinline Specifier* next (CodeSpecifiers specifiers, Specifier& spec_iter) { return next_CodeSpecifiers(specifiers, & spec_iter); } forceinline Specifier* next (CodeSpecifiers specifiers, Specifier& spec_iter) { return next_CodeSpecifiers(specifiers, & spec_iter); }
forceinline void add_interface(CodeStruct self, CodeTypename interface) { return struct_add_interface(self, interface); } forceinline void add_interface(CodeStruct self, CodeTypename interface) { return struct_add_interface(self, interface); }
forceinline String to_string (CodeStruct self) { return struct_to_string(self); } forceinline StrBuilder to_string (CodeStruct self) { return struct_to_string(self); }
forceinline void to_string_fwd(CodeStruct self, String& result) { return struct_to_string_fwd(self, & result); } forceinline void to_strbuilder_fwd(CodeStruct self, StrBuilder& result) { return struct_to_strbuilder_fwd(self, & result); }
forceinline void to_string_def(CodeStruct self, String& result) { return struct_to_string_def(self, & result); } forceinline void to_strbuilder_def(CodeStruct self, StrBuilder& result) { return struct_to_strbuilder_def(self, & result); }
forceinline String to_string(CodeAttributes attributes) { return attributes_to_string(attributes); } forceinline StrBuilder to_string(CodeAttributes attributes) { return attributes_to_string(attributes); }
forceinline void to_string(CodeAttributes attributes, String& result) { return attributes_to_string_ref(attributes, & result); } forceinline void to_string(CodeAttributes attributes, StrBuilder& result) { return attributes_to_strbuilder_ref(attributes, & result); }
forceinline String to_string(CodeComment comment ) { return comment_to_string(comment); } forceinline StrBuilder to_string(CodeComment comment ) { return comment_to_string(comment); }
forceinline void to_string(CodeComment comment, String& result ) { return comment_to_string_ref(comment, & result); } forceinline void to_string(CodeComment comment, StrBuilder& result ) { return comment_to_strbuilder_ref(comment, & result); }
forceinline String to_string (CodeConstructor constructor) { return constructor_to_string(constructor); } forceinline StrBuilder to_string (CodeConstructor constructor) { return constructor_to_string(constructor); }
forceinline void to_string_def(CodeConstructor constructor, String& result ) { return constructor_to_string_def(constructor, & result); } forceinline void to_strbuilder_def(CodeConstructor constructor, StrBuilder& result ) { return constructor_to_strbuilder_def(constructor, & result); }
forceinline void to_string_fwd(CodeConstructor constructor, String& result ) { return constructor_to_string_fwd(constructor, & result); } forceinline void to_strbuilder_fwd(CodeConstructor constructor, StrBuilder& result ) { return constructor_to_strbuilder_fwd(constructor, & result); }
forceinline String to_string(CodeDefine self) { return define_to_string(self); } forceinline StrBuilder to_string(CodeDefine self) { return define_to_string(self); }
forceinline void to_string(CodeDefine self, String& result) { return define_to_string_ref(self, & result); } forceinline void to_string(CodeDefine self, StrBuilder& result) { return define_to_strbuilder_ref(self, & result); }
forceinline String to_string (CodeDestructor destructor) { return destructor_to_string(destructor); } forceinline StrBuilder to_string (CodeDestructor destructor) { return destructor_to_string(destructor); }
forceinline void to_string_def(CodeDestructor destructor, String& result ) { return destructor_to_string_def(destructor, & result); } forceinline void to_strbuilder_def(CodeDestructor destructor, StrBuilder& result ) { return destructor_to_strbuilder_def(destructor, & result); }
forceinline void to_string_fwd(CodeDestructor destructor, String& result ) { return destructor_to_string_fwd(destructor, & result); } forceinline void to_strbuilder_fwd(CodeDestructor destructor, StrBuilder& result ) { return destructor_to_strbuilder_fwd(destructor, & result); }
forceinline String to_string (CodeEnum self) { return enum_to_string(self); } forceinline StrBuilder to_string (CodeEnum self) { return enum_to_string(self); }
forceinline void to_string_def (CodeEnum self, String& result ) { return enum_to_string_def(self, & result); } forceinline void to_strbuilder_def (CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_def(self, & result); }
forceinline void to_string_fwd (CodeEnum self, String& result ) { return enum_to_string_fwd(self, & result); } forceinline void to_strbuilder_fwd (CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_fwd(self, & result); }
forceinline void to_string_class_def(CodeEnum self, String& result ) { return enum_to_string_class_def(self, & result); } forceinline void to_strbuilder_class_def(CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_class_def(self, & result); }
forceinline void to_string_class_fwd(CodeEnum self, String& result ) { return enum_to_string_class_fwd(self, & result); } forceinline void to_strbuilder_class_fwd(CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_class_fwd(self, & result); }
forceinline String to_string(CodeExec exec) { return exec_to_string(exec); } forceinline StrBuilder to_string(CodeExec exec) { return exec_to_string(exec); }
forceinline void to_string(CodeExec exec, String& result) { return exec_to_string_ref(exec, & result); } forceinline void to_string(CodeExec exec, StrBuilder& result) { return exec_to_strbuilder_ref(exec, & result); }
forceinline void to_string(CodeExtern self, String& result) { return extern_to_string(self, & result); } forceinline void to_string(CodeExtern self, StrBuilder& result) { return extern_to_string(self, & result); }
forceinline String to_string(CodeInclude self) { return include_to_string(self); } forceinline StrBuilder to_string(CodeInclude self) { return include_to_string(self); }
forceinline void to_string(CodeInclude self, String& result) { return include_to_string_ref(self, & result); } forceinline void to_string(CodeInclude self, StrBuilder& result) { return include_to_strbuilder_ref(self, & result); }
forceinline String to_string(CodeFriend self) { return friend_to_string(self); } forceinline StrBuilder to_string(CodeFriend self) { return friend_to_string(self); }
forceinline void to_string(CodeFriend self, String& result) { return friend_to_string_ref(self, & result); } forceinline void to_string(CodeFriend self, StrBuilder& result) { return friend_to_strbuilder_ref(self, & result); }
forceinline String to_string (CodeFn self) { return fn_to_string(self); } forceinline StrBuilder to_string (CodeFn self) { return fn_to_string(self); }
forceinline void to_string_def(CodeFn self, String& result) { return fn_to_string_def(self, & result); } forceinline void to_strbuilder_def(CodeFn self, StrBuilder& result) { return fn_to_strbuilder_def(self, & result); }
forceinline void to_string_fwd(CodeFn self, String& result) { return fn_to_string_fwd(self, & result); } forceinline void to_strbuilder_fwd(CodeFn self, StrBuilder& result) { return fn_to_strbuilder_fwd(self, & result); }
forceinline String to_string(CodeModule self) { return module_to_string(self); } forceinline StrBuilder to_string(CodeModule self) { return module_to_string(self); }
forceinline void to_string(CodeModule self, String& result) { return module_to_string_ref(self, & result); } forceinline void to_string(CodeModule self, StrBuilder& result) { return module_to_strbuilder_ref(self, & result); }
forceinline String to_string(CodeNS self) { return namespace_to_string(self); } forceinline StrBuilder to_string(CodeNS self) { return namespace_to_string(self); }
forceinline void to_string(CodeNS self, String& result) { return namespace_to_string_ref(self, & result); } forceinline void to_string(CodeNS self, StrBuilder& result) { return namespace_to_strbuilder_ref(self, & result); }
forceinline String to_string (CodeOperator self) { return code_op_to_string(self); } forceinline StrBuilder to_string (CodeOperator self) { return code_op_to_string(self); }
forceinline void to_string_fwd(CodeOperator self, String& result ) { return code_op_to_string_fwd(self, & result); } forceinline void to_strbuilder_fwd(CodeOperator self, StrBuilder& result ) { return code_op_to_strbuilder_fwd(self, & result); }
forceinline void to_string_def(CodeOperator self, String& result ) { return code_op_to_string_def(self, & result); } forceinline void to_strbuilder_def(CodeOperator self, StrBuilder& result ) { return code_op_to_strbuilder_def(self, & result); }
forceinline String to_string (CodeOpCast op_cast ) { return opcast_to_string(op_cast); } forceinline StrBuilder to_string (CodeOpCast op_cast ) { return opcast_to_string(op_cast); }
forceinline void to_string_def(CodeOpCast op_cast, String& result ) { return opcast_to_string_def(op_cast, & result); } forceinline void to_strbuilder_def(CodeOpCast op_cast, StrBuilder& result ) { return opcast_to_strbuilder_def(op_cast, & result); }
forceinline void to_string_fwd(CodeOpCast op_cast, String& result ) { return opcast_to_string_fwd(op_cast, & result); } forceinline void to_strbuilder_fwd(CodeOpCast op_cast, StrBuilder& result ) { return opcast_to_strbuilder_fwd(op_cast, & result); }
forceinline String to_string(CodePragma self) { return pragma_to_string(self); } forceinline StrBuilder to_string(CodePragma self) { return pragma_to_string(self); }
forceinline void to_string(CodePragma self, String& result) { return pragma_to_string_ref(self, & result); } forceinline void to_string(CodePragma self, StrBuilder& result) { return pragma_to_strbuilder_ref(self, & result); }
forceinline String to_string (CodePreprocessCond cond) { return preprocess_to_string(cond); } forceinline StrBuilder to_string (CodePreprocessCond cond) { return preprocess_to_string(cond); }
forceinline void to_string_if (CodePreprocessCond cond, String& result ) { return preprocess_to_string_if(cond, & result); } forceinline void to_strbuilder_if (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_if(cond, & result); }
forceinline void to_string_ifdef (CodePreprocessCond cond, String& result ) { return preprocess_to_string_ifdef(cond, & result); } forceinline void to_strbuilder_ifdef (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_ifdef(cond, & result); }
forceinline void to_string_ifndef(CodePreprocessCond cond, String& result ) { return preprocess_to_string_ifndef(cond, & result); } forceinline void to_strbuilder_ifndef(CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_ifndef(cond, & result); }
forceinline void to_string_elif (CodePreprocessCond cond, String& result ) { return preprocess_to_string_elif(cond, & result); } forceinline void to_strbuilder_elif (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_elif(cond, & result); }
forceinline void to_string_else (CodePreprocessCond cond, String& result ) { return preprocess_to_string_else(cond, & result); } forceinline void to_strbuilder_else (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_else(cond, & result); }
forceinline void to_string_endif (CodePreprocessCond cond, String& result ) { return preprocess_to_string_endif(cond, & result); } forceinline void to_strbuilder_endif (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_endif(cond, & result); }
forceinline String to_string(CodeTemplate self) { return template_to_string(self); } forceinline StrBuilder to_string(CodeTemplate self) { return template_to_string(self); }
forceinline void to_string(CodeTemplate self, String& result) { return template_to_string_ref(self, & result); } forceinline void to_string(CodeTemplate self, StrBuilder& result) { return template_to_strbuilder_ref(self, & result); }
forceinline String to_string(CodeTypename self) { return typename_to_string(self); } forceinline StrBuilder to_string(CodeTypename self) { return typename_to_string(self); }
forceinline void to_string(CodeTypename self, String& result) { return typename_to_string_ref(self, & result); } forceinline void to_string(CodeTypename self, StrBuilder& result) { return typename_to_strbuilder_ref(self, & result); }
forceinline String to_string(CodeTypedef self) { return typedef_to_string(self); } forceinline StrBuilder to_string(CodeTypedef self) { return typedef_to_string(self); }
forceinline void to_string(CodeTypedef self, String& result ) { return typedef_to_string_ref(self, & result); } forceinline void to_string(CodeTypedef self, StrBuilder& result ) { return typedef_to_strbuilder_ref(self, & result); }
forceinline String to_string (CodeUnion self) { return union_to_string(self); } forceinline StrBuilder to_string (CodeUnion self) { return union_to_string(self); }
forceinline void to_string_def(CodeUnion self, String& result) { return union_to_string_def(self, & result); } forceinline void to_strbuilder_def(CodeUnion self, StrBuilder& result) { return union_to_strbuilder_def(self, & result); }
forceinline void to_string_fwd(CodeUnion self, String& result) { return union_to_string_fwd(self, & result); } forceinline void to_strbuilder_fwd(CodeUnion self, StrBuilder& result) { return union_to_strbuilder_fwd(self, & result); }
forceinline String to_string (CodeUsing op_cast ) { return using_to_string(op_cast); } forceinline StrBuilder to_string (CodeUsing op_cast ) { return using_to_string(op_cast); }
forceinline void to_string (CodeUsing op_cast, String& result ) { return using_to_string_ref(op_cast, & result); } forceinline void to_string (CodeUsing op_cast, StrBuilder& result ) { return using_to_strbuilder_ref(op_cast, & result); }
forceinline void to_string_ns(CodeUsing op_cast, String& result ) { return using_to_string_ns(op_cast, & result); } forceinline void to_strbuilder_ns(CodeUsing op_cast, StrBuilder& result ) { return using_to_strbuilder_ns(op_cast, & result); }
forceinline String to_string(CodeVar self) { return var_to_string(self); } forceinline StrBuilder to_string(CodeVar self) { return var_to_string(self); }
forceinline void to_string(CodeVar self, String& result) { return var_to_string_ref(self, & result); } forceinline void to_string(CodeVar self, StrBuilder& result) { return var_to_strbuilder_ref(self, & result); }
GEN_OPITMIZE_MAPPINGS_END GEN_OPITMIZE_MAPPINGS_END
#endif //if GEN_C_LIKE_CPP #endif //if GEN_C_LIKE_CPP

12
base/components/gen/ecodetypes.hpp
View File

@@ -72,9 +72,9 @@ enum CodeType : u32
CT_UnderlyingType = GEN_U32_MAX CT_UnderlyingType = GEN_U32_MAX
}; };
inline StrC codetype_to_str( CodeType type ) inline Str codetype_to_str( CodeType type )
{ {
local_persist StrC lookup[61] = { local_persist Str lookup[61] = {
{ sizeof( "Invalid" ), "Invalid" }, { sizeof( "Invalid" ), "Invalid" },
{ sizeof( "Untyped" ), "Untyped" }, { sizeof( "Untyped" ), "Untyped" },
{ sizeof( "NewLine" ), "NewLine" }, { sizeof( "NewLine" ), "NewLine" },
@@ -140,9 +140,9 @@ inline StrC codetype_to_str( CodeType type )
return lookup[type]; return lookup[type];
} }
inline StrC codetype_to_keyword_str( CodeType type ) inline Str codetype_to_keyword_str( CodeType type )
{ {
local_persist StrC lookup[61] = { local_persist Str lookup[61] = {
{ sizeof( "__NA__" ) - 1, "__NA__" }, { sizeof( "__NA__" ) - 1, "__NA__" },
{ sizeof( "__NA__" ) - 1, "__NA__" }, { sizeof( "__NA__" ) - 1, "__NA__" },
{ sizeof( "__NA__" ) - 1, "__NA__" }, { sizeof( "__NA__" ) - 1, "__NA__" },
@@ -208,12 +208,12 @@ inline StrC codetype_to_keyword_str( CodeType type )
return lookup[type]; return lookup[type];
} }
forceinline StrC to_str( CodeType type ) forceinline Str to_str( CodeType type )
{ {
return codetype_to_str( type ); return codetype_to_str( type );
} }
forceinline StrC to_keyword_str( CodeType type ) forceinline Str to_keyword_str( CodeType type )
{ {
return codetype_to_keyword_str( type ); return codetype_to_keyword_str( type );
} }

6
base/components/gen/eoperator.hpp
View File

@@ -58,9 +58,9 @@ enum Operator : u32
Op_UnderlyingType = 0xffffffffu Op_UnderlyingType = 0xffffffffu
}; };
inline StrC operator_to_str( Operator op ) inline Str operator_to_str( Operator op )
{ {
local_persist StrC lookup[47] = { local_persist Str lookup[47] = {
{ sizeof( "INVALID" ), "INVALID" }, { sizeof( "INVALID" ), "INVALID" },
{ sizeof( "=" ), "=" }, { sizeof( "=" ), "=" },
{ sizeof( "+=" ), "+=" }, { sizeof( "+=" ), "+=" },
@@ -112,7 +112,7 @@ inline StrC operator_to_str( Operator op )
return lookup[op]; return lookup[op];
} }
forceinline StrC to_str( Operator op ) forceinline Str to_str( Operator op )
{ {
return operator_to_str( op ); return operator_to_str( op );
} }

14
base/components/gen/especifier.hpp
View File

@@ -37,9 +37,9 @@ enum Specifier : u32
Spec_UnderlyingType = 0xffffffffu Spec_UnderlyingType = 0xffffffffu
}; };
inline StrC spec_to_str( Specifier type ) inline Str spec_to_str( Specifier type )
{ {
local_persist StrC lookup[26] = { local_persist Str lookup[26] = {
{ sizeof( "INVALID" ), "INVALID" }, { sizeof( "INVALID" ), "INVALID" },
{ sizeof( "consteval" ), "consteval" }, { sizeof( "consteval" ), "consteval" },
{ sizeof( "constexpr" ), "constexpr" }, { sizeof( "constexpr" ), "constexpr" },
@@ -75,12 +75,12 @@ inline bool spec_is_trailing( Specifier specifier )
return specifier > Spec_Virtual; return specifier > Spec_Virtual;
} }
inline Specifier strc_to_specifier( StrC str ) inline Specifier str_to_specifier( Str str )
{ {
local_persist u32 keymap[Spec_NumSpecifiers]; local_persist u32 keymap[Spec_NumSpecifiers];
do_once_start for ( u32 index = 0; index < Spec_NumSpecifiers; index++ ) do_once_start for ( u32 index = 0; index < Spec_NumSpecifiers; index++ )
{ {
StrC enum_str = spec_to_str( (Specifier)index ); Str enum_str = spec_to_str( (Specifier)index );
keymap[index] = crc32( enum_str.Ptr, enum_str.Len - 1 ); keymap[index] = crc32( enum_str.Ptr, enum_str.Len - 1 );
} }
do_once_end u32 hash = crc32( str.Ptr, str.Len ); do_once_end u32 hash = crc32( str.Ptr, str.Len );
@@ -92,14 +92,14 @@ inline Specifier strc_to_specifier( StrC str )
return Spec_Invalid; return Spec_Invalid;
} }
forceinline StrC to_str( Specifier spec ) forceinline Str to_str( Specifier spec )
{ {
return spec_to_str( spec ); return spec_to_str( spec );
} }
forceinline Specifier to_type( StrC str ) forceinline Specifier to_type( Str str )
{ {
return strc_to_specifier( str ); return str_to_specifier( str );
} }
forceinline bool is_trailing( Specifier specifier ) forceinline bool is_trailing( Specifier specifier )

10
base/components/gen/etoktype.cpp
View File

@@ -111,9 +111,9 @@ enum TokType : u32
Tok_NumTokens Tok_NumTokens
}; };
inline StrC toktype_to_str( TokType type ) inline Str toktype_to_str( TokType type )
{ {
local_persist StrC lookup[] = { local_persist Str lookup[] = {
{ sizeof( "__invalid__" ), "__invalid__" }, { sizeof( "__invalid__" ), "__invalid__" },
{ sizeof( "private" ), "private" }, { sizeof( "private" ), "private" },
{ sizeof( "protected" ), "protected" }, { sizeof( "protected" ), "protected" },
@@ -192,7 +192,7 @@ inline StrC toktype_to_str( TokType type )
{ sizeof( "*" ), "*" }, { sizeof( "*" ), "*" },
{ sizeof( ";" ), ";" }, { sizeof( ";" ), ";" },
{ sizeof( "static_assert" ), "static_assert" }, { sizeof( "static_assert" ), "static_assert" },
{ sizeof( "__string__" ), "__string__" }, { sizeof( "__strbuilder__" ), "__strbuilder__" },
{ sizeof( "typename" ), "typename" }, { sizeof( "typename" ), "typename" },
{ sizeof( "unsigned" ), "unsigned" }, { sizeof( "unsigned" ), "unsigned" },
{ sizeof( "signed" ), "signed" }, { sizeof( "signed" ), "signed" },
@@ -215,12 +215,12 @@ inline StrC toktype_to_str( TokType type )
return lookup[type]; return lookup[type];
} }
inline TokType strc_to_toktype( StrC str ) inline TokType str_to_toktype( Str str )
{ {
local_persist u32 keymap[Tok_NumTokens]; local_persist u32 keymap[Tok_NumTokens];
do_once_start for ( u32 index = 0; index < Tok_NumTokens; index++ ) do_once_start for ( u32 index = 0; index < Tok_NumTokens; index++ )
{ {
StrC enum_str = toktype_to_str( (TokType)index ); Str enum_str = toktype_to_str( (TokType)index );
keymap[index] = crc32( enum_str.Ptr, enum_str.Len - 1 ); keymap[index] = crc32( enum_str.Ptr, enum_str.Len - 1 );
} }
do_once_end u32 hash = crc32( str.Ptr, str.Len ); do_once_end u32 hash = crc32( str.Ptr, str.Len );

2
base/components/header_end.hpp
View File

@@ -53,7 +53,7 @@ constexpr s32 MaxUntypedStrLength = GEN_MAX_UNTYPED_STR_LENGTH;
constexpr s32 LexAllocator_Size = GEN_LEX_ALLOCATOR_SIZE; constexpr s32 LexAllocator_Size = GEN_LEX_ALLOCATOR_SIZE;
constexpr s32 Builder_StrBufferReserve = GEN_BUILDER_STR_BUFFER_RESERVE; constexpr s32 Builder_StrBufferReserve = GEN_BUILDER_STR_BUFFER_RESERVE;
extern StrC enum_underlying_sig; extern Str enum_underlying_sig;
extern Code access_public; extern Code access_public;
extern Code access_protected; extern Code access_protected;

6
base/components/inlines.hpp
View File

@@ -101,7 +101,7 @@ Code& Code::operator ++()
} }
#endif #endif
forceinline forceinline
StrC code_type_str(Code self) Str code_type_str(Code self)
{ {
GEN_ASSERT(self != nullptr); GEN_ASSERT(self != nullptr);
return codetype_to_str( self->Type ); return codetype_to_str( self->Type );
@@ -397,7 +397,7 @@ CodeBody def_body( CodeType type )
} }
inline inline
StrC token_fmt_impl( ssize num, ... ) Str token_fmt_impl( ssize num, ... )
{ {
local_persist thread_local local_persist thread_local
char buf[GEN_PRINTF_MAXLEN] = { 0 }; char buf[GEN_PRINTF_MAXLEN] = { 0 };
@@ -408,7 +408,7 @@ StrC token_fmt_impl( ssize num, ... )
ssize result = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num, va); ssize result = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num, va);
va_end(va); va_end(va);
StrC str = { result, buf }; Str str = { result, buf };
return str; return str;
} }
#pragma endregion Interface #pragma endregion Interface

83
base/components/interface.cpp
View File

@@ -101,11 +101,11 @@ void define_constants()
access_public->Name = get_cached_string( txt("public:\n") ); access_public->Name = get_cached_string( txt("public:\n") );
code_set_global(access_public); code_set_global(access_public);
StrC api_export_str = code(GEN_API_Export_Code); Str api_export_str = code(GEN_API_Export_Code);
attrib_api_export = def_attributes( api_export_str ); attrib_api_export = def_attributes( api_export_str );
code_set_global(cast(Code, attrib_api_export)); code_set_global(cast(Code, attrib_api_export));
StrC api_import_str = code(GEN_API_Import_Code); Str api_import_str = code(GEN_API_Import_Code);
attrib_api_import = def_attributes( api_import_str ); attrib_api_import = def_attributes( api_import_str );
code_set_global(cast(Code, attrib_api_import)); code_set_global(cast(Code, attrib_api_import));
@@ -145,43 +145,34 @@ void define_constants()
preprocess_endif->Type = CT_Preprocess_EndIf; preprocess_endif->Type = CT_Preprocess_EndIf;
code_set_global((Code)preprocess_endif); code_set_global((Code)preprocess_endif);
# define def_constant_code_type( Type_ ) \ Str auto_str = txt("auto"); t_auto = def_type( auto_str ); code_set_global( t_auto );
do \ Str void_str = txt("void"); t_void = def_type( void_str ); code_set_global( t_void );
{ \ Str int_str = txt("int"); t_int = def_type( int_str ); code_set_global( t_int );
StrC name_str = name(Type_); \ Str bool_str = txt("bool"); t_bool = def_type( bool_str ); code_set_global( t_bool );
t_##Type_ = def_type( name_str ); \ Str char_str = txt("char"); t_char = def_type( char_str ); code_set_global( t_char );
code_set_global( cast(Code, t_##Type_)); \ Str wchar_str = txt("wchar_t"); t_wchar_t = def_type( wchar_str ); code_set_global( t_wchar_t );
} while(0) Str class_str = txt("class"); t_class = def_type( class_str ); code_set_global( t_class );
Str typename_str = txt("typename"); t_typename = def_type( typename_str ); code_set_global( t_typename );
def_constant_code_type( auto );
def_constant_code_type( void );
def_constant_code_type( int );
def_constant_code_type( bool );
def_constant_code_type( char );
def_constant_code_type( wchar_t );
def_constant_code_type( class );
def_constant_code_type( typename );
#ifdef GEN_DEFINE_LIBRARY_CODE_CONSTANTS #ifdef GEN_DEFINE_LIBRARY_CODE_CONSTANTS
t_b32 = def_type( name(b32) ); t_b32 = def_type( name(b32) ); code_set_global( t_b32 );
def_constant_code_type( s8 ); Str s8_str = txt("s8"); t_s8 = def_type( s8_str ); code_set_global( t_s8 );
def_constant_code_type( s16 ); Str s16_str = txt("s16"); t_s16 = def_type( s16_str ); code_set_global( t_s16 );
def_constant_code_type( s32 ); Str s32_str = txt("s32"); t_s32 = def_type( s32_str ); code_set_global( t_s32 );
def_constant_code_type( s64 ); Str s64_str = txt("s64"); t_s64 = def_type( s64_str ); code_set_global( t_s64 );
def_constant_code_type( u8 ); Str u8_str = txt("u8"); t_u8 = def_type( u8_str ); code_set_global( t_u8 );
def_constant_code_type( u16 ); Str u16_str = txt("u16"); t_u16 = def_type( u16_str ); code_set_global( t_u16 );
def_constant_code_type( u32 ); Str u32_str = txt("u32"); t_u32 = def_type( u32_str ); code_set_global( t_u32 );
def_constant_code_type( u64 ); Str u64_str = txt("u64"); t_u64 = def_type( u64_str ); code_set_global( t_u64 );
def_constant_code_type( ssize ); Str ssize_str = txt("ssize"); t_ssize = def_type( ssize_str ); code_set_global( t_ssize );
def_constant_code_type( usize ); Str usize_str = txt("usize"); t_usize = def_type( usize_str ); code_set_global( t_usize );
def_constant_code_type( f32 ); Str f32_str = txt("f32"); t_f32 = def_type( f32_str ); code_set_global( t_f32 );
def_constant_code_type( f64 ); Str f64_str = txt("f64"); t_f64 = def_type( f64_str ); code_set_global( t_f64 );
#endif #endif
# undef def_constant_code_type
spec_const = def_specifier( Spec_Const); code_set_global( cast(Code, spec_const )); 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_consteval = def_specifier( Spec_Consteval); code_set_global( cast(Code, spec_consteval ));;
@@ -282,12 +273,12 @@ void init()
LexArena = arena_init_from_allocator( Allocator_Lexer, LexAllocator_Size ); LexArena = arena_init_from_allocator( Allocator_Lexer, LexAllocator_Size );
Arena string_arena = arena_init_from_allocator( Allocator_StringArena, SizePer_StringArena ); Arena strbuilder_arena = arena_init_from_allocator( Allocator_StringArena, SizePer_StringArena );
if ( string_arena.PhysicalStart == nullptr ) if ( strbuilder_arena.PhysicalStart == nullptr )
GEN_FATAL( "gen::init: Failed to initialize the string arena" ); GEN_FATAL( "gen::init: Failed to initialize the string arena" );
array_append( StringArenas, string_arena ); array_append( StringArenas, strbuilder_arena );
} }
// Setup the hash tables // Setup the hash tables
@@ -321,8 +312,8 @@ void deinit()
left = array_num(StringArenas); left = array_num(StringArenas);
do do
{ {
Arena* string_arena = & StringArenas[index]; Arena* strbuilder_arena = & StringArenas[index];
arena_free(string_arena); arena_free(strbuilder_arena);
index++; index++;
} }
while ( left--, left ); while ( left--, left );
@@ -366,8 +357,8 @@ void reset()
left = array_num(StringArenas); left = array_num(StringArenas);
do do
{ {
Arena* string_arena = & StringArenas[index]; Arena* strbuilder_arena = & StringArenas[index];
string_arena->TotalUsed = 0;; strbuilder_arena->TotalUsed = 0;;
index++; index++;
} }
while ( left--, left ); while ( left--, left );
@@ -377,18 +368,18 @@ void reset()
define_constants(); define_constants();
} }
AllocatorInfo get_string_allocator( s32 str_length ) AllocatorInfo get_strbuilder_allocator( s32 c_str_length )
{ {
Arena* last = array_back(StringArenas); Arena* last = array_back(StringArenas);
usize size_req = str_length + sizeof(StringHeader) + sizeof(char*); usize size_req = c_str_length + sizeof(StrBuilderHeader) + sizeof(char*);
if ( last->TotalUsed + scast(ssize, size_req) > last->TotalSize ) if ( last->TotalUsed + scast(ssize, size_req) > last->TotalSize )
{ {
Arena new_arena = arena_init_from_allocator( Allocator_StringArena, SizePer_StringArena ); Arena new_arena = arena_init_from_allocator( Allocator_StringArena, SizePer_StringArena );
if ( ! array_append( StringArenas, new_arena ) ) if ( ! array_append( StringArenas, new_arena ) )
GEN_FATAL( "gen::get_string_allocator: Failed to allocate a new string arena" ); GEN_FATAL( "gen::get_strbuilder_allocator: Failed to allocate a new string arena" );
last = array_back(StringArenas); last = array_back(StringArenas);
} }
@@ -397,7 +388,7 @@ AllocatorInfo get_string_allocator( s32 str_length )
} }
// Will either make or retrive a code string. // Will either make or retrive a code string.
StringCached get_cached_string( StrC str ) StringCached get_cached_string( Str str )
{ {
s32 hash_length = str.Len > kilobytes(1) ? kilobytes(1) : str.Len; s32 hash_length = str.Len > kilobytes(1) ? kilobytes(1) : str.Len;
u64 key = crc32( str.Ptr, hash_length ); u64 key = crc32( str.Ptr, hash_length );
@@ -408,7 +399,7 @@ StringCached get_cached_string( StrC str )
return * result; return * result;
} }
StrC result = string_to_strc( string_make_strc( get_string_allocator( str.Len ), str )); Str result = strbuilder_to_str( strbuilder_make_str( get_strbuilder_allocator( str.Len ), str ));
hashtable_set(StringCache, key, result ); hashtable_set(StringCache, key, result );
return result; return result;
@@ -451,12 +442,12 @@ void set_allocator_lexer( AllocatorInfo allocator )
Allocator_Lexer = allocator; Allocator_Lexer = allocator;
} }
void set_allocator_string_arena( AllocatorInfo allocator ) void set_allocator_strbuilder_arena( AllocatorInfo allocator )
{ {
Allocator_StringArena = allocator; Allocator_StringArena = allocator;
} }
void set_allocator_string_table( AllocatorInfo allocator ) void set_allocator_strbuilder_table( AllocatorInfo allocator )
{ {
Allocator_StringArena = allocator; Allocator_StringArena = allocator;
} }

108
base/components/interface.hpp
View File

@@ -28,7 +28,7 @@ void reset();
// Used internally to retrive or make string allocations. // Used internally to retrive or make string allocations.
// Strings are stored in a series of string arenas of fixed size (SizePer_StringArena) // Strings are stored in a series of string arenas of fixed size (SizePer_StringArena)
StringCached get_cached_string( StrC str ); StringCached get_cached_string( Str str );
/* /*
This provides a fresh Code AST. This provides a fresh Code AST.
@@ -42,14 +42,14 @@ Code make_code();
void set_allocator_data_arrays ( AllocatorInfo data_array_allocator ); void set_allocator_data_arrays ( AllocatorInfo data_array_allocator );
void set_allocator_code_pool ( AllocatorInfo pool_allocator ); void set_allocator_code_pool ( AllocatorInfo pool_allocator );
void set_allocator_lexer ( AllocatorInfo lex_allocator ); void set_allocator_lexer ( AllocatorInfo lex_allocator );
void set_allocator_string_arena( AllocatorInfo string_allocator ); void set_allocator_strbuilder_arena( AllocatorInfo strbuilder_allocator );
void set_allocator_string_table( AllocatorInfo string_allocator ); void set_allocator_strbuilder_table( AllocatorInfo strbuilder_allocator );
void set_allocator_type_table ( AllocatorInfo type_reg_allocator ); void set_allocator_type_table ( AllocatorInfo type_reg_allocator );
#pragma region Upfront #pragma region Upfront
CodeAttributes def_attributes( StrC content ); CodeAttributes def_attributes( Str content );
CodeComment def_comment ( StrC content ); CodeComment def_comment ( Str content );
struct Opts_def_struct { struct Opts_def_struct {
CodeBody body; CodeBody body;
@@ -60,7 +60,7 @@ struct Opts_def_struct {
s32 num_interfaces; s32 num_interfaces;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeClass def_class( StrC name, Opts_def_struct opts GEN_PARAM_DEFAULT ); CodeClass def_class( Str name, Opts_def_struct opts GEN_PARAM_DEFAULT );
struct Opts_def_constructor { struct Opts_def_constructor {
CodeParams params; CodeParams params;
@@ -72,7 +72,7 @@ CodeConstructor def_constructor( Opts_def_constructor opts GEN_PARAM_DEFAULT );
struct Opts_def_define { struct Opts_def_define {
b32 dont_append_preprocess_defines; b32 dont_append_preprocess_defines;
}; };
CodeDefine def_define( StrC name, StrC content, Opts_def_define opts GEN_PARAM_DEFAULT ); CodeDefine def_define( Str name, Str content, Opts_def_define opts GEN_PARAM_DEFAULT );
struct Opts_def_destructor { struct Opts_def_destructor {
Code body; Code body;
@@ -88,10 +88,10 @@ struct Opts_def_enum {
ModuleFlag mflags; ModuleFlag mflags;
Code type_macro; Code type_macro;
}; };
CodeEnum def_enum( StrC name, Opts_def_enum opts GEN_PARAM_DEFAULT ); CodeEnum def_enum( Str name, Opts_def_enum opts GEN_PARAM_DEFAULT );
CodeExec def_execution ( StrC content ); CodeExec def_execution ( Str content );
CodeExtern def_extern_link( StrC name, CodeBody body ); CodeExtern def_extern_link( Str name, CodeBody body );
CodeFriend def_friend ( Code symbol ); CodeFriend def_friend ( Code symbol );
struct Opts_def_function { struct Opts_def_function {
@@ -102,14 +102,14 @@ struct Opts_def_function {
CodeAttributes attrs; CodeAttributes attrs;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeFn def_function( StrC name, Opts_def_function opts GEN_PARAM_DEFAULT ); CodeFn def_function( Str name, Opts_def_function opts GEN_PARAM_DEFAULT );
struct Opts_def_include { b32 foreign; }; struct Opts_def_include { b32 foreign; };
struct Opts_def_module { ModuleFlag mflags; }; struct Opts_def_module { ModuleFlag mflags; };
struct Opts_def_namespace { ModuleFlag mflags; }; struct Opts_def_namespace { ModuleFlag mflags; };
CodeInclude def_include ( StrC content, Opts_def_include opts GEN_PARAM_DEFAULT ); CodeInclude def_include ( Str content, Opts_def_include opts GEN_PARAM_DEFAULT );
CodeModule def_module ( StrC name, Opts_def_module opts GEN_PARAM_DEFAULT ); CodeModule def_module ( Str name, Opts_def_module opts GEN_PARAM_DEFAULT );
CodeNS def_namespace( StrC name, CodeBody body, Opts_def_namespace opts GEN_PARAM_DEFAULT ); CodeNS def_namespace( Str name, CodeBody body, Opts_def_namespace opts GEN_PARAM_DEFAULT );
struct Opts_def_operator { struct Opts_def_operator {
CodeParams params; CodeParams params;
@@ -119,7 +119,7 @@ struct Opts_def_operator {
CodeAttributes attributes; CodeAttributes attributes;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeOperator def_operator( Operator op, StrC nspace, Opts_def_operator opts GEN_PARAM_DEFAULT ); CodeOperator def_operator( Operator op, Str nspace, Opts_def_operator opts GEN_PARAM_DEFAULT );
struct Opts_def_operator_cast { struct Opts_def_operator_cast {
CodeBody body; CodeBody body;
@@ -128,14 +128,14 @@ struct Opts_def_operator_cast {
CodeOpCast def_operator_cast( CodeTypename type, Opts_def_operator_cast opts GEN_PARAM_DEFAULT ); CodeOpCast def_operator_cast( CodeTypename type, Opts_def_operator_cast opts GEN_PARAM_DEFAULT );
struct Opts_def_param { Code value; }; struct Opts_def_param { Code value; };
CodeParams def_param ( CodeTypename type, StrC name, Opts_def_param opts GEN_PARAM_DEFAULT ); CodeParams def_param ( CodeTypename type, Str name, Opts_def_param opts GEN_PARAM_DEFAULT );
CodePragma def_pragma( StrC directive ); CodePragma def_pragma( Str directive );
CodePreprocessCond def_preprocess_cond( EPreprocessCond type, StrC content ); CodePreprocessCond def_preprocess_cond( EPreprocessCond type, Str content );
CodeSpecifiers def_specifier( Specifier specifier ); CodeSpecifiers def_specifier( Specifier specifier );
CodeStruct def_struct( StrC name, Opts_def_struct opts GEN_PARAM_DEFAULT ); CodeStruct def_struct( Str name, Opts_def_struct opts GEN_PARAM_DEFAULT );
struct Opts_def_template { ModuleFlag mflags; }; struct Opts_def_template { ModuleFlag mflags; };
CodeTemplate def_template( CodeParams params, Code definition, Opts_def_template opts GEN_PARAM_DEFAULT ); CodeTemplate def_template( CodeParams params, Code definition, Opts_def_template opts GEN_PARAM_DEFAULT );
@@ -146,27 +146,27 @@ struct Opts_def_type {
CodeSpecifiers specifiers; CodeSpecifiers specifiers;
CodeAttributes attributes; CodeAttributes attributes;
}; };
CodeTypename def_type( StrC name, Opts_def_type opts GEN_PARAM_DEFAULT ); CodeTypename def_type( Str name, Opts_def_type opts GEN_PARAM_DEFAULT );
struct Opts_def_typedef { struct Opts_def_typedef {
CodeAttributes attributes; CodeAttributes attributes;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeTypedef def_typedef( StrC name, Code type, Opts_def_typedef opts GEN_PARAM_DEFAULT ); CodeTypedef def_typedef( Str name, Code type, Opts_def_typedef opts GEN_PARAM_DEFAULT );
struct Opts_def_union { struct Opts_def_union {
CodeAttributes attributes; CodeAttributes attributes;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeUnion def_union( StrC name, CodeBody body, Opts_def_union opts GEN_PARAM_DEFAULT ); CodeUnion def_union( Str name, CodeBody body, Opts_def_union opts GEN_PARAM_DEFAULT );
struct Opts_def_using { struct Opts_def_using {
CodeAttributes attributes; CodeAttributes attributes;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeUsing def_using( StrC name, CodeTypename type, Opts_def_using opts GEN_PARAM_DEFAULT ); CodeUsing def_using( Str name, CodeTypename type, Opts_def_using opts GEN_PARAM_DEFAULT );
CodeUsing def_using_namespace( StrC name ); CodeUsing def_using_namespace( Str name );
struct Opts_def_variable struct Opts_def_variable
{ {
@@ -175,7 +175,7 @@ struct Opts_def_variable
CodeAttributes attributes; CodeAttributes attributes;
ModuleFlag mflags; ModuleFlag mflags;
}; };
CodeVar def_variable( CodeTypename type, StrC name, Opts_def_variable opts GEN_PARAM_DEFAULT ); CodeVar def_variable( CodeTypename type, Str name, Opts_def_variable opts GEN_PARAM_DEFAULT );
// Constructs an empty body. Use AST::validate_body() to check if the body is was has valid entries. // Constructs an empty body. Use AST::validate_body() to check if the body is was has valid entries.
CodeBody def_body( CodeType type ); CodeBody def_body( CodeType type );
@@ -220,13 +220,13 @@ struct StackNode
Token Start; Token Start;
Token Name; // The name of the AST node (if parsed) Token Name; // The name of the AST node (if parsed)
StrC FailedProc; // The name of the procedure that failed Str FailedProc; // The name of the procedure that failed
}; };
// Stack nodes are allocated the error's allocator // Stack nodes are allocated the error's allocator
struct Error struct Error
{ {
String message; StrBuilder message;
StackNode* context_stack; StackNode* context_stack;
}; };
GEN_NS_PARSER_END GEN_NS_PARSER_END
@@ -243,28 +243,28 @@ struct ParseInfo
// Errors are allocated to a dedicated general arena. // Errors are allocated to a dedicated general arena.
}; };
CodeBody parse_file( StrC path ); CodeBody parse_file( Str path );
#endif #endif
CodeClass parse_class ( StrC class_def ); CodeClass parse_class ( Str class_def );
CodeConstructor parse_constructor ( StrC constructor_def ); CodeConstructor parse_constructor ( Str constructor_def );
CodeDestructor parse_destructor ( StrC destructor_def ); CodeDestructor parse_destructor ( Str destructor_def );
CodeEnum parse_enum ( StrC enum_def ); CodeEnum parse_enum ( Str enum_def );
CodeBody parse_export_body ( StrC export_def ); CodeBody parse_export_body ( Str export_def );
CodeExtern parse_extern_link ( StrC exten_link_def ); CodeExtern parse_extern_link ( Str exten_link_def );
CodeFriend parse_friend ( StrC friend_def ); CodeFriend parse_friend ( Str friend_def );
CodeFn parse_function ( StrC fn_def ); CodeFn parse_function ( Str fn_def );
CodeBody parse_global_body ( StrC body_def ); CodeBody parse_global_body ( Str body_def );
CodeNS parse_namespace ( StrC namespace_def ); CodeNS parse_namespace ( Str namespace_def );
CodeOperator parse_operator ( StrC operator_def ); CodeOperator parse_operator ( Str operator_def );
CodeOpCast parse_operator_cast( StrC operator_def ); CodeOpCast parse_operator_cast( Str operator_def );
CodeStruct parse_struct ( StrC struct_def ); CodeStruct parse_struct ( Str struct_def );
CodeTemplate parse_template ( StrC template_def ); CodeTemplate parse_template ( Str template_def );
CodeTypename parse_type ( StrC type_def ); CodeTypename parse_type ( Str type_def );
CodeTypedef parse_typedef ( StrC typedef_def ); CodeTypedef parse_typedef ( Str typedef_def );
CodeUnion parse_union ( StrC union_def ); CodeUnion parse_union ( Str union_def );
CodeUsing parse_using ( StrC using_def ); CodeUsing parse_using ( Str using_def );
CodeVar parse_variable ( StrC var_def ); CodeVar parse_variable ( Str var_def );
#pragma endregion Parsing #pragma endregion Parsing
@@ -272,9 +272,9 @@ CodeVar parse_variable ( StrC var_def );
ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va ); ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va );
//! Do not use directly. Use the token_fmt macro instead. //! Do not use directly. Use the token_fmt macro instead.
StrC token_fmt_impl( ssize, ... ); Str token_fmt_impl( ssize, ... );
Code untyped_str ( StrC content); Code untyped_str ( Str content);
Code untyped_fmt ( char const* fmt, ... ); Code untyped_fmt ( char const* fmt, ... );
Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... ); Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... );
@@ -317,21 +317,21 @@ Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... );
#ifndef token_fmt #ifndef token_fmt
/* /*
Takes a format string (char const*) and a list of tokens (StrC) and returns a StrC of the formatted string. Takes a format string (char const*) and a list of tokens (Str) and returns a Str of the formatted string.
Tokens are provided in '<'identifier'>' format where '<' '>' are just angle brackets (you can change it in token_fmt_va) Tokens are provided in '<'identifier'>' format where '<' '>' are just angle brackets (you can change it in token_fmt_va)
--------------------------------------------------------- ---------------------------------------------------------
Example - A string with: Example - A string with:
typedef <type> <name> <name>; typedef <type> <name> <name>;
Will have a token_fmt arguments populated with: Will have a token_fmt arguments populated with:
"type", strc_for_type, "type", str_for_type,
"name", strc_for_name, "name", str_for_name,
and: and:
stringize( typedef <type> <name> <name>; ) stringize( typedef <type> <name> <name>; )
----------------------------------------------------------- -----------------------------------------------------------
So the full call for this example would be: So the full call for this example would be:
token_fmt( token_fmt(
"type", strc_for_type "type", str_for_type
, "name", strc_for_name , "name", str_for_name
, stringize( , stringize(
typedef <type> <name> <name> typedef <type> <name> <name>
)); ));

40
base/components/interface.parsing.cpp
View File

@@ -8,7 +8,7 @@
// Publically Exposed Interface // Publically Exposed Interface
CodeClass parse_class( StrC def ) CodeClass parse_class( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -24,7 +24,7 @@ CodeClass parse_class( StrC def )
return result; return result;
} }
CodeConstructor parse_constructor( StrC def ) CodeConstructor parse_constructor( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -41,7 +41,7 @@ CodeConstructor parse_constructor( StrC def )
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
b32 ignore_spec = false; b32 ignore_spec = false;
@@ -84,7 +84,7 @@ CodeConstructor parse_constructor( StrC def )
return result; return result;
} }
CodeDestructor parse_destructor( StrC def ) CodeDestructor parse_destructor( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -101,7 +101,7 @@ CodeDestructor parse_destructor( StrC def )
return result; return result;
} }
CodeEnum parse_enum( StrC def ) CodeEnum parse_enum( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -117,7 +117,7 @@ CodeEnum parse_enum( StrC def )
return parser_parse_enum( parser_not_inplace_def); return parser_parse_enum( parser_not_inplace_def);
} }
CodeBody parse_export_body( StrC def ) CodeBody parse_export_body( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -130,7 +130,7 @@ CodeBody parse_export_body( StrC def )
return parser_parse_export_body(); return parser_parse_export_body();
} }
CodeExtern parse_extern_link( StrC def ) CodeExtern parse_extern_link( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -143,7 +143,7 @@ CodeExtern parse_extern_link( StrC def )
return parser_parse_extern_link(); return parser_parse_extern_link();
} }
CodeFriend parse_friend( StrC def ) CodeFriend parse_friend( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -156,7 +156,7 @@ CodeFriend parse_friend( StrC def )
return parser_parse_friend(); return parser_parse_friend();
} }
CodeFn parse_function( StrC def ) CodeFn parse_function( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -169,7 +169,7 @@ CodeFn parse_function( StrC def )
return (CodeFn) parser_parse_function(); return (CodeFn) parser_parse_function();
} }
CodeBody parse_global_body( StrC def ) CodeBody parse_global_body( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -185,7 +185,7 @@ CodeBody parse_global_body( StrC def )
return result; return result;
} }
CodeNS parse_namespace( StrC def ) CodeNS parse_namespace( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -198,7 +198,7 @@ CodeNS parse_namespace( StrC def )
return parser_parse_namespace(); return parser_parse_namespace();
} }
CodeOperator parse_operator( StrC def ) CodeOperator parse_operator( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -211,7 +211,7 @@ CodeOperator parse_operator( StrC def )
return (CodeOperator) parser_parse_operator(); return (CodeOperator) parser_parse_operator();
} }
CodeOpCast parse_operator_cast( StrC def ) CodeOpCast parse_operator_cast( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -224,7 +224,7 @@ CodeOpCast parse_operator_cast( StrC def )
return parser_parse_operator_cast(NullCode); return parser_parse_operator_cast(NullCode);
} }
CodeStruct parse_struct( StrC def ) CodeStruct parse_struct( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -240,7 +240,7 @@ CodeStruct parse_struct( StrC def )
return result; return result;
} }
CodeTemplate parse_template( StrC def ) CodeTemplate parse_template( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -253,7 +253,7 @@ CodeTemplate parse_template( StrC def )
return parser_parse_template(); return parser_parse_template();
} }
CodeTypename parse_type( StrC def ) CodeTypename parse_type( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -266,7 +266,7 @@ CodeTypename parse_type( StrC def )
return parser_parse_type( parser_not_from_template, nullptr); return parser_parse_type( parser_not_from_template, nullptr);
} }
CodeTypedef parse_typedef( StrC def ) CodeTypedef parse_typedef( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -279,7 +279,7 @@ CodeTypedef parse_typedef( StrC def )
return parser_parse_typedef(); return parser_parse_typedef();
} }
CodeUnion parse_union( StrC def ) CodeUnion parse_union( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -292,7 +292,7 @@ CodeUnion parse_union( StrC def )
return parser_parse_union( parser_not_inplace_def); return parser_parse_union( parser_not_inplace_def);
} }
CodeUsing parse_using( StrC def ) CodeUsing parse_using( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );
@@ -305,7 +305,7 @@ CodeUsing parse_using( StrC def )
return parser_parse_using(); return parser_parse_using();
} }
CodeVar parse_variable( StrC def ) CodeVar parse_variable( Str def )
{ {
GEN_USING_NS_PARSER; GEN_USING_NS_PARSER;
check_parse_args( def ); check_parse_args( def );

18
base/components/interface.untyped.cpp
View File

@@ -15,16 +15,16 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
local_persist local_persist
StringTable tok_map; StringTable tok_map;
{ {
tok_map = hashtable_init(StrC, fixed_arena_allocator_info(& tok_map_arena) ); tok_map = hashtable_init(Str, fixed_arena_allocator_info(& tok_map_arena) );
s32 left = num_tokens - 1; s32 left = num_tokens - 1;
while ( left-- ) while ( left-- )
{ {
char const* token = va_arg( va, char const* ); char const* token = va_arg( va, char const* );
StrC value = va_arg( va, StrC ); Str value = va_arg( va, Str );
u32 key = crc32( token, str_len(token) ); u32 key = crc32( token, c_str_len(token) );
hashtable_set( tok_map, key, value ); hashtable_set( tok_map, key, value );
} }
} }
@@ -61,7 +61,7 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
char const* token = fmt + 1; char const* token = fmt + 1;
u32 key = crc32( token, tok_len ); u32 key = crc32( token, tok_len );
StrC* value = hashtable_get(tok_map, key ); Str* value = hashtable_get(tok_map, key );
if ( value ) if ( value )
{ {
@@ -99,7 +99,7 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
return result; return result;
} }
Code untyped_str( StrC content ) Code untyped_str( Str content )
{ {
if ( content.Len == 0 ) if ( content.Len == 0 )
{ {
@@ -135,11 +135,11 @@ Code untyped_fmt( char const* fmt, ...)
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
ssize length = str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va); ssize length = c_str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va);
va_end(va); va_end(va);
StrC buf_str = { str_len_capped(fmt, MaxNameLength), fmt }; Str buf_str = { c_str_len_capped(fmt, MaxNameLength), fmt };
StrC uncapped_str = { length, buf }; Str uncapped_str = { length, buf };
Code Code
result = make_code(); result = make_code();
@@ -172,7 +172,7 @@ Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... )
ssize length = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num_tokens, va); ssize length = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num_tokens, va);
va_end(va); va_end(va);
StrC buf_str = { length, buf }; Str buf_str = { length, buf };
Code Code
result = make_code(); result = make_code();

927
base/components/interface.upfront.cpp
View File

File diff suppressed because it is too large Load Diff

299
base/components/lexer.cpp
View File

@@ -41,9 +41,9 @@ AccessSpec tok_to_access_specifier(Token tok)
return scast(AccessSpec, tok.Type); return scast(AccessSpec, tok.Type);
} }
StrC tok_to_str(Token tok) Str tok_to_str(Token tok)
{ {
StrC str = { tok.Length, tok.Text }; Str str = { tok.Length, tok.Text };
return str; return str;
} }
@@ -92,13 +92,13 @@ bool tok_is_end_definition(Token tok)
return bitfield_is_equal( u32, tok.Flags, TF_EndDefinition ); return bitfield_is_equal( u32, tok.Flags, TF_EndDefinition );
} }
String tok_to_string(Token tok) StrBuilder tok_to_string(Token tok)
{ {
String result = string_make_reserve( GlobalAllocator, kilobytes(4) ); StrBuilder result = strbuilder_make_reserve( GlobalAllocator, kilobytes(4) );
StrC type_str = toktype_to_str( tok.Type ); Str type_str = toktype_to_str( tok.Type );
string_append_fmt( & result, "Line: %d Column: %d, Type: %.*s Content: %.*s" strbuilder_append_fmt( & result, "Line: %d Column: %d, Type: %.*s Content: %.*s"
, tok.Line, tok.Column , tok.Line, tok.Column
, type_str.Len, type_str.Ptr , type_str.Len, type_str.Ptr
, tok.Length, tok.Text , tok.Length, tok.Text
@@ -175,48 +175,6 @@ global FixedArena_256KB Lexer_defines_map_arena;
global StringTable Lexer_defines; global StringTable Lexer_defines;
global Array(Token) Lexer_Tokens; global Array(Token) Lexer_Tokens;
#define current ( * ctx->scanner )
#define move_forward() \
{ \
if ( current == '\n' ) \
{ \
ctx->line++; \
ctx->column = 1; \
} \
else \
{ \
ctx->column++; \
} \
ctx->left--; \
ctx->scanner++; \
}
#define skip_whitespace() \
while ( ctx->left && char_is_space( current ) ) \
{ \
move_forward(); \
}
#define end_line() \
do \
{ \
while ( ctx->left && current == ' ' ) \
{ \
move_forward(); \
} \
if ( ctx->left && current == '\r' ) \
{ \
move_forward(); \
move_forward(); \
} \
else if ( ctx->left && current == '\n' ) \
{ \
move_forward(); \
} \
} \
while (0)
enum enum
{ {
Lex_Continue, Lex_Continue,
@@ -225,7 +183,7 @@ enum
struct LexContext struct LexContext
{ {
StrC content; Str content;
s32 left; s32 left;
char const* scanner; char const* scanner;
s32 line; s32 line;
@@ -234,6 +192,44 @@ struct LexContext
Token token; Token token;
}; };
forceinline
void lexer_move_forward( LexContext* ctx )
{
if ( * ctx->scanner == '\n' ) {
ctx->line += 1;
ctx->column = 1;
}
else {
++ ctx->column;
}
-- ctx->left;
++ ctx->scanner;
}
#define move_forward() lexer_move_forward(ctx)
forceinline
void lexer_skip_whitespace( LexContext* ctx )
{
while ( ctx->left && char_is_space( * ctx->scanner ) )
move_forward();
}
#define skip_whitespace() lexer_skip_whitespace(ctx)
forceinline
void lexer_end_line( LexContext* ctx )
{
while ( ctx->left && (* ctx->scanner) == ' ' )
move_forward();
if ( ctx->left && (* ctx->scanner) == '\r' ) {
move_forward();
move_forward();
}
else if ( ctx->left && (* ctx->scanner) == '\n' )
move_forward();
}
#define end_line() lexer_end_line(ctx)
forceinline forceinline
s32 lex_preprocessor_directive( LexContext* ctx ) s32 lex_preprocessor_directive( LexContext* ctx )
{ {
@@ -245,13 +241,13 @@ s32 lex_preprocessor_directive( LexContext* ctx )
skip_whitespace(); skip_whitespace();
ctx->token.Text = ctx->scanner; ctx->token.Text = ctx->scanner;
while (ctx->left && ! char_is_space(current) ) while (ctx->left && ! char_is_space((* ctx->scanner)) )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
} }
ctx->token.Type = strc_to_toktype( tok_to_str(ctx->token) ); ctx->token.Type = str_to_toktype( tok_to_str(ctx->token) );
bool is_preprocessor = ctx->token.Type >= Tok_Preprocess_Define && ctx->token.Type <= Tok_Preprocess_Pragma; bool is_preprocessor = ctx->token.Type >= Tok_Preprocess_Define && ctx->token.Type <= Tok_Preprocess_Pragma;
if ( ! is_preprocessor ) if ( ! is_preprocessor )
@@ -263,24 +259,24 @@ s32 lex_preprocessor_directive( LexContext* ctx )
s32 within_char = false; s32 within_char = false;
while ( ctx->left ) while ( ctx->left )
{ {
if ( current == '"' && ! within_char ) if ( * ctx->scanner == '"' && ! within_char )
within_string ^= true; within_string ^= true;
if ( current == '\'' && ! within_string ) if ( * ctx->scanner == '\'' && ! within_string )
within_char ^= true; within_char ^= true;
if ( current == '\\' && ! within_string && ! within_char ) if ( * ctx->scanner == '\\' && ! within_string && ! within_char )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
if ( current == '\r' ) if ( (* ctx->scanner) == '\r' )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
@@ -290,19 +286,19 @@ s32 lex_preprocessor_directive( LexContext* ctx )
{ {
log_failure( "gen::Parser::lex: Invalid escape sequence '\\%c' (%d, %d)" log_failure( "gen::Parser::lex: Invalid escape sequence '\\%c' (%d, %d)"
" in preprocessor directive (%d, %d)\n%.100s" " in preprocessor directive (%d, %d)\n%.100s"
, current, ctx->line, ctx->column , (* ctx->scanner), ctx->line, ctx->column
, ctx->token.Line, ctx->token.Column, ctx->token.Text ); , ctx->token.Line, ctx->token.Column, ctx->token.Text );
break; break;
} }
} }
if ( current == '\r' ) if ( (* ctx->scanner) == '\r' )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
@@ -343,13 +339,13 @@ s32 lex_preprocessor_directive( LexContext* ctx )
name.Length = 1; name.Length = 1;
move_forward(); move_forward();
while ( ctx->left && ( char_is_alphanumeric(current) || current == '_' ) ) while ( ctx->left && ( char_is_alphanumeric((* ctx->scanner)) || (* ctx->scanner) == '_' ) )
{ {
move_forward(); move_forward();
name.Length++; name.Length++;
} }
if ( ctx->left && current == '(' ) if ( ctx->left && (* ctx->scanner) == '(' )
{ {
move_forward(); move_forward();
name.Length++; name.Length++;
@@ -367,12 +363,12 @@ s32 lex_preprocessor_directive( LexContext* ctx )
{ {
preprocess_content.Type = Tok_String; preprocess_content.Type = Tok_String;
if ( current != '"' && current != '<' ) if ( (* ctx->scanner) != '"' && (* ctx->scanner) != '<' )
{ {
String directive_str = string_fmt_buf( GlobalAllocator, "%.*s", min( 80, ctx->left + preprocess_content.Length ), ctx->token.Text ); StrBuilder directive_str = strbuilder_fmt_buf( GlobalAllocator, "%.*s", min( 80, ctx->left + preprocess_content.Length ), ctx->token.Text );
log_failure( "gen::Parser::lex: Expected '\"' or '<' after #include, not '%c' (%d, %d)\n%s" log_failure( "gen::Parser::lex: Expected '\"' or '<' after #include, not '%c' (%d, %d)\n%s"
, current , (* ctx->scanner)
, preprocess_content.Line , preprocess_content.Line
, preprocess_content.Column , preprocess_content.Column
, (char*) directive_str , (char*) directive_str
@@ -382,7 +378,7 @@ s32 lex_preprocessor_directive( LexContext* ctx )
move_forward(); move_forward();
preprocess_content.Length++; preprocess_content.Length++;
while ( ctx->left && current != '"' && current != '>' ) while ( ctx->left && (* ctx->scanner) != '"' && (* ctx->scanner) != '>' )
{ {
move_forward(); move_forward();
preprocess_content.Length++; preprocess_content.Length++;
@@ -391,12 +387,12 @@ s32 lex_preprocessor_directive( LexContext* ctx )
move_forward(); move_forward();
preprocess_content.Length++; preprocess_content.Length++;
if ( current == '\r' && ctx->scanner[1] == '\n' ) if ( (* ctx->scanner) == '\r' && ctx->scanner[1] == '\n' )
{ {
move_forward(); move_forward();
move_forward(); move_forward();
} }
else if ( current == '\n' ) else if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
} }
@@ -411,24 +407,24 @@ s32 lex_preprocessor_directive( LexContext* ctx )
// SkipWhitespace(); // SkipWhitespace();
while ( ctx->left ) while ( ctx->left )
{ {
if ( current == '"' && ! within_char ) if ( (* ctx->scanner) == '"' && ! within_char )
within_string ^= true; within_string ^= true;
if ( current == '\'' && ! within_string ) if ( (* ctx->scanner) == '\'' && ! within_string )
within_char ^= true; within_char ^= true;
if ( current == '\\' && ! within_string && ! within_char ) if ( (* ctx->scanner) == '\\' && ! within_string && ! within_char )
{ {
move_forward(); move_forward();
preprocess_content.Length++; preprocess_content.Length++;
if ( current == '\r' ) if ( (* ctx->scanner) == '\r' )
{ {
move_forward(); move_forward();
preprocess_content.Length++; preprocess_content.Length++;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
preprocess_content.Length++; preprocess_content.Length++;
@@ -436,25 +432,25 @@ s32 lex_preprocessor_directive( LexContext* ctx )
} }
else else
{ {
String directive_str = string_make_length( GlobalAllocator, ctx->token.Text, ctx->token.Length ); StrBuilder directive_str = strbuilder_make_length( GlobalAllocator, ctx->token.Text, ctx->token.Length );
String content_str = string_fmt_buf( GlobalAllocator, "%.*s", min( 400, ctx->left + preprocess_content.Length ), preprocess_content.Text ); StrBuilder content_str = strbuilder_fmt_buf( GlobalAllocator, "%.*s", min( 400, ctx->left + preprocess_content.Length ), preprocess_content.Text );
log_failure( "gen::Parser::lex: Invalid escape sequence '\\%c' (%d, %d)" log_failure( "gen::Parser::lex: Invalid escape sequence '\\%c' (%d, %d)"
" in preprocessor directive '%s' (%d, %d)\n%s" " in preprocessor directive '%s' (%d, %d)\n%s"
, current, ctx->line, ctx->column , (* ctx->scanner), ctx->line, ctx->column
, directive_str, preprocess_content.Line, preprocess_content.Column , directive_str, preprocess_content.Line, preprocess_content.Column
, content_str ); , content_str );
break; break;
} }
} }
if ( current == '\r' ) if ( (* ctx->scanner) == '\r' )
{ {
break; break;
//move_forward(); //move_forward();
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
//move_forward(); //move_forward();
break; break;
@@ -477,7 +473,7 @@ void lex_found_token( LexContext* ctx )
return; return;
} }
TokType type = strc_to_toktype( tok_to_str(ctx->token) ); TokType type = str_to_toktype( tok_to_str(ctx->token) );
if (type <= Tok_Access_Public && type >= Tok_Access_Private ) if (type <= Tok_Access_Public && type >= Tok_Access_Private )
{ {
@@ -493,7 +489,7 @@ void lex_found_token( LexContext* ctx )
{ {
skip_whitespace(); skip_whitespace();
if ( current != '"' ) if ( (* ctx->scanner) != '"' )
{ {
type = Tok_Spec_Extern; type = Tok_Spec_Extern;
ctx->token.Flags |= TF_Specifier; ctx->token.Flags |= TF_Specifier;
@@ -523,29 +519,29 @@ void lex_found_token( LexContext* ctx )
} }
u64 key = 0; u64 key = 0;
if ( current == '(') if ( (* ctx->scanner) == '(')
key = crc32( ctx->token.Text, ctx->token.Length + 1 ); key = crc32( ctx->token.Text, ctx->token.Length + 1 );
else else
key = crc32( ctx->token.Text, ctx->token.Length ); key = crc32( ctx->token.Text, ctx->token.Length );
StrC* define = hashtable_get(ctx->defines, key ); Str* define = hashtable_get(ctx->defines, key );
if ( define ) if ( define )
{ {
ctx->token.Type = Tok_Preprocess_Macro; ctx->token.Type = Tok_Preprocess_Macro;
// Want to ignore any arguments the define may have as they can be execution expressions. // Want to ignore any arguments the define may have as they can be execution expressions.
if ( ctx->left && current == '(' ) if ( ctx->left && (* ctx->scanner) == '(' )
{ {
move_forward(); move_forward();
ctx->token.Length++; ctx->token.Length++;
s32 level = 0; s32 level = 0;
while ( ctx->left && (current != ')' || level > 0) ) while ( ctx->left && ((* ctx->scanner) != ')' || level > 0) )
{ {
if ( current == '(' ) if ( (* ctx->scanner) == '(' )
level++; level++;
else if ( current == ')' && level > 0 ) else if ( (* ctx->scanner) == ')' && level > 0 )
level--; level--;
move_forward(); move_forward();
@@ -556,12 +552,12 @@ void lex_found_token( LexContext* ctx )
ctx->token.Length++; ctx->token.Length++;
} }
//if ( current == '\r' && ctx->scanner[1] == '\n' ) //if ( (* ctx->scanner) == '\r' && ctx->scanner[1] == '\n' )
//{ //{
// move_forward(); // move_forward();
// ctx->token.Length++; // ctx->token.Length++;
//} //}
//else if ( current == '\n' ) //else if ( (* ctx->scanner) == '\n' )
//{ //{
// move_forward(); // move_forward();
// ctx->token.Length++; // ctx->token.Length++;
@@ -576,8 +572,8 @@ void lex_found_token( LexContext* ctx )
} }
neverinline neverinline
// TokArray lex( Array<Token> tokens, StrC content ) // TokArray lex( Array<Token> tokens, Str content )
TokArray lex( StrC content ) TokArray lex( Str content )
{ {
LexContext c; LexContext* ctx = & c; LexContext c; LexContext* ctx = & c;
c.content = content; c.content = content;
@@ -624,7 +620,7 @@ TokArray lex( StrC content )
#if 0 #if 0
if (Tokens.num()) if (Tokens.num())
{ {
log_fmt("\nLastTok: %S", Tokens.back().to_string()); log_fmt("\nLastTok: %SB", Tokens.back().to_string());
} }
#endif #endif
@@ -637,13 +633,13 @@ TokArray lex( StrC content )
if ( c.column == 1 ) if ( c.column == 1 )
{ {
if ( current == '\r') if ( (* ctx->scanner) == '\r')
{ {
move_forward(); move_forward();
c.token.Length = 1; c.token.Length = 1;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
@@ -661,12 +657,8 @@ TokArray lex( StrC content )
if ( c.left <= 0 ) if ( c.left <= 0 )
break; break;
switch ( current ) switch ( (* ctx->scanner) )
{ {
if (array_back(Lexer_Tokens)->Length > 100 ) {
__debugbreak();
}
case '#': case '#':
{ {
s32 result = lex_preprocessor_directive( ctx ); s32 result = lex_preprocessor_directive( ctx );
@@ -681,13 +673,13 @@ TokArray lex( StrC content )
Token thanks_c = { c.scanner, 0, Tok_Invalid, c.line, c.column, TF_Null }; Token thanks_c = { c.scanner, 0, Tok_Invalid, c.line, c.column, TF_Null };
c.token = thanks_c; c.token = thanks_c;
} }
if ( current == '\r') if ( (* ctx->scanner) == '\r')
{ {
move_forward(); move_forward();
c.token.Length = 1; c.token.Length = 1;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
c.token.Type = Tok_NewLine; c.token.Type = Tok_NewLine;
c.token.Length++; c.token.Length++;
@@ -696,7 +688,6 @@ TokArray lex( StrC content )
array_append( Lexer_Tokens, c.token ); array_append( Lexer_Tokens, c.token );
} }
} }
continue; continue;
} }
@@ -718,10 +709,10 @@ TokArray lex( StrC content )
move_forward(); move_forward();
} }
if ( current == '.' ) if ( (* ctx->scanner) == '.' )
{ {
move_forward(); move_forward();
if( current == '.' ) if( (* ctx->scanner) == '.' )
{ {
c.token.Length = 3; c.token.Length = 3;
c.token.Type = Tok_Varadic_Argument; c.token.Type = Tok_Varadic_Argument;
@@ -730,9 +721,9 @@ TokArray lex( StrC content )
} }
else else
{ {
String context_str = string_fmt_buf( GlobalAllocator, "%s", c.scanner, min( 100, c.left ) ); StrBuilder context_str = strbuilder_fmt_buf( GlobalAllocator, "%s", c.scanner, min( 100, c.left ) );
log_failure( "gen::lex: invalid varadic argument, expected '...' got '..%c' (%d, %d)\n%s", current, c.line, c.column, context_str ); log_failure( "gen::lex: invalid varadic argument, expected '...' got '..%c' (%d, %d)\n%s", (* ctx->scanner), c.line, c.column, context_str );
} }
} }
@@ -749,7 +740,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
if ( current == '&' ) // && if ( (* ctx->scanner) == '&' ) // &&
{ {
c.token.Length = 2; c.token.Length = 2;
c.token.Type = Tok_Ampersand_DBL; c.token.Type = Tok_Ampersand_DBL;
@@ -771,7 +762,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
if ( current == ':' ) if ( (* ctx->scanner) == ':' )
{ {
move_forward(); move_forward();
c.token.Type = Tok_Access_StaticSymbol; c.token.Type = Tok_Access_StaticSymbol;
@@ -811,7 +802,7 @@ TokArray lex( StrC content )
{ {
move_forward(); move_forward();
if ( current == ']' ) if ( (* ctx->scanner) == ']' )
{ {
c.token.Length = 2; c.token.Length = 2;
c.token.Type = Tok_Operator; c.token.Type = Tok_Operator;
@@ -859,19 +850,19 @@ TokArray lex( StrC content )
move_forward(); move_forward();
if ( c.left && current == '\\' ) if ( c.left && (* ctx->scanner) == '\\' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
if ( current == '\'' ) if ( (* ctx->scanner) == '\'' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
} }
} }
while ( c.left && current != '\'' ) while ( c.left && (* ctx->scanner) != '\'' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -906,7 +897,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
if ( current == '=' ) if ( (* ctx->scanner) == '=' )
{ {
c.token.Length++; c.token.Length++;
c.token.Flags |= TF_Assign; c.token.Flags |= TF_Assign;
@@ -941,13 +932,13 @@ TokArray lex( StrC content )
move_forward(); move_forward();
while ( c.left ) while ( c.left )
{ {
if ( current == '"' ) if ( (* ctx->scanner) == '"' )
{ {
move_forward(); move_forward();
break; break;
} }
if ( current == '\\' ) if ( (* ctx->scanner) == '\\' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -990,7 +981,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
if ( current == '=' ) if ( (* ctx->scanner) == '=' )
{ {
c.token.Length++; c.token.Length++;
c.token.Flags = TF_Operator; c.token.Flags = TF_Operator;
@@ -1045,7 +1036,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
if ( current == '=' ) if ( (* ctx->scanner) == '=' )
{ {
c.token.Length++; c.token.Length++;
c.token.Flags |= TF_Assign; c.token.Flags |= TF_Assign;
@@ -1055,7 +1046,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
} }
else while ( c.left && current == *(c.scanner - 1) && c.token.Length < 3 ) else while ( c.left && (* ctx->scanner) == *(c.scanner - 1) && c.token.Length < 3 )
{ {
c.token.Length++; c.token.Length++;
@@ -1077,21 +1068,21 @@ TokArray lex( StrC content )
{ {
move_forward(); move_forward();
if ( current == '>' ) if ( (* ctx->scanner) == '>' )
{ {
c.token.Length++; c.token.Length++;
// token.Type = Tok_Access_PointerToMemberSymbol; // token.Type = Tok_Access_PointerToMemberSymbol;
c.token.Flags |= TF_AccessOperator; c.token.Flags |= TF_AccessOperator;
move_forward(); move_forward();
if ( current == '*' ) if ( (* ctx->scanner) == '*' )
{ {
// token.Type = Tok_Access_PointerToMemberOfPointerSymbol; // token.Type = Tok_Access_PointerToMemberOfPointerSymbol;
c.token.Length++; c.token.Length++;
move_forward(); move_forward();
} }
} }
else if ( current == '=' ) else if ( (* ctx->scanner) == '=' )
{ {
c.token.Length++; c.token.Length++;
// token.Type = Tok_Assign_Subtract; // token.Type = Tok_Assign_Subtract;
@@ -1100,7 +1091,7 @@ TokArray lex( StrC content )
if (c.left) if (c.left)
move_forward(); move_forward();
} }
else while ( c.left && current == *(c.scanner - 1) && c.token.Length < 3 ) else while ( c.left && (* ctx->scanner) == *(c.scanner - 1) && c.token.Length < 3 )
{ {
c.token.Length++; c.token.Length++;
@@ -1121,32 +1112,32 @@ TokArray lex( StrC content )
if ( c.left ) if ( c.left )
{ {
if ( current == '=' ) if ( (* ctx->scanner) == '=' )
{ {
// token.Type = TokeType::Assign_Divide; // token.Type = TokeType::Assign_Divide;
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
c.token.Flags = TF_Assign; c.token.Flags = TF_Assign;
} }
else if ( current == '/' ) else if ( (* ctx->scanner) == '/' )
{ {
c.token.Type = Tok_Comment; c.token.Type = Tok_Comment;
c.token.Length = 2; c.token.Length = 2;
c.token.Flags = TF_Null; c.token.Flags = TF_Null;
move_forward(); move_forward();
while ( c.left && current != '\n' && current != '\r' ) while ( c.left && (* ctx->scanner) != '\n' && (* ctx->scanner) != '\r' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
} }
if ( current == '\r' ) if ( (* ctx->scanner) == '\r' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -1154,14 +1145,14 @@ TokArray lex( StrC content )
array_append( Lexer_Tokens, c.token ); array_append( Lexer_Tokens, c.token );
continue; continue;
} }
else if ( current == '*' ) else if ( (* ctx->scanner) == '*' )
{ {
c.token.Type = Tok_Comment; c.token.Type = Tok_Comment;
c.token.Length = 2; c.token.Length = 2;
c.token.Flags = TF_Null; c.token.Flags = TF_Null;
move_forward(); move_forward();
bool star = current == '*'; bool star = (* ctx->scanner) == '*';
bool slash = c.scanner[1] == '/'; bool slash = c.scanner[1] == '/';
bool at_end = star && slash; bool at_end = star && slash;
while ( c.left && ! at_end ) while ( c.left && ! at_end )
@@ -1169,7 +1160,7 @@ TokArray lex( StrC content )
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
star = current == '*'; star = (* ctx->scanner) == '*';
slash = c.scanner[1] == '/'; slash = c.scanner[1] == '/';
at_end = star && slash; at_end = star && slash;
} }
@@ -1177,12 +1168,12 @@ TokArray lex( StrC content )
move_forward(); move_forward();
move_forward(); move_forward();
if ( current == '\r' ) if ( (* ctx->scanner) == '\r' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -1196,13 +1187,13 @@ TokArray lex( StrC content )
} }
} }
if ( char_is_alpha( current ) || current == '_' ) if ( char_is_alpha( (* ctx->scanner) ) || (* ctx->scanner) == '_' )
{ {
c.token.Text = c.scanner; c.token.Text = c.scanner;
c.token.Length = 1; c.token.Length = 1;
move_forward(); move_forward();
while ( c.left && ( char_is_alphanumeric(current) || current == '_' ) ) while ( c.left && ( char_is_alphanumeric((* ctx->scanner)) || (* ctx->scanner) == '_' ) )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -1210,7 +1201,7 @@ TokArray lex( StrC content )
goto FoundToken; goto FoundToken;
} }
else if ( char_is_digit(current) ) else if ( char_is_digit((* ctx->scanner)) )
{ {
// This is a very brute force lex, no checks are done for validity of literal. // This is a very brute force lex, no checks are done for validity of literal.
@@ -1221,15 +1212,15 @@ TokArray lex( StrC content )
move_forward(); move_forward();
if (c.left if (c.left
&& ( current == 'x' || current == 'X' && ( (* ctx->scanner) == 'x' || (* ctx->scanner) == 'X'
|| current == 'b' || current == 'B' || (* ctx->scanner) == 'b' || (* ctx->scanner) == 'B'
|| current == 'o' || current == 'O' ) || (* ctx->scanner) == 'o' || (* ctx->scanner) == 'O' )
) )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
while ( c.left && char_is_hex_digit(current) ) while ( c.left && char_is_hex_digit((* ctx->scanner)) )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -1238,18 +1229,18 @@ TokArray lex( StrC content )
goto FoundToken; goto FoundToken;
} }
while ( c.left && char_is_digit(current) ) while ( c.left && char_is_digit((* ctx->scanner)) )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
} }
if ( c.left && current == '.' ) if ( c.left && (* ctx->scanner) == '.' )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
while ( c.left && char_is_digit(current) ) while ( c.left && char_is_digit((* ctx->scanner)) )
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -1257,18 +1248,18 @@ TokArray lex( StrC content )
// Handle number literal suffixes in a botched way // Handle number literal suffixes in a botched way
if (c.left && ( if (c.left && (
current == 'l' || current == 'L' || // long/long long (* ctx->scanner) == 'l' || (* ctx->scanner) == 'L' || // long/long long
current == 'u' || current == 'U' || // unsigned (* ctx->scanner) == 'u' || (* ctx->scanner) == 'U' || // unsigned
current == 'f' || current == 'F' || // float (* ctx->scanner) == 'f' || (* ctx->scanner) == 'F' || // float
current == 'i' || current == 'I' || // imaginary (* ctx->scanner) == 'i' || (* ctx->scanner) == 'I' || // imaginary
current == 'z' || current == 'Z')) // complex (* ctx->scanner) == 'z' || (* ctx->scanner) == 'Z')) // complex
{ {
char prev = current; char prev = (* ctx->scanner);
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
// Handle 'll'/'LL' as a special case when we just processed an 'l'/'L' // Handle 'll'/'LL' as a special case when we just processed an 'l'/'L'
if (c.left && (prev == 'l' || prev == 'L') && (current == 'l' || current == 'L')) if (c.left && (prev == 'l' || prev == 'L') && ((* ctx->scanner) == 'l' || (* ctx->scanner) == 'L'))
{ {
move_forward(); move_forward();
c.token.Length++; c.token.Length++;
@@ -1291,11 +1282,11 @@ TokArray lex( StrC content )
); );
} }
String context_str = string_fmt_buf( GlobalAllocator, "%.*s", min( 100, c.left ), c.scanner ); StrBuilder context_str = strbuilder_fmt_buf( GlobalAllocator, "%.*s", min( 100, c.left ), c.scanner );
log_failure( "Failed to lex token '%c' (%d, %d)\n%s", current, c.line, c.column, context_str ); log_failure( "Failed to lex token '%c' (%d, %d)\n%s", (* ctx->scanner), c.line, c.column, context_str );
// Skip to next whitespace since we can't know if anything else is valid until then. // Skip to next whitespace since we can't know if anything else is valid until then.
while ( c.left && ! char_is_space( current ) ) while ( c.left && ! char_is_space( (* ctx->scanner) ) )
{ {
move_forward(); move_forward();
} }
@@ -1309,13 +1300,13 @@ TokArray lex( StrC content )
{ {
Token thanks_c = { c.scanner, 0, Tok_Invalid, c.line, c.column, TF_Null }; Token thanks_c = { c.scanner, 0, Tok_Invalid, c.line, c.column, TF_Null };
c.token = thanks_c; c.token = thanks_c;
if ( current == '\r') if ( (* ctx->scanner) == '\r')
{ {
move_forward(); move_forward();
c.token.Length = 1; c.token.Length = 1;
} }
if ( current == '\n' ) if ( (* ctx->scanner) == '\n' )
{ {
c.token.Type = Tok_NewLine; c.token.Type = Tok_NewLine;
c.token.Length++; c.token.Length++;
@@ -1342,8 +1333,8 @@ TokArray lex( StrC content )
TokArray result = { Lexer_Tokens, 0 }; TokArray result = { Lexer_Tokens, 0 };
return result; return result;
} }
#undef current
#undef move_forward #undef move_forward
#undef SkipWhitespace #undef skip_whitespace
#undef end_line
GEN_NS_PARSER_END GEN_NS_PARSER_END

254
base/components/parser.cpp
View File

@@ -18,7 +18,7 @@ struct StackNode
Token Start; Token Start;
Token Name; // The name of the AST node (if parsed) Token Name; // The name of the AST node (if parsed)
StrC ProcName; // The name of the procedure Str ProcName; // The name of the procedure
}; };
struct ParseContext struct ParseContext
@@ -32,22 +32,22 @@ void parser_push( ParseContext* ctx, StackNode* node )
node->Prev = ctx->Scope; node->Prev = ctx->Scope;
ctx->Scope = node; ctx->Scope = node;
#if 0 && Build_Debug #if 0 && GEN_BUILD_DEBUG
log_fmt("\tEntering Context: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr ); log_fmt("\tEntering Context: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr );
#endif #endif
} }
void parser_pop(ParseContext* ctx) void parser_pop(ParseContext* ctx)
{ {
#if 0 && Build_Debug #if 0 && GEN_BUILD_DEBUG
log_fmt("\tPopping Context: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr ); log_fmt("\tPopping Context: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr );
#endif #endif
ctx->Scope = ctx->Scope->Prev; ctx->Scope = ctx->Scope->Prev;
} }
String parser_to_string(ParseContext ctx) StrBuilder parser_to_string(ParseContext ctx)
{ {
String result = string_make_reserve( GlobalAllocator, kilobytes(4) ); StrBuilder result = strbuilder_make_reserve( GlobalAllocator, kilobytes(4) );
Token scope_start = ctx.Scope->Start; Token scope_start = ctx.Scope->Start;
Token last_valid = ctx.Tokens.Idx >= array_num(ctx.Tokens.Arr) ? ctx.Tokens.Arr[array_num(ctx.Tokens.Arr) -1] : (* lex_current(& ctx.Tokens, true)); Token last_valid = ctx.Tokens.Idx >= array_num(ctx.Tokens.Arr) ? ctx.Tokens.Arr[array_num(ctx.Tokens.Arr) -1] : (* lex_current(& ctx.Tokens, true));
@@ -60,21 +60,21 @@ String parser_to_string(ParseContext ctx)
length++; length++;
} }
StrC scope_strc = { length, scope_start.Text }; Str scope_str = { length, scope_start.Text };
String line = string_make_strc( GlobalAllocator, scope_strc ); StrBuilder line = strbuilder_make_str( GlobalAllocator, scope_str );
string_append_fmt( & result, "\tScope : %s\n", line ); strbuilder_append_fmt( & result, "\tScope : %s\n", line );
string_free(& line); strbuilder_free(& line);
sptr dist = (sptr)last_valid.Text - (sptr)scope_start.Text + 2; sptr dist = (sptr)last_valid.Text - (sptr)scope_start.Text + 2;
sptr length_from_err = dist; sptr length_from_err = dist;
StrC err_strc = { length_from_err, last_valid.Text }; Str err_str = { length_from_err, last_valid.Text };
String line_from_err = string_make_strc( GlobalAllocator, err_strc ); StrBuilder line_from_err = strbuilder_make_str( GlobalAllocator, err_str );
if ( length_from_err < 100 ) if ( length_from_err < 100 )
string_append_fmt(& result, "\t(%d, %d):%*c\n", last_valid.Line, last_valid.Column, length_from_err, '^' ); strbuilder_append_fmt(& result, "\t(%d, %d):%*c\n", last_valid.Line, last_valid.Column, length_from_err, '^' );
else else
string_append_fmt(& result, "\t(%d, %d)\n", last_valid.Line, last_valid.Column ); strbuilder_append_fmt(& result, "\t(%d, %d)\n", last_valid.Line, last_valid.Column );
StackNode* curr_scope = ctx.Scope; StackNode* curr_scope = ctx.Scope;
s32 level = 0; s32 level = 0;
@@ -82,11 +82,11 @@ String parser_to_string(ParseContext ctx)
{ {
if ( tok_is_valid(curr_scope->Name) ) if ( tok_is_valid(curr_scope->Name) )
{ {
string_append_fmt(& result, "\t%d: %s, AST Name: %.*s\n", level, curr_scope->ProcName.Ptr, curr_scope->Name.Length, curr_scope->Name.Text ); strbuilder_append_fmt(& result, "\t%d: %s, AST Name: %.*s\n", level, curr_scope->ProcName.Ptr, curr_scope->Name.Length, curr_scope->Name.Text );
} }
else else
{ {
string_append_fmt(& result, "\t%d: %s\n", level, curr_scope->ProcName.Ptr ); strbuilder_append_fmt(& result, "\t%d: %s\n", level, curr_scope->ProcName.Ptr );
} }
curr_scope = curr_scope->Prev; curr_scope = curr_scope->Prev;
@@ -128,8 +128,8 @@ bool lex__eat(TokArray* self, TokType type )
return false; return false;
} }
#if 0 && Build_Debug #if 0 && GEN_BUILD_DEBUG
log_fmt("Ate: %S\n", self->Arr[Idx].to_string() ); log_fmt("Ate: %SB\n", self->Arr[Idx].to_string() );
#endif #endif
self->Idx ++; self->Idx ++;
@@ -144,7 +144,7 @@ void parser_init()
); );
fixed_arena_init(& Lexer_defines_map_arena); fixed_arena_init(& Lexer_defines_map_arena);
Lexer_defines = hashtable_init_reserve(StrC, fixed_arena_allocator_info( & Lexer_defines_map_arena), 256 ); Lexer_defines = hashtable_init_reserve(Str, fixed_arena_allocator_info( & Lexer_defines_map_arena), 256 );
} }
internal internal
@@ -157,17 +157,17 @@ void parser_deinit()
#pragma region Helper Macros #pragma region Helper Macros
#define check_parse_args( def ) _check_parse_args(def, stringize(_func_) ) #define check_parse_args( def ) _check_parse_args(def, stringize(_func_) )
bool _check_parse_args( StrC def, char const* func_name ) bool _check_parse_args( Str def, char const* func_name )
{ {
if ( def.Len <= 0 ) if ( def.Len <= 0 )
{ {
log_failure( str_fmt_buf("gen::%s: length must greater than 0", func_name) ); log_failure( c_str_fmt_buf("gen::%s: length must greater than 0", func_name) );
parser_pop(& Context); parser_pop(& Context);
return false; return false;
} }
if ( def.Ptr == nullptr ) if ( def.Ptr == nullptr )
{ {
log_failure( str_fmt_buf("gen::%s: def was null", func_name) ); log_failure( c_str_fmt_buf("gen::%s: def was null", func_name) );
parser_pop(& Context); parser_pop(& Context);
return false; return false;
} }
@@ -230,7 +230,7 @@ internal CodePreprocessCond parse_preprocess_cond ();
internal Code parse_simple_preprocess ( TokType which, bool dont_consume_braces ); internal Code parse_simple_preprocess ( TokType which, bool dont_consume_braces );
internal Code parse_static_assert (); internal Code parse_static_assert ();
internal void parse_template_args ( Token* token ); internal void parse_template_args ( Token* token );
internal CodeVar parse_variable_after_name ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeTypename type, StrC name ); internal CodeVar parse_variable_after_name ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeTypename type, Str name );
internal CodeVar parse_variable_declaration_list (); internal CodeVar parse_variable_declaration_list ();
internal CodeClass parser_parse_class ( bool inplace_def ); internal CodeClass parser_parse_class ( bool inplace_def );
@@ -268,9 +268,9 @@ constexpr bool parser_strip_formatting_dont_preserve_newlines = false;
It has edge case failures that prevent it from being used in function bodies. It has edge case failures that prevent it from being used in function bodies.
*/ */
internal internal
String parser_strip_formatting( StrC raw_text, bool preserve_newlines ) StrBuilder parser_strip_formatting( Str raw_text, bool preserve_newlines )
{ {
String content = string_make_reserve( GlobalAllocator, raw_text.Len ); StrBuilder content = strbuilder_make_reserve( GlobalAllocator, raw_text.Len );
if ( raw_text.Len == 0 ) if ( raw_text.Len == 0 )
return content; return content;
@@ -317,7 +317,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
if ( tokleft ) if ( tokleft )
move_fwd(); move_fwd();
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
last_cut = rcast(sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast(sptr, scanner ) - rcast( sptr, raw_text.Ptr );
continue; continue;
} }
@@ -339,7 +339,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
if ( tokleft ) if ( tokleft )
move_fwd(); move_fwd();
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
continue; continue;
} }
@@ -353,7 +353,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
scanner += 2; scanner += 2;
tokleft -= 2; tokleft -= 2;
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
continue; continue;
} }
@@ -372,7 +372,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
if (tokleft) if (tokleft)
move_fwd(); move_fwd();
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
continue; continue;
} }
@@ -381,10 +381,10 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
if (scanner[0] == '\t') if (scanner[0] == '\t')
{ {
if (pos > last_cut) if (pos > last_cut)
string_append_c_str_len( & content, cut_ptr, cut_length); strbuilder_append_c_str_len( & content, cut_ptr, cut_length);
if ( * string_back( content ) != ' ' ) if ( * strbuilder_back( content ) != ' ' )
string_append_char( & content, ' ' ); strbuilder_append_char( & content, ' ' );
move_fwd(); move_fwd();
last_cut = rcast( sptr, scanner) - rcast( sptr, raw_text.Ptr); last_cut = rcast( sptr, scanner) - rcast( sptr, raw_text.Ptr);
@@ -400,17 +400,17 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
scanner += 2; scanner += 2;
tokleft -= 2; tokleft -= 2;
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
continue; continue;
} }
if ( pos > last_cut ) if ( pos > last_cut )
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
// Replace with a space // Replace with a space
if ( * string_back( content ) != ' ' ) if ( * strbuilder_back( content ) != ' ' )
string_append_char( & content, ' ' ); strbuilder_append_char( & content, ' ' );
scanner += 2; scanner += 2;
tokleft -= 2; tokleft -= 2;
@@ -427,17 +427,17 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
move_fwd(); move_fwd();
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
continue; continue;
} }
if ( pos > last_cut ) if ( pos > last_cut )
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
// Replace with a space // Replace with a space
if ( * string_back( content ) != ' ' ) if ( * strbuilder_back( content ) != ' ' )
string_append_char( & content, ' ' ); strbuilder_append_char( & content, ' ' );
move_fwd(); move_fwd();
@@ -448,7 +448,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
// Escaped newlines // Escaped newlines
if ( scanner[0] == '\\' ) if ( scanner[0] == '\\' )
{ {
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
s32 amount_to_skip = 1; s32 amount_to_skip = 1;
if ( tokleft > 1 && scanner[1] == '\n' ) if ( tokleft > 1 && scanner[1] == '\n' )
@@ -475,7 +475,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
// Consectuive spaces // Consectuive spaces
if ( tokleft > 1 && char_is_space( scanner[0] ) && char_is_space( scanner[ 1 ] ) ) if ( tokleft > 1 && char_is_space( scanner[0] ) && char_is_space( scanner[ 1 ] ) )
{ {
string_append_c_str_len( & content, cut_ptr, cut_length ); strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
do do
{ {
move_fwd(); move_fwd();
@@ -485,9 +485,9 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ); last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
// Preserve only 1 space of formattting // Preserve only 1 space of formattting
char* last = string_back(content); char* last = strbuilder_back(content);
if ( last == nullptr || * last != ' ' ) if ( last == nullptr || * last != ' ' )
string_append_char( & content, ' ' ); strbuilder_append_char( & content, ' ' );
continue; continue;
} }
@@ -497,7 +497,7 @@ String parser_strip_formatting( StrC raw_text, bool preserve_newlines )
if ( last_cut < raw_text.Len ) if ( last_cut < raw_text.Len )
{ {
string_append_c_str_len( & content, cut_ptr, raw_text.Len - last_cut ); strbuilder_append_c_str_len( & content, cut_ptr, raw_text.Len - last_cut );
} }
#undef cut_ptr #undef cut_ptr
@@ -681,14 +681,14 @@ CodeAttributes parse_attributes()
if ( len > 0 ) if ( len > 0 )
{ {
StrC attribute_txt = { len, start.Text }; Str attribute_txt = { len, start.Text };
parser_pop(& Context); parser_pop(& Context);
String name_stripped = parser_strip_formatting( attribute_txt, parser_strip_formatting_dont_preserve_newlines ); StrBuilder name_stripped = parser_strip_formatting( attribute_txt, parser_strip_formatting_dont_preserve_newlines );
Code result = make_code(); Code result = make_code();
result->Type = CT_PlatformAttributes; result->Type = CT_PlatformAttributes;
result->Name = get_cached_string( string_to_strc(name_stripped) ); result->Name = get_cached_string( strbuilder_to_str(name_stripped) );
result->Content = result->Name; result->Content = result->Name;
// result->Token = // result->Token =
@@ -846,7 +846,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
case Tok_Statement_End: case Tok_Statement_End:
{ {
// TODO(Ed): Convert this to a general warning procedure // TODO(Ed): Convert this to a general warning procedure
log_fmt("Dangling end statement found %S\n", tok_to_string(currtok_noskip)); log_fmt("Dangling end statement found %SB\n", tok_to_string(currtok_noskip));
eat( Tok_Statement_End ); eat( Tok_Statement_End );
continue; continue;
} }
@@ -1015,7 +1015,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
b32 ignore_spec = false; b32 ignore_spec = false;
@@ -1069,10 +1069,10 @@ CodeBody parse_class_struct_body( TokType which, Token name )
if ( attributes ) if ( attributes )
{ {
String fused = string_make_reserve( GlobalAllocator, attributes->Content.Len + more_attributes->Content.Len ); StrBuilder fused = strbuilder_make_reserve( GlobalAllocator, attributes->Content.Len + more_attributes->Content.Len );
string_append_fmt( & fused, "%S %S", attributes->Content, more_attributes->Content ); strbuilder_append_fmt( & fused, "%SB %SB", attributes->Content, more_attributes->Content );
StrC attrib_name = { string_length(fused), fused }; Str attrib_name = { strbuilder_length(fused), fused };
attributes->Name = get_cached_string( attrib_name ); attributes->Name = get_cached_string( attrib_name );
attributes->Content = attributes->Name; attributes->Content = attributes->Name;
// <Attributes> <Specifiers> <Attributes> // <Attributes> <Specifiers> <Attributes>
@@ -1109,7 +1109,7 @@ CodeBody parse_class_struct_body( TokType which, Token name )
{ {
if ( nexttok.Type == Tok_Capture_Start && name.Length && currtok.Type == Tok_Identifier ) if ( nexttok.Type == Tok_Capture_Start && name.Length && currtok.Type == Tok_Identifier )
{ {
if ( str_compare_len( name.Text, currtok.Text, name.Length ) == 0 ) if ( c_str_compare_len( name.Text, currtok.Text, name.Length ) == 0 )
{ {
member = cast(Code, parser_parse_constructor( specifiers )); member = cast(Code, parser_parse_constructor( specifiers ));
// <Attributes> <Specifiers> <Name>() // <Attributes> <Specifiers> <Name>()
@@ -1226,13 +1226,13 @@ Code parse_complicated_definition( TokType which )
} }
Token tok = tokens.Arr[ idx - 1 ]; Token tok = tokens.Arr[ idx - 1 ];
if ( tok_is_specifier(tok) && spec_is_trailing( strc_to_specifier( tok_to_str(tok))) ) if ( tok_is_specifier(tok) && spec_is_trailing( str_to_specifier( tok_to_str(tok))) )
{ {
// <which> <type_identifier>(...) <specifier> ...; // <which> <type_identifier>(...) <specifier> ...;
s32 spec_idx = idx - 1; s32 spec_idx = idx - 1;
Token spec = tokens.Arr[spec_idx]; Token spec = tokens.Arr[spec_idx];
while ( tok_is_specifier(spec) && spec_is_trailing( strc_to_specifier( tok_to_str(spec))) ) while ( tok_is_specifier(spec) && spec_is_trailing( str_to_specifier( tok_to_str(spec))) )
{ {
-- spec_idx; -- spec_idx;
spec = tokens.Arr[spec_idx]; spec = tokens.Arr[spec_idx];
@@ -1343,7 +1343,7 @@ Code parse_complicated_definition( TokType which )
} }
else else
{ {
log_failure( "Unsupported or bad member definition after %s declaration\n%S", toktype_to_str(which).Ptr, parser_to_string(Context) ); log_failure( "Unsupported or bad member definition after %s declaration\n%SB", toktype_to_str(which).Ptr, parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -1389,7 +1389,7 @@ CodeDefine parse_define()
return define; return define;
} }
define->Content = get_cached_string( string_to_strc( parser_strip_formatting( tok_to_str(currtok), parser_strip_formatting_dont_preserve_newlines )) ); define->Content = get_cached_string( strbuilder_to_str( parser_strip_formatting( tok_to_str(currtok), parser_strip_formatting_dont_preserve_newlines )) );
eat( Tok_Preprocess_Content ); eat( Tok_Preprocess_Content );
// #define <Name> <Content> // #define <Name> <Content>
@@ -1486,12 +1486,12 @@ CodeFn parse_function_after_name(
{ {
if ( specifiers == nullptr ) if ( specifiers == nullptr )
{ {
specifiers = def_specifier( strc_to_specifier( tok_to_str(currtok)) ); specifiers = def_specifier( str_to_specifier( tok_to_str(currtok)) );
eat( currtok.Type ); eat( currtok.Type );
continue; continue;
} }
specifiers_append(specifiers, strc_to_specifier( tok_to_str(currtok)) ); specifiers_append(specifiers, str_to_specifier( tok_to_str(currtok)) );
eat( currtok.Type ); eat( currtok.Type );
} }
// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers> // <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>
@@ -1533,13 +1533,13 @@ CodeFn parse_function_after_name(
// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>; <InlineCmt> // <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>; <InlineCmt>
} }
String StrBuilder
name_stripped = string_make_strc( GlobalAllocator, tok_to_str(name) ); name_stripped = strbuilder_make_str( GlobalAllocator, tok_to_str(name) );
strip_space(name_stripped); strip_space(name_stripped);
CodeFn CodeFn
result = (CodeFn) make_code(); result = (CodeFn) make_code();
result->Name = get_cached_string( string_to_strc(name_stripped) ); result->Name = get_cached_string( strbuilder_to_str(name_stripped) );
result->ModuleFlags = mflags; result->ModuleFlags = mflags;
if ( body ) if ( body )
@@ -1616,7 +1616,7 @@ Code parse_function_body()
if ( len > 0 ) if ( len > 0 )
{ {
StrC str = { len, start.Text }; Str str = { len, start.Text };
body_append( result, cast(Code, def_execution( str )) ); body_append( result, cast(Code, def_execution( str )) );
} }
@@ -1661,7 +1661,7 @@ CodeBody parse_global_nspace( CodeType which )
{ {
case Tok_Comma: case Tok_Comma:
{ {
log_failure("Dangling comma found: %S\nContext:\n%S", tok_to_string(currtok), parser_to_string(Context)); log_failure("Dangling comma found: %SB\nContext:\n%SB", tok_to_string(currtok), parser_to_string(Context));
parser_pop( & Context); parser_pop( & Context);
return InvalidCode; return InvalidCode;
} }
@@ -1669,7 +1669,7 @@ CodeBody parse_global_nspace( CodeType which )
case Tok_Statement_End: case Tok_Statement_End:
{ {
// TODO(Ed): Convert this to a general warning procedure // TODO(Ed): Convert this to a general warning procedure
log_fmt("Dangling end statement found %S\n", tok_to_string(currtok_noskip)); log_fmt("Dangling end statement found %SB\n", tok_to_string(currtok_noskip));
eat( Tok_Statement_End ); eat( Tok_Statement_End );
continue; continue;
} }
@@ -1796,8 +1796,9 @@ CodeBody parse_global_nspace( CodeType which )
break; break;
case Tok_Module_Import: { case Tok_Module_Import: {
not_implemented( context );
// import ... // import ...
log_failure( "gen::%s: This function is not implemented" );
return InvalidCode;
} }
//! Fallthrough intentional //! Fallthrough intentional
case Tok_Attribute_Open: case Tok_Attribute_Open:
@@ -1827,7 +1828,7 @@ CodeBody parse_global_nspace( CodeType which )
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
bool ignore_spec = false; bool ignore_spec = false;
@@ -1855,7 +1856,7 @@ CodeBody parse_global_nspace( CodeType which )
break; break;
default: default:
StrC spec_str = spec_to_str(spec); Str spec_str = spec_to_str(spec);
log_failure( "Invalid specifier %.*s for variable\n%s", spec_str.Len, spec_str, parser_to_string(Context) ); log_failure( "Invalid specifier %.*s for variable\n%s", spec_str.Len, spec_str, parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
@@ -1959,7 +1960,7 @@ CodeBody parse_global_nspace( CodeType which )
Member_Resolved_To_Lone_Macro: Member_Resolved_To_Lone_Macro:
if ( member == Code_Invalid ) if ( member == Code_Invalid )
{ {
log_failure( "Failed to parse member\nToken: %S\nContext:\n%S", tok_to_string(currtok_noskip), parser_to_string(Context) ); log_failure( "Failed to parse member\nToken: %SB\nContext:\n%SB", tok_to_string(currtok_noskip), parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -2086,7 +2087,7 @@ Code parse_global_nspace_constructor_destructor( CodeSpecifiers specifiers )
tok_left = tokens.Arr[idx]; tok_left = tokens.Arr[idx];
} }
bool is_same = str_compare_len( tok_right.Text, tok_left.Text, tok_right.Length ) == 0; bool is_same = c_str_compare_len( tok_right.Text, tok_left.Text, tok_right.Length ) == 0;
if (tok_left.Type == Tok_Identifier && is_same) if (tok_left.Type == Tok_Identifier && is_same)
{ {
// We have found the pattern we desired // We have found the pattern we desired
@@ -2135,7 +2136,7 @@ Token parse_identifier( bool* possible_member_function )
if ( currtok.Type == Tok_Operator && currtok.Text[0] == '~' ) if ( currtok.Type == Tok_Operator && currtok.Text[0] == '~' )
{ {
bool is_destructor = strc_are_equal( Context.Scope->Prev->ProcName, txt("parser_parse_destructor")); bool is_destructor = str_are_equal( Context.Scope->Prev->ProcName, txt("parser_parse_destructor"));
if (is_destructor) if (is_destructor)
{ {
name.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )name.Text; name.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )name.Text;
@@ -2143,7 +2144,7 @@ Token parse_identifier( bool* possible_member_function )
return name; return name;
} }
log_failure( "Error, had a ~ operator after %S but not a destructor\n%s", toktype_to_str( prevtok.Type ), parser_to_string(Context) ); log_failure( "Error, had a ~ operator after %SB but not a destructor\n%s", toktype_to_str( prevtok.Type ), parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return invalid; return invalid;
} }
@@ -2441,9 +2442,9 @@ CodeOperator parse_operator_after_ret_type(
break; break;
default: default:
{ {
StrC str_new = operator_to_str(Op_New); Str c_str_new = operator_to_str(Op_New);
StrC str_delete = operator_to_str(Op_Delete); Str c_str_delete = operator_to_str(Op_Delete);
if ( str_compare_len( currtok.Text, str_new.Ptr, max(str_new.Len - 1, currtok.Length)) == 0) if ( c_str_compare_len( currtok.Text, c_str_new.Ptr, max(c_str_new.Len - 1, currtok.Length)) == 0)
{ {
op = Op_New; op = Op_New;
eat( Tok_Identifier ); eat( Tok_Identifier );
@@ -2455,7 +2456,7 @@ CodeOperator parse_operator_after_ret_type(
idx++; idx++;
} }
Token next = Context.Tokens.Arr[idx]; Token next = Context.Tokens.Arr[idx];
if ( currtok.Type == Tok_Operator && str_compare_len(currtok.Text, "[]", 2) == 0) if ( currtok.Type == Tok_Operator && c_str_compare_len(currtok.Text, "[]", 2) == 0)
{ {
eat(Tok_Operator); eat(Tok_Operator);
op = Op_NewArray; op = Op_NewArray;
@@ -2467,7 +2468,7 @@ CodeOperator parse_operator_after_ret_type(
op = Op_NewArray; op = Op_NewArray;
} }
} }
else if ( str_compare_len( currtok.Text, str_delete.Ptr, max(str_delete.Len - 1, currtok.Length )) == 0) else if ( c_str_compare_len( currtok.Text, c_str_delete.Ptr, max(c_str_delete.Len - 1, currtok.Length )) == 0)
{ {
op = Op_Delete; op = Op_Delete;
eat(Tok_Identifier); eat(Tok_Identifier);
@@ -2479,7 +2480,7 @@ CodeOperator parse_operator_after_ret_type(
idx++; idx++;
} }
Token next = Context.Tokens.Arr[idx]; Token next = Context.Tokens.Arr[idx];
if ( currtok.Type == Tok_Operator && str_compare_len(currtok.Text, "[]", 2) == 0) if ( currtok.Type == Tok_Operator && c_str_compare_len(currtok.Text, "[]", 2) == 0)
{ {
eat(Tok_Operator); eat(Tok_Operator);
op = Op_DeleteArray; op = Op_DeleteArray;
@@ -2525,12 +2526,12 @@ CodeOperator parse_operator_after_ret_type(
{ {
if ( specifiers == nullptr ) if ( specifiers == nullptr )
{ {
specifiers = def_specifier( strc_to_specifier( tok_to_str(currtok)) ); specifiers = def_specifier( str_to_specifier( tok_to_str(currtok)) );
eat( currtok.Type ); eat( currtok.Type );
continue; continue;
} }
specifiers_append(specifiers, strc_to_specifier( tok_to_str(currtok)) ); specifiers_append(specifiers, str_to_specifier( tok_to_str(currtok)) );
eat( currtok.Type ); eat( currtok.Type );
} }
// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers> // <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers>
@@ -2817,7 +2818,7 @@ CodeParams parse_params( bool use_template_capture )
eat( currtok.Type ); eat( currtok.Type );
} }
value = untyped_str( string_to_strc(parser_strip_formatting( tok_to_str(value_tok), parser_strip_formatting_dont_preserve_newlines )) ); value = untyped_str( strbuilder_to_str(parser_strip_formatting( tok_to_str(value_tok), parser_strip_formatting_dont_preserve_newlines )) );
// ( <Macro> <ValueType> <Name> = <Expression> // ( <Macro> <ValueType> <Name> = <Expression>
} }
} }
@@ -2933,7 +2934,7 @@ CodeParams parse_params( bool use_template_capture )
eat( currtok.Type ); eat( currtok.Type );
} }
value = untyped_str( string_to_strc(parser_strip_formatting( tok_to_str(value_tok), parser_strip_formatting_dont_preserve_newlines )) ); value = untyped_str( strbuilder_to_str(parser_strip_formatting( tok_to_str(value_tok), parser_strip_formatting_dont_preserve_newlines )) );
// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression> // ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>
} }
// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>, .. // ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>, ..
@@ -3044,8 +3045,8 @@ Code parse_simple_preprocess( TokType which, bool dont_consume_braces )
eat( Tok_BraceCurly_Close ); eat( Tok_BraceCurly_Close );
// <Macro> { <Body> } // <Macro> { <Body> }
StrC prev_proc = Context.Scope->Prev->ProcName; Str prev_proc = Context.Scope->Prev->ProcName;
if ( str_compare_len( prev_proc.Ptr, "parser_parse_typedef", prev_proc.Len ) != 0 ) if ( c_str_compare_len( prev_proc.Ptr, "parser_parse_typedef", prev_proc.Len ) != 0 )
{ {
if ( check( Tok_Statement_End )) if ( check( Tok_Statement_End ))
{ {
@@ -3065,14 +3066,14 @@ Code parse_simple_preprocess( TokType which, bool dont_consume_braces )
{ {
// If the macro is just a macro in the body of an AST it may have a semi-colon for the user to close on purpsoe // If the macro is just a macro in the body of an AST it may have a semi-colon for the user to close on purpsoe
// (especially for functional macros) // (especially for functional macros)
StrC calling_proc = Context.Scope->Prev->ProcName; Str calling_proc = Context.Scope->Prev->ProcName;
if (strc_contains(Context.Scope->Prev->ProcName, txt("parser_parse_enum"))) if (str_contains(Context.Scope->Prev->ProcName, txt("parser_parse_enum")))
{ {
// Do nothing // Do nothing
goto Leave_Scope_Early; goto Leave_Scope_Early;
} }
else if (strc_contains(Context.Scope->Prev->ProcName, txt("parser_parse_typedef"))) else if (str_contains(Context.Scope->Prev->ProcName, txt("parser_parse_typedef")))
{ {
// TODO(Ed): Reveiw the context for this? // TODO(Ed): Reveiw the context for this?
if ( peektok.Type == Tok_Statement_End ) if ( peektok.Type == Tok_Statement_End )
@@ -3094,8 +3095,8 @@ Code parse_simple_preprocess( TokType which, bool dont_consume_braces )
} }
} }
else if ( else if (
strc_contains(calling_proc, txt("parse_global_nspace")) str_contains(calling_proc, txt("parse_global_nspace"))
|| strc_contains(calling_proc, txt("parse_class_struct_body")) || str_contains(calling_proc, txt("parse_class_struct_body"))
) )
{ {
if (peektok.Type == Tok_Statement_End) if (peektok.Type == Tok_Statement_End)
@@ -3112,9 +3113,9 @@ Code parse_simple_preprocess( TokType which, bool dont_consume_braces )
Leave_Scope_Early: Leave_Scope_Early:
char const* content = str_fmt_buf( "%.*s ", tok.Length, tok.Text ); char const* content = c_str_fmt_buf( "%.*s ", tok.Length, tok.Text );
Code result = untyped_str( to_strc_from_c_str(content) ); Code result = untyped_str( to_str_from_c_str(content) );
Context.Scope->Name = tok; Context.Scope->Name = tok;
parser_pop(& Context); parser_pop(& Context);
@@ -3155,8 +3156,8 @@ Code parse_static_assert()
content.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)content.Text; content.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)content.Text;
char const* str = str_fmt_buf( "%.*s\n", content.Length, content.Text ); char const* str = c_str_fmt_buf( "%.*s\n", content.Length, content.Text );
StrC content_str = { content.Length + 1, str }; Str content_str = { content.Length + 1, str };
assert->Content = get_cached_string( content_str ); assert->Content = get_cached_string( content_str );
assert->Name = assert->Content; assert->Name = assert->Content;
@@ -3210,7 +3211,7 @@ CodeVar parse_variable_after_name(
, CodeAttributes attributes , CodeAttributes attributes
, CodeSpecifiers specifiers , CodeSpecifiers specifiers
, CodeTypename type , CodeTypename type
, StrC name , Str name
) )
{ {
push_scope(); push_scope();
@@ -3288,7 +3289,7 @@ CodeVar parse_variable_after_name(
if ( currtok.Type == Tok_Statement_End ) if ( currtok.Type == Tok_Statement_End )
{ {
log_failure( "Expected expression after bitfield \n%S", parser_to_string(Context) ); log_failure( "Expected expression after bitfield \n%SB", parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -3397,7 +3398,7 @@ CodeVar parse_variable_declaration_list()
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
switch ( spec ) switch ( spec )
{ {
@@ -3405,7 +3406,7 @@ CodeVar parse_variable_declaration_list()
if ( specifiers->NumEntries && specifiers->ArrSpecs[ specifiers->NumEntries - 1 ] != Spec_Ptr ) if ( specifiers->NumEntries && specifiers->ArrSpecs[ specifiers->NumEntries - 1 ] != Spec_Ptr )
{ {
log_failure( "Error, const specifier must come after pointer specifier for variable declaration proceeding comma\n" log_failure( "Error, const specifier must come after pointer specifier for variable declaration proceeding comma\n"
"(Parser will add and continue to specifiers, but will most likely fail to compile)\n%S" "(Parser will add and continue to specifiers, but will most likely fail to compile)\n%SB"
, parser_to_string(Context) ); , parser_to_string(Context) );
specifiers_append(specifiers, spec ); specifiers_append(specifiers, spec );
@@ -3420,7 +3421,7 @@ CodeVar parse_variable_declaration_list()
default: default:
{ {
log_failure( "Error, invalid specifier '%s' proceeding comma\n" log_failure( "Error, invalid specifier '%s' proceeding comma\n"
"(Parser will add and continue to specifiers, but will most likely fail to compile)\n%SC" "(Parser will add and continue to specifiers, but will most likely fail to compile)\n%S"
, tok_to_str(currtok), parser_to_string(Context) ); , tok_to_str(currtok), parser_to_string(Context) );
continue; continue;
} }
@@ -3436,7 +3437,7 @@ CodeVar parse_variable_declaration_list()
} }
// , <Specifiers> // , <Specifiers>
StrC name = tok_to_str(currtok); Str name = tok_to_str(currtok);
eat( Tok_Identifier ); eat( Tok_Identifier );
// , <Specifiers> <Name> // , <Specifiers> <Name>
@@ -3565,7 +3566,7 @@ CodeDestructor parser_parse_destructor( CodeSpecifiers specifiers )
push_scope(); push_scope();
bool has_context = Context.Scope && Context.Scope->Prev; bool has_context = Context.Scope && Context.Scope->Prev;
bool is_in_global_nspace = has_context && strc_are_equal( Context.Scope->Prev->ProcName, txt("parse_global_nspace") ); bool is_in_global_nspace = has_context && str_are_equal( Context.Scope->Prev->ProcName, txt("parse_global_nspace") );
if ( check( Tok_Spec_Virtual ) ) if ( check( Tok_Spec_Virtual ) )
{ {
@@ -3616,7 +3617,7 @@ CodeDestructor parser_parse_destructor( CodeSpecifiers specifiers )
specifiers_append(specifiers, Spec_Pure ); specifiers_append(specifiers, Spec_Pure );
} }
else if ( left && str_compare_len( upcoming.Text, "default", sizeof("default") - 1 ) == 0) else if ( left && c_str_compare_len( upcoming.Text, "default", sizeof("default") - 1 ) == 0)
{ {
body = cast(CodeBody, parse_assignment_expression()); body = cast(CodeBody, parse_assignment_expression());
// <Virtual Specifier> ~< // <Virtual Specifier> ~<
@@ -3730,7 +3731,7 @@ CodeEnum parser_parse_enum( bool inplace_def )
else if ( currtok.Type == Tok_Preprocess_Macro ) else if ( currtok.Type == Tok_Preprocess_Macro )
{ {
// We'll support the enum_underlying macro // We'll support the enum_underlying macro
if ( strc_contains( tok_to_str(currtok), enum_underlying_sig) ) if ( str_contains( tok_to_str(currtok), enum_underlying_sig) )
{ {
use_macro_underlying = true; use_macro_underlying = true;
underlying_macro = parse_simple_preprocess( Tok_Preprocess_Macro, parser_dont_consume_braces ); underlying_macro = parse_simple_preprocess( Tok_Preprocess_Macro, parser_dont_consume_braces );
@@ -3987,7 +3988,7 @@ CodeFriend parser_parse_friend()
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
switch ( spec ) switch ( spec )
{ {
@@ -4111,7 +4112,7 @@ CodeFn parser_parse_function()
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
switch ( spec ) switch ( spec )
{ {
@@ -4224,7 +4225,7 @@ CodeOperator parser_parse_operator()
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
switch ( spec ) switch ( spec )
{ {
@@ -4237,7 +4238,7 @@ CodeOperator parser_parse_operator()
break; break;
default: default:
log_failure( "Invalid specifier " "%SC" " for operator\n%S", spec_to_str(spec), parser_to_string(Context) ); log_failure( "Invalid specifier " "%S" " for operator\n%SB", spec_to_str(spec), parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -4466,7 +4467,7 @@ CodeTemplate parser_parse_template()
{ {
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
switch ( spec ) switch ( spec )
{ {
@@ -4512,7 +4513,7 @@ CodeTemplate parser_parse_template()
bool has_context = Context.Scope && Context.Scope->Prev; bool has_context = Context.Scope && Context.Scope->Prev;
bool is_in_global_nspace = has_context && strc_are_equal( Context.Scope->Prev->ProcName, txt("parse_global_nspace") ); bool is_in_global_nspace = has_context && str_are_equal( Context.Scope->Prev->ProcName, txt("parse_global_nspace") );
// Possible constructor implemented at global file scope. // Possible constructor implemented at global file scope.
if (is_in_global_nspace) if (is_in_global_nspace)
{ {
@@ -4609,11 +4610,11 @@ CodeTypename parser_parse_type( bool from_template, bool* typedef_is_function )
// Prefix specifiers // Prefix specifiers
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
if ( spec != Spec_Const ) if ( spec != Spec_Const )
{ {
log_failure( "Error, invalid specifier used in type definition: %SC\n%S", tok_to_str(currtok), parser_to_string(Context) ); log_failure( "Error, invalid specifier used in type definition: %S\n%SB", tok_to_str(currtok), parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -4626,7 +4627,7 @@ CodeTypename parser_parse_type( bool from_template, bool* typedef_is_function )
if ( left == 0 ) if ( left == 0 )
{ {
log_failure( "Error, unexpected end of type definition\n%S", parser_to_string(Context) ); log_failure( "Error, unexpected end of type definition\n%SB", parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -4748,7 +4749,7 @@ else if ( currtok.Type == Tok_DeclType )
// Suffix specifiers for typename. // Suffix specifiers for typename.
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
if ( spec != Spec_Const && spec != Spec_Ptr && spec != Spec_Ref && spec != Spec_RValue ) if ( spec != Spec_Const && spec != Spec_Ptr && spec != Spec_Ref && spec != Spec_RValue )
{ {
@@ -4807,7 +4808,7 @@ else if ( currtok.Type == Tok_DeclType )
} }
bool has_context = Context.Scope && Context.Scope->Prev; bool has_context = Context.Scope && Context.Scope->Prev;
bool is_for_opcast = has_context && strc_are_equal( Context.Scope->Prev->ProcName, txt("parser_parse_operator_cast") ); bool is_for_opcast = has_context && str_are_equal( Context.Scope->Prev->ProcName, txt("parser_parse_operator_cast") );
if ( is_for_opcast && is_function_typename && last_capture ) if ( is_for_opcast && is_function_typename && last_capture )
{ {
// If we're parsing for an operator cast, having one capture start is not enough // If we're parsing for an operator cast, having one capture start is not enough
@@ -4831,8 +4832,8 @@ else if ( currtok.Type == Tok_DeclType )
return_type = ( CodeTypename )make_code(); return_type = ( CodeTypename )make_code();
return_type->Type = CT_Typename; return_type->Type = CT_Typename;
// String // StrBuilder
// name_stripped = String::make( GlobalAllocator, name ); // name_stripped = StrBuilder::make( GlobalAllocator, name );
// name_stripped.strip_space(); // name_stripped.strip_space();
return_type->Name = get_cached_string( tok_to_str(name) ); return_type->Name = get_cached_string( tok_to_str(name) );
@@ -4947,14 +4948,14 @@ else if ( currtok.Type == Tok_DeclType )
// Look for suffix specifiers for the function // Look for suffix specifiers for the function
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
if ( spec != Spec_Const if ( spec != Spec_Const
// TODO : Add support for NoExcept, l-value, volatile, l-value, etc // TODO : Add support for NoExcept, l-value, volatile, l-value, etc
// && spec != Spec_NoExcept // && spec != Spec_NoExcept
&& spec != Spec_RValue ) && spec != Spec_RValue )
{ {
log_failure( "Error, invalid specifier used in type definition: %SC\n%S", tok_to_str(currtok), parser_to_string(Context) ); log_failure( "Error, invalid specifier used in type definition: %S\n%SB", tok_to_str(currtok), parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -4988,7 +4989,7 @@ else if ( currtok.Type == Tok_DeclType )
// result->Token = Context.Scope->Start; // result->Token = Context.Scope->Start;
// Need to wait until were using the new parsing method to do this. // Need to wait until were using the new parsing method to do this.
String name_stripped = parser_strip_formatting( tok_to_str(name), parser_strip_formatting_dont_preserve_newlines ); StrBuilder name_stripped = parser_strip_formatting( tok_to_str(name), parser_strip_formatting_dont_preserve_newlines );
// name_stripped.strip_space(); // name_stripped.strip_space();
@@ -4999,7 +5000,7 @@ else if ( currtok.Type == Tok_DeclType )
} }
#endif #endif
result->Name = get_cached_string( string_to_strc(name_stripped) ); result->Name = get_cached_string( strbuilder_to_str(name_stripped) );
if ( attributes ) if ( attributes )
result->Attributes = attributes; result->Attributes = attributes;
@@ -5081,7 +5082,7 @@ CodeTypedef parser_parse_typedef()
if ( currtok.Type == Tok_Identifier ) if ( currtok.Type == Tok_Identifier )
{ {
StrC name_str = { name.Length, name.Text }; Str name_str = { name.Length, name.Text };
type = untyped_str(name_str); type = untyped_str(name_str);
name = currtok; name = currtok;
eat(Tok_Identifier); eat(Tok_Identifier);
@@ -5160,7 +5161,7 @@ CodeTypedef parser_parse_typedef()
if ( ! ok_to_parse ) if ( ! ok_to_parse )
{ {
log_failure( "Unsupported or bad member definition after struct declaration\n%S", parser_to_string(Context) ); log_failure( "Unsupported or bad member definition after struct declaration\n%SB", parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -5186,7 +5187,7 @@ CodeTypedef parser_parse_typedef()
} }
else else
{ {
log_failure( "Unsupported or bad member definition after struct declaration\n%S", parser_to_string(Context) ); log_failure( "Unsupported or bad member definition after struct declaration\n%SB", parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -5207,7 +5208,7 @@ CodeTypedef parser_parse_typedef()
} }
else if ( ! is_function ) else if ( ! is_function )
{ {
log_failure( "Error, expected identifier for typedef\n%S", parser_to_string(Context) ); log_failure( "Error, expected identifier for typedef\n%SB", parser_to_string(Context) );
parser_pop(& Context); parser_pop(& Context);
return InvalidCode; return InvalidCode;
} }
@@ -5278,7 +5279,7 @@ CodeUnion parser_parse_union( bool inplace_def )
CodeAttributes attributes = parse_attributes(); CodeAttributes attributes = parse_attributes();
// <ModuleFlags> union <Attributes> // <ModuleFlags> union <Attributes>
StrC name = { 0, nullptr }; Str name = { 0, nullptr };
if ( check( Tok_Identifier ) ) if ( check( Tok_Identifier ) )
{ {
name = tok_to_str(currtok); name = tok_to_str(currtok);
@@ -5526,7 +5527,7 @@ CodeVar parser_parse_variable()
while ( left && tok_is_specifier(currtok) ) while ( left && tok_is_specifier(currtok) )
{ {
Specifier spec = strc_to_specifier( tok_to_str(currtok) ); Specifier spec = str_to_specifier( tok_to_str(currtok) );
switch ( spec ) switch ( spec )
{ {
case Spec_Const: case Spec_Const:
@@ -5580,11 +5581,10 @@ CodeVar parser_parse_variable()
return result; return result;
} }
internal internal
CodeTypename parser_parse_type_alt( bool from_template, bool* typedef_is_functon ) CodeTypename parser_parse_type_alt( bool from_template, bool* typedef_is_functon )
{ {
return InvalidCode;
} }
GEN_NS_PARSER_END GEN_NS_PARSER_END

2
base/components/static_data.cpp
View File

@@ -28,7 +28,7 @@ global AllocatorInfo Allocator_TypeTable = {0};
#pragma region Constants #pragma region Constants
global StrC enum_underlying_sig; global Str enum_underlying_sig;
global Code access_public; global Code access_public;
global Code access_protected; global Code access_protected;

12
base/components/types.hpp
View File

@@ -44,17 +44,17 @@ enum AccessSpec : u32
static_assert( size_of(AccessSpec) == size_of(u32), "AccessSpec not u32 size" ); static_assert( size_of(AccessSpec) == size_of(u32), "AccessSpec not u32 size" );
inline inline
StrC access_spec_to_str( AccessSpec type ) Str access_spec_to_str( AccessSpec type )
{ {
local_persist local_persist
StrC lookup[ (u32)AccessSpec_Num_AccessSpec ] = { Str lookup[ (u32)AccessSpec_Num_AccessSpec ] = {
{ sizeof("") - 1, "" }, { sizeof("") - 1, "" },
{ sizeof("prviate") - 1, "private" }, { sizeof("prviate") - 1, "private" },
{ sizeof("protected") - 1, "private" }, { sizeof("protected") - 1, "private" },
{ sizeof("public") - 1, "public" }, { sizeof("public") - 1, "public" },
}; };
StrC invalid = { sizeof("Invalid") - 1, "Invalid" }; Str invalid = { sizeof("Invalid") - 1, "Invalid" };
if ( type > AccessSpec_Public ) if ( type > AccessSpec_Public )
return invalid; return invalid;
@@ -97,17 +97,17 @@ enum ModuleFlag : u32
static_assert( size_of(ModuleFlag) == size_of(u32), "ModuleFlag not u32 size" ); static_assert( size_of(ModuleFlag) == size_of(u32), "ModuleFlag not u32 size" );
inline inline
StrC module_flag_to_str( ModuleFlag flag ) Str module_flag_to_str( ModuleFlag flag )
{ {
local_persist local_persist
StrC lookup[ (u32)Num_ModuleFlags ] = { Str lookup[ (u32)Num_ModuleFlags ] = {
{ sizeof("__none__"), "__none__" }, { sizeof("__none__"), "__none__" },
{ sizeof("export"), "export" }, { sizeof("export"), "export" },
{ sizeof("import"), "import" }, { sizeof("import"), "import" },
}; };
local_persist local_persist
StrC invalid_flag = { sizeof("invalid"), "invalid" }; Str invalid_flag = { sizeof("invalid"), "invalid" };
if ( flag > ModuleFlag_Import ) if ( flag > ModuleFlag_Import )
return invalid_flag; return invalid_flag;

24
base/dependencies/debug.hpp
View File

@@ -8,16 +8,20 @@
#pragma region Debug #pragma region Debug
#if defined( _MSC_VER ) #if GEN_BUILD_DEBUG
# if _MSC_VER < 1300 # if defined( GEN_COMPILER_MSVC )
# define GEN_DEBUG_TRAP() __asm int 3 /* Trap to debugger! */ # if _MSC_VER < 1300
# define GEN_DEBUG_TRAP() __asm int 3 /* Trap to debugger! */
# else
# define GEN_DEBUG_TRAP() __debugbreak()
# endif
# elif defined( GEN_COMPILER_TINYC )
# define GEN_DEBUG_TRAP() process_exit( 1 )
# else # else
# define GEN_DEBUG_TRAP() __debugbreak() # define GEN_DEBUG_TRAP() __builtin_trap()
# endif # endif
#elif defined( GEN_COMPILER_TINYC )
# define GEN_DEBUG_TRAP() process_exit( 1 )
#else #else
# define GEN_DEBUG_TRAP() __builtin_trap() # define GEN_DEBUG_TRAP()
#endif #endif
#define GEN_ASSERT( cond ) GEN_ASSERT_MSG( cond, NULL ) #define GEN_ASSERT( cond ) GEN_ASSERT_MSG( cond, NULL )
@@ -37,14 +41,14 @@
// NOTE: Things that shouldn't happen with a message! // NOTE: Things that shouldn't happen with a message!
#define GEN_PANIC( msg, ... ) GEN_ASSERT_MSG( 0, msg, ##__VA_ARGS__ ) #define GEN_PANIC( msg, ... ) GEN_ASSERT_MSG( 0, msg, ##__VA_ARGS__ )
#if Build_Debug #if GEN_BULD_DEBUG
#define GEN_FATAL( ... ) \ #define GEN_FATAL( ... ) \
do \ do \
{ \ { \
local_persist thread_local \ local_persist thread_local \
char buf[GEN_PRINTF_MAXLEN] = { 0 }; \ char buf[GEN_PRINTF_MAXLEN] = { 0 }; \
\ \
str_fmt(buf, GEN_PRINTF_MAXLEN, __VA_ARGS__); \ c_str_fmt(buf, GEN_PRINTF_MAXLEN, __VA_ARGS__); \
GEN_PANIC(buf); \ GEN_PANIC(buf); \
} \ } \
while (0) while (0)
@@ -53,7 +57,7 @@
# define GEN_FATAL( ... ) \ # define GEN_FATAL( ... ) \
do \ do \
{ \ { \
str_fmt_out_err( __VA_ARGS__ ); \ c_str_fmt_out_err( __VA_ARGS__ ); \
process_exit(1); \ process_exit(1); \
} \ } \
while (0) while (0)

4
base/dependencies/filesystem.cpp
View File

@@ -18,7 +18,7 @@ wchar_t* _alloc_utf8_to_ucs2( AllocatorInfo a, char const* text, ssize* w_len_ )
*w_len_ = w_len; *w_len_ = w_len;
return NULL; return NULL;
} }
len = str_len( text ); len = c_str_len( text );
if ( len == 0 ) if ( len == 0 )
{ {
if ( w_len_ ) if ( w_len_ )
@@ -375,7 +375,7 @@ FileError file_close( FileInfo* f )
FileError file_new( FileInfo* f, FileDescriptor fd, FileOperations ops, char const* filename ) FileError file_new( FileInfo* f, FileDescriptor fd, FileOperations ops, char const* filename )
{ {
FileError err = EFileError_NONE; FileError err = EFileError_NONE;
ssize len = str_len( filename ); ssize len = c_str_len( filename );
f->ops = ops; f->ops = ops;
f->fd = fd; f->fd = fd;

2
base/dependencies/filesystem.hpp
View File

@@ -93,7 +93,7 @@ struct DirInfo
// Internals // Internals
char** filenames; // zpl_array char** filenames; // zpl_array
String buf; StrBuilder buf;
}; };
struct FileInfo struct FileInfo

78
base/dependencies/parsing.cpp
View File

@@ -8,7 +8,7 @@
#define _adt_fprintf( s_, fmt_, ... ) \ #define _adt_fprintf( s_, fmt_, ... ) \
do \ do \
{ \ { \
if ( str_fmt_file( s_, fmt_, ##__VA_ARGS__ ) < 0 ) \ if ( c_str_fmt_file( s_, fmt_, ##__VA_ARGS__ ) < 0 ) \
return EADT_ERROR_OUT_OF_MEMORY; \ return EADT_ERROR_OUT_OF_MEMORY; \
} while ( 0 ) } while ( 0 )
@@ -69,7 +69,7 @@ ADT_Node* adt_find( ADT_Node* node, char const* name, b32 deep_search )
for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ ) for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
{ {
if ( ! str_compare( node->nodes[ i ].name, name ) ) if ( ! c_str_compare( node->nodes[ i ].name, name ) )
{ {
return ( node->nodes + i ); return ( node->nodes + i );
} }
@@ -96,7 +96,7 @@ internal ADT_Node* _adt_get_value( ADT_Node* node, char const* value )
case EADT_TYPE_MULTISTRING : case EADT_TYPE_MULTISTRING :
case EADT_TYPE_STRING : case EADT_TYPE_STRING :
{ {
if ( node->string && ! str_compare( node->string, value ) ) if ( node->string && ! c_str_compare( node->string, value ) )
{ {
return node; return node;
} }
@@ -115,7 +115,7 @@ internal ADT_Node* _adt_get_value( ADT_Node* node, char const* value )
ssize fsize = 0; ssize fsize = 0;
u8* buf = file_stream_buf( &tmp, &fsize ); u8* buf = file_stream_buf( &tmp, &fsize );
if ( ! str_compare( ( char const* )buf, value ) ) if ( ! c_str_compare( ( char const* )buf, value ) )
{ {
file_close( &tmp ); file_close( &tmp );
return node; return node;
@@ -135,7 +135,7 @@ internal ADT_Node* _adt_get_field( ADT_Node* node, char* name, char* value )
{ {
for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ ) for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
{ {
if ( ! str_compare( node->nodes[ i ].name, name ) ) if ( ! c_str_compare( node->nodes[ i ].name, name ) )
{ {
ADT_Node* child = &node->nodes[ i ]; ADT_Node* child = &node->nodes[ i ];
if ( _adt_get_value( child, value ) ) if ( _adt_get_value( child, value ) )
@@ -168,22 +168,22 @@ ADT_Node* adt_query( ADT_Node* node, char const* uri )
} }
#if defined EADT_URI_DEBUG || 0 #if defined EADT_URI_DEBUG || 0
str_fmt_out( "uri: %s\n", uri ); c_str_fmt_out( "uri: %s\n", uri );
#endif #endif
char * p = ( char* )uri, *b = p, *e = p; char * p = ( char* )uri, *b = p, *e = p;
ADT_Node* found_node = NULL; ADT_Node* found_node = NULL;
b = p; b = p;
p = e = ( char* )str_skip( p, '/' ); p = e = ( char* )c_str_skip( p, '/' );
char* buf = str_fmt_buf( "%.*s", ( int )( e - b ), b ); char* buf = c_str_fmt_buf( "%.*s", ( int )( e - b ), b );
/* handle field value lookup */ /* handle field value lookup */
if ( *b == '[' ) if ( *b == '[' )
{ {
char *l_p = buf + 1, *l_b = l_p, *l_e = l_p, *l_b2 = l_p, *l_e2 = l_p; char *l_p = buf + 1, *l_b = l_p, *l_e = l_p, *l_b2 = l_p, *l_e2 = l_p;
l_e = ( char* )str_skip( l_p, '=' ); l_e = ( char* )c_str_skip( l_p, '=' );
l_e2 = ( char* )str_skip( l_p, ']' ); l_e2 = ( char* )c_str_skip( l_p, ']' );
if ( ( ! *l_e && node->type != EADT_TYPE_ARRAY ) || ! *l_e2 ) if ( ( ! *l_e && node->type != EADT_TYPE_ARRAY ) || ! *l_e2 )
{ {
@@ -257,7 +257,7 @@ ADT_Node* adt_query( ADT_Node* node, char const* uri )
/* handle array index lookup */ /* handle array index lookup */
else else
{ {
ssize idx = ( ssize )str_to_i64( buf, NULL, 10 ); ssize idx = ( ssize )c_str_to_i64( buf, NULL, 10 );
if ( idx >= 0 && idx < scast(ssize, array_num(node->nodes)) ) if ( idx >= 0 && idx < scast(ssize, array_num(node->nodes)) )
{ {
found_node = &node->nodes[ idx ]; found_node = &node->nodes[ idx ];
@@ -511,7 +511,7 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
} }
else else
{ {
if ( ! str_compare_len( e, "0x", 2 ) || ! str_compare_len( e, "0X", 2 ) ) if ( ! c_str_compare_len( e, "0x", 2 ) || ! c_str_compare_len( e, "0X", 2 ) )
{ {
node_props = EADT_PROPS_IS_HEX; node_props = EADT_PROPS_IS_HEX;
} }
@@ -575,12 +575,12 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
} }
} }
orig_exp = exp = ( u8 )str_to_i64( expbuf, NULL, 10 ); orig_exp = exp = ( u8 )c_str_to_i64( expbuf, NULL, 10 );
} }
if ( node_type == EADT_TYPE_INTEGER ) if ( node_type == EADT_TYPE_INTEGER )
{ {
node->integer = str_to_i64( buf, 0, 0 ); node->integer = c_str_to_i64( buf, 0, 0 );
#ifndef GEN_PARSER_DISABLE_ANALYSIS #ifndef GEN_PARSER_DISABLE_ANALYSIS
/* special case: negative zero */ /* special case: negative zero */
if ( node->integer == 0 && buf[ 0 ] == '-' ) if ( node->integer == 0 && buf[ 0 ] == '-' )
@@ -595,19 +595,19 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
} }
else else
{ {
node->real = str_to_f64( buf, 0 ); node->real = c_str_to_f64( buf, 0 );
#ifndef GEN_PARSER_DISABLE_ANALYSIS #ifndef GEN_PARSER_DISABLE_ANALYSIS
char *q = buf, *base_string = q, *base_string2 = q; char *q = buf, *base_string = q, *base_string2 = q;
base_string = ccast( char*, str_skip( base_string, '.' )); base_string = ccast( char*, c_str_skip( base_string, '.' ));
*base_string = '\0'; *base_string = '\0';
base_string2 = base_string + 1; base_string2 = base_string + 1;
char* base_string_off = base_string2; char* base_strbuilder_off = base_string2;
while ( *base_string_off++ == '0' ) while ( *base_strbuilder_off++ == '0' )
base2_offset++; base2_offset++;
base = ( s32 )str_to_i64( q, 0, 0 ); base = ( s32 )c_str_to_i64( q, 0, 0 );
base2 = ( s32 )str_to_i64( base_string2, 0, 0 ); base2 = ( s32 )c_str_to_i64( base_string2, 0, 0 );
if ( exp ) if ( exp )
{ {
exp = exp * ( ! ( eb == 10.0f ) ? -1 : 1 ); exp = exp * ( ! ( eb == 10.0f ) ? -1 : 1 );
@@ -750,7 +750,7 @@ ADT_Error adt_print_string( FileInfo* file, ADT_Node* node, char const* escaped_
do do
{ {
p = str_skip_any( p, escaped_chars ); p = c_str_skip_any( p, escaped_chars );
_adt_fprintf( file, "%.*s", pointer_diff( b, p ), b ); _adt_fprintf( file, "%.*s", pointer_diff( b, p ), b );
if ( *p && ! ! char_first_occurence( escaped_chars, *p ) ) if ( *p && ! ! char_first_occurence( escaped_chars, *p ) )
{ {
@@ -763,7 +763,7 @@ ADT_Error adt_print_string( FileInfo* file, ADT_Node* node, char const* escaped_
return EADT_ERROR_NONE; return EADT_ERROR_NONE;
} }
ADT_Error adt_str_to_number( ADT_Node* node ) ADT_Error adt_c_str_to_number( ADT_Node* node )
{ {
GEN_ASSERT( node ); GEN_ASSERT( node );
@@ -779,7 +779,7 @@ ADT_Error adt_str_to_number( ADT_Node* node )
return EADT_ERROR_NONE; return EADT_ERROR_NONE;
} }
ADT_Error adt_str_to_number_strict( ADT_Node* node ) ADT_Error adt_c_str_to_number_strict( ADT_Node* node )
{ {
GEN_ASSERT( node ); GEN_ASSERT( node );
@@ -826,7 +826,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
do do
{ {
char delimiter = 0; char delimiter = 0;
currentChar = ccast( char*, str_trim( currentChar, false )); currentChar = ccast( char*, c_str_trim( currentChar, false ));
if ( *currentChar == 0 ) if ( *currentChar == 0 )
break; break;
@@ -850,7 +850,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
#endif #endif
do do
{ {
endChar = ccast( char*, str_skip( endChar, '"' )); endChar = ccast( char*, c_str_skip( endChar, '"' ));
if ( *endChar && *( endChar + 1 ) == '"' ) if ( *endChar && *( endChar + 1 ) == '"' )
{ {
@@ -869,7 +869,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
} }
*endChar = 0; *endChar = 0;
currentChar = ccast( char*, str_trim( endChar + 1, true )); currentChar = ccast( char*, c_str_trim( endChar + 1, true ));
delimiter = * currentChar; delimiter = * currentChar;
/* unescape escaped quotes (so that unescaped text escapes :) */ /* unescape escaped quotes (so that unescaped text escapes :) */
@@ -879,7 +879,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
{ {
if ( *escapedChar == '"' && *( escapedChar + 1 ) == '"' ) if ( *escapedChar == '"' && *( escapedChar + 1 ) == '"' )
{ {
mem_move( escapedChar, escapedChar + 1, str_len( escapedChar ) ); mem_move( escapedChar, escapedChar + 1, c_str_len( escapedChar ) );
} }
escapedChar++; escapedChar++;
} }
@@ -906,7 +906,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
if ( * endChar ) if ( * endChar )
{ {
currentChar = ccast( char*, str_trim( endChar, true )); currentChar = ccast( char*, c_str_trim( endChar, true ));
while ( char_is_space( *( endChar - 1 ) ) ) while ( char_is_space( *( endChar - 1 ) ) )
{ {
@@ -927,7 +927,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
char* num_p = beginChar; char* num_p = beginChar;
// We only consider hexadecimal values if they start with 0x // We only consider hexadecimal values if they start with 0x
if ( str_len(num_p) > 2 && num_p[0] == '0' && (num_p[1] == 'x' || num_p[1] == 'X') ) if ( c_str_len(num_p) > 2 && num_p[0] == '0' && (num_p[1] == 'x' || num_p[1] == 'X') )
{ {
num_p += 2; // skip '0x' prefix num_p += 2; // skip '0x' prefix
do do
@@ -946,7 +946,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
if (!skip_number) if (!skip_number)
{ {
adt_str_to_number(&rowItem); adt_c_str_to_number(&rowItem);
} }
} }
@@ -1021,16 +1021,16 @@ void _csv_write_record( FileInfo* file, CSV_Object* node )
{ {
case EADT_NAME_STYLE_DOUBLE_QUOTE : case EADT_NAME_STYLE_DOUBLE_QUOTE :
{ {
str_fmt_file( file, "\"" ); c_str_fmt_file( file, "\"" );
adt_print_string( file, node, "\"", "\"" ); adt_print_string( file, node, "\"", "\"" );
str_fmt_file( file, "\"" ); c_str_fmt_file( file, "\"" );
} }
break; break;
case EADT_NAME_STYLE_NO_QUOTES : case EADT_NAME_STYLE_NO_QUOTES :
{ {
#endif #endif
str_fmt_file( file, "%s", node->string ); c_str_fmt_file( file, "%s", node->string );
#ifndef GEN_PARSER_DISABLE_ANALYSIS #ifndef GEN_PARSER_DISABLE_ANALYSIS
} }
break; break;
@@ -1078,10 +1078,10 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
_csv_write_header( file, &obj->nodes[ i ] ); _csv_write_header( file, &obj->nodes[ i ] );
if ( i + 1 != cols ) if ( i + 1 != cols )
{ {
str_fmt_file( file, "%c", delimiter ); c_str_fmt_file( file, "%c", delimiter );
} }
} }
str_fmt_file( file, "\n" ); c_str_fmt_file( file, "\n" );
} }
for ( ssize r = 0; r < rows; r++ ) for ( ssize r = 0; r < rows; r++ )
@@ -1091,14 +1091,14 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
_csv_write_record( file, &obj->nodes[ i ].nodes[ r ] ); _csv_write_record( file, &obj->nodes[ i ].nodes[ r ] );
if ( i + 1 != cols ) if ( i + 1 != cols )
{ {
str_fmt_file( file, "%c", delimiter ); c_str_fmt_file( file, "%c", delimiter );
} }
} }
str_fmt_file( file, "\n" ); c_str_fmt_file( file, "\n" );
} }
} }
String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delimiter ) StrBuilder csv_write_strbuilder_delimiter( AllocatorInfo a, CSV_Object* obj, char delimiter )
{ {
FileInfo tmp; FileInfo tmp;
file_stream_new( &tmp, a ); file_stream_new( &tmp, a );
@@ -1106,7 +1106,7 @@ String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delimi
ssize fsize; ssize fsize;
u8* buf = file_stream_buf( &tmp, &fsize ); u8* buf = file_stream_buf( &tmp, &fsize );
String output = string_make_length( a, ( char* )buf, fsize ); StrBuilder output = strbuilder_make_length( a, ( char* )buf, fsize );
file_close( &tmp ); file_close( &tmp );
return output; return output;
} }

12
base/dependencies/parsing.hpp
View File

@@ -350,7 +350,7 @@ char* adt_parse_number_strict( ADT_Node* node, char* base_str );
* @param node * @param node
* @return * @return
*/ */
ADT_Error adt_str_to_number( ADT_Node* node ); ADT_Error adt_c_str_to_number( ADT_Node* node );
/** /**
* @brief Parses and converts an existing string node into a number. * @brief Parses and converts an existing string node into a number.
@@ -359,7 +359,7 @@ ADT_Error adt_str_to_number( ADT_Node* node );
* @param node * @param node
* @return * @return
*/ */
ADT_Error adt_str_to_number_strict( ADT_Node* node ); ADT_Error adt_c_str_to_number_strict( ADT_Node* node );
/** /**
* @brief Prints a number into a file stream. * @brief Prints a number into a file stream.
@@ -406,9 +406,9 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator,
void csv_free( CSV_Object* obj ); void csv_free( CSV_Object* obj );
void csv_write( FileInfo* file, CSV_Object* obj ); void csv_write( FileInfo* file, CSV_Object* obj );
String csv_write_string( AllocatorInfo a, CSV_Object* obj ); StrBuilder csv_write_string( AllocatorInfo a, CSV_Object* obj );
void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delim ); void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delim );
String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delim ); StrBuilder csv_write_strbuilder_delimiter( AllocatorInfo a, CSV_Object* obj, char delim );
/* inline */ /* inline */
@@ -425,9 +425,9 @@ void csv_write( FileInfo* file, CSV_Object* obj )
} }
inline inline
String csv_write_string( AllocatorInfo a, CSV_Object* obj ) StrBuilder csv_write_string( AllocatorInfo a, CSV_Object* obj )
{ {
return csv_write_string_delimiter( a, obj, ',' ); return csv_write_strbuilder_delimiter( a, obj, ',' );
} }
#pragma endregion CSV #pragma endregion CSV

69
base/dependencies/printing.cpp
View File

@@ -1,6 +1,6 @@
#ifdef GEN_INTELLISENSE_DIRECTIVES #ifdef GEN_INTELLISENSE_DIRECTIVES
# pragma once # pragma once
# include "string_ops.cpp" # include "strbuilder_ops.cpp"
#endif #endif
#pragma region Printing #pragma region Printing
@@ -48,7 +48,7 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
if ( str == NULL && max_len >= 6 ) if ( str == NULL && max_len >= 6 )
{ {
res += str_copy_nulpad( text, "(null)", 6 ); res += c_str_copy_nulpad( text, "(null)", 6 );
return res; return res;
} }
@@ -56,7 +56,7 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
// Made the design decision for this library that precision is the length of the string. // Made the design decision for this library that precision is the length of the string.
len = info->precision; len = info->precision;
else else
len = str_len( str ); len = c_str_len( str );
if ( info && ( info->width == 0 && info->flags & GEN_FMT_WIDTH ) ) if ( info && ( info->width == 0 && info->flags & GEN_FMT_WIDTH ) )
{ {
@@ -69,7 +69,7 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
len = info->precision < len ? info->precision : len; len = info->precision < len ? info->precision : len;
if ( res + len > max_len ) if ( res + len > max_len )
return res; return res;
res += str_copy_nulpad( text, str, len ); res += c_str_copy_nulpad( text, str, len );
text += res; text += res;
if ( info->width > res ) if ( info->width > res )
@@ -93,15 +93,15 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
if ( res + len > max_len ) if ( res + len > max_len )
return res; return res;
res += str_copy_nulpad( text, str, len ); res += c_str_copy_nulpad( text, str, len );
} }
if ( info ) if ( info )
{ {
if ( info->flags & GEN_FMT_UPPER ) if ( info->flags & GEN_FMT_UPPER )
str_to_upper( begin ); c_str_to_upper( begin );
else if ( info->flags & GEN_FMT_LOWER ) else if ( info->flags & GEN_FMT_LOWER )
str_to_lower( begin ); c_str_to_lower( begin );
} }
return res; return res;
@@ -238,7 +238,7 @@ internal ssize _print_f64( char* text, ssize max_len, _format_info* info, b32 is
return ( text - text_begin ); return ( text - text_begin );
} }
neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_list va ) neverinline ssize c_str_fmt_va( char* text, ssize max_len, char const* fmt, va_list va )
{ {
char const* text_begin = text; char const* text_begin = text;
ssize remaining = max_len, res; ssize remaining = max_len, res;
@@ -310,7 +310,7 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
} }
else else
{ {
info.width = scast( s32, str_to_i64( fmt, ccast( char**, & fmt), 10 )); info.width = scast( s32, c_str_to_i64( fmt, ccast( char**, & fmt), 10 ));
if ( info.width != 0 ) if ( info.width != 0 )
{ {
info.flags |= GEN_FMT_WIDTH; info.flags |= GEN_FMT_WIDTH;
@@ -328,7 +328,7 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
} }
else else
{ {
info.precision = scast( s32, str_to_i64( fmt, ccast( char**, & fmt), 10 )); info.precision = scast( s32, c_str_to_i64( fmt, ccast( char**, & fmt), 10 ));
} }
info.flags &= ~GEN_FMT_ZERO; info.flags &= ~GEN_FMT_ZERO;
} }
@@ -419,19 +419,20 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
case 'S': case 'S':
{ {
if ( *(fmt + 1) == 'C' ) if ( *(fmt + 1) == 'B' )
{ {
++ fmt; ++ fmt;
StrC gen_str = va_arg( va, StrC); StrBuilder gen_str = { va_arg( va, char*) };
info.precision = gen_str.Len;
len = _print_string( text, remaining, &info, gen_str.Ptr ); info.precision = strbuilder_length(gen_str);
len = _print_string( text, remaining, &info, gen_str );
break; break;
} }
String gen_str = { va_arg( va, char*) }; Str gen_str = va_arg( va, Str);
info.precision = gen_str.Len;
info.precision = string_length(gen_str); len = _print_string( text, remaining, &info, gen_str.Ptr );
len = _print_string( text, remaining, &info, gen_str );
} }
break; break;
@@ -531,67 +532,67 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
return ( res >= max_len || res < 0 ) ? -1 : res; return ( res >= max_len || res < 0 ) ? -1 : res;
} }
char* str_fmt_buf_va( char const* fmt, va_list va ) char* c_str_fmt_buf_va( char const* fmt, va_list va )
{ {
local_persist thread_local char buffer[ GEN_PRINTF_MAXLEN ]; local_persist thread_local char buffer[ GEN_PRINTF_MAXLEN ];
str_fmt_va( buffer, size_of( buffer ), fmt, va ); c_str_fmt_va( buffer, size_of( buffer ), fmt, va );
return buffer; return buffer;
} }
char* str_fmt_buf( char const* fmt, ... ) char* c_str_fmt_buf( char const* fmt, ... )
{ {
va_list va; va_list va;
char* str; char* str;
va_start( va, fmt ); va_start( va, fmt );
str = str_fmt_buf_va( fmt, va ); str = c_str_fmt_buf_va( fmt, va );
va_end( va ); va_end( va );
return str; return str;
} }
ssize str_fmt_file_va( FileInfo* f, char const* fmt, va_list va ) ssize c_str_fmt_file_va( FileInfo* f, char const* fmt, va_list va )
{ {
local_persist thread_local char buf[ GEN_PRINTF_MAXLEN ]; local_persist thread_local char buf[ GEN_PRINTF_MAXLEN ];
ssize len = str_fmt_va( buf, size_of( buf ), fmt, va ); ssize len = c_str_fmt_va( buf, size_of( buf ), fmt, va );
b32 res = file_write( f, buf, len - 1 ); // NOTE: prevent extra whitespace b32 res = file_write( f, buf, len - 1 ); // NOTE: prevent extra whitespace
return res ? len : -1; return res ? len : -1;
} }
ssize str_fmt_file( FileInfo* f, char const* fmt, ... ) ssize c_str_fmt_file( FileInfo* f, char const* fmt, ... )
{ {
ssize res; ssize res;
va_list va; va_list va;
va_start( va, fmt ); va_start( va, fmt );
res = str_fmt_file_va( f, fmt, va ); res = c_str_fmt_file_va( f, fmt, va );
va_end( va ); va_end( va );
return res; return res;
} }
ssize str_fmt( char* str, ssize n, char const* fmt, ... ) ssize c_str_fmt( char* str, ssize n, char const* fmt, ... )
{ {
ssize res; ssize res;
va_list va; va_list va;
va_start( va, fmt ); va_start( va, fmt );
res = str_fmt_va( str, n, fmt, va ); res = c_str_fmt_va( str, n, fmt, va );
va_end( va ); va_end( va );
return res; return res;
} }
ssize str_fmt_out_va( char const* fmt, va_list va ) ssize c_str_fmt_out_va( char const* fmt, va_list va )
{ {
return str_fmt_file_va( file_get_standard( EFileStandard_OUTPUT ), fmt, va ); return c_str_fmt_file_va( file_get_standard( EFileStandard_OUTPUT ), fmt, va );
} }
ssize str_fmt_out_err_va( char const* fmt, va_list va ) ssize c_str_fmt_out_err_va( char const* fmt, va_list va )
{ {
return str_fmt_file_va( file_get_standard( EFileStandard_ERROR ), fmt, va ); return c_str_fmt_file_va( file_get_standard( EFileStandard_ERROR ), fmt, va );
} }
ssize str_fmt_out_err( char const* fmt, ... ) ssize c_str_fmt_out_err( char const* fmt, ... )
{ {
ssize res; ssize res;
va_list va; va_list va;
va_start( va, fmt ); va_start( va, fmt );
res = str_fmt_out_err_va( fmt, va ); res = c_str_fmt_out_err_va( fmt, va );
va_end( va ); va_end( va );
return res; return res;
} }

22
base/dependencies/printing.hpp
View File

@@ -1,6 +1,6 @@
#ifdef GEN_INTELLISENSE_DIRECTIVES #ifdef GEN_INTELLISENSE_DIRECTIVES
# pragma once # pragma once
# include "string_ops.hpp" # include "strbuilder_ops.hpp"
#endif #endif
#pragma region Printing #pragma region Printing
@@ -13,15 +13,15 @@ typedef struct FileInfo FileInfo;
typedef char PrintF_Buffer[GEN_PRINTF_MAXLEN]; typedef char PrintF_Buffer[GEN_PRINTF_MAXLEN];
// NOTE: A locally persisting buffer is used internally // NOTE: A locally persisting buffer is used internally
char* str_fmt_buf ( char const* fmt, ... ); char* c_str_fmt_buf ( char const* fmt, ... );
char* str_fmt_buf_va ( char const* fmt, va_list va ); char* c_str_fmt_buf_va ( char const* fmt, va_list va );
ssize str_fmt ( char* str, ssize n, char const* fmt, ... ); ssize c_str_fmt ( char* str, ssize n, char const* fmt, ... );
ssize str_fmt_va ( char* str, ssize n, char const* fmt, va_list va ); ssize c_str_fmt_va ( char* str, ssize n, char const* fmt, va_list va );
ssize str_fmt_out_va ( char const* fmt, va_list va ); ssize c_str_fmt_out_va ( char const* fmt, va_list va );
ssize str_fmt_out_err ( char const* fmt, ... ); ssize c_str_fmt_out_err ( char const* fmt, ... );
ssize str_fmt_out_err_va( char const* fmt, va_list va ); ssize c_str_fmt_out_err_va( char const* fmt, va_list va );
ssize str_fmt_file ( FileInfo* f, char const* fmt, ... ); ssize c_str_fmt_file ( FileInfo* f, char const* fmt, ... );
ssize str_fmt_file_va ( FileInfo* f, char const* fmt, va_list va ); ssize c_str_fmt_file_va ( FileInfo* f, char const* fmt, va_list va );
constexpr constexpr
char const* Msg_Invalid_Value = "INVALID VALUE PROVIDED"; char const* Msg_Invalid_Value = "INVALID VALUE PROVIDED";
@@ -33,7 +33,7 @@ ssize log_fmt(char const* fmt, ...)
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
res = str_fmt_out_va(fmt, va); res = c_str_fmt_out_va(fmt, va);
va_end(va); va_end(va);
return res; return res;

6
base/dependencies/src_start.cpp
View File

@@ -13,9 +13,9 @@
# define _printf_err( fmt, ... ) fprintf( stderr, fmt, __VA_ARGS__ ) # define _printf_err( fmt, ... ) fprintf( stderr, fmt, __VA_ARGS__ )
# define _printf_err_va( fmt, va ) vfprintf( stderr, fmt, va ) # define _printf_err_va( fmt, va ) vfprintf( stderr, fmt, va )
# else # else
# define _strlen str_len # define _strlen c_str_len
# define _printf_err( fmt, ... ) str_fmt_out_err( fmt, __VA_ARGS__ ) # define _printf_err( fmt, ... ) c_str_fmt_out_err( fmt, __VA_ARGS__ )
# define _printf_err_va( fmt, va ) str_fmt_out_err_va( fmt, va ) # define _printf_err_va( fmt, va ) c_str_fmt_out_err_va( fmt, va )
# endif # endif
# endif # endif
# #

16
base/dependencies/string_ops.cpp
View File

@@ -3,7 +3,7 @@
# include "debug.cpp" # include "debug.cpp"
#endif #endif
#pragma region String Ops #pragma region StrBuilder Ops
internal internal
ssize _scan_zpl_i64( const char* text, s32 base, s64* value ) ssize _scan_zpl_i64( const char* text, s32 base, s64* value )
@@ -18,7 +18,7 @@ ssize _scan_zpl_i64( const char* text, s32 base, s64* value )
text++; text++;
} }
if ( base == 16 && str_compare_len( text, "0x", 2 ) == 0 ) if ( base == 16 && c_str_compare_len( text, "0x", 2 ) == 0 )
text += 2; text += 2;
for ( ;; ) for ( ;; )
@@ -53,14 +53,14 @@ global const char _num_to_char_table[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"@$"; "@$";
s64 str_to_i64( const char* str, char** end_ptr, s32 base ) s64 c_str_to_i64( const char* str, char** end_ptr, s32 base )
{ {
ssize len; ssize len;
s64 value; s64 value;
if ( ! base ) if ( ! base )
{ {
if ( ( str_len( str ) > 2 ) && ( str_compare_len( str, "0x", 2 ) == 0 ) ) if ( ( c_str_len( str ) > 2 ) && ( c_str_compare_len( str, "0x", 2 ) == 0 ) )
base = 16; base = 16;
else else
base = 10; base = 10;
@@ -100,7 +100,7 @@ void i64_to_str( s64 value, char* string, s32 base )
if ( negative ) if ( negative )
*buf++ = '-'; *buf++ = '-';
*buf = '\0'; *buf = '\0';
str_reverse( string ); c_str_reverse( string );
} }
void u64_to_str( u64 value, char* string, s32 base ) void u64_to_str( u64 value, char* string, s32 base )
@@ -121,10 +121,10 @@ void u64_to_str( u64 value, char* string, s32 base )
} }
*buf = '\0'; *buf = '\0';
str_reverse( string ); c_str_reverse( string );
} }
f64 str_to_f64( const char* str, char** end_ptr ) f64 c_str_to_f64( const char* str, char** end_ptr )
{ {
f64 result, value, sign, scale; f64 result, value, sign, scale;
s32 frac; s32 frac;
@@ -211,4 +211,4 @@ f64 str_to_f64( const char* str, char** end_ptr )
return result; return result;
} }
#pragma endregion String Ops #pragma endregion StrBuilder Ops

64
base/dependencies/string_ops.hpp
View File

@@ -3,7 +3,7 @@
# include "memory.hpp" # include "memory.hpp"
#endif #endif
#pragma region String Ops #pragma region StrBuilder Ops
const char* char_first_occurence( const char* str, char c ); const char* char_first_occurence( const char* str, char c );
@@ -18,25 +18,25 @@ char char_to_upper( char c );
s32 digit_to_int( char c ); s32 digit_to_int( char c );
s32 hex_digit_to_int( char c ); s32 hex_digit_to_int( char c );
s32 str_compare( const char* s1, const char* s2 ); s32 c_str_compare( const char* s1, const char* s2 );
s32 str_compare_len( const char* s1, const char* s2, ssize len ); s32 c_str_compare_len( const char* s1, const char* s2, ssize len );
char* str_copy( char* dest, const char* source, ssize len ); char* c_str_copy( char* dest, const char* source, ssize len );
ssize str_copy_nulpad( char* dest, const char* source, ssize len ); ssize c_str_copy_nulpad( char* dest, const char* source, ssize len );
ssize str_len( const char* str ); ssize c_str_len( const char* str );
ssize str_len_capped( const char* str, ssize max_len ); ssize c_str_len_capped( const char* str, ssize max_len );
char* str_reverse( char* str ); // NOTE: ASCII only char* c_str_reverse( char* str ); // NOTE: ASCII only
char const* str_skip( char const* str, char c ); char const* c_str_skip( char const* str, char c );
char const* str_skip_any( char const* str, char const* char_list ); char const* c_str_skip_any( char const* str, char const* char_list );
char const* str_trim( char const* str, b32 catch_newline ); char const* c_str_trim( char const* str, b32 catch_newline );
// NOTE: ASCII only // NOTE: ASCII only
void str_to_lower( char* str ); void c_str_to_lower( char* str );
void str_to_upper( char* str ); void c_str_to_upper( char* str );
s64 str_to_i64( const char* str, char** end_ptr, s32 base ); s64 c_str_to_i64( const char* str, char** end_ptr, s32 base );
void i64_to_str( s64 value, char* string, s32 base ); void i64_to_str( s64 value, char* string, s32 base );
void u64_to_str( u64 value, char* string, s32 base ); void u64_to_str( u64 value, char* string, s32 base );
f64 str_to_f64( const char* str, char** end_ptr ); f64 c_str_to_f64( const char* str, char** end_ptr );
inline inline
const char* char_first_occurence( const char* s, char c ) const char* char_first_occurence( const char* s, char c )
@@ -122,7 +122,7 @@ s32 hex_digit_to_int( char c )
} }
inline inline
s32 str_compare( const char* s1, const char* s2 ) s32 c_str_compare( const char* s1, const char* s2 )
{ {
while ( *s1 && ( *s1 == *s2 ) ) while ( *s1 && ( *s1 == *s2 ) )
{ {
@@ -132,7 +132,7 @@ s32 str_compare( const char* s1, const char* s2 )
} }
inline inline
s32 str_compare_len( const char* s1, const char* s2, ssize len ) s32 c_str_compare_len( const char* s1, const char* s2, ssize len )
{ {
for ( ; len > 0; s1++, s2++, len-- ) for ( ; len > 0; s1++, s2++, len-- )
{ {
@@ -145,7 +145,7 @@ s32 str_compare_len( const char* s1, const char* s2, ssize len )
} }
inline inline
char* str_copy( char* dest, const char* source, ssize len ) char* c_str_copy( char* dest, const char* source, ssize len )
{ {
GEN_ASSERT_NOT_NULL( dest ); GEN_ASSERT_NOT_NULL( dest );
if ( source ) if ( source )
@@ -166,7 +166,7 @@ char* str_copy( char* dest, const char* source, ssize len )
} }
inline inline
ssize str_copy_nulpad( char* dest, const char* source, ssize len ) ssize c_str_copy_nulpad( char* dest, const char* source, ssize len )
{ {
ssize result = 0; ssize result = 0;
GEN_ASSERT_NOT_NULL( dest ); GEN_ASSERT_NOT_NULL( dest );
@@ -191,7 +191,7 @@ ssize str_copy_nulpad( char* dest, const char* source, ssize len )
} }
inline inline
ssize str_len( const char* str ) ssize c_str_len( const char* str )
{ {
if ( str == NULL ) if ( str == NULL )
{ {
@@ -204,7 +204,7 @@ ssize str_len( const char* str )
} }
inline inline
ssize str_len_capped( const char* str, ssize max_len ) ssize c_str_len_capped( const char* str, ssize max_len )
{ {
const char* end = rcast(const char*, mem_find( str, 0, max_len )); const char* end = rcast(const char*, mem_find( str, 0, max_len ));
if ( end ) if ( end )
@@ -213,9 +213,9 @@ ssize str_len_capped( const char* str, ssize max_len )
} }
inline inline
char* str_reverse( char* str ) char* c_str_reverse( char* str )
{ {
ssize len = str_len( str ); ssize len = c_str_len( str );
char* a = str + 0; char* a = str + 0;
char* b = str + len - 1; char* b = str + len - 1;
len /= 2; len /= 2;
@@ -228,7 +228,7 @@ char* str_reverse( char* str )
} }
inline inline
char const* str_skip( char const* str, char c ) char const* c_str_skip( char const* str, char c )
{ {
while ( *str && *str != c ) while ( *str && *str != c )
{ {
@@ -238,20 +238,20 @@ char const* str_skip( char const* str, char c )
} }
inline inline
char const* str_skip_any( char const* str, char const* char_list ) char const* c_str_skip_any( char const* str, char const* char_list )
{ {
char const* closest_ptr = rcast( char const*, pointer_add_const( rcast(mem_ptr_const, str), str_len( str ) )); char const* closest_ptr = rcast( char const*, pointer_add_const( rcast(mem_ptr_const, str), c_str_len( str ) ));
ssize char_list_count = str_len( char_list ); ssize char_list_count = c_str_len( char_list );
for ( ssize i = 0; i < char_list_count; i++ ) for ( ssize i = 0; i < char_list_count; i++ )
{ {
char const* p = str_skip( str, char_list[ i ] ); char const* p = c_str_skip( str, char_list[ i ] );
closest_ptr = min( closest_ptr, p ); closest_ptr = min( closest_ptr, p );
} }
return closest_ptr; return closest_ptr;
} }
inline inline
char const* str_trim( char const* str, b32 catch_newline ) char const* c_str_trim( char const* str, b32 catch_newline )
{ {
while ( *str && char_is_space( *str ) && ( ! catch_newline || ( catch_newline && *str != '\n' ) ) ) while ( *str && char_is_space( *str ) && ( ! catch_newline || ( catch_newline && *str != '\n' ) ) )
{ {
@@ -261,7 +261,7 @@ char const* str_trim( char const* str, b32 catch_newline )
} }
inline inline
void str_to_lower( char* str ) void c_str_to_lower( char* str )
{ {
if ( ! str ) if ( ! str )
return; return;
@@ -273,7 +273,7 @@ void str_to_lower( char* str )
} }
inline inline
void str_to_upper( char* str ) void c_str_to_upper( char* str )
{ {
if ( ! str ) if ( ! str )
return; return;
@@ -284,4 +284,4 @@ void str_to_upper( char* str )
} }
} }
#pragma endregion String Ops #pragma endregion StrBuilder Ops

28
base/dependencies/strings.cpp
View File

@@ -3,27 +3,27 @@
# include "hashing.cpp" # include "hashing.cpp"
#endif #endif
#pragma region String #pragma region StrBuilder
String string_make_length( AllocatorInfo allocator, char const* str, ssize length ) StrBuilder strbuilder_make_length( AllocatorInfo allocator, char const* str, ssize length )
{ {
ssize const header_size = sizeof( StringHeader ); ssize const header_size = sizeof( StrBuilderHeader );
s32 alloc_size = header_size + length + 1; s32 alloc_size = header_size + length + 1;
void* allocation = alloc( allocator, alloc_size ); void* allocation = alloc( allocator, alloc_size );
if ( allocation == nullptr ) { if ( allocation == nullptr ) {
String null_string = {nullptr}; StrBuilder null_string = {nullptr};
return null_string; return null_string;
} }
StringHeader* StrBuilderHeader*
header = rcast(StringHeader*, allocation); header = rcast(StrBuilderHeader*, allocation);
header->Allocator = allocator; header->Allocator = allocator;
header->Capacity = length; header->Capacity = length;
header->Length = length; header->Length = length;
String result = { rcast( char*, allocation) + header_size }; StrBuilder result = { rcast( char*, allocation) + header_size };
if ( length && str ) if ( length && str )
mem_copy( result, str, length ); mem_copy( result, str, length );
@@ -35,27 +35,27 @@ String string_make_length( AllocatorInfo allocator, char const* str, ssize lengt
return result; return result;
} }
String string_make_reserve( AllocatorInfo allocator, ssize capacity ) StrBuilder strbuilder_make_reserve( AllocatorInfo allocator, ssize capacity )
{ {
ssize const header_size = sizeof( StringHeader ); ssize const header_size = sizeof( StrBuilderHeader );
s32 alloc_size = header_size + capacity + 1; s32 alloc_size = header_size + capacity + 1;
void* allocation = alloc( allocator, alloc_size ); void* allocation = alloc( allocator, alloc_size );
if ( allocation == nullptr ) { if ( allocation == nullptr ) {
String null_string = {nullptr}; StrBuilder null_string = {nullptr};
return null_string; return null_string;
} }
mem_set( allocation, 0, alloc_size ); mem_set( allocation, 0, alloc_size );
StringHeader* StrBuilderHeader*
header = rcast(StringHeader*, allocation); header = rcast(StrBuilderHeader*, allocation);
header->Allocator = allocator; header->Allocator = allocator;
header->Capacity = capacity; header->Capacity = capacity;
header->Length = 0; header->Length = 0;
String result = { rcast(char*, allocation) + header_size }; StrBuilder result = { rcast(char*, allocation) + header_size };
return result; return result;
} }
#pragma endregion String #pragma endregion StrBuilder

512
base/dependencies/strings.hpp
View File

@@ -5,18 +5,18 @@
#pragma region Strings #pragma region Strings
struct StrC; struct Str;
StrC to_strc_from_c_str (char const* bad_string); Str to_str_from_c_str (char const* bad_string);
bool strc_are_equal (StrC lhs, StrC rhs); bool str_are_equal (Str lhs, Str rhs);
char const* strc_back (StrC str); char const* str_back (Str str);
bool strc_contains (StrC str, StrC substring); bool str_contains (Str str, Str substring);
StrC strc_duplicate (StrC str, AllocatorInfo allocator); Str str_duplicate (Str str, AllocatorInfo allocator);
b32 strc_starts_with (StrC str, StrC substring); b32 str_starts_with (Str str, Str substring);
StrC strc_visualize_whitespace(StrC str, AllocatorInfo allocator); Str str_visualize_whitespace(Str str, AllocatorInfo allocator);
// Constant string with length. // Constant string with length.
struct StrC struct Str
{ {
ssize Len; ssize Len;
char const* Ptr; char const* Ptr;
@@ -26,40 +26,40 @@ struct StrC
forceinline char const& operator[]( ssize index ) const { return Ptr[index]; } forceinline char const& operator[]( ssize index ) const { return Ptr[index]; }
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
forceinline bool is_equal (StrC rhs) const { return strc_are_equal(* this, rhs); } forceinline bool is_equal (Str rhs) const { return str_are_equal(* this, rhs); }
forceinline char const* back () const { return strc_back(* this); } forceinline char const* back () const { return str_back(* this); }
forceinline bool contains (StrC substring) const { return strc_contains(* this, substring); } forceinline bool contains (Str substring) const { return str_contains(* this, substring); }
forceinline StrC duplicate (AllocatorInfo allocator) const { return strc_duplicate(* this, allocator); } forceinline Str duplicate (AllocatorInfo allocator) const { return str_duplicate(* this, allocator); }
forceinline b32 starts_with (StrC substring) const { return strc_starts_with(* this, substring); } forceinline b32 starts_with (Str substring) const { return str_starts_with(* this, substring); }
forceinline StrC visualize_whitespace(AllocatorInfo allocator) const { return strc_visualize_whitespace(* this, allocator); } forceinline Str visualize_whitespace(AllocatorInfo allocator) const { return str_visualize_whitespace(* this, allocator); }
#endif #endif
#endif #endif
}; };
#define cast_to_strc( str ) * rcast( StrC*, (str) - sizeof(ssize) ) #define cast_to_str( str ) * rcast( Str*, (str) - sizeof(ssize) )
#ifndef txt #ifndef txt
# if GEN_COMPILER_CPP # if GEN_COMPILER_CPP
# define txt( text ) StrC { sizeof( text ) - 1, ( text ) } # define txt( text ) Str { sizeof( text ) - 1, ( text ) }
# else # else
# define txt( text ) (StrC){ sizeof( text ) - 1, ( text ) } # define txt( text ) (Str){ sizeof( text ) - 1, ( text ) }
# endif # endif
#endif #endif
GEN_API_C_BEGIN GEN_API_C_BEGIN
forceinline char const* strc_begin(StrC str) { return str.Ptr; } forceinline char const* str_begin(Str str) { return str.Ptr; }
forceinline char const* strc_end (StrC str) { return str.Ptr + str.Len; } forceinline char const* str_end (Str str) { return str.Ptr + str.Len; }
forceinline char const* strc_next (StrC str, char const* iter) { return iter + 1; } forceinline char const* str_next (Str str, char const* iter) { return iter + 1; }
GEN_API_C_END GEN_API_C_END
#if GEN_COMPILER_CPP #if GEN_COMPILER_CPP
forceinline char const* begin(StrC str) { return str.Ptr; } forceinline char const* begin(Str str) { return str.Ptr; }
forceinline char const* end (StrC str) { return str.Ptr + str.Len; } forceinline char const* end (Str str) { return str.Ptr + str.Len; }
forceinline char const* next (StrC str, char const* iter) { return iter + 1; } forceinline char const* next (Str str, char const* iter) { return iter + 1; }
#endif #endif
inline inline
bool strc_are_equal(StrC lhs, StrC rhs) bool str_are_equal(Str lhs, Str rhs)
{ {
if (lhs.Len != rhs.Len) if (lhs.Len != rhs.Len)
return false; return false;
@@ -72,12 +72,12 @@ bool strc_are_equal(StrC lhs, StrC rhs)
} }
inline inline
char const* strc_back(StrC str) { char const* str_back(Str str) {
return & str.Ptr[str.Len - 1]; return & str.Ptr[str.Len - 1];
} }
inline inline
bool strc_contains(StrC str, StrC substring) bool str_contains(Str str, Str substring)
{ {
if (substring.Len > str.Len) if (substring.Len > str.Len)
return false; return false;
@@ -86,97 +86,97 @@ bool strc_contains(StrC str, StrC substring)
ssize sub_len = substring.Len; ssize sub_len = substring.Len;
for (ssize idx = 0; idx <= main_len - sub_len; ++idx) for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
{ {
if (str_compare_len(str.Ptr + idx, substring.Ptr, sub_len) == 0) if (c_str_compare_len(str.Ptr + idx, substring.Ptr, sub_len) == 0)
return true; return true;
} }
return false; return false;
} }
inline inline
b32 strc_starts_with(StrC str, StrC substring) { b32 str_starts_with(Str str, Str substring) {
if (substring.Len > str.Len) if (substring.Len > str.Len)
return false; return false;
b32 result = str_compare_len(str.Ptr, substring.Ptr, substring.Len) == 0; b32 result = c_str_compare_len(str.Ptr, substring.Ptr, substring.Len) == 0;
return result; return result;
} }
inline inline
StrC to_strc_from_c_str( char const* bad_str ) { Str to_str_from_c_str( char const* bad_str ) {
StrC result = { str_len( bad_str ), bad_str }; Str result = { c_str_len( bad_str ), bad_str };
return result; return result;
} }
// Dynamic String // Dynamic StrBuilder
// This is directly based off the ZPL string api. // This is directly based off the ZPL string api.
// They used a header pattern // They used a header pattern
// I kept it for simplicty of porting but its not necessary to keep it that way. // I kept it for simplicty of porting but its not necessary to keep it that way.
#pragma region String #pragma region StrBuilder
struct StringHeader; struct StrBuilderHeader;
#if GEN_COMPILER_C #if GEN_COMPILER_C
typedef char* String; typedef char* StrBuilder;
#else #else
struct String; struct StrBuilder;
#endif #endif
forceinline usize string_grow_formula(usize value); forceinline usize strbuilder_grow_formula(usize value);
String string_make_c_str (AllocatorInfo allocator, char const* str); StrBuilder strbuilder_make_c_str (AllocatorInfo allocator, char const* str);
String string_make_strc (AllocatorInfo allocator, StrC str); StrBuilder strbuilder_make_str (AllocatorInfo allocator, Str str);
String string_make_reserve (AllocatorInfo allocator, ssize capacity); StrBuilder strbuilder_make_reserve (AllocatorInfo allocator, ssize capacity);
String string_make_length (AllocatorInfo allocator, char const* str, ssize length); StrBuilder strbuilder_make_length (AllocatorInfo allocator, char const* str, ssize length);
String string_fmt (AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...); StrBuilder strbuilder_fmt (AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...);
String string_fmt_buf (AllocatorInfo allocator, char const* fmt, ...); StrBuilder strbuilder_fmt_buf (AllocatorInfo allocator, char const* fmt, ...);
String string_join (AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue); StrBuilder strbuilder_join (AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue);
bool string_are_equal (String const lhs, String const rhs); bool strbuilder_are_equal (StrBuilder const lhs, StrBuilder const rhs);
bool string_are_equal_strc (String const lhs, StrC rhs); bool strbuilder_are_equal_str (StrBuilder const lhs, Str rhs);
bool string_make_space_for (String* str, char const* to_append, ssize add_len); bool strbuilder_make_space_for (StrBuilder* str, char const* to_append, ssize add_len);
bool string_append_char (String* str, char c); bool strbuilder_append_char (StrBuilder* str, char c);
bool string_append_c_str (String* str, char const* str_to_append); bool strbuilder_append_c_str (StrBuilder* str, char const* c_str_to_append);
bool string_append_c_str_len (String* str, char const* str_to_append, ssize length); bool strbuilder_append_c_str_len (StrBuilder* str, char const* c_str_to_append, ssize length);
bool string_append_strc (String* str, StrC str_to_append); bool strbuilder_append_str (StrBuilder* str, Str c_str_to_append);
bool string_append_string (String* str, String const other); bool strbuilder_append_string (StrBuilder* str, StrBuilder const other);
bool string_append_fmt (String* str, char const* fmt, ...); bool strbuilder_append_fmt (StrBuilder* str, char const* fmt, ...);
ssize string_avail_space (String const str); ssize strbuilder_avail_space (StrBuilder const str);
char* string_back (String str); char* strbuilder_back (StrBuilder str);
bool string_contains_strc (String const str, StrC substring); bool strbuilder_contains_str (StrBuilder const str, Str substring);
bool string_contains_string (String const str, String const substring); bool strbuilder_contains_string (StrBuilder const str, StrBuilder const substring);
ssize string_capacity (String const str); ssize strbuilder_capacity (StrBuilder const str);
void string_clear (String str); void strbuilder_clear (StrBuilder str);
String string_duplicate (String const str, AllocatorInfo allocator); StrBuilder strbuilder_duplicate (StrBuilder const str, AllocatorInfo allocator);
void string_free (String* str); void strbuilder_free (StrBuilder* str);
StringHeader* string_get_header (String str); StrBuilderHeader* strbuilder_get_header (StrBuilder str);
ssize string_length (String const str); ssize strbuilder_length (StrBuilder const str);
b32 string_starts_with_strc (String const str, StrC substring); b32 strbuilder_starts_with_str (StrBuilder const str, Str substring);
b32 string_starts_with_string (String const str, String substring); b32 strbuilder_starts_with_string (StrBuilder const str, StrBuilder substring);
void string_skip_line (String str); void strbuilder_skip_line (StrBuilder str);
void string_strip_space (String str); void strbuilder_strip_space (StrBuilder str);
StrC string_to_strc (String str); Str strbuilder_to_str (StrBuilder str);
void string_trim (String str, char const* cut_set); void strbuilder_trim (StrBuilder str, char const* cut_set);
void string_trim_space (String str); void strbuilder_trim_space (StrBuilder str);
String string_visualize_whitespace(String const str); StrBuilder strbuilder_visualize_whitespace(StrBuilder const str);
struct StringHeader { struct StrBuilderHeader {
AllocatorInfo Allocator; AllocatorInfo Allocator;
ssize Capacity; ssize Capacity;
ssize Length; ssize Length;
}; };
#if GEN_COMPILER_CPP #if GEN_COMPILER_CPP
struct String struct StrBuilder
{ {
char* Data; char* Data;
forceinline operator char*() { return Data; } forceinline operator char*() { return Data; }
forceinline operator char const*() const { return Data; } forceinline operator char const*() const { return Data; }
forceinline operator StrC() const { return { string_length(* this), Data }; } forceinline operator Str() const { return { strbuilder_length(* this), Data }; }
String const& operator=(String const& other) const { StrBuilder const& operator=(StrBuilder const& other) const {
if (this == &other) if (this == &other)
return *this; return *this;
String* this_ = ccast(String*, this); StrBuilder* this_ = ccast(StrBuilder*, this);
this_->Data = other.Data; this_->Data = other.Data;
return *this; return *this;
@@ -185,69 +185,69 @@ struct String
forceinline char& operator[](ssize index) { return Data[index]; } forceinline char& operator[](ssize index) { return Data[index]; }
forceinline char const& operator[](ssize index) const { return Data[index]; } forceinline char const& operator[](ssize index) const { return Data[index]; }
forceinline bool operator==(std::nullptr_t) const { return Data == nullptr; } forceinline bool operator==(std::nullptr_t) const { return Data == nullptr; }
forceinline bool operator!=(std::nullptr_t) const { return Data != nullptr; } forceinline bool operator!=(std::nullptr_t) const { return Data != nullptr; }
friend forceinline bool operator==(std::nullptr_t, const String str) { return str.Data == nullptr; } friend forceinline bool operator==(std::nullptr_t, const StrBuilder str) { return str.Data == nullptr; }
friend forceinline bool operator!=(std::nullptr_t, const String str) { return str.Data != nullptr; } friend forceinline bool operator!=(std::nullptr_t, const StrBuilder str) { return str.Data != nullptr; }
#if ! GEN_C_LIKE_CPP #if ! GEN_C_LIKE_CPP
forceinline char* begin() const { return Data; } forceinline char* begin() const { return Data; }
forceinline char* end() const { return Data + string_length(* this); } forceinline char* end() const { return Data + strbuilder_length(* this); }
#pragma region Member Mapping #pragma region Member Mapping
forceinline static String make(AllocatorInfo allocator, char const* str) { return string_make_c_str(allocator, str); } forceinline static StrBuilder make(AllocatorInfo allocator, char const* str) { return strbuilder_make_c_str(allocator, str); }
forceinline static String make(AllocatorInfo allocator, StrC str) { return string_make_strc(allocator, str); } forceinline static StrBuilder make(AllocatorInfo allocator, Str str) { return strbuilder_make_str(allocator, str); }
forceinline static String make_reserve(AllocatorInfo allocator, ssize cap) { return string_make_reserve(allocator, cap); } forceinline static StrBuilder make_reserve(AllocatorInfo allocator, ssize cap) { return strbuilder_make_reserve(allocator, cap); }
forceinline static String make_length(AllocatorInfo a, char const* s, ssize l) { return string_make_length(a, s, l); } forceinline static StrBuilder make_length(AllocatorInfo a, char const* s, ssize l) { return strbuilder_make_length(a, s, l); }
forceinline static String join(AllocatorInfo a, char const** p, ssize n, char const* g) { return string_join(a, p, n, g); } forceinline static StrBuilder join(AllocatorInfo a, char const** p, ssize n, char const* g) { return strbuilder_join(a, p, n, g); }
forceinline static usize grow_formula(usize value) { return string_grow_formula(value); } forceinline static usize grow_formula(usize value) { return strbuilder_grow_formula(value); }
static static
String fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...) { StrBuilder fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...) {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
ssize res = str_fmt_va(buf, buf_size, fmt, va) - 1; ssize res = c_str_fmt_va(buf, buf_size, fmt, va) - 1;
va_end(va); va_end(va);
return string_make_length(allocator, buf, res); return strbuilder_make_length(allocator, buf, res);
} }
static static
String fmt_buf(AllocatorInfo allocator, char const* fmt, ...) { StrBuilder fmt_buf(AllocatorInfo allocator, char const* fmt, ...) {
local_persist thread_local local_persist thread_local
char buf[GEN_PRINTF_MAXLEN] = { 0 }; char buf[GEN_PRINTF_MAXLEN] = { 0 };
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
ssize res = str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va) - 1; ssize res = c_str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va) - 1;
va_end(va); va_end(va);
return string_make_length(allocator, buf, res); return strbuilder_make_length(allocator, buf, res);
} }
forceinline bool make_space_for(char const* str, ssize add_len) { return string_make_space_for(this, str, add_len); } forceinline bool make_space_for(char const* str, ssize add_len) { return strbuilder_make_space_for(this, str, add_len); }
forceinline bool append(char c) { return string_append_char(this, c); } forceinline bool append(char c) { return strbuilder_append_char(this, c); }
forceinline bool append(char const* str) { return string_append_c_str(this, str); } forceinline bool append(char const* str) { return strbuilder_append_c_str(this, str); }
forceinline bool append(char const* str, ssize length) { return string_append_c_str_len(this, str, length); } forceinline bool append(char const* str, ssize length) { return strbuilder_append_c_str_len(this, str, length); }
forceinline bool append(StrC str) { return string_append_strc(this, str); } forceinline bool append(Str str) { return strbuilder_append_str(this, str); }
forceinline bool append(const String other) { return string_append_string(this, other); } forceinline bool append(const StrBuilder other) { return strbuilder_append_string(this, other); }
forceinline ssize avail_space() const { return string_avail_space(* this); } forceinline ssize avail_space() const { return strbuilder_avail_space(* this); }
forceinline char* back() { return string_back(* this); } forceinline char* back() { return strbuilder_back(* this); }
forceinline bool contains(StrC substring) const { return string_contains_strc(* this, substring); } forceinline bool contains(Str substring) const { return strbuilder_contains_str(* this, substring); }
forceinline bool contains(String const& substring) const { return string_contains_string(* this, substring); } forceinline bool contains(StrBuilder const& substring) const { return strbuilder_contains_string(* this, substring); }
forceinline ssize capacity() const { return string_capacity(* this); } forceinline ssize capacity() const { return strbuilder_capacity(* this); }
forceinline void clear() { string_clear(* this); } forceinline void clear() { strbuilder_clear(* this); }
forceinline String duplicate(AllocatorInfo allocator) const { return string_duplicate(* this, allocator); } forceinline StrBuilder duplicate(AllocatorInfo allocator) const { return strbuilder_duplicate(* this, allocator); }
forceinline void free() { string_free(this); } forceinline void free() { strbuilder_free(this); }
forceinline bool is_equal(String const& other) const { return string_are_equal(* this, other); } forceinline bool is_equal(StrBuilder const& other) const { return strbuilder_are_equal(* this, other); }
forceinline bool is_equal(StrC other) const { return string_are_equal_strc(* this, other); } forceinline bool is_equal(Str other) const { return strbuilder_are_equal_str(* this, other); }
forceinline ssize length() const { return string_length(* this); } forceinline ssize length() const { return strbuilder_length(* this); }
forceinline b32 starts_with(StrC substring) const { return string_starts_with_strc(* this, substring); } forceinline b32 starts_with(Str substring) const { return strbuilder_starts_with_str(* this, substring); }
forceinline b32 starts_with(String substring) const { return string_starts_with_string(* this, substring); } forceinline b32 starts_with(StrBuilder substring) const { return strbuilder_starts_with_string(* this, substring); }
forceinline void skip_line() { string_skip_line(* this); } forceinline void skip_line() { strbuilder_skip_line(* this); }
forceinline void strip_space() { string_strip_space(* this); } forceinline void strip_space() { strbuilder_strip_space(* this); }
forceinline StrC to_strc() { return { string_length(*this), Data}; } forceinline Str to_str() { return { strbuilder_length(*this), Data}; }
forceinline void trim(char const* cut_set) { string_trim(* this, cut_set); } forceinline void trim(char const* cut_set) { strbuilder_trim(* this, cut_set); }
forceinline void trim_space() { string_trim_space(* this); } forceinline void trim_space() { strbuilder_trim_space(* this); }
forceinline String visualize_whitespace() const { return string_visualize_whitespace(* this); } forceinline StrBuilder visualize_whitespace() const { return strbuilder_visualize_whitespace(* this); }
forceinline StringHeader& get_header() { return * string_get_header(* this); } forceinline StrBuilderHeader& get_header() { return * strbuilder_get_header(* this); }
bool append_fmt(char const* fmt, ...) { bool append_fmt(char const* fmt, ...) {
ssize res; ssize res;
@@ -255,163 +255,163 @@ struct String
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
res = str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1; res = c_str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
va_end(va); va_end(va);
return string_append_c_str_len(this, buf, res); return strbuilder_append_c_str_len(this, buf, res);
} }
#pragma endregion Member Mapping #pragma endregion Member Mapping
#endif #endif
}; };
#endif #endif
forceinline char* string_begin(String str) { return ((char*) str); } forceinline char* strbuilder_begin(StrBuilder str) { return ((char*) str); }
forceinline char* string_end (String str) { return ((char*) str + string_length(str)); } forceinline char* strbuilder_end (StrBuilder str) { return ((char*) str + strbuilder_length(str)); }
forceinline char* string_next (String str, char const* iter) { return ((char*) iter + 1); } forceinline char* strbuilder_next (StrBuilder str, char const* iter) { return ((char*) iter + 1); }
#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP #if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
forceinline char* begin(String str) { return ((char*) str); } forceinline char* begin(StrBuilder str) { return ((char*) str); }
forceinline char* end (String str) { return ((char*) str + string_length(str)); } forceinline char* end (StrBuilder str) { return ((char*) str + strbuilder_length(str)); }
forceinline char* next (String str, char* iter) { return ((char*) iter + 1); } forceinline char* next (StrBuilder str, char* iter) { return ((char*) iter + 1); }
#endif #endif
#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP #if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
forceinline bool make_space_for(String& str, char const* to_append, ssize add_len); forceinline bool make_space_for(StrBuilder& str, char const* to_append, ssize add_len);
forceinline bool append(String& str, char c); forceinline bool append(StrBuilder& str, char c);
forceinline bool append(String& str, char const* str_to_append); forceinline bool append(StrBuilder& str, char const* c_str_to_append);
forceinline bool append(String& str, char const* str_to_append, ssize length); forceinline bool append(StrBuilder& str, char const* c_str_to_append, ssize length);
forceinline bool append(String& str, StrC str_to_append); forceinline bool append(StrBuilder& str, Str c_str_to_append);
forceinline bool append(String& str, const String other); forceinline bool append(StrBuilder& str, const StrBuilder other);
forceinline bool append_fmt(String& str, char const* fmt, ...); forceinline bool append_fmt(StrBuilder& str, char const* fmt, ...);
forceinline char& back(String& str); forceinline char& back(StrBuilder& str);
forceinline void clear(String& str); forceinline void clear(StrBuilder& str);
forceinline void free(String& str); forceinline void free(StrBuilder& str);
#endif #endif
forceinline forceinline
usize string_grow_formula(usize value) { usize strbuilder_grow_formula(usize value) {
// Using a very aggressive growth formula to reduce time mem_copying with recursive calls to append in this library. // Using a very aggressive growth formula to reduce time mem_copying with recursive calls to append in this library.
return 4 * value + 8; return 4 * value + 8;
} }
forceinline forceinline
String string_make_c_str(AllocatorInfo allocator, char const* str) { StrBuilder strbuilder_make_c_str(AllocatorInfo allocator, char const* str) {
ssize length = str ? str_len(str) : 0; ssize length = str ? c_str_len(str) : 0;
return string_make_length(allocator, str, length); return strbuilder_make_length(allocator, str, length);
} }
forceinline forceinline
String string_make_strc(AllocatorInfo allocator, StrC str) { StrBuilder strbuilder_make_str(AllocatorInfo allocator, Str str) {
return string_make_length(allocator, str.Ptr, str.Len); return strbuilder_make_length(allocator, str.Ptr, str.Len);
} }
inline inline
String string_fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...) { StrBuilder strbuilder_fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...) {
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
ssize res = str_fmt_va(buf, buf_size, fmt, va) - 1; ssize res = c_str_fmt_va(buf, buf_size, fmt, va) - 1;
va_end(va); va_end(va);
return string_make_length(allocator, buf, res); return strbuilder_make_length(allocator, buf, res);
} }
inline inline
String string_fmt_buf(AllocatorInfo allocator, char const* fmt, ...) StrBuilder strbuilder_fmt_buf(AllocatorInfo allocator, char const* fmt, ...)
{ {
local_persist thread_local local_persist thread_local
PrintF_Buffer buf = struct_init(PrintF_Buffer, {0}); PrintF_Buffer buf = struct_init(PrintF_Buffer, {0});
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
ssize res = str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va) -1; ssize res = c_str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va) -1;
va_end(va); va_end(va);
return string_make_length(allocator, buf, res); return strbuilder_make_length(allocator, buf, res);
} }
inline inline
String string_join(AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue) StrBuilder strbuilder_join(AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue)
{ {
String result = string_make_c_str(allocator, ""); StrBuilder result = strbuilder_make_c_str(allocator, "");
for (ssize idx = 0; idx < num_parts; ++idx) for (ssize idx = 0; idx < num_parts; ++idx)
{ {
string_append_c_str(& result, parts[idx]); strbuilder_append_c_str(& result, parts[idx]);
if (idx < num_parts - 1) if (idx < num_parts - 1)
string_append_c_str(& result, glue); strbuilder_append_c_str(& result, glue);
} }
return result; return result;
} }
forceinline forceinline
bool string_append_char(String* str, char c) { bool strbuilder_append_char(StrBuilder* str, char c) {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
return string_append_c_str_len( str, (char const*)& c, (ssize)1); return strbuilder_append_c_str_len( str, (char const*)& c, (ssize)1);
} }
forceinline forceinline
bool string_append_c_str(String* str, char const* str_to_append) { bool strbuilder_append_c_str(StrBuilder* str, char const* c_str_to_append) {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
return string_append_c_str_len(str, str_to_append, str_len(str_to_append)); return strbuilder_append_c_str_len(str, c_str_to_append, c_str_len(c_str_to_append));
} }
inline inline
bool string_append_c_str_len(String* str, char const* str_to_append, ssize append_length) bool strbuilder_append_c_str_len(StrBuilder* str, char const* c_str_to_append, ssize append_length)
{ {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
if ( rcast(sptr, str_to_append) > 0) if ( rcast(sptr, c_str_to_append) > 0)
{ {
ssize curr_len = string_length(* str); ssize curr_len = strbuilder_length(* str);
if ( ! string_make_space_for(str, str_to_append, append_length)) if ( ! strbuilder_make_space_for(str, c_str_to_append, append_length))
return false; return false;
StringHeader* header = string_get_header(* str); StrBuilderHeader* header = strbuilder_get_header(* str);
char* Data = * str; char* Data = * str;
mem_copy( Data + curr_len, str_to_append, append_length); mem_copy( Data + curr_len, c_str_to_append, append_length);
Data[curr_len + append_length] = '\0'; Data[curr_len + append_length] = '\0';
header->Length = curr_len + append_length; header->Length = curr_len + append_length;
} }
return str_to_append != nullptr; return c_str_to_append != nullptr;
} }
forceinline forceinline
bool string_append_strc(String* str, StrC str_to_append) { bool strbuilder_append_str(StrBuilder* str, Str c_str_to_append) {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
return string_append_c_str_len(str, str_to_append.Ptr, str_to_append.Len); return strbuilder_append_c_str_len(str, c_str_to_append.Ptr, c_str_to_append.Len);
} }
forceinline forceinline
bool string_append_string(String* str, String const other) { bool strbuilder_append_string(StrBuilder* str, StrBuilder const other) {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
return string_append_c_str_len(str, (char const*)other, string_length(other)); return strbuilder_append_c_str_len(str, (char const*)other, strbuilder_length(other));
} }
bool string_append_fmt(String* str, char const* fmt, ...) { bool strbuilder_append_fmt(StrBuilder* str, char const* fmt, ...) {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
ssize res; ssize res;
char buf[GEN_PRINTF_MAXLEN] = { 0 }; char buf[GEN_PRINTF_MAXLEN] = { 0 };
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
res = str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1; res = c_str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
va_end(va); va_end(va);
return string_append_c_str_len(str, (char const*)buf, res); return strbuilder_append_c_str_len(str, (char const*)buf, res);
} }
inline inline
bool string_are_equal_string(String const lhs, String const rhs) bool strbuilder_are_equal_string(StrBuilder const lhs, StrBuilder const rhs)
{ {
if (string_length(lhs) != string_length(rhs)) if (strbuilder_length(lhs) != strbuilder_length(rhs))
return false; return false;
for (ssize idx = 0; idx < string_length(lhs); ++idx) for (ssize idx = 0; idx < strbuilder_length(lhs); ++idx)
if (lhs[idx] != rhs[idx]) if (lhs[idx] != rhs[idx])
return false; return false;
@@ -419,12 +419,12 @@ bool string_are_equal_string(String const lhs, String const rhs)
} }
inline inline
bool string_are_equal_strc(String const lhs, StrC rhs) bool strbuilder_are_equal_str(StrBuilder const lhs, Str rhs)
{ {
if (string_length(lhs) != (rhs.Len)) if (strbuilder_length(lhs) != (rhs.Len))
return false; return false;
for (ssize idx = 0; idx < string_length(lhs); ++idx) for (ssize idx = 0; idx < strbuilder_length(lhs); ++idx)
if (lhs[idx] != rhs.Ptr[idx]) if (lhs[idx] != rhs.Ptr[idx])
return false; return false;
@@ -432,20 +432,20 @@ bool string_are_equal_strc(String const lhs, StrC rhs)
} }
forceinline forceinline
ssize string_avail_space(String const str) { ssize strbuilder_avail_space(StrBuilder const str) {
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader)); StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
return header->Capacity - header->Length; return header->Capacity - header->Length;
} }
forceinline forceinline
char* string_back(String str) { char* strbuilder_back(StrBuilder str) {
return & (str)[string_length(str) - 1]; return & (str)[strbuilder_length(str) - 1];
} }
inline inline
bool string_contains_StrC(String const str, StrC substring) bool strbuilder_contains_StrC(StrBuilder const str, Str substring)
{ {
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader)); StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
if (substring.Len > header->Length) if (substring.Len > header->Length)
return false; return false;
@@ -455,7 +455,7 @@ bool string_contains_StrC(String const str, StrC substring)
for (ssize idx = 0; idx <= main_len - sub_len; ++idx) for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
{ {
if (str_compare_len(str + idx, substring.Ptr, sub_len) == 0) if (c_str_compare_len(str + idx, substring.Ptr, sub_len) == 0)
return true; return true;
} }
@@ -463,19 +463,19 @@ bool string_contains_StrC(String const str, StrC substring)
} }
inline inline
bool string_contains_string(String const str, String const substring) bool strbuilder_contains_string(StrBuilder const str, StrBuilder const substring)
{ {
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader)); StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
if (string_length(substring) > header->Length) if (strbuilder_length(substring) > header->Length)
return false; return false;
ssize main_len = header->Length; ssize main_len = header->Length;
ssize sub_len = string_length(substring); ssize sub_len = strbuilder_length(substring);
for (ssize idx = 0; idx <= main_len - sub_len; ++idx) for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
{ {
if (str_compare_len(str + idx, substring, sub_len) == 0) if (c_str_compare_len(str + idx, substring, sub_len) == 0)
return true; return true;
} }
@@ -483,47 +483,47 @@ bool string_contains_string(String const str, String const substring)
} }
forceinline forceinline
ssize string_capacity(String const str) { ssize strbuilder_capacity(StrBuilder const str) {
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader)); StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
return header->Capacity; return header->Capacity;
} }
forceinline forceinline
void string_clear(String str) { void strbuilder_clear(StrBuilder str) {
string_get_header(str)->Length = 0; strbuilder_get_header(str)->Length = 0;
} }
forceinline forceinline
String string_duplicate(String const str, AllocatorInfo allocator) { StrBuilder strbuilder_duplicate(StrBuilder const str, AllocatorInfo allocator) {
return string_make_length(allocator, str, string_length(str)); return strbuilder_make_length(allocator, str, strbuilder_length(str));
} }
forceinline forceinline
void string_free(String* str) { void strbuilder_free(StrBuilder* str) {
GEN_ASSERT(str != nullptr); GEN_ASSERT(str != nullptr);
if (! (* str)) if (! (* str))
return; return;
StringHeader* header = string_get_header(* str); StrBuilderHeader* header = strbuilder_get_header(* str);
allocator_free(header->Allocator, header); allocator_free(header->Allocator, header);
} }
forceinline forceinline
StringHeader* string_get_header(String str) { StrBuilderHeader* strbuilder_get_header(StrBuilder str) {
return (StringHeader*)(scast(char*, str) - sizeof(StringHeader)); return (StrBuilderHeader*)(scast(char*, str) - sizeof(StrBuilderHeader));
} }
forceinline forceinline
ssize string_length(String const str) ssize strbuilder_length(StrBuilder const str)
{ {
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader)); StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
return header->Length; return header->Length;
} }
inline inline
bool string_make_space_for(String* str, char const* to_append, ssize add_len) bool strbuilder_make_space_for(StrBuilder* str, char const* to_append, ssize add_len)
{ {
ssize available = string_avail_space(* str); ssize available = strbuilder_avail_space(* str);
if (available >= add_len) { if (available >= add_len) {
return true; return true;
@@ -534,20 +534,20 @@ bool string_make_space_for(String* str, char const* to_append, ssize add_len)
void* ptr; void* ptr;
void* new_ptr; void* new_ptr;
AllocatorInfo allocator = string_get_header(* str)->Allocator; AllocatorInfo allocator = strbuilder_get_header(* str)->Allocator;
StringHeader* header = nullptr; StrBuilderHeader* header = nullptr;
new_len = string_grow_formula(string_length(* str) + add_len); new_len = strbuilder_grow_formula(strbuilder_length(* str) + add_len);
ptr = string_get_header(* str); ptr = strbuilder_get_header(* str);
old_size = size_of(StringHeader) + string_length(* str) + 1; old_size = size_of(StrBuilderHeader) + strbuilder_length(* str) + 1;
new_size = size_of(StringHeader) + new_len + 1; new_size = size_of(StrBuilderHeader) + new_len + 1;
new_ptr = resize(allocator, ptr, old_size, new_size); new_ptr = resize(allocator, ptr, old_size, new_size);
if (new_ptr == nullptr) if (new_ptr == nullptr)
return false; return false;
header = rcast(StringHeader*, new_ptr); header = rcast(StrBuilderHeader*, new_ptr);
header->Allocator = allocator; header->Allocator = allocator;
header->Capacity = new_len; header->Capacity = new_len;
@@ -559,25 +559,25 @@ bool string_make_space_for(String* str, char const* to_append, ssize add_len)
} }
forceinline forceinline
b32 string_starts_with_strc(String const str, StrC substring) { b32 strbuilder_starts_with_str(StrBuilder const str, Str substring) {
if (substring.Len > string_length(str)) if (substring.Len > strbuilder_length(str))
return false; return false;
b32 result = str_compare_len(str, substring.Ptr, substring.Len) == 0; b32 result = c_str_compare_len(str, substring.Ptr, substring.Len) == 0;
return result; return result;
} }
forceinline forceinline
b32 string_starts_with_string(String const str, String substring) { b32 strbuilder_starts_with_string(StrBuilder const str, StrBuilder substring) {
if (string_length(substring) > string_length(str)) if (strbuilder_length(substring) > strbuilder_length(str))
return false; return false;
b32 result = str_compare_len(str, substring, string_length(substring) - 1) == 0; b32 result = c_str_compare_len(str, substring, strbuilder_length(substring) - 1) == 0;
return result; return result;
} }
inline inline
void string_skip_line(String str) void strbuilder_skip_line(StrBuilder str)
{ {
#define current (*scanner) #define current (*scanner)
char* scanner = str; char* scanner = str;
@@ -593,13 +593,13 @@ void string_skip_line(String str)
mem_move((char*)str, scanner, new_length); mem_move((char*)str, scanner, new_length);
StringHeader* header = string_get_header(str); StrBuilderHeader* header = strbuilder_get_header(str);
header->Length = new_length; header->Length = new_length;
#undef current #undef current
} }
inline inline
void strip_space(String str) void strip_space(StrBuilder str)
{ {
char* write_pos = str; char* write_pos = str;
char* read_pos = str; char* read_pos = str;
@@ -616,22 +616,22 @@ void strip_space(String str)
write_pos[0] = '\0'; // Null-terminate the modified string write_pos[0] = '\0'; // Null-terminate the modified string
// Update the length if needed // Update the length if needed
string_get_header(str)->Length = write_pos - str; strbuilder_get_header(str)->Length = write_pos - str;
} }
forceinline forceinline
StrC string_to_strc(String str) { Str strbuilder_to_str(StrBuilder str) {
StrC result = { string_length(str), (char const*)str }; Str result = { strbuilder_length(str), (char const*)str };
return result; return result;
} }
inline inline
void string_trim(String str, char const* cut_set) void strbuilder_trim(StrBuilder str, char const* cut_set)
{ {
ssize len = 0; ssize len = 0;
char* start_pos = str; char* start_pos = str;
char* end_pos = scast(char*, str) + string_length(str) - 1; char* end_pos = scast(char*, str) + strbuilder_length(str) - 1;
while (start_pos <= end_pos && char_first_occurence(cut_set, *start_pos)) while (start_pos <= end_pos && char_first_occurence(cut_set, *start_pos))
start_pos++; start_pos++;
@@ -646,98 +646,98 @@ void string_trim(String str, char const* cut_set)
str[len] = '\0'; str[len] = '\0';
string_get_header(str)->Length = len; strbuilder_get_header(str)->Length = len;
} }
forceinline forceinline
void string_trim_space(String str) { void strbuilder_trim_space(StrBuilder str) {
string_trim(str, " \t\r\n\v\f"); strbuilder_trim(str, " \t\r\n\v\f");
} }
inline inline
String string_visualize_whitespace(String const str) StrBuilder strbuilder_visualize_whitespace(StrBuilder const str)
{ {
StringHeader* header = (StringHeader*)(scast(char const*, str) - sizeof(StringHeader)); StrBuilderHeader* header = (StrBuilderHeader*)(scast(char const*, str) - sizeof(StrBuilderHeader));
String result = string_make_reserve(header->Allocator, string_length(str) * 2); // Assume worst case for space requirements. StrBuilder result = strbuilder_make_reserve(header->Allocator, strbuilder_length(str) * 2); // Assume worst case for space requirements.
for (char const* c = string_begin(str); c != string_end(str); c = string_next(str, c)) for (char const* c = strbuilder_begin(str); c != strbuilder_end(str); c = strbuilder_next(str, c))
switch ( * c ) switch ( * c )
{ {
case ' ': case ' ':
string_append_strc(& result, txt("·")); strbuilder_append_str(& result, txt("·"));
break; break;
case '\t': case '\t':
string_append_strc(& result, txt("→")); strbuilder_append_str(& result, txt("→"));
break; break;
case '\n': case '\n':
string_append_strc(& result, txt("↵")); strbuilder_append_str(& result, txt("↵"));
break; break;
case '\r': case '\r':
string_append_strc(& result, txt("⏎")); strbuilder_append_str(& result, txt("⏎"));
break; break;
case '\v': case '\v':
string_append_strc(& result, txt("⇕")); strbuilder_append_str(& result, txt("⇕"));
break; break;
case '\f': case '\f':
string_append_strc(& result, txt("⌂")); strbuilder_append_str(& result, txt("⌂"));
break; break;
default: default:
string_append_char(& result, * c); strbuilder_append_char(& result, * c);
break; break;
} }
return result; return result;
} }
#pragma endregion String #pragma endregion StrBuilder
#if GEN_COMPILER_CPP #if GEN_COMPILER_CPP
struct String_POD { struct StrBuilder_POD {
char* Data; char* Data;
}; };
static_assert( sizeof( String_POD ) == sizeof( String ), "String is not a POD" ); static_assert( sizeof( StrBuilder_POD ) == sizeof( StrBuilder ), "StrBuilder is not a POD" );
#endif #endif
forceinline forceinline
StrC strc_duplicate(StrC str, AllocatorInfo allocator) { Str str_duplicate(Str str, AllocatorInfo allocator) {
StrC result = string_to_strc( string_make_length(allocator, str.Ptr, str.Len)); Str result = strbuilder_to_str( strbuilder_make_length(allocator, str.Ptr, str.Len));
return result; return result;
} }
inline inline
StrC strc_visualize_whitespace(StrC str, AllocatorInfo allocator) Str str_visualize_whitespace(Str str, AllocatorInfo allocator)
{ {
String result = string_make_reserve(allocator, str.Len * 2); // Assume worst case for space requirements. StrBuilder result = strbuilder_make_reserve(allocator, str.Len * 2); // Assume worst case for space requirements.
for (char const* c = strc_begin(str); c != strc_end(str); c = strc_next(str, c)) for (char const* c = str_begin(str); c != str_end(str); c = str_next(str, c))
switch ( * c ) switch ( * c )
{ {
case ' ': case ' ':
string_append_strc(& result, txt("·")); strbuilder_append_str(& result, txt("·"));
break; break;
case '\t': case '\t':
string_append_strc(& result, txt("→")); strbuilder_append_str(& result, txt("→"));
break; break;
case '\n': case '\n':
string_append_strc(& result, txt("↵")); strbuilder_append_str(& result, txt("↵"));
break; break;
case '\r': case '\r':
string_append_strc(& result, txt("⏎")); strbuilder_append_str(& result, txt("⏎"));
break; break;
case '\v': case '\v':
string_append_strc(& result, txt("⇕")); strbuilder_append_str(& result, txt("⇕"));
break; break;
case '\f': case '\f':
string_append_strc(& result, txt("⌂")); strbuilder_append_str(& result, txt("⌂"));
break; break;
default: default:
string_append_char(& result, * c); strbuilder_append_char(& result, * c);
break; break;
} }
return string_to_strc(result); return strbuilder_to_str(result);
} }
// Represents strings cached with the string table. // Represents strings cached with the string table.
// Should never be modified, if changed string is desired, cache_string( str ) another. // Should never be modified, if changed string is desired, cache_string( str ) another.
typedef StrC StringCached; typedef Str StringCached;
// Implements basic string interning. Data structure is based off the ZPL Hashtable. // Implements basic string interning. Data structure is based off the ZPL Hashtable.
typedef HashTable(StringCached) StringTable; typedef HashTable(StringCached) StringTable;

423
base/gencpp.refactor
View File

@@ -1,423 +0,0 @@
__VERSION 1
// This is a example template to be used with the refactor program
// Use it to refactor the naming convention of this library to your own.
// Can be used as an aid to help use use your project's implementation if it fullfills the dependencies of this project.
// Example: Most likely have a memory and string library already, just rename the functions and make sure the args are the same.
// Program: https://github.com/Ed94/refactor
// NOTE: Due to the current limitations of the program, not every symbol in the library can be renamed.
// This is due to the program not actually parsing C/C++.
// 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
// TODO(ED): THIS IS VERY OUTDATED
// Gen Macro namespace
// namespace GEN_, new_namespace_
// ---------- Dependency Macros
// Platform
// word GEN_ARCH_64_BIT, new_name
// word GEN_ARCH_32_BIT, new_name
// word GEN_SYSTEM_ANDROID, new_name
// word GEN_SYSTEM_CYGWIN, new_name
// word GEN_SYSTEM_EMSCRIPTEN, new_name
// word GEN_SYSTEM_FREEBSD, new_name
// word GEN_SYSTEM_IOS, new_name
// word GEN_SYSTEM_LINUX, new_name
// word GEN_SYSTEM_MACOS, new_name
// word GEN_SYSTEM_OPENBSD, new_name
// word GEN_SYSTEM_OSX, new_name
// word GEN_SYSTEM_UNIX, new_name
// word GEN_SYSTEM_WINDOWS, new_name
// word GEN_COMPILER_CLANG, new_name
// word GEN_COMPILER_GCC, new_name
// word GEN_COMPILER_MINGW, new_name
// word GEN_COMPILER_MSVC, new_name
// word global, new_name
// word internal, new_name
// word local_persist, new_name
// word forceinline, new_name
// word neverinline, new_name
// word bit, new_name
// word bitfield_is_equal, new_name
// word ccast, new_name
// word pcast, new_name
// word rcast, new_name
// word scast, new_name
// word num_args, new_name
// word num_args_impl, new_name
// word stringize, new_name
// word stringize_va, new_name
// word do_once, new_name
// word do_once_start, new_name
// word do_once_end, new_name
// word label_scope_start, new_name
// word label_scope_end, new_name
// word count_of, new_name
// word is_between, new_name
// word min, new_name
// word size_of, new_name
// word offset_of, new_name
// word swap, new_name
// Basic Types
// word GEN_U8_MIN, new_name
// word GEN_U8_MAX, new_name
// word GEN_I8_MIN, new_name
// word GEN_I8_MAX, new_name
// word GEN_U16_MIN, new_name
// word GEN_U16_MAX, new_name
// word GEN_I16_MIN, new_name
// word GEN_I16_MAX, new_name
// word GEN_U32_MIN, new_name
// word GEN_U32_MAX, new_name
// word GEN_I32_MIN, new_name
// word GEN_I32_MAX, new_name
// word GEN_U64_MIN, new_name
// word GEN_U64_MAX, new_name
// word GEN_I64_MIN, new_name
// word GEN_I64_MAX, new_name
// word GEN_USIZE_MIN, new_name
// word GEN_USIZE_MAX, new_name
// word GEN_ISIZE_MIN, new_name
// word GEN_ISIZE_MAX, new_name
// word GEN_F32_MIN, new_name
// word GEN_F32_MAX, new_name
// word GEN_F64_MIN, new_name
// word GEN_F64_MAX, new_name
// Debug
// word GEN_DEBUG_TRAP, new_name
// word GEN_ASSERT, new_name
// word GEN_ASSERT_MSG, new_name
// word GEN_ASSERT_NOT_NULL, new_name
// word GEN_PANIC, new_name
// word GEN_FATAL, new_name
// Memory
// word kilobytes, new_name
// word megabytes, new_name
// word gigabytes, new_name
// word terabytes, new_name
// word zero_item, new_name
// word zero_array, new_name
// word alloc_item, new_name
// word alloc_array, new_name
// word malloc, new_name
// word mfree, new_name
// Strings
// word txt, new_name
// word cast_to_strc, new_name
// ---------- Dependency Types
// word b8, new_name
// word b16, new_name
// word b32, new_name
// word s8, new_name
// word s16, new_name
// word s32, new_name
// word s64, new_name
// word u8, new_name
// word u16, new_name
// word u32, new_name
// word u64, new_name
// word usize, new_name
// word ssize, new_name
// word sptr, new_name
// word uptr, new_name
// word f32, new_name
// word f64, new_name
// namespace EAllocator_, new_namespace_
// namespace EFileMode_, new_namespace_
// namespace EFileError_, new_namespace_
// word AllocatorInfo, new_name
// word AllocatorProc, new_name
// word AllocFlag, new_name
// word AllocType, new_name
// word ArrayHeader, new_name
// word DirEntry, new_name
// word DirInfo, new_name
// word DirType, new_name
// word FileDescriptor, new_name
// word FileError, new_name
// word FileInfo, new_name
// word FileTime, new_name
// word FileModeFlag, new_name
// word FileOperations, new_name
// word FileStandardType, new_name
// word SeekWhenceType, new_name
// ---------- Dependency Data
// word default_file_operations, new_name
// ---------- Dependency Procedures
// word align_forward, new_name
// word align_fordward_i64, new_name
// word alloc, new_name
// word alloc_align, new_name
// word assert_handler, new_name
// word assert_crash, new_name
// word char_first_occurence, new_name
// word char_is_alpha, new_name
// word char_is_alphanumeric, new_name
// word char_is_digit, new_name
// word char_is_hex_digit, new_name
// word char_is_space, new_name
// word char_to_lower, new_name
// word char_to_upper, new_name
// word crc32, new_name
// word default_resize_align, new_name
// word digit_to_int, new_name
// word file_close, new_name
// word file_get_standard, new_name
// word file_name, new_name
// word file_open, new_name
// word file_open_mode, new_name
// word file_seek, new_name
// word file_tell, new_name
// word file_write, new_name
// word file_write_at, new_name
// word file_write_at_check, new_name
// word free, new_name
// word free_all, new_name
// word heap, new_name
// word heap_allocator_proc, new_name
// word heap_stats_check, new_name
// word heap_stats_alloc_count, new_name
// word heap_stats_init, new_name
// word heap_stats_used_memory, new_name
// word hex_digit_to_int, new_name
// word i64_to_str, new_name
// word is_power_of_two, new_name
// word log_fmt, new_name
// word mem_copy, new_name
// word mem_move, new_name
// word mem_set, new_name
// word pointer_add, new_name
// word mem_copy, new_name
// word mem_find, new_name
// word mem_move, new_name
// word mem_set, new_name
// word resize, new_name
// word resize_align, new_name
// word process_exit, new_name
// word str_compare, new_name
// word str_copy, new_name
// word str_copy_nulpad, new_name
// word str_fmt_buf, new_name
// word str_fmt_buf_va, new_name
// word str_fmt_file_va, new_name
// word str_fmt_out_va, new_name
// word str_fmt_out_err, new_name
// word str_fmt_out_err_va, new_name
// word str_fmt_va, new_name
// word str_len, new_name
// word str_reverse, new_name
// word str_to_i64, new_name
// word str_to_lower, new_name
// word str_to_upper, new_name
// word u64_to_str, new_name
// word zero_size, new_name
// ---------- gencpp Macros
// word log_failure, new_name
// word NullCode, new_name
// word CodeInvalid, new_name
// ------------ gencpp common
// word Arena, new_name
// word Array, new_name
// word HashTable, new_name
// word Pool, new_name
// word StrC, new_name
// word String, new_name
// word to_str, new_name
// word to_str, new_name
// word to_type, new_name
// ------------ gencpp Types & Constants
// word LogFailType, new_name
// word AccessSpec, new_name
// word ECode, new_name
// word EnumClass, new_name
// word EnumRegular, new_name
// word EnumT, new_name
// word EOperator, new_name
// word ESpecifier, new_name
// word OperatorT, new_name
// word ModuleFlag, new_name
// word SpecifierT, new_name
// word StringCached, new_name
// word StringTable, new_name
// word UsingRegular, new_name
// word UsingNamespace, new_name
// ------------ gencpp Data
// word API_Export, new_name
// word API_Import, new_name
// word AST_POD_Size, new_name
// word AST, new_name
// word AST_POD, new_name
// word Code, new_name
// word Code_POD, new_name
// word Keyword, new_name
// ------------ gencpp API
// word init, new_name
// word deinit, new_name
// word get_cached_string, new_name
// word make_code, new_name
// word make_code_entries, new_name
// word set_allocator_data_arrays, new_name
// word set_allocator_code_pool, new_name
// word set_allocator_code_entries_arena, new_name
// word set_allocator_string_arena, new_name
// word set_allocator_string_table, new_name
// word set_allocator_type_table, new_name
// ------------ upfront constructor namespace
// namespace def_ new_namespace_
// ------------ upfront constructor individual
// word def_attributes, new_name
// word def_comment, new_name
// word def_class, new_name
// word def_constructor, new_name
// word def_destructor, new_name
// word def_define, new_name
// word def_enum, new_name
// word def_execution, new_name
// word def_extern_link, new_name
// word def_friend, new_name
// word def_function, new_name
// word def_include, new_name
// word def_module, new_name
// word def_namespace, new_name
// word def_operator, new_name
// word def_operator_cast, new_name
// word def_param, new_name
// word def_pargma, new_name
// word def_preprocess_cond, new_name
// word def_specifier, new_name
// word def_struct, new_name
// word def_template, new_name
// word def_type, new_name
// word def_typedef, new_name
// word def_union, new_name
// word def_using, new_name
// word def_using_namespace, new_name
// word def_variable, new_name
// word def_body, new_name
// word def_class_body, new_name
// word def_enum_body, new_name
// word def_export_body, new_name
// word def_extern_link_body, new_name
// word def_function_body, new_name
// word def_global_body, new_name
// word def_namespace_body, new_name
// word def_params, new_name
// word def_specifiers, new_name
// word def_struct_body, new_name
// word def_union_body, new_name
// ------------ parse constructor namespace
// namespace parse_, new_namespace_
// ------------ parse constructor individual
// word parse_class, new_name
// word parse_enum, new_name
// word parse_export_body, new_name
// word parse_extern_link, new_name
// word parse_friend, new_name
// word parse_function, new_name
// word parse_global_body, new_name
// word parse_namespace, new_name
// word parse_operator, new_name
// word parse_struct, new_name
// word parse_template, new_name
// word parse_type, new_name
// word parse_typedef, new_name
// word parse_union, new_name
// word parse_using, new_name
// word parse_variable, new_name
// ------------ untyped constructor namespace
// namespace untyped_, new_namespace_
// ------------ untyped constructor individual
// word token_fmt_impl, new_name
// word token_fmt_va, new_name
// word untyped_str, new_name
// word untyped_fmt, new_name
// word untyped_token_fmt, new_name
// ------------ File Ops
// word Builder, new_name
// word Editor, new_name
// word Scanner, new_name
// ------------ gencpp user macros
// word gen_main, new_name
// word GEN_TIME, new_name
// word __, new_name
// word name, new_name
// word code, new_name
// word args, new_name
// word code_str, new_name
// word code_fmt, new_name
// word token_fmt, new_name
// ------------ Type AST namespace
// namespace t_, new_namespace_
// ------------ Specifier AST namespace
// namespace spec_, new_namespace_

319
base/helpers/base_codegen.hpp
View File

@@ -9,58 +9,58 @@ using namespace gen;
CodeBody gen_ecode( char const* path, bool use_c_definition = false ) CodeBody gen_ecode( char const* path, bool use_c_definition = false )
{ {
FixedArena_32KB scratch; fixed_arena_init(& scratch); FixedArena_32KB scratch; fixed_arena_init(& scratch);
AllocatorInfo scratch_info = fixed_arena_allocator_info(& scratch); AllocatorInfo scratch_info = fixed_arena_allocator_info(& scratch);
CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path ); CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path );
String enum_entries = string_make_reserve( GlobalAllocator, kilobytes(1) ); StrBuilder enum_entries = strbuilder_make_reserve( GlobalAllocator, kilobytes(1) );
String to_str_entries = string_make_reserve( GlobalAllocator, kilobytes(1) ); StrBuilder to_c_str_entries = strbuilder_make_reserve( GlobalAllocator, kilobytes(1) );
String to_keyword_str_entries = string_make_reserve( GlobalAllocator, kilobytes(1) ); StrBuilder to_keyword_c_str_entries = strbuilder_make_reserve( GlobalAllocator, kilobytes(1) );
for ( ssize idx = 0; idx < array_num(csv_enum.Col_1); ++ idx ) { for ( ssize idx = 0; idx < array_num(csv_enum.Col_1); ++ idx ) {
char const* code = csv_enum.Col_1[idx].string; char const* code = csv_enum.Col_1[idx].string;
char const* keyword = csv_enum.Col_2[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. // TODO(Ed): to_c_str_entries and the others in here didn't have proper sizing of the Str slice.
string_append_fmt( & enum_entries, "CT_%s,\n", code ); strbuilder_append_fmt( & enum_entries, "CT_%s,\n", code );
string_append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", code, code ); strbuilder_append_fmt( & to_c_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", code, code );
string_append_fmt( & to_keyword_str_entries, "{ sizeof(\"%s\") - 1, \"%s\" },\n", keyword, keyword ); strbuilder_append_fmt( & to_keyword_c_str_entries, "{ sizeof(\"%s\") - 1, \"%s\" },\n", keyword, keyword );
} }
CodeEnum enum_code; 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_code = parse_enum(token_fmt_impl((3 + 1) / 2, "entries", strbuilder_to_str(enum_entries),
"enum CodeType enum_underlying(u32) { <entries> CT_NumTypes, CT_UnderlyingType = GEN_U32_MAX };" "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_code = parse_enum(token_fmt_impl((3 + 1) / 2, "entries", strbuilder_to_str(enum_entries),
"enum CodeType : u32 { <entries> CT_NumTypes, CT_UnderlyingType = GEN_U32_MAX };" "enum CodeType : u32 { <entries> CT_NumTypes, CT_UnderlyingType = GEN_U32_MAX };"
)); ));
} }
#pragma push_macro("local_persist") #pragma push_macro("local_persist")
#undef local_persist #undef local_persist
StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) )); Str lookup_size = strbuilder_to_str(strbuilder_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) ));
CodeBody to_str_fns = parse_global_body( token_fmt( CodeBody to_c_str_fns = parse_global_body( token_fmt(
"entries", string_to_strc(to_str_entries) "entries", strbuilder_to_str(to_c_str_entries)
, "keywords", string_to_strc(to_keyword_str_entries) , "keywords", strbuilder_to_str(to_keyword_c_str_entries)
, "num", lookup_size , "num", lookup_size
, stringize( , stringize(
inline inline
StrC codetype_to_str( CodeType type ) Str codetype_to_str( CodeType type )
{ {
local_persist local_persist
StrC lookup[<num>] = { Str lookup[<num>] = {
<entries> <entries>
}; };
return lookup[ type ]; return lookup[ type ];
} }
inline inline
StrC codetype_to_keyword_str( CodeType type ) Str codetype_to_keyword_str( CodeType type )
{ {
local_persist local_persist
StrC lookup[ <num> ] = { Str lookup[ <num> ] = {
<keywords> <keywords>
}; };
return lookup[ type ]; return lookup[ type ];
@@ -76,14 +76,14 @@ CodeBody gen_ecode( char const* path, bool use_c_definition = false )
body_append(result, code_t); body_append(result, code_t);
} }
body_append(result, to_str_fns); body_append(result, to_c_str_fns);
if (! use_c_definition) { if (! use_c_definition) {
#pragma push_macro("forceinline") #pragma push_macro("forceinline")
#undef forceinline #undef forceinline
CodeBody alias_mappings = parse_global_body(code( CodeBody alias_mappings = parse_global_body(code(
forceinline StrC to_str (CodeType type) { return codetype_to_str(type); } forceinline Str to_str (CodeType type) { return codetype_to_str(type); }
forceinline StrC to_keyword_str(CodeType type) { return codetype_to_keyword_str(type); } forceinline Str to_keyword_str(CodeType type) { return codetype_to_keyword_str(type); }
)); ));
#pragma pop_macro("forceinline") #pragma pop_macro("forceinline")
body_append(result, alias_mappings); body_append(result, alias_mappings);
@@ -93,19 +93,18 @@ CodeBody gen_ecode( char const* path, bool use_c_definition = false )
CodeBody gen_eoperator( char const* path, bool use_c_definition = false ) CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
{ {
FixedArena_16KB scratch; fixed_arena_init(& scratch); FixedArena_16KB scratch; fixed_arena_init(& scratch);
AllocatorInfo scratch_info = fixed_arena_allocator_info(& scratch); AllocatorInfo scratch_info = fixed_arena_allocator_info(& scratch);
CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path ); CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path );
String enum_entries = string_make_reserve( GlobalAllocator, 32 ); StrBuilder enum_entries = strbuilder_make_reserve( GlobalAllocator, 32 );
String to_str_entries = string_make_reserve( GlobalAllocator, 32 ); StrBuilder to_c_str_entries = strbuilder_make_reserve( GlobalAllocator, 32 );
for (usize idx = 0; idx < array_num(csv_enum.Col_1); idx++) { for (usize idx = 0; idx < array_num(csv_enum.Col_1); idx++) {
char const* enum_str = csv_enum.Col_1[idx].string; char const* enum_str = csv_enum.Col_1[idx].string;
char const* entry_to_str = csv_enum.Col_2[idx].string; char const* entry_to_str = csv_enum.Col_2[idx].string;
strbuilder_append_fmt( & enum_entries, "Op_%s,\n", enum_str );
string_append_fmt( & enum_entries, "Op_%s,\n", enum_str ); strbuilder_append_fmt( & to_c_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
string_append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
} }
CodeEnum enum_code; CodeEnum enum_code;
@@ -113,7 +112,7 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
{ {
#pragma push_macro("enum_underlying") #pragma push_macro("enum_underlying")
#undef enum_underlying #undef enum_underlying
enum_code = parse_enum(token_fmt("entries", string_to_strc(enum_entries), stringize( enum_code = parse_enum(token_fmt("entries", strbuilder_to_str(enum_entries), stringize(
enum Operator enum_underlying(u32) enum Operator enum_underlying(u32)
{ {
<entries> <entries>
@@ -125,7 +124,7 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
} }
else else
{ {
enum_code = parse_enum(token_fmt("entries", string_to_strc(enum_entries), stringize( enum_code = parse_enum(token_fmt("entries", strbuilder_to_str(enum_entries), stringize(
enum Operator : u32 enum Operator : u32
{ {
<entries> <entries>
@@ -137,16 +136,16 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
#pragma push_macro("local_persist") #pragma push_macro("local_persist")
#undef local_persist #undef local_persist
StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) )); Str lookup_size = strbuilder_to_str(strbuilder_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) ));
CodeFn to_str = parse_function(token_fmt( CodeFn to_str = parse_function(token_fmt(
"entries", string_to_strc(to_str_entries) "entries", strbuilder_to_str(to_c_str_entries)
, "num", lookup_size , "num", lookup_size
, stringize( , stringize(
inline inline
StrC operator_to_str( Operator op ) Str operator_to_str( Operator op )
{ {
local_persist local_persist
StrC lookup[<num>] = { Str lookup[<num>] = {
<entries> <entries>
}; };
@@ -169,7 +168,7 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
#pragma push_macro("forceinline") #pragma push_macro("forceinline")
#undef forceinline #undef forceinline
CodeBody alias_mappings = parse_global_body(code( CodeBody alias_mappings = parse_global_body(code(
forceinline StrC to_str(Operator op) { return operator_to_str(op); } forceinline Str to_str(Operator op) { return operator_to_str(op); }
)); ));
#pragma pop_macro("forceinline") #pragma pop_macro("forceinline")
body_append(result, alias_mappings); body_append(result, alias_mappings);
@@ -179,20 +178,19 @@ CodeBody gen_eoperator( char const* path, bool use_c_definition = false )
CodeBody gen_especifier( char const* path, bool use_c_definition = false ) CodeBody gen_especifier( char const* path, bool use_c_definition = false )
{ {
FixedArena_16KB scratch; fixed_arena_init(& scratch); FixedArena_16KB scratch; fixed_arena_init(& scratch);
AllocatorInfo scratch_info = fixed_arena_allocator_info(& scratch); AllocatorInfo scratch_info = fixed_arena_allocator_info(& scratch);
CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path ); CSV_Columns2 csv_enum = parse_csv_two_columns( scratch_info, path );
String enum_entries = string_make_reserve( scratch_info, kilobytes(1) ); StrBuilder enum_entries = strbuilder_make_reserve( scratch_info, kilobytes(1) );
String to_str_entries = string_make_reserve( scratch_info, kilobytes(1) ); StrBuilder to_c_str_entries = strbuilder_make_reserve( scratch_info, kilobytes(1) );
for (usize idx = 0; idx < array_num(csv_enum.Col_1); idx++) for (usize idx = 0; idx < array_num(csv_enum.Col_1); idx++)
{ {
char const* enum_str = csv_enum.Col_1[idx].string; char const* enum_str = csv_enum.Col_1[idx].string;
char const* entry_to_str = csv_enum.Col_2[idx].string; char const* entry_to_str = csv_enum.Col_2[idx].string;
strbuilder_append_fmt( & enum_entries, "Spec_%s,\n", enum_str );
string_append_fmt( & enum_entries, "Spec_%s,\n", enum_str ); strbuilder_append_fmt( & to_c_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
string_append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
} }
CodeEnum enum_code; CodeEnum enum_code;
@@ -200,7 +198,7 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
{ {
#pragma push_macro("enum_underlying") #pragma push_macro("enum_underlying")
#undef enum_underlying #undef enum_underlying
enum_code = parse_enum(token_fmt("entries", string_to_strc(enum_entries), stringize( enum_code = parse_enum(token_fmt("entries", strbuilder_to_str(enum_entries), stringize(
enum Specifier enum_underlying(u32) enum Specifier enum_underlying(u32)
{ {
<entries> <entries>
@@ -212,7 +210,7 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
} }
else else
{ {
enum_code = parse_enum(token_fmt("entries", string_to_strc(enum_entries), stringize( enum_code = parse_enum(token_fmt("entries", strbuilder_to_str(enum_entries), stringize(
enum Specifier : u32 enum Specifier : u32
{ {
<entries> <entries>
@@ -221,8 +219,7 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
}; };
))); )));
} }
CodeFn is_trailing = parse_function(token_fmt("specifier", strbuilder_to_str(to_c_str_entries), stringize(
CodeFn is_trailing = parse_function(token_fmt("specifier", string_to_strc(to_str_entries), stringize(
inline inline
bool spec_is_trailing( Specifier specifier ) bool spec_is_trailing( Specifier specifier )
{ {
@@ -240,16 +237,16 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
#undef do_once_end #undef do_once_end
#undef forceinline #undef forceinline
#undef neverinline #undef neverinline
StrC lookup_size = string_to_strc(string_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) )); Str lookup_size = strbuilder_to_str(strbuilder_fmt_buf(GlobalAllocator, "%d", array_num(csv_enum.Col_1) ));
CodeFn to_str = parse_function(token_fmt( CodeFn to_str = parse_function(token_fmt(
"entries", string_to_strc(to_str_entries) "entries", strbuilder_to_str(to_c_str_entries)
, "num", lookup_size , "num", lookup_size
, stringize( , stringize(
inline inline
StrC spec_to_str( Specifier type ) Str spec_to_str( Specifier type )
{ {
local_persist local_persist
StrC lookup[<num>] = { Str lookup[<num>] = {
<entries> <entries>
}; };
@@ -257,16 +254,16 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
} }
))); )));
CodeFn to_type = parse_function( token_fmt( "entries", string_to_strc(to_str_entries), stringize( CodeFn to_type = parse_function( token_fmt( "entries", strbuilder_to_str(to_c_str_entries), stringize(
inline inline
Specifier strc_to_specifier( StrC str ) Specifier str_to_specifier( Str str )
{ {
local_persist local_persist
u32 keymap[ Spec_NumSpecifiers ]; u32 keymap[ Spec_NumSpecifiers ];
do_once_start do_once_start
for ( u32 index = 0; index < Spec_NumSpecifiers; index++ ) for ( u32 index = 0; index < Spec_NumSpecifiers; index++ )
{ {
StrC enum_str = spec_to_str( (Specifier)index ); Str enum_str = spec_to_str( (Specifier)index );
// We subtract 1 to remove the null terminator // We subtract 1 to remove the null terminator
// This is because the tokens lexed are not null terminated. // This is because the tokens lexed are not null terminated.
@@ -308,8 +305,8 @@ CodeBody gen_especifier( char const* path, bool use_c_definition = false )
#pragma push_macro("forceinline") #pragma push_macro("forceinline")
#undef forceinline #undef forceinline
CodeBody alias_mappings = parse_global_body(code( CodeBody alias_mappings = parse_global_body(code(
forceinline StrC to_str (Specifier spec) { return spec_to_str(spec); } forceinline Str to_str (Specifier spec) { return spec_to_str(spec); }
forceinline Specifier to_type( StrC str ) { return strc_to_specifier(str); } forceinline Specifier to_type( Str str ) { return str_to_specifier(str); }
forceinline bool is_trailing( Specifier specifier ) { return spec_is_trailing(specifier); } forceinline bool is_trailing( Specifier specifier ) { return spec_is_trailing(specifier); }
)); ));
#pragma pop_macro("forceinline") #pragma pop_macro("forceinline")
@@ -334,50 +331,50 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path, bool use_c_
csv_parse( &csv_attr_nodes, rcast(char*, attrib_content.data), scratch_info, 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_strs = csv_enum_nodes.nodes[0].nodes;
Array<ADT_Node> enum_str_strs = csv_enum_nodes.nodes[1].nodes; Array<ADT_Node> enum_c_str_strs = csv_enum_nodes.nodes[1].nodes;
Array<ADT_Node> attribute_strs = csv_attr_nodes.nodes[0].nodes; Array<ADT_Node> attribute_strs = csv_attr_nodes.nodes[0].nodes;
Array<ADT_Node> attribute_str_strs = csv_attr_nodes.nodes[1].nodes; Array<ADT_Node> attribute_c_str_strs = csv_attr_nodes.nodes[1].nodes;
String enum_entries = string_make_reserve( scratch_info, kilobytes(2) ); StrBuilder enum_entries = strbuilder_make_reserve( scratch_info, kilobytes(2) );
String to_str_entries = string_make_reserve( scratch_info, kilobytes(4) ); StrBuilder to_c_str_entries = strbuilder_make_reserve( scratch_info, kilobytes(4) );
String attribute_entries = string_make_reserve( scratch_info, kilobytes(2) ); StrBuilder attribute_entries = strbuilder_make_reserve( scratch_info, kilobytes(2) );
String to_str_attributes = string_make_reserve( scratch_info, kilobytes(4) ); StrBuilder to_c_str_attributes = strbuilder_make_reserve( scratch_info, kilobytes(4) );
String attribute_define_entries = string_make_reserve( scratch_info, kilobytes(4) ); StrBuilder attribute_define_entries = strbuilder_make_reserve( scratch_info, kilobytes(4) );
for (usize idx = 0; idx < array_num(enum_strs); idx++) for (usize idx = 0; idx < array_num(enum_strs); idx++)
{ {
char const* enum_str = enum_strs[idx].string; char const* enum_str = enum_strs[idx].string;
char const* entry_to_str = enum_str_strs [idx].string; char const* entry_to_str = enum_c_str_strs [idx].string;
string_append_fmt( & enum_entries, "Tok_%s,\n", enum_str ); strbuilder_append_fmt( & enum_entries, "Tok_%s,\n", enum_str );
string_append_fmt( & to_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str); strbuilder_append_fmt( & to_c_str_entries, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
} }
for ( usize idx = 0; idx < array_num(attribute_strs); idx++ ) for ( usize idx = 0; idx < array_num(attribute_strs); idx++ )
{ {
char const* attribute_str = attribute_strs[idx].string; char const* attribute_str = attribute_strs[idx].string;
char const* entry_to_str = attribute_str_strs [idx].string; char const* entry_to_str = attribute_c_str_strs [idx].string;
string_append_fmt( & attribute_entries, "Tok_Attribute_%s,\n", attribute_str ); strbuilder_append_fmt( & attribute_entries, "Tok_Attribute_%s,\n", attribute_str );
string_append_fmt( & to_str_attributes, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str); strbuilder_append_fmt( & to_c_str_attributes, "{ sizeof(\"%s\"), \"%s\" },\n", entry_to_str, entry_to_str);
string_append_fmt( & attribute_define_entries, "Entry( Tok_Attribute_%s, \"%s\" )", attribute_str, entry_to_str ); strbuilder_append_fmt( & attribute_define_entries, "Entry( Tok_Attribute_%s, \"%s\" )", attribute_str, entry_to_str );
if ( idx < array_num(attribute_strs) - 1 ) if ( idx < array_num(attribute_strs) - 1 )
string_append_strc( & attribute_define_entries, txt(" \\\n")); strbuilder_append_str( & attribute_define_entries, txt(" \\\n"));
else else
string_append_strc( & attribute_define_entries, txt("\n")); strbuilder_append_str( & attribute_define_entries, txt("\n"));
} }
#pragma push_macro("GEN_DEFINE_ATTRIBUTE_TOKENS") #pragma push_macro("GEN_DEFINE_ATTRIBUTE_TOKENS")
#undef GEN_DEFINE_ATTRIBUTE_TOKENS #undef GEN_DEFINE_ATTRIBUTE_TOKENS
CodeDefine attribute_entires_def = def_define( name(GEN_DEFINE_ATTRIBUTE_TOKENS), string_to_strc(attribute_define_entries) ); CodeDefine attribute_entires_def = def_define( name(GEN_DEFINE_ATTRIBUTE_TOKENS), strbuilder_to_str(attribute_define_entries) );
#pragma pop_macro("GEN_DEFINE_ATTRIBUTE_TOKENS") #pragma pop_macro("GEN_DEFINE_ATTRIBUTE_TOKENS")
// We cannot parse this enum, it has Attribute names as enums // We cannot parse this enum, it has Attribute names as enums
CodeEnum enum_code; CodeEnum enum_code;
if (use_c_definition) if (use_c_definition)
{ {
enum_code = parse_enum(token_fmt("entries", string_to_strc(enum_entries), "attribute_toks", string_to_strc(attribute_entries), stringize( enum_code = parse_enum(token_fmt("entries", strbuilder_to_str(enum_entries), "attribute_toks", strbuilder_to_str(attribute_entries), stringize(
enum TokType enum TokType
{ {
<entries> <entries>
@@ -389,7 +386,7 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path, bool use_c_
} }
else else
{ {
enum_code = parse_enum(token_fmt("entries", string_to_strc(enum_entries), "attribute_toks", string_to_strc(attribute_entries), stringize( enum_code = parse_enum(token_fmt("entries", strbuilder_to_str(enum_entries), "attribute_toks", strbuilder_to_str(attribute_entries), stringize(
enum TokType : u32 enum TokType : u32
{ {
<entries> <entries>
@@ -405,12 +402,12 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path, bool use_c_
#undef local_persist #undef local_persist
#undef do_once_start #undef do_once_start
#undef do_once_end #undef do_once_end
CodeFn to_str = parse_function(token_fmt("entries", string_to_strc(to_str_entries), "attribute_toks", string_to_strc(to_str_attributes), stringize( CodeFn to_str = parse_function(token_fmt("entries", strbuilder_to_str(to_c_str_entries), "attribute_toks", strbuilder_to_str(to_c_str_attributes), stringize(
inline inline
StrC toktype_to_str( TokType type ) Str toktype_to_str( TokType type )
{ {
local_persist local_persist
StrC lookup[] = { Str lookup[] = {
<entries> <entries>
<attribute_toks> <attribute_toks>
}; };
@@ -419,16 +416,16 @@ CodeBody gen_etoktype( char const* etok_path, char const* attr_path, bool use_c_
} }
))); )));
CodeFn to_type = parse_function( token_fmt( "entries", string_to_strc(to_str_entries), stringize( CodeFn to_type = parse_function( token_fmt( "entries", strbuilder_to_str(to_c_str_entries), stringize(
inline inline
TokType strc_to_toktype( StrC str ) TokType str_to_toktype( Str str )
{ {
local_persist local_persist
u32 keymap[ Tok_NumTokens ]; u32 keymap[ Tok_NumTokens ];
do_once_start do_once_start
for ( u32 index = 0; index < Tok_NumTokens; index++ ) for ( u32 index = 0; index < Tok_NumTokens; index++ )
{ {
StrC enum_str = toktype_to_str( (TokType)index ); Str enum_str = toktype_to_str( (TokType)index );
// We subtract 1 to remove the null terminator // We subtract 1 to remove the null terminator
// This is because the tokens lexed are not null terminated. // This is because the tokens lexed are not null terminated.
@@ -518,59 +515,59 @@ CodeBody gen_ast_inlines()
#pragma pop_macro("GEN_NS") #pragma pop_macro("GEN_NS")
#pragma pop_macro("CodeInvalid") #pragma pop_macro("CodeInvalid")
CodeBody impl_code = parse_global_body( token_fmt( "typename", StrC name(Code), code_impl_tmpl )); CodeBody impl_code = parse_global_body( token_fmt( "typename", Str name(Code), code_impl_tmpl ));
CodeBody impl_code_body = parse_global_body( token_fmt( "typename", StrC name(CodeBody), code_impl_tmpl )); CodeBody impl_code_body = parse_global_body( token_fmt( "typename", Str name(CodeBody), code_impl_tmpl ));
CodeBody impl_code_attr = parse_global_body( token_fmt( "typename", StrC name(CodeAttributes), code_impl_tmpl )); CodeBody impl_code_attr = parse_global_body( token_fmt( "typename", Str name(CodeAttributes), code_impl_tmpl ));
CodeBody impl_code_cmt = parse_global_body( token_fmt( "typename", StrC name(CodeComment), code_impl_tmpl )); CodeBody impl_code_cmt = parse_global_body( token_fmt( "typename", Str name(CodeComment), code_impl_tmpl ));
CodeBody impl_code_constr = parse_global_body( token_fmt( "typename", StrC name(CodeConstructor), code_impl_tmpl )); CodeBody impl_code_constr = parse_global_body( token_fmt( "typename", Str name(CodeConstructor), code_impl_tmpl ));
CodeBody impl_code_class = parse_global_body( token_fmt( "typename", StrC name(CodeClass), code_impl_tmpl )); CodeBody impl_code_class = parse_global_body( token_fmt( "typename", Str name(CodeClass), code_impl_tmpl ));
CodeBody impl_code_define = parse_global_body( token_fmt( "typename", StrC name(CodeDefine), code_impl_tmpl )); CodeBody impl_code_define = parse_global_body( token_fmt( "typename", Str name(CodeDefine), code_impl_tmpl ));
CodeBody impl_code_destruct = parse_global_body( token_fmt( "typename", StrC name(CodeDestructor), code_impl_tmpl )); CodeBody impl_code_destruct = parse_global_body( token_fmt( "typename", Str name(CodeDestructor), code_impl_tmpl ));
CodeBody impl_code_enum = parse_global_body( token_fmt( "typename", StrC name(CodeEnum), code_impl_tmpl )); CodeBody impl_code_enum = parse_global_body( token_fmt( "typename", Str name(CodeEnum), code_impl_tmpl ));
CodeBody impl_code_exec = parse_global_body( token_fmt( "typename", StrC name(CodeExec), code_impl_tmpl )); CodeBody impl_code_exec = parse_global_body( token_fmt( "typename", Str name(CodeExec), code_impl_tmpl ));
CodeBody impl_code_extern = parse_global_body( token_fmt( "typename", StrC name(CodeExtern), code_impl_tmpl )); CodeBody impl_code_extern = parse_global_body( token_fmt( "typename", Str name(CodeExtern), code_impl_tmpl ));
CodeBody impl_code_include = parse_global_body( token_fmt( "typename", StrC name(CodeInclude), code_impl_tmpl )); CodeBody impl_code_include = parse_global_body( token_fmt( "typename", Str name(CodeInclude), code_impl_tmpl ));
CodeBody impl_code_friend = parse_global_body( token_fmt( "typename", StrC name(CodeFriend), code_impl_tmpl )); CodeBody impl_code_friend = parse_global_body( token_fmt( "typename", Str name(CodeFriend), code_impl_tmpl ));
CodeBody impl_code_fn = parse_global_body( token_fmt( "typename", StrC name(CodeFn), code_impl_tmpl )); CodeBody impl_code_fn = parse_global_body( token_fmt( "typename", Str name(CodeFn), code_impl_tmpl ));
CodeBody impl_code_module = parse_global_body( token_fmt( "typename", StrC name(CodeModule), code_impl_tmpl )); CodeBody impl_code_module = parse_global_body( token_fmt( "typename", Str name(CodeModule), code_impl_tmpl ));
CodeBody impl_code_ns = parse_global_body( token_fmt( "typename", StrC name(CodeNS), code_impl_tmpl )); CodeBody impl_code_ns = parse_global_body( token_fmt( "typename", Str name(CodeNS), code_impl_tmpl ));
CodeBody impl_code_op = parse_global_body( token_fmt( "typename", StrC name(CodeOperator), code_impl_tmpl )); CodeBody impl_code_op = parse_global_body( token_fmt( "typename", Str name(CodeOperator), code_impl_tmpl ));
CodeBody impl_code_opcast = parse_global_body( token_fmt( "typename", StrC name(CodeOpCast), code_impl_tmpl )); CodeBody impl_code_opcast = parse_global_body( token_fmt( "typename", Str name(CodeOpCast), code_impl_tmpl ));
CodeBody impl_code_params = parse_global_body( token_fmt( "typename", StrC name(CodeParams), code_impl_tmpl )); CodeBody impl_code_params = parse_global_body( token_fmt( "typename", Str name(CodeParams), code_impl_tmpl ));
CodeBody impl_code_pragma = parse_global_body( token_fmt( "typename", StrC name(CodePragma), code_impl_tmpl )); CodeBody impl_code_pragma = parse_global_body( token_fmt( "typename", Str name(CodePragma), code_impl_tmpl ));
CodeBody impl_code_precond = parse_global_body( token_fmt( "typename", StrC name(CodePreprocessCond), code_impl_tmpl )); CodeBody impl_code_precond = parse_global_body( token_fmt( "typename", Str name(CodePreprocessCond), code_impl_tmpl ));
CodeBody impl_code_specs = parse_global_body( token_fmt( "typename", StrC name(CodeSpecifiers), code_impl_tmpl )); CodeBody impl_code_specs = parse_global_body( token_fmt( "typename", Str name(CodeSpecifiers), code_impl_tmpl ));
CodeBody impl_code_struct = parse_global_body( token_fmt( "typename", StrC name(CodeStruct), code_impl_tmpl )); CodeBody impl_code_struct = parse_global_body( token_fmt( "typename", Str name(CodeStruct), code_impl_tmpl ));
CodeBody impl_code_tmpl = parse_global_body( token_fmt( "typename", StrC name(CodeTemplate), code_impl_tmpl )); CodeBody impl_code_tmpl = parse_global_body( token_fmt( "typename", Str name(CodeTemplate), code_impl_tmpl ));
CodeBody impl_code_type = parse_global_body( token_fmt( "typename", StrC name(CodeTypename), code_impl_tmpl )); CodeBody impl_code_type = parse_global_body( token_fmt( "typename", Str name(CodeTypename), code_impl_tmpl ));
CodeBody impl_code_typedef = parse_global_body( token_fmt( "typename", StrC name(CodeTypedef), code_impl_tmpl )); CodeBody impl_code_typedef = parse_global_body( token_fmt( "typename", Str name(CodeTypedef), code_impl_tmpl ));
CodeBody impl_code_union = parse_global_body( token_fmt( "typename", StrC name(CodeUnion), code_impl_tmpl )); CodeBody impl_code_union = parse_global_body( token_fmt( "typename", Str name(CodeUnion), code_impl_tmpl ));
CodeBody impl_code_using = parse_global_body( token_fmt( "typename", StrC name(CodeUsing), code_impl_tmpl )); CodeBody impl_code_using = parse_global_body( token_fmt( "typename", Str name(CodeUsing), code_impl_tmpl ));
CodeBody impl_code_var = parse_global_body( token_fmt( "typename", StrC name(CodeVar), code_impl_tmpl )); CodeBody impl_code_var = parse_global_body( token_fmt( "typename", Str name(CodeVar), code_impl_tmpl ));
body_append(impl_code_attr, parse_global_body( token_fmt( "typename", StrC name(Attributes), codetype_impl_tmpl ))); body_append(impl_code_attr, parse_global_body( token_fmt( "typename", Str name(Attributes), codetype_impl_tmpl )));
body_append(impl_code_cmt, parse_global_body( token_fmt( "typename", StrC name(Comment), codetype_impl_tmpl ))); body_append(impl_code_cmt, parse_global_body( token_fmt( "typename", Str name(Comment), codetype_impl_tmpl )));
body_append(impl_code_constr, parse_global_body( token_fmt( "typename", StrC name(Constructor), codetype_impl_tmpl ))); body_append(impl_code_constr, parse_global_body( token_fmt( "typename", Str name(Constructor), codetype_impl_tmpl )));
body_append(impl_code_define, parse_global_body( token_fmt( "typename", StrC name(Define), codetype_impl_tmpl ))); body_append(impl_code_define, parse_global_body( token_fmt( "typename", Str name(Define), codetype_impl_tmpl )));
body_append(impl_code_destruct, parse_global_body( token_fmt( "typename", StrC name(Destructor), codetype_impl_tmpl ))); body_append(impl_code_destruct, parse_global_body( token_fmt( "typename", Str name(Destructor), codetype_impl_tmpl )));
body_append(impl_code_enum, parse_global_body( token_fmt( "typename", StrC name(Enum), codetype_impl_tmpl ))); body_append(impl_code_enum, parse_global_body( token_fmt( "typename", Str name(Enum), codetype_impl_tmpl )));
body_append(impl_code_exec, parse_global_body( token_fmt( "typename", StrC name(Exec), codetype_impl_tmpl ))); body_append(impl_code_exec, parse_global_body( token_fmt( "typename", Str name(Exec), codetype_impl_tmpl )));
body_append(impl_code_extern, parse_global_body( token_fmt( "typename", StrC name(Extern), codetype_impl_tmpl ))); body_append(impl_code_extern, parse_global_body( token_fmt( "typename", Str name(Extern), codetype_impl_tmpl )));
body_append(impl_code_include, parse_global_body( token_fmt( "typename", StrC name(Include), codetype_impl_tmpl ))); body_append(impl_code_include, parse_global_body( token_fmt( "typename", Str name(Include), codetype_impl_tmpl )));
body_append(impl_code_friend, parse_global_body( token_fmt( "typename", StrC name(Friend), codetype_impl_tmpl ))); body_append(impl_code_friend, parse_global_body( token_fmt( "typename", Str name(Friend), codetype_impl_tmpl )));
body_append(impl_code_fn, parse_global_body( token_fmt( "typename", StrC name(Fn), codetype_impl_tmpl ))); body_append(impl_code_fn, parse_global_body( token_fmt( "typename", Str name(Fn), codetype_impl_tmpl )));
body_append(impl_code_module, parse_global_body( token_fmt( "typename", StrC name(Module), codetype_impl_tmpl ))); body_append(impl_code_module, parse_global_body( token_fmt( "typename", Str name(Module), codetype_impl_tmpl )));
body_append(impl_code_ns, parse_global_body( token_fmt( "typename", StrC name(NS), codetype_impl_tmpl ))); body_append(impl_code_ns, parse_global_body( token_fmt( "typename", Str name(NS), codetype_impl_tmpl )));
body_append(impl_code_op, parse_global_body( token_fmt( "typename", StrC name(Operator), codetype_impl_tmpl ))); body_append(impl_code_op, parse_global_body( token_fmt( "typename", Str name(Operator), codetype_impl_tmpl )));
body_append(impl_code_opcast, parse_global_body( token_fmt( "typename", StrC name(OpCast), codetype_impl_tmpl ))); body_append(impl_code_opcast, parse_global_body( token_fmt( "typename", Str name(OpCast), codetype_impl_tmpl )));
body_append(impl_code_pragma, parse_global_body( token_fmt( "typename", StrC name(Pragma), codetype_impl_tmpl ))); body_append(impl_code_pragma, parse_global_body( token_fmt( "typename", Str name(Pragma), codetype_impl_tmpl )));
body_append(impl_code_precond, parse_global_body( token_fmt( "typename", StrC name(PreprocessCond), codetype_impl_tmpl ))); body_append(impl_code_precond, parse_global_body( token_fmt( "typename", Str name(PreprocessCond), codetype_impl_tmpl )));
body_append(impl_code_tmpl, parse_global_body( token_fmt( "typename", StrC name(Template), codetype_impl_tmpl ))); body_append(impl_code_tmpl, parse_global_body( token_fmt( "typename", Str name(Template), codetype_impl_tmpl )));
body_append(impl_code_type, parse_global_body( token_fmt( "typename", StrC name(Typename), codetype_impl_tmpl ))); body_append(impl_code_type, parse_global_body( token_fmt( "typename", Str name(Typename), codetype_impl_tmpl )));
body_append(impl_code_typedef, parse_global_body( token_fmt( "typename", StrC name(Typedef), codetype_impl_tmpl ))); body_append(impl_code_typedef, parse_global_body( token_fmt( "typename", Str name(Typedef), codetype_impl_tmpl )));
body_append(impl_code_union, parse_global_body( token_fmt( "typename", StrC name(Union), codetype_impl_tmpl ))); body_append(impl_code_union, parse_global_body( token_fmt( "typename", Str name(Union), codetype_impl_tmpl )));
body_append(impl_code_using, parse_global_body( token_fmt( "typename", StrC name(Using), codetype_impl_tmpl ))); body_append(impl_code_using, parse_global_body( token_fmt( "typename", Str name(Using), codetype_impl_tmpl )));
body_append(impl_code_var, parse_global_body( token_fmt( "typename", StrC name(Var), codetype_impl_tmpl ))); body_append(impl_code_var, parse_global_body( token_fmt( "typename", Str name(Var), codetype_impl_tmpl )));
#pragma push_macro("forceinline") #pragma push_macro("forceinline")
#undef forceinline #undef forceinline
@@ -582,34 +579,34 @@ CodeBody gen_ast_inlines()
); );
#pragma pop_macro("forceinline") #pragma pop_macro("forceinline")
CodeBody impl_cast_body = parse_global_body( token_fmt( "typename", StrC name(Body), cast_tmpl )); CodeBody impl_cast_body = parse_global_body( token_fmt( "typename", Str name(Body), cast_tmpl ));
CodeBody impl_cast_attribute = parse_global_body( token_fmt( "typename", StrC name(Attributes), cast_tmpl )); CodeBody impl_cast_attribute = parse_global_body( token_fmt( "typename", Str name(Attributes), cast_tmpl ));
CodeBody impl_cast_cmt = parse_global_body( token_fmt( "typename", StrC name(Comment), cast_tmpl )); CodeBody impl_cast_cmt = parse_global_body( token_fmt( "typename", Str name(Comment), cast_tmpl ));
CodeBody impl_cast_constr = parse_global_body( token_fmt( "typename", StrC name(Constructor), cast_tmpl )); CodeBody impl_cast_constr = parse_global_body( token_fmt( "typename", Str name(Constructor), cast_tmpl ));
CodeBody impl_cast_class = parse_global_body( token_fmt( "typename", StrC name(Class), cast_tmpl )); CodeBody impl_cast_class = parse_global_body( token_fmt( "typename", Str name(Class), cast_tmpl ));
CodeBody impl_cast_define = parse_global_body( token_fmt( "typename", StrC name(Define), cast_tmpl )); CodeBody impl_cast_define = parse_global_body( token_fmt( "typename", Str name(Define), cast_tmpl ));
CodeBody impl_cast_destruct = parse_global_body( token_fmt( "typename", StrC name(Destructor), cast_tmpl )); CodeBody impl_cast_destruct = parse_global_body( token_fmt( "typename", Str name(Destructor), cast_tmpl ));
CodeBody impl_cast_enum = parse_global_body( token_fmt( "typename", StrC name(Enum), cast_tmpl )); CodeBody impl_cast_enum = parse_global_body( token_fmt( "typename", Str name(Enum), cast_tmpl ));
CodeBody impl_cast_exec = parse_global_body( token_fmt( "typename", StrC name(Exec), cast_tmpl )); CodeBody impl_cast_exec = parse_global_body( token_fmt( "typename", Str name(Exec), cast_tmpl ));
CodeBody impl_cast_extern = parse_global_body( token_fmt( "typename", StrC name(Extern), cast_tmpl )); CodeBody impl_cast_extern = parse_global_body( token_fmt( "typename", Str name(Extern), cast_tmpl ));
CodeBody impl_cast_friend = parse_global_body( token_fmt( "typename", StrC name(Friend), cast_tmpl )); CodeBody impl_cast_friend = parse_global_body( token_fmt( "typename", Str name(Friend), cast_tmpl ));
CodeBody impl_cast_fn = parse_global_body( token_fmt( "typename", StrC name(Fn), cast_tmpl )); CodeBody impl_cast_fn = parse_global_body( token_fmt( "typename", Str name(Fn), cast_tmpl ));
CodeBody impl_cast_include = parse_global_body( token_fmt( "typename", StrC name(Include), cast_tmpl )); CodeBody impl_cast_include = parse_global_body( token_fmt( "typename", Str name(Include), cast_tmpl ));
CodeBody impl_cast_module = parse_global_body( token_fmt( "typename", StrC name(Module), cast_tmpl )); CodeBody impl_cast_module = parse_global_body( token_fmt( "typename", Str name(Module), cast_tmpl ));
CodeBody impl_cast_ns = parse_global_body( token_fmt( "typename", StrC name(NS), cast_tmpl )); CodeBody impl_cast_ns = parse_global_body( token_fmt( "typename", Str name(NS), cast_tmpl ));
CodeBody impl_cast_op = parse_global_body( token_fmt( "typename", StrC name(Operator), cast_tmpl )); CodeBody impl_cast_op = parse_global_body( token_fmt( "typename", Str name(Operator), cast_tmpl ));
CodeBody impl_cast_opcast = parse_global_body( token_fmt( "typename", StrC name(OpCast), cast_tmpl )); CodeBody impl_cast_opcast = parse_global_body( token_fmt( "typename", Str name(OpCast), cast_tmpl ));
CodeBody impl_cast_params = parse_global_body( token_fmt( "typename", StrC name(Params), cast_tmpl )); CodeBody impl_cast_params = parse_global_body( token_fmt( "typename", Str name(Params), cast_tmpl ));
CodeBody impl_cast_pragma = parse_global_body( token_fmt( "typename", StrC name(Pragma), cast_tmpl )); CodeBody impl_cast_pragma = parse_global_body( token_fmt( "typename", Str name(Pragma), cast_tmpl ));
CodeBody impl_cast_precond = parse_global_body( token_fmt( "typename", StrC name(PreprocessCond), cast_tmpl )); CodeBody impl_cast_precond = parse_global_body( token_fmt( "typename", Str name(PreprocessCond), cast_tmpl ));
CodeBody impl_cast_specs = parse_global_body( token_fmt( "typename", StrC name(Specifiers), cast_tmpl )); CodeBody impl_cast_specs = parse_global_body( token_fmt( "typename", Str name(Specifiers), cast_tmpl ));
CodeBody impl_cast_struct = parse_global_body( token_fmt( "typename", StrC name(Struct), cast_tmpl )); CodeBody impl_cast_struct = parse_global_body( token_fmt( "typename", Str name(Struct), cast_tmpl ));
CodeBody impl_cast_tmpl = parse_global_body( token_fmt( "typename", StrC name(Template), cast_tmpl )); CodeBody impl_cast_tmpl = parse_global_body( token_fmt( "typename", Str name(Template), cast_tmpl ));
CodeBody impl_cast_type = parse_global_body( token_fmt( "typename", StrC name(Typename), cast_tmpl )); CodeBody impl_cast_type = parse_global_body( token_fmt( "typename", Str name(Typename), cast_tmpl ));
CodeBody impl_cast_typedef = parse_global_body( token_fmt( "typename", StrC name(Typedef), cast_tmpl )); CodeBody impl_cast_typedef = parse_global_body( token_fmt( "typename", Str name(Typedef), cast_tmpl ));
CodeBody impl_cast_union = parse_global_body( token_fmt( "typename", StrC name(Union), cast_tmpl )); CodeBody impl_cast_union = parse_global_body( token_fmt( "typename", Str name(Union), cast_tmpl ));
CodeBody impl_cast_using = parse_global_body( token_fmt( "typename", StrC name(Using), cast_tmpl )); CodeBody impl_cast_using = parse_global_body( token_fmt( "typename", Str name(Using), cast_tmpl ));
CodeBody impl_cast_var = parse_global_body( token_fmt( "typename", StrC name(Var), cast_tmpl )); CodeBody impl_cast_var = parse_global_body( token_fmt( "typename", Str name(Var), cast_tmpl ));
CodeBody result = def_global_body( args( CodeBody result = def_global_body( args(
def_pragma( txt("region generated code inline implementation")), def_pragma( txt("region generated code inline implementation")),

34
base/helpers/misc.hpp
View File

@@ -21,22 +21,22 @@ using namespace gen;
void clang_format_file( char const* path, char const* style_path ) void clang_format_file( char const* path, char const* style_path )
{ {
GEN_ASSERT_NOT_NULL(path); GEN_ASSERT_NOT_NULL(path);
String resolved_path = string_make_strc(GlobalAllocator, to_strc_from_c_str(path)); StrBuilder resolved_path = strbuilder_make_str(GlobalAllocator, to_str_from_c_str(path));
String style_arg; StrBuilder style_arg;
if (style_path) { if (style_path) {
style_arg = string_make_strc(GlobalAllocator, txt("-style=file:")); style_arg = strbuilder_make_str(GlobalAllocator, txt("-style=file:"));
string_append_fmt( & style_arg, "%s ", style_path ); strbuilder_append_fmt( & style_arg, "%s ", style_path );
} }
StrC clang_format = txt("clang-format "); Str clang_format = txt("clang-format ");
StrC cf_format_inplace = txt("-i "); Str cf_format_inplace = txt("-i ");
StrC cf_verbose = txt("-verbose "); Str cf_verbose = txt("-verbose ");
String command = string_make_strc( GlobalAllocator, clang_format ); StrBuilder command = strbuilder_make_str( GlobalAllocator, clang_format );
string_append_strc( & command, cf_format_inplace ); strbuilder_append_str( & command, cf_format_inplace );
string_append_strc( & command, cf_verbose ); strbuilder_append_str( & command, cf_verbose );
string_append_string( & command, style_arg ); strbuilder_append_string( & command, style_arg );
string_append_string( & command, resolved_path ); strbuilder_append_string( & command, resolved_path );
system( command ); system( command );
} }
@@ -48,11 +48,11 @@ void refactor_file( char const* path, char const* refactor_script )
GEN_ASSERT_NOT_NULL(path); GEN_ASSERT_NOT_NULL(path);
GEN_ASSERT_NOT_NULL(refactor_script); GEN_ASSERT_NOT_NULL(refactor_script);
String command = string_make_strc(GlobalAllocator, txt("refactor ")); StrBuilder command = strbuilder_make_str(GlobalAllocator, txt("refactor "));
// string_append_strc( & command, txt("-debug ") ); // strbuilder_append_str( & command, txt("-debug ") );
string_append_strc( & command, txt("-num=1 ") ); strbuilder_append_str( & command, txt("-num=1 ") );
string_append_fmt( & command, "-src=%s ", path ); strbuilder_append_fmt( & command, "-src=%s ", path );
string_append_fmt( & command,"-spec=%s ", refactor_script ); strbuilder_append_fmt( & command,"-spec=%s ", refactor_script );
system(command); system(command);
log_fmt("\n"); log_fmt("\n");
} }

8
docs/AST_Design.md
View File

@@ -37,7 +37,7 @@ The full definitions of all asts are within:
* [`ast.hpp`](../base/components/ast.hpp) * [`ast.hpp`](../base/components/ast.hpp)
* [`ast_types.hpp`](../base/components/ast_types.hpp) * [`ast_types.hpp`](../base/components/ast_types.hpp)
* [`code_types.hpp`](../base/components/ast_types.hpp) * [`code_types.hpp`](../base/components/code_types.hpp)
The C/C++ interface procedures are located with `ast.hpp` (for the Code type), and `code_types.hpp` for all others. The C/C++ interface procedures are located with `ast.hpp` (for the Code type), and `code_types.hpp` for all others.
@@ -46,13 +46,13 @@ The C/C++ interface procedures are located with `ast.hpp` (for the Code type), a
All code types can either serialize using a function of the pattern: All code types can either serialize using a function of the pattern:
```c ```c
String <prefix>_to_string(Code code); StrBuilder <prefix>_to_string(Code code);
// or // or
<prefix>_to_string(Code code, String& result); <prefix>_to_string(Code code, StrBuilder& result);
``` ```
Where the first generates strings allocated using Allocator_StringArena and the other appends an existing strings with their backed allocator. 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`. Serialization of for the AST is defined for `Code` in [`ast.chpp`](../base/components/ast.cpp) with `code_to_strbuilder_ptr` & `code_to_string`.
Serializtion for the rest of the code types is within [`code_serialization.cpp`](../base/components/code_serialization.cpp). 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. Gencpp's serialization does not provide coherent formatting of the code. The user should use a formatter after serializing.

4
docs/AST_Types.md
View File

@@ -248,7 +248,7 @@ 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. 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. The `enum_underlying_sig` is a `Str` global var that can be set which will be defined within `PreprocessorDefines` and used in `parser_parse_enum` to identify a valid macro.
Serialization: Serialization:
@@ -637,7 +637,7 @@ Serialization:
`<Name>` currently has the full serialization of anything with `<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).* *Note: ArrExpr is not used in serialization by `typename_to_strbuilder_ref` its instead handled by a parent AST's serailization (variable, typedef, using).*
## Typedef ## Typedef

8
docs/Parser_Algo.md
View File

@@ -12,8 +12,8 @@ gencpp uses a hand-written recursive descent parser. Both the lexer and parser c
### Lexer ### Lexer
The lex procedure does the lexical pass of content provided as a `StrC` type. The lex procedure does the lexical pass of content provided as a `Str` type.
The tokens are stored (for now) in `gen::parser::Lexer_Tokens`. The tokens are stored (for now) in `Lexer_Tokens`.
Fields: Fields:
@@ -75,7 +75,7 @@ The parser has a limited user interface, only specific types of definitions or s
Each public user interface procedure has the following format: Each public user interface procedure has the following format:
```cpp ```cpp
<code type> parse_<definition type>( StrC def ) <code type> parse_<definition type>( Str def )
{ {
check_parse_args( def ); check_parse_args( def );
using namespace Parser; using namespace Parser;
@@ -287,7 +287,7 @@ In the future statements and expressions will be parsed.
1. Attributes ( Standard, GNU, MSVC, Macro ) : `parse_attributes` 1. Attributes ( Standard, GNU, MSVC, Macro ) : `parse_attributes`
2. Specifiers ( consteval, constexpr, constinit, extern, forceinline, global, inline, internal_linkage, neverinline, static ) 2. Specifiers ( consteval, constexpr, constinit, extern, forceinline, global, inline, internal_linkage, neverinline, static )
3. Is either ( identifier, const specifier, long, short, signed, unsigned, bool, char, double, int) 3. Is either ( identifier, const specifier, long, short, signed, unsigned, bool, char, double, int)
1. Attempt to parse as constrcutor or destructor : `parse_global_nspace_constructor_destructor` 1. Attempt to parse as construtor or destructor : `parse_global_nspace_constructor_destructor`
2. If its an operator cast (definition outside class) : `parse_operator_cast` 2. If its an operator cast (definition outside class) : `parse_operator_cast`
3. Its an operator, function, or varaible : `parse_operator_function_or_varaible` 3. Its an operator, function, or varaible : `parse_operator_function_or_varaible`
4. If its not a global body, consume the closing curly brace 4. If its not a global body, consume the closing curly brace

38
docs/Parsing.md
View File

@@ -15,25 +15,25 @@ You can think of this parser as *frontend parser* vs a *semantic parser*. Its in
User exposed interface: User exposed interface:
```cpp ```cpp
CodeClass parse_class ( StrC class_def ); CodeClass parse_class ( Str class_def );
CodeConstructor parse_constructor ( StrC constructor_def ); CodeConstructor parse_constructor ( Str constructor_def );
CodeDestructor parse_destructor ( StrC destructor_def ); CodeDestructor parse_destructor ( Str destructor_def );
CodeEnum parse_enum ( StrC enum_def ); CodeEnum parse_enum ( Str enum_def );
CodeBody parse_export_body ( StrC export_def ); CodeBody parse_export_body ( Str export_def );
CodeExtern parse_extern_link ( StrC exten_link_def ); CodeExtern parse_extern_link ( Str exten_link_def );
CodeFriend parse_friend ( StrC friend_def ); CodeFriend parse_friend ( Str friend_def );
CodeFn parse_function ( StrC fn_def ); CodeFn parse_function ( Str fn_def );
CodeBody parse_global_body ( StrC body_def ); CodeBody parse_global_body ( Str body_def );
CodeNS parse_namespace ( StrC namespace_def ); CodeNS parse_namespace ( Str namespace_def );
CodeOperator parse_operator ( StrC operator_def ); CodeOperator parse_operator ( Str operator_def );
CodeOpCast parse_operator_cast( StrC operator_def ); CodeOpCast parse_operator_cast( Str operator_def );
CodeStruct parse_struct ( StrC struct_def ); CodeStruct parse_struct ( Str struct_def );
CodeTemplate parse_template ( StrC template_def ); CodeTemplate parse_template ( Str template_def );
CodeType parse_type ( StrC type_def ); CodeType parse_type ( Str type_def );
CodeTypedef parse_typedef ( StrC typedef_def ); CodeTypedef parse_typedef ( Str typedef_def );
CodeUnion parse_union ( StrC union_def ); CodeUnion parse_union ( Str union_def );
CodeUsing parse_using ( StrC using_def ); CodeUsing parse_using ( Str using_def );
CodeVar parse_variable ( StrC var_def ); CodeVar parse_variable ( Str var_def );
``` ```
To parse file buffers, use the `parse_global_body` function. To parse file buffers, use the `parse_global_body` function.

12
docs/Readme.md
View File

@@ -4,7 +4,7 @@
Contains: Contains:
* [AST_Design](./AST_Design.md): Overvie of ASTs * [AST_Design](./AST_Design.md): Overview of ASTs
* [AST Types](./AST_Types.md): Listing of all AST types along with their Code type interface. * [AST Types](./AST_Types.md): Listing of all AST types along with their Code type interface.
* [Parsing](./Parsing.md): Overview of the parsing interface. * [Parsing](./Parsing.md): Overview of the parsing interface.
* [Parser Algo](./Parser_Algo.md): In-depth breakdown of the parser's implementation. * [Parser Algo](./Parser_Algo.md): In-depth breakdown of the parser's implementation.
@@ -49,10 +49,10 @@ However, the user may specifiy memory configuration.
https://github.com/Ed94/gencpp/blob/eea4ebf5c40d5d87baa465abfb1be30845b2377e/base/components/ast.hpp#L396-L461 https://github.com/Ed94/gencpp/blob/eea4ebf5c40d5d87baa465abfb1be30845b2377e/base/components/ast.hpp#L396-L461
*`StringCahced` is a typedef for `Str` (a string slice), to denote it is an interned string*
*`CodeType` is enum taggin the type of code. 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`* *`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* *`StrBuilder` 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: The width dictates how much the static array can hold before it must give way to using an allocated array:
@@ -79,7 +79,7 @@ int AST_ArrSpecs_Cap =
Data Notes: Data Notes:
* The allocator definitions used are exposed to the user incase they want to dictate memory usage * 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`. * You'll find the memory handling in `init`, `deinit`, `reset`, `gen_strbuilder_allocator`, `get_cached_string`, `make_code`.
* Allocators are defined with the `AllocatorInfo` structure found in [`memory.hpp`](../base/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: * Most of the work is just defining the allocation procedure:
@@ -308,7 +308,7 @@ Code <name> = code_str( <some code without "" quotes > )
Template metaprogramming in the traditional sense becomes possible with the use of `token_fmt` and parse constructors: Template metaprogramming in the traditional sense becomes possible with the use of `token_fmt` and parse constructors:
```cpp ```cpp
StrC value = txt("Something"); Str value = txt("Something");
char const* template_str = txt( char const* template_str = txt(
Code with <key> to replace with token_values Code with <key> to replace with token_values
@@ -403,7 +403,7 @@ There are two provided auxillary interfaces:
* Builder * Builder
* Scanner * Scanner
### Builder is a similar object to the jai language's string_builder ### Builder is a similar object to the jai language's strbuilder_builder
* The purpose of it is to generate a file. * The purpose of it is to generate a file.
* A file is specified and opened for writing using the open( file_path) function. * A file is specified and opened for writing using the open( file_path) function.

141
gen_c_library/c_library.cpp
View File

@@ -24,24 +24,24 @@ constexpr char const* generation_notice =
"// This file was generated automatially by gencpp's c_library.cpp " "// This file was generated automatially by gencpp's c_library.cpp "
"(See: https://github.com/Ed94/gencpp)\n\n"; "(See: https://github.com/Ed94/gencpp)\n\n";
constexpr StrC roll_own_dependencies_guard_start = txt(R"( constexpr Str roll_own_dependencies_guard_start = txt(R"(
//! If its desired to roll your own dependencies, define GEN_ROLL_OWN_DEPENDENCIES before including this file. //! 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 // Dependencies are derived from the c-zpl library: https://github.com/zpl-c/zpl
#ifndef GEN_ROLL_OWN_DEPENDENCIES #ifndef GEN_ROLL_OWN_DEPENDENCIES
)"); )");
constexpr StrC roll_own_dependencies_guard_end = txt(R"( constexpr Str roll_own_dependencies_guard_end = txt(R"(
// GEN_ROLL_OWN_DEPENDENCIES // GEN_ROLL_OWN_DEPENDENCIES
#endif #endif
)"); )");
constexpr StrC implementation_guard_start = txt(R"( constexpr Str implementation_guard_start = txt(R"(
#pragma region GENCPP IMPLEMENTATION GUARD #pragma region GENCPP IMPLEMENTATION GUARD
#if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED) #if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED)
# define GEN_IMPLEMENTED # define GEN_IMPLEMENTED
)"); )");
constexpr StrC implementation_guard_end = txt(R"( constexpr Str implementation_guard_end = txt(R"(
#endif #endif
#pragma endregion GENCPP IMPLEMENTATION GUARD #pragma endregion GENCPP IMPLEMENTATION GUARD
)"); )");
@@ -87,7 +87,7 @@ int gen_main()
#pragma region Resolve Dependencies #pragma region Resolve Dependencies
Code header_platform = scan_file( path_base "dependencies/platform.hpp" ); Code header_platform = scan_file( path_base "dependencies/platform.hpp" );
Code header_macros = scan_file( path_base "dependencies/macros.hpp" ); Code header_macros = scan_file( path_base "dependencies/macros.hpp" );
Code header_generic_macros = scan_file( "components/generic_macros.hpp" ); Code header_generic_macros = scan_file( "components/generic_macros.h" );
Code header_basic_types = scan_file( path_base "dependencies/basic_types.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_debug = scan_file( path_base "dependencies/debug.hpp" );
Code header_string_ops = scan_file( path_base "dependencies/string_ops.hpp" ); Code header_string_ops = scan_file( path_base "dependencies/string_ops.hpp" );
@@ -100,7 +100,7 @@ int gen_main()
{ {
case CT_Using: case CT_Using:
{ {
log_fmt("REPLACE THIS MANUALLY: %SC\n", entry->Name); log_fmt("REPLACE THIS MANUALLY: %S\n", entry->Name);
CodeUsing using_ver = cast(CodeUsing, entry); CodeUsing using_ver = cast(CodeUsing, entry);
CodeTypedef typedef_ver = def_typedef(using_ver->Name, using_ver->UnderlyingType); CodeTypedef typedef_ver = def_typedef(using_ver->Name, using_ver->UnderlyingType);
@@ -126,7 +126,7 @@ int gen_main()
if (fn->Specs) { if (fn->Specs) {
s32 constexpr_found = fn->Specs.remove( Spec_Constexpr ); s32 constexpr_found = fn->Specs.remove( Spec_Constexpr );
if (constexpr_found > -1) { if (constexpr_found > -1) {
//log_fmt("Found constexpr: %S\n", entry.to_string()); //log_fmt("Found constexpr: %SB\n", entry.to_string());
fn->Specs.append(Spec_Inline); fn->Specs.append(Spec_Inline);
} }
} }
@@ -238,7 +238,7 @@ do \
break; break;
case CT_Variable: case CT_Variable:
{ {
if ( strc_contains(entry->Name, txt("Msg_Invalid_Value"))) if ( str_contains(entry->Name, txt("Msg_Invalid_Value")))
{ {
CodeDefine define = def_define(entry->Name, entry->Value->Content); CodeDefine define = def_define(entry->Name, entry->Value->Content);
header_printing.append(define); header_printing.append(define);
@@ -292,16 +292,16 @@ do \
case CT_Preprocess_IfNotDef: case CT_Preprocess_IfNotDef:
{ {
//log_fmt("\nIFNDEF: %SC\n", entry->Content); //log_fmt("\nIFNDEF: %S\n", entry->Content);
header_strings.append(entry); header_strings.append(entry);
} }
break; break;
case CT_Struct_Fwd: case CT_Struct_Fwd:
{ {
if ( entry->Name.is_equal(txt("String")) ) if ( entry->Name.is_equal(txt("StrBuilder")) )
{ {
CodeTypedef c_def = parse_typedef(code( typedef char* String; )); CodeTypedef c_def = parse_typedef(code( typedef char* StrBuilder; ));
header_strings.append(c_def); header_strings.append(c_def);
header_strings.append(fmt_newline); header_strings.append(fmt_newline);
++ entry; ++ entry;
@@ -341,12 +341,12 @@ do \
case CT_Typedef: case CT_Typedef:
{ {
StrC name_string_table = txt("StringTable"); Str name_string_table = txt("StringTable");
CodeTypedef td = cast(CodeTypedef, entry); CodeTypedef td = cast(CodeTypedef, entry);
if (td->Name.contains(name_string_table)) if (td->Name.contains(name_string_table))
{ {
CodeBody ht = gen_hashtable(txt("gen_StrC"), name_string_table); CodeBody ht = gen_hashtable(txt("gen_Str"), name_string_table);
header_strings.append(ht); header_strings.append(ht);
break; break;
} }
@@ -388,8 +388,8 @@ do \
case CT_Union: case CT_Union:
case CT_Union_Fwd: case CT_Union_Fwd:
{ {
StrC type_str = codetype_to_keyword_str(entry->Type); Str type_str = codetype_to_keyword_str(entry->Type);
StrC formated_tmpl = token_fmt_impl( 3, Str formated_tmpl = token_fmt_impl( 3,
"type", type_str "type", type_str
, "name", entry->Name, , "name", entry->Name,
stringize( stringize(
@@ -490,8 +490,8 @@ do \
continue; continue;
} }
StrC type_str = codetype_to_keyword_str(entry->Type); Str type_str = codetype_to_keyword_str(entry->Type);
StrC formated_tmpl = token_fmt_impl( 3, Str formated_tmpl = token_fmt_impl( 3,
"type", type_str "type", type_str
, "name", entry->Name, , "name", entry->Name,
stringize( stringize(
@@ -549,9 +549,9 @@ do \
{ {
CodeTypename type = using_ver->UnderlyingType; CodeTypename type = using_ver->UnderlyingType;
CodeTypedef typedef_ver = parse_typedef(token_fmt( CodeTypedef typedef_ver = parse_typedef(token_fmt(
"ReturnType", to_string(type->ReturnType).to_strc() "ReturnType", to_string(type->ReturnType).to_str()
, "Name" , using_ver->Name , "Name" , using_ver->Name
, "Parameters", to_string(type->Params).to_strc() , "Parameters", to_string(type->Params).to_str()
, stringize( , stringize(
typedef <ReturnType>( * <Name>)(<Parameters>); typedef <ReturnType>( * <Name>)(<Parameters>);
))); )));
@@ -578,7 +578,7 @@ do \
types.append(entry_td); types.append(entry_td);
continue; continue;
} }
//log_fmt("Detected ENUM: %S", entry->Name); //log_fmt("Detected ENUM: %SB", entry->Name);
convert_cpp_enum_to_c(cast(CodeEnum, entry), types); convert_cpp_enum_to_c(cast(CodeEnum, entry), types);
} }
break; break;
@@ -645,9 +645,9 @@ do \
CodeFn fn = cast(CodeFn, entry); CodeFn fn = cast(CodeFn, entry);
if (fn->Name.starts_with(txt("code_"))) if (fn->Name.starts_with(txt("code_")))
{ {
StrC old_prefix = txt("code_"); Str old_prefix = txt("code_");
StrC actual_name = { fn->Name.Len - old_prefix.Len, fn->Name.Ptr + old_prefix.Len }; Str actual_name = { fn->Name.Len - old_prefix.Len, fn->Name.Ptr + old_prefix.Len };
String new_name = String::fmt_buf(GlobalAllocator, "code__%SC", actual_name ); StrBuilder new_name = StrBuilder::fmt_buf(GlobalAllocator, "code__%S", actual_name );
fn->Name = get_cached_string(new_name); fn->Name = get_cached_string(new_name);
code_c_interface.append(fn); code_c_interface.append(fn);
@@ -694,21 +694,21 @@ do \
s32 constexpr_found = var->Specs ? var->Specs.remove( Spec_Constexpr ) : - 1; s32 constexpr_found = var->Specs ? var->Specs.remove( Spec_Constexpr ) : - 1;
if (constexpr_found > -1) { if (constexpr_found > -1) {
//log_fmt("Found constexpr: %S\n", entry.to_string()); //log_fmt("Found constexpr: %SB\n", entry.to_string());
if (var->Name.contains(txt("AST_ArrSpecs_Cap"))) if (var->Name.contains(txt("AST_ArrSpecs_Cap")))
{ {
Code def = untyped_str(txt( Code def = untyped_str(txt(
R"(#define AST_ArrSpecs_Cap \ R"(#define AST_ArrSpecs_Cap \
( \ ( \
AST_POD_Size \ AST_POD_Size \
- sizeof(Code) \ - sizeof(Code) \
- sizeof(StringCached) \ - sizeof(StringCached) \
- sizeof(Code) * 2 \ - sizeof(Code) * 2 \
- sizeof(Token*) \ - sizeof(Token*) \
- sizeof(Code) \ - sizeof(Code) \
- sizeof(CodeType) \ - sizeof(CodeType) \
- sizeof(ModuleFlag) \ - sizeof(ModuleFlag) \
- sizeof(u32) \ - sizeof(u32) \
) \ ) \
/ sizeof(Specifier) - 1 / sizeof(Specifier) - 1
)" )"
@@ -729,7 +729,7 @@ R"(#define AST_ArrSpecs_Cap \
break; break;
} }
StrC code_typenames[] = { Str code_typenames[] = {
txt("Code"), txt("Code"),
txt("CodeBody"), txt("CodeBody"),
txt("CodeAttributes"), txt("CodeAttributes"),
@@ -752,6 +752,7 @@ R"(#define AST_ArrSpecs_Cap \
txt("CodeParams"), txt("CodeParams"),
txt("CodePreprocessCond"), txt("CodePreprocessCond"),
txt("CodeSpecifiers"), txt("CodeSpecifiers"),
txt("CodeStruct"),
txt("CodeTemplate"), txt("CodeTemplate"),
txt("CodeTypename"), txt("CodeTypename"),
txt("CodeTypedef"), txt("CodeTypedef"),
@@ -790,24 +791,24 @@ R"(#define AST_ArrSpecs_Cap \
default: gen_generic_selection (Fail case) \ default: gen_generic_selection (Fail case) \
) GEN_RESOLVED_FUNCTION_CALL( code, ... ) \ ) GEN_RESOLVED_FUNCTION_CALL( code, ... ) \
*/ */
String generic_selector = String::make_reserve(GlobalAllocator, kilobytes(2)); StrBuilder generic_selector = StrBuilder::make_reserve(GlobalAllocator, kilobytes(2));
for ( CodeFn fn : code_c_interface ) for ( CodeFn fn : code_c_interface )
{ {
generic_selector.clear(); generic_selector.clear();
StrC private_prefix = txt("code__"); Str private_prefix = txt("code__");
StrC actual_name = { fn->Name.Len - private_prefix.Len, fn->Name.Ptr + private_prefix.Len }; Str actual_name = { fn->Name.Len - private_prefix.Len, fn->Name.Ptr + private_prefix.Len };
String interface_name = String::fmt_buf(GlobalAllocator, "code_%SC", actual_name ); StrBuilder interface_name = StrBuilder::fmt_buf(GlobalAllocator, "code_%S", actual_name );
// Resolve generic's arguments // Resolve generic's arguments
b32 has_args = fn->Params->NumEntries > 1; b32 has_args = fn->Params->NumEntries > 1;
String params_str = String::make_reserve(GlobalAllocator, 32); StrBuilder params_str = StrBuilder::make_reserve(GlobalAllocator, 32);
for (CodeParams 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 // We skip the first parameter as its always going to be the code for selection
if (param->Next == nullptr) { if (param->Next == nullptr) {
params_str.append_fmt( "%SC", param->Name ); params_str.append_fmt( "%S", param->Name );
continue; continue;
} }
params_str.append_fmt( "%SC, ", param->Name ); params_str.append_fmt( "%S, ", param->Name );
} }
char const* tmpl_def_start = nullptr; char const* tmpl_def_start = nullptr;
@@ -823,14 +824,14 @@ R"(#define <interface_name>( code ) _Generic( (code), \
} }
// Definition start // Definition start
generic_selector.append( token_fmt( generic_selector.append( token_fmt(
"interface_name", interface_name.to_strc() "interface_name", interface_name.to_str()
, "params", params_str.to_strc() // Only used if has_args , "params", params_str.to_str() // Only used if has_args
, tmpl_def_start , tmpl_def_start
)); ));
// Append slots // Append slots
for(StrC type : code_typenames ) { for(Str type : code_typenames ) {
generic_selector.append_fmt("%SC : %SC,\\\n", type, fn->Name ); generic_selector.append_fmt("%S : %S,\\\n", type, fn->Name );
} }
generic_selector.append(txt("default: gen_generic_selection_fail \\\n")); generic_selector.append(txt("default: gen_generic_selection_fail \\\n"));
@@ -843,7 +844,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
} }
// Definition end // Definition end
generic_selector.append( token_fmt( generic_selector.append( token_fmt(
"params", params_str.to_strc() "params", params_str.to_str()
, "type", fn->Params->ValueType->Name , "type", fn->Params->ValueType->Name
, tmpl_def_end ) ); , tmpl_def_end ) );
@@ -889,8 +890,8 @@ R"(#define <interface_name>( code ) _Generic( (code), \
char conversion_buf[32] = {}; char conversion_buf[32] = {};
u64_to_str(size_of(AST_Body::_PAD_), conversion_buf, 10); u64_to_str(size_of(AST_Body::_PAD_), conversion_buf, 10);
StrC arr_exp = union_entry->ValueType->ArrExpr->Content; Str arr_exp = union_entry->ValueType->ArrExpr->Content;
StrC cpp_size = to_strc_from_c_str(conversion_buf); Str cpp_size = to_str_from_c_str(conversion_buf);
union_entry->ValueType->ArrExpr = untyped_str( cpp_size ); union_entry->ValueType->ArrExpr = untyped_str( cpp_size );
union_entry->InlineCmt = untyped_str(token_fmt("arr_exp", arr_exp, union_entry->InlineCmt = untyped_str(token_fmt("arr_exp", arr_exp,
"// Had to hardcode _PAD_ because (<arr_exp>) was 67 bytes in C\n" "// Had to hardcode _PAD_ because (<arr_exp>) was 67 bytes in C\n"
@@ -930,8 +931,8 @@ R"(#define <interface_name>( code ) _Generic( (code), \
if (prev && prev->Name.is_equal(entry->Name)) { if (prev && prev->Name.is_equal(entry->Name)) {
// rename second definition so there isn't a symbol conflict // rename second definition so there isn't a symbol conflict
String postfix_arr = String::fmt_buf(GlobalAllocator, "%SC_arr", entry->Name); StrBuilder postfix_arr = StrBuilder::fmt_buf(GlobalAllocator, "%S_arr", entry->Name);
entry->Name = get_cached_string(postfix_arr.to_strc()); entry->Name = get_cached_string(postfix_arr.to_str());
postfix_arr.free(); postfix_arr.free();
} }
@@ -939,20 +940,20 @@ R"(#define <interface_name>( code ) _Generic( (code), \
for ( CodeParams 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 // Convert the definition to use a default struct: https://vxtwitter.com/vkrajacic/status/1749816169736073295
StrC prefix = txt("def_"); Str prefix = txt("def_");
StrC actual_name = { fn->Name.Len - prefix.Len, fn->Name.Ptr + prefix.Len }; Str actual_name = { fn->Name.Len - prefix.Len, fn->Name.Ptr + prefix.Len };
StrC new_name = String::fmt_buf(GlobalAllocator, "def__%SC", actual_name ).to_strc(); Str new_name = StrBuilder::fmt_buf(GlobalAllocator, "def__%S", actual_name ).to_str();
// Resolve define's arguments // Resolve define's arguments
b32 has_args = fn->Params->NumEntries > 1; b32 has_args = fn->Params->NumEntries > 1;
String params_str = String::make_reserve(GlobalAllocator, 32); StrBuilder params_str = StrBuilder::make_reserve(GlobalAllocator, 32);
for (CodeParams 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 ) { if ( other_param == opt_param ) {
params_str.append_fmt( "%SC", other_param->Name ); params_str.append_fmt( "%S", other_param->Name );
break; break;
} }
// If there are arguments before the optional, prepare them here. // If there are arguments before the optional, prepare them here.
params_str.append_fmt( "%SC, ", other_param->Name ); params_str.append_fmt( "%S, ", other_param->Name );
} }
char const* tmpl_fn_macro = nullptr; char const* tmpl_fn_macro = nullptr;
if (params_str.length() > 0 ) { if (params_str.length() > 0 ) {
@@ -964,7 +965,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
Code fn_macro = untyped_str(token_fmt( Code fn_macro = untyped_str(token_fmt(
"def_name", fn->Name "def_name", fn->Name
, "def__name", new_name , "def__name", new_name
, "params", params_str.to_strc() , "params", params_str.to_str()
, "opts_type", opt_param->ValueType->Name , "opts_type", opt_param->ValueType->Name
, tmpl_fn_macro , tmpl_fn_macro
)); ));
@@ -1018,9 +1019,9 @@ R"(#define <interface_name>( code ) _Generic( (code), \
CodeFn fn = cast(CodeFn, entry); CodeFn fn = cast(CodeFn, entry);
if (fn->Name.starts_with(txt("code_"))) if (fn->Name.starts_with(txt("code_")))
{ {
StrC old_prefix = txt("code_"); Str old_prefix = txt("code_");
StrC actual_name = { fn->Name.Len - old_prefix.Len, fn->Name.Ptr + old_prefix.Len }; Str actual_name = { fn->Name.Len - old_prefix.Len, fn->Name.Ptr + old_prefix.Len };
String new_name = String::fmt_buf(GlobalAllocator, "code__%SC", actual_name ); StrBuilder new_name = StrBuilder::fmt_buf(GlobalAllocator, "code__%S", actual_name );
fn->Name = get_cached_string(new_name); fn->Name = get_cached_string(new_name);
} }
@@ -1173,9 +1174,9 @@ R"(#define <interface_name>( code ) _Generic( (code), \
CodeFn fn = cast(CodeFn, entry); CodeFn fn = cast(CodeFn, entry);
if (fn->Name.starts_with(txt("code_"))) if (fn->Name.starts_with(txt("code_")))
{ {
StrC old_prefix = txt("code_"); Str old_prefix = txt("code_");
StrC actual_name = { fn->Name.Len - old_prefix.Len, fn->Name.Ptr + old_prefix.Len }; Str actual_name = { fn->Name.Len - old_prefix.Len, fn->Name.Ptr + old_prefix.Len };
String new_name = String::fmt_buf(GlobalAllocator, "code__%SC", actual_name ); StrBuilder new_name = StrBuilder::fmt_buf(GlobalAllocator, "code__%S", actual_name );
fn->Name = get_cached_string(new_name); fn->Name = get_cached_string(new_name);
} }
@@ -1218,16 +1219,16 @@ R"(#define <interface_name>( code ) _Generic( (code), \
) )
{ {
// rename second definition so there isn't a symbol conflict // rename second definition so there isn't a symbol conflict
String postfix_arr = String::fmt_buf(GlobalAllocator, "%SC_arr", fn->Name); StrBuilder postfix_arr = StrBuilder::fmt_buf(GlobalAllocator, "%S_arr", fn->Name);
fn->Name = get_cached_string(postfix_arr.to_strc()); fn->Name = get_cached_string(postfix_arr.to_str());
postfix_arr.free(); postfix_arr.free();
} }
for ( CodeParams 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_"); Str prefix = txt("def_");
StrC actual_name = { fn->Name.Len - prefix.Len, fn->Name.Ptr + prefix.Len }; Str actual_name = { fn->Name.Len - prefix.Len, fn->Name.Ptr + prefix.Len };
StrC new_name = String::fmt_buf(GlobalAllocator, "def__%SC", actual_name ).to_strc(); Str new_name = StrBuilder::fmt_buf(GlobalAllocator, "def__%S", actual_name ).to_str();
fn->Name = get_cached_string(new_name); fn->Name = get_cached_string(new_name);
} }
@@ -1318,7 +1319,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
Code define_ver = untyped_str(token_fmt( Code define_ver = untyped_str(token_fmt(
"name", var->Name "name", var->Name
, "value", var->Value->Content , "value", var->Value->Content
, "type", var->ValueType.to_string().to_strc() , "type", var->ValueType.to_string().to_str()
, "#define <name> (<type>) <value>\n" , "#define <name> (<type>) <value>\n"
)); ));
src_lexer.append(define_ver); src_lexer.append(define_ver);
@@ -1363,7 +1364,7 @@ R"(#define <interface_name>( code ) _Generic( (code), \
Code define_ver = untyped_str(token_fmt( Code define_ver = untyped_str(token_fmt(
"name", var->Name "name", var->Name
, "value", var->Value->Content , "value", var->Value->Content
, "type", var->ValueType.to_string().to_strc() , "type", var->ValueType.to_string().to_str()
, "#define <name> (<type>) <value>\n" , "#define <name> (<type>) <value>\n"
)); ));
src_parser.append(define_ver); src_parser.append(define_ver);

23
gen_c_library/c_library.refactor
View File

@@ -167,13 +167,13 @@ namespace pool_, gen_pool_
// Printing // Printing
namespace str_, gen_str_ namespace c_str_, gen_c_str_
word PrintF_Buffer, gen_PrintF_Buffer word PrintF_Buffer, gen_PrintF_Buffer
word Msg_Invalid_Value, gen_Msg_Invalid_Value word Msg_Invalid_Value, gen_Msg_Invalid_Value
word log_fmt, gen_log_fmt word log_fmt, gen_log_fmt
// String Ops // StrBuilder Ops
namespace char_, gen_char_ namespace char_, gen_char_
@@ -211,18 +211,18 @@ word crc64, gen_crc64
// Strings // Strings
word StrC, gen_StrC word Str, gen_Str
word to_strc_from_c_str, gen_to_strc_from_c_str word to_str_from_c_str, gen_to_str_from_c_str
namespace strc_, gen_strc_ namespace str_, gen_str_
word cast_to_strc, gen_cast_to_strc word cast_to_str, gen_cast_to_str
word StringHeader, gen_StringHeader word StrBuilderHeader, gen_StrBuilderHeader
word String, gen_String word StrBuilder, gen_StrBuilder
namespace string_, gen_string_ namespace strbuilder_, gen_strbuilder_
word StringCached, gen_StringCached word StringCached, gen_StringCached
@@ -308,7 +308,7 @@ word operator_to_str, gen_operator_to_str
word Specifier, gen_Specifier word Specifier, gen_Specifier
word spec_to_str, gen_spec_to_str word spec_to_str, gen_spec_to_str
word spec_is_trailing, gen_spec_is_trailing word spec_is_trailing, gen_spec_is_trailing
// word strc_to_specifier, gen_strc_to_specifier // word str_to_specifier, gen_str_to_specifier
// AST // AST
@@ -340,6 +340,7 @@ word CodePragma, gen_CodePragma
word CodeParams, gen_CodeParams word CodeParams, gen_CodeParams
word CodePreprocessCond, gen_CodePreprocessCond word CodePreprocessCond, gen_CodePreprocessCond
word CodeSpecifiers, gen_CodeSpecifiers word CodeSpecifiers, gen_CodeSpecifiers
word CodeStruct, gen_CodeStruct
word CodeTemplate, gen_CodeTemplate word CodeTemplate, gen_CodeTemplate
word CodeTypename, gen_CodeTypename word CodeTypename, gen_CodeTypename
word CodeTypedef, gen_CodeTypedef word CodeTypedef, gen_CodeTypedef
@@ -522,7 +523,7 @@ word parser_deinit, gen_parser_deinit
word TokType, gen_TokType word TokType, gen_TokType
word toktype_to_str, gen_toktype_to_str word toktype_to_str, gen_toktype_to_str
// word strc_to_toktype, gen_strc_to_toktype // word str_to_toktype, gen_str_to_toktype
word NullToken, gen_NullToken word NullToken, gen_NullToken
namespace tok_, gen_tok_ namespace tok_, gen_tok_

18
gen_c_library/components/containers.array.hpp
View File

@@ -40,11 +40,11 @@ CodeBody gen_array_base()
)); ));
}; };
CodeBody gen_array( StrC type, StrC array_name ) CodeBody gen_array( Str type, Str array_name )
{ {
String array_type = String::fmt_buf( GlobalAllocator, "%.*s", array_name.Len, array_name.Ptr ); StrBuilder array_type = StrBuilder::fmt_buf( GlobalAllocator, "%.*s", array_name.Len, array_name.Ptr );
String fn = String::fmt_buf( GlobalAllocator, "%.*s", array_name.Len, array_name.Ptr ); StrBuilder fn = StrBuilder::fmt_buf( GlobalAllocator, "%.*s", array_name.Len, array_name.Ptr );
// str_to_lower(fn.Data); // c_str_to_lower(fn.Data);
#pragma push_macro( "GEN_ASSERT" ) #pragma push_macro( "GEN_ASSERT" )
#pragma push_macro( "rcast" ) #pragma push_macro( "rcast" )
@@ -56,7 +56,7 @@ CodeBody gen_array( StrC type, StrC array_name )
#undef cast #undef cast
#undef typeof #undef typeof
#undef forceinline #undef forceinline
CodeBody result = parse_global_body( token_fmt( "array_type", (StrC)array_type, "fn", (StrC)fn, "type", (StrC)type CodeBody result = parse_global_body( token_fmt( "array_type", (Str)array_type, "fn", (Str)fn, "type", (Str)type
, stringize( , stringize(
typedef <type>* <array_type>; typedef <type>* <array_type>;
@@ -375,9 +375,9 @@ CodeBody gen_array( StrC type, StrC array_name )
#pragma pop_macro( "forceinline" ) #pragma pop_macro( "forceinline" )
++ Array_DefinitionCounter; ++ Array_DefinitionCounter;
StrC slot_str = String::fmt_buf(GlobalAllocator, "%d", Array_DefinitionCounter).to_strc(); Str slot_str = StrBuilder::fmt_buf(GlobalAllocator, "%d", Array_DefinitionCounter).to_str();
Code generic_interface_slot = untyped_str(token_fmt( "type", type, "array_type", (StrC)array_type, "slot", (StrC)slot_str, Code generic_interface_slot = untyped_str(token_fmt( "type", type, "array_type", (Str)array_type, "slot", (Str)slot_str,
R"(#define GENERIC_SLOT_<slot>__array_init <type>, <array_type>_init R"(#define GENERIC_SLOT_<slot>__array_init <type>, <array_type>_init
#define GENERIC_SLOT_<slot>__array_init_reserve <type>, <array_type>_init_reserve #define GENERIC_SLOT_<slot>__array_init_reserve <type>, <array_type>_init_reserve
#define GENERIC_SLOT_<slot>__array_append <array_type>, <array_type>_append #define GENERIC_SLOT_<slot>__array_append <array_type>, <array_type>_append
@@ -399,13 +399,13 @@ R"(#define GENERIC_SLOT_<slot>__array_init <type>, <array_type>_i
)); ));
return def_global_body( args( return def_global_body( args(
def_pragma( string_to_strc( string_fmt_buf( GlobalAllocator, "region %S", array_type ))), def_pragma( strbuilder_to_str( strbuilder_fmt_buf( GlobalAllocator, "region %SB", array_type ))),
fmt_newline, fmt_newline,
generic_interface_slot, generic_interface_slot,
fmt_newline, fmt_newline,
result, result,
fmt_newline, fmt_newline,
def_pragma( string_to_strc(string_fmt_buf( GlobalAllocator, "endregion %S", array_type ))), def_pragma( strbuilder_to_str(strbuilder_fmt_buf( GlobalAllocator, "endregion %SB", array_type ))),
fmt_newline fmt_newline
)); ));
}; };

48
gen_c_library/components/containers.hashtable.hpp
View File

@@ -27,24 +27,24 @@ R"(#define HashTable(_type) struct _type
return def_global_body(args(struct_def, define_type, define_critical_load_scale)); return def_global_body(args(struct_def, define_type, define_critical_load_scale));
} }
CodeBody gen_hashtable( StrC type, StrC hashtable_name ) CodeBody gen_hashtable( Str type, Str hashtable_name )
{ {
String tbl_type = {(char*) hashtable_name.duplicate(GlobalAllocator).Ptr}; StrBuilder tbl_type = {(char*) hashtable_name.duplicate(GlobalAllocator).Ptr};
String fn = tbl_type.duplicate(GlobalAllocator); StrBuilder fn = tbl_type.duplicate(GlobalAllocator);
// str_to_lower(fn.Data); // c_str_to_lower(fn.Data);
String name_lower = String::make( GlobalAllocator, hashtable_name ); StrBuilder name_lower = StrBuilder::make( GlobalAllocator, hashtable_name );
// str_to_lower( name_lower.Data ); // c_str_to_lower( name_lower.Data );
String hashtable_entry = String::fmt_buf( GlobalAllocator, "HTE_%.*s", hashtable_name.Len, hashtable_name.Ptr ); StrBuilder hashtable_entry = StrBuilder::fmt_buf( GlobalAllocator, "HTE_%.*s", hashtable_name.Len, hashtable_name.Ptr );
String entry_array_name = String::fmt_buf( GlobalAllocator, "Arr_HTE_%.*s", hashtable_name.Len, hashtable_name.Ptr ); StrBuilder entry_array_name = StrBuilder::fmt_buf( GlobalAllocator, "Arr_HTE_%.*s", hashtable_name.Len, hashtable_name.Ptr );
String entry_array_fn_ns = String::fmt_buf( GlobalAllocator, "arr_hte_%.*s", name_lower.length(), name_lower.Data ); StrBuilder entry_array_fn_ns = StrBuilder::fmt_buf( GlobalAllocator, "arr_hte_%.*s", name_lower.length(), name_lower.Data );
CodeBody hashtable_types = parse_global_body( token_fmt( CodeBody hashtable_types = parse_global_body( token_fmt(
"type", (StrC) type, "type", (Str) type,
"tbl_name", (StrC) hashtable_name, "tbl_name", (Str) hashtable_name,
"tbl_type", (StrC) tbl_type, "tbl_type", (Str) tbl_type,
stringize( stringize(
typedef struct HashTable_<type> <tbl_type>; typedef struct HashTable_<type> <tbl_type>;
typedef struct HTE_<tbl_name> HTE_<tbl_name>; typedef struct HTE_<tbl_name> HTE_<tbl_name>;
@@ -74,13 +74,13 @@ CodeBody gen_hashtable( StrC type, StrC hashtable_name )
#undef typeof #undef typeof
#undef forceinline #undef forceinline
CodeBody hashtable_def = parse_global_body( token_fmt( CodeBody hashtable_def = parse_global_body( token_fmt(
"type", (StrC) type, "type", (Str) type,
"tbl_name", (StrC) hashtable_name, "tbl_name", (Str) hashtable_name,
"tbl_type", (StrC) tbl_type, "tbl_type", (Str) tbl_type,
"fn", (StrC) fn, "fn", (Str) fn,
"entry_type", (StrC) hashtable_entry, "entry_type", (Str) hashtable_entry,
"array_entry", (StrC) entry_array_name, "array_entry", (Str) entry_array_name,
"fn_array", (StrC) entry_array_fn_ns, "fn_array", (Str) entry_array_fn_ns,
stringize( stringize(
struct HashTable_<type> { struct HashTable_<type> {
Array_ssize Hashes; Array_ssize Hashes;
@@ -372,9 +372,9 @@ CodeBody gen_hashtable( StrC type, StrC hashtable_name )
#pragma pop_macro( "forceinline" ) #pragma pop_macro( "forceinline" )
++ HashTable_DefinitionCounter; ++ HashTable_DefinitionCounter;
StrC slot_str = String::fmt_buf(GlobalAllocator, "%d", HashTable_DefinitionCounter).to_strc(); Str slot_str = StrBuilder::fmt_buf(GlobalAllocator, "%d", HashTable_DefinitionCounter).to_str();
Code generic_interface_slot = untyped_str(token_fmt( "type", type, "tbl_type", (StrC)tbl_type, "slot", (StrC)slot_str, Code generic_interface_slot = untyped_str(token_fmt( "type", type, "tbl_type", (Str)tbl_type, "slot", (Str)slot_str,
R"(#define GENERIC_SLOT_<slot>__hashtable_init <type>, <tbl_type>_init R"(#define GENERIC_SLOT_<slot>__hashtable_init <type>, <tbl_type>_init
#define GENERIC_SLOT_<slot>__hashtable_init_reserve <type>, <tbl_type>_init_reserve #define GENERIC_SLOT_<slot>__hashtable_init_reserve <type>, <tbl_type>_init_reserve
#define GENERIC_SLOT_<slot>__hashtable_clear <tbl_type>, <tbl_type>_clear #define GENERIC_SLOT_<slot>__hashtable_clear <tbl_type>, <tbl_type>_clear
@@ -395,12 +395,12 @@ R"(#define GENERIC_SLOT_<slot>__hashtable_init <type>, <tbl_type>_
)" )"
)); ));
char const* cmt_str = str_fmt_buf( "Name: %.*s Type: %.*s" char const* cmt_str = c_str_fmt_buf( "Name: %.*s Type: %.*s"
, tbl_type.length(), tbl_type.Data , tbl_type.length(), tbl_type.Data
, type.Len, type.Ptr ); , type.Len, type.Ptr );
return def_global_body(args( return def_global_body(args(
def_pragma( string_to_strc( string_fmt_buf( GlobalAllocator, "region %S", tbl_type ))), def_pragma( strbuilder_to_str( strbuilder_fmt_buf( GlobalAllocator, "region %SB", tbl_type ))),
fmt_newline, fmt_newline,
generic_interface_slot, generic_interface_slot,
fmt_newline, fmt_newline,
@@ -409,7 +409,7 @@ R"(#define GENERIC_SLOT_<slot>__hashtable_init <type>, <tbl_type>_
entry_array, entry_array,
hashtable_def, hashtable_def,
fmt_newline, fmt_newline,
def_pragma( string_to_strc( string_fmt_buf( GlobalAllocator, "endregion %S", tbl_type ))), def_pragma( strbuilder_to_str( strbuilder_fmt_buf( GlobalAllocator, "endregion %SB", tbl_type ))),
fmt_newline fmt_newline
)); ));
} }

59
gen_c_library/components/generic_macros.hpp → gen_c_library/components/generic_macros.h
View File

@@ -3,9 +3,9 @@
// ____ _ ______ _ _ ____ _ __ _ // ____ _ ______ _ _ ____ _ __ _
// / ___} (_) | ____} | | (_) / __ \ | | | |(_) // / ___} (_) | ____} | | (_) / __ \ | | | |(_)
// | | ___ ___ _ __ ___ _ __ _ ___ | |__ _ _ _ __ ___| |_ _ ___ _ __ | | | |_ _____ _ __ | | ___ __ _ __| | _ _ __ __ _ // | | ___ ___ _ __ ___ _ __ _ ___ | |__ _ _ _ __ ___| |_ _ ___ _ __ | | | |_ _____ _ __ | | ___ __ _ __| | _ _ __ __ _
// | |{__ |/ _ \ '_ \ / _ \ '__} |/ __| | __} | | | '_ \ / __} __} |/ _ \| '_ \ | | | \ \ / / _ \ '_ \| |/ _ \ / _` |/ _` || | '_ \ / _` | // | |{__ |/ _ \ '_ \ / _ \ '__} |/ __| | __} | | | '_ \ / __} __} |/ _ \| '_ \ | | | \ \ / / _ \ '_ }| |/ _ \ / _` |/ _` || | '_ \ / _` |
// | |__j | __/ | | | __/ | | | (__ | | | |_| | | | | (__| l_| | (_) | | | | | l__| |\ V / __/ | | | | (_) | (_| | (_| || | | | | (_| | // | |__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|_|_| |_|\__, | // \____/ \___}_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: __| | // 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 {___/ // 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. // 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.
@@ -30,7 +30,7 @@
// Where GEN_GENERIC_SEL_ENTRY_COMMA_DELIMITER is specifically looking for that <comma> , // 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, , ) #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 // ^ Selects the comma ^ is the type ^ is the function ^ Insert a comma
// The slot won't exist if that comma is not found. | // 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: // 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; typedef struct GENCPP_NO_RESOLVED_GENERIC_SELECTION GENCPP_NO_RESOLVED_GENERIC_SELECTION;
@@ -43,12 +43,12 @@ GENCPP_NO_RESOLVED_GENERIC_SELECTION const gen_generic_selection_fail = {0};
// Below are generated on demand for an overlaod depdendent on a type: // Below are generated on demand for an overlaod depdendent on a type:
// ---------------------------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------------------------
#define GEN_FUNCTION_GENERIC_EXAMPLE( selector_arg ) _Generic( \ #define GEN_FUNCTION_GENERIC_EXAMPLE( selector_arg ) _Generic( \
(selector_arg), /* Select Via Expression*/ \ (selector_arg), /* Select Via Expression*/ \
/* Extendibility slots: */ \ /* Extendibility slots: */ \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_1__function_sig ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_2__function_sig ) \
default: gen_generic_selection_fail \ default: gen_generic_selection_fail \
) GEN_RESOLVED_FUNCTION_CALL( selector_arg ) ) GEN_RESOLVED_FUNCTION_CALL( selector_arg )
// ---------------------------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------------------------
@@ -68,20 +68,21 @@ size_t gen_example_hash__P_long( long val ) { return val * 2654435761ull; }
#define GENERIC_SLOT_2_gen_example_hash long long, gen_example_hash__P_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; } 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, // If using an Editor with support for syntax hightlighting macros:
// GENERIC_SLOT_1_gen_example_hash and GENERIC_SLOT_2_gen_example_hash should show color highlighting indicating the slot is enabled,
// or, "defined" for usage during the compilation pass that handles the _Generic instrinsic. // or, "defined" for usage during the compilation pass that handles the _Generic instrinsic.
#define gen_hash_example( function_arguments ) _Generic( \ #define gen_hash_example( function_arguments ) _Generic( \
(function_arguments), /* Select Via Expression*/ \ (function_arguments), /* Select Via Expression*/ \
/* Extendibility slots: */ \ /* Extendibility slots: */ \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_1 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_1_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_2 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_2_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_3 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_3_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_4 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_4_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_5 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_5_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_6 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_6_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_7 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_7_gen_example_hash ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( HASH__ARGS_SIG_8 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_8_gen_example_hash ) \
default: gen_generic_selection_fail \ default: gen_generic_selection_fail \
) GEN_RESOLVED_FUNCTION_CALL( function_arguments ) ) GEN_RESOLVED_FUNCTION_CALL( function_arguments )
// Additional Variations: // Additional Variations:
@@ -89,20 +90,20 @@ size_t gen_example_hash__P_long_long( long long val ) { return val * 2654435761u
// If the function takes more than one argument the following is used: // If the function takes more than one argument the following is used:
#define GEN_FUNCTION_GENERIC_EXAMPLE_VARADIC( selector_arg, ... ) _Generic( \ #define GEN_FUNCTION_GENERIC_EXAMPLE_VARADIC( selector_arg, ... ) _Generic( \
(selector_arg), \ (selector_arg), \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_1__function_sig ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_2 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_2__function_sig ) \
/* ... */ \ /* ... */ \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT(FunctionID__ARGS_SIG_N ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT(GENERIC_SLOT_N__function_sig ) \
default: gen_generic_selection_fail \ default: gen_generic_selection_fail \
) GEN_RESOLVED_FUNCTION_CALL( selector_arg, __VA_ARG__ ) ) GEN_RESOLVED_FUNCTION_CALL( selector_arg, __VA_ARG__ )
// If the function does not take the arugment as a parameter: // If the function does not take the arugment as a parameter:
#define GEN_FUNCTION_GENERIC_EXAMPLE_DIRECT_TYPE( selector_arg ) _Generic( \ #define GEN_FUNCTION_GENERIC_EXAMPLE_DIRECT_TYPE( selector_arg ) _Generic( \
( GEN_TYPE_TO_EXP(selector_arg) ), \ ( GEN_TYPE_TO_EXP(selector_arg) ), \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_1 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_1__function_sig ) \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( FunctionID__ARGS_SIG_2 ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_2__function_sig ) \
/* ... */ \ /* ... */ \
GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT(FunctionID__ARGS_SIG_N ) \ GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT(GENERIC_SLOT_N__function_sig ) \
default: gen_generic_selection_fail \ default: gen_generic_selection_fail \
) GEN_RESOLVED_FUNCTION_CALL() ) GEN_RESOLVED_FUNCTION_CALL()

42
gen_c_library/components/misc.hpp
View File

@@ -18,13 +18,13 @@ void convert_cpp_enum_to_c( CodeEnum to_convert, CodeBody to_append )
#pragma pop_macro("enum_underlying") #pragma pop_macro("enum_underlying")
} }
b32 ignore_preprocess_cond_block( StrC cond_sig, Code& entry_iter, CodeBody& parsed_body, CodeBody& body ) b32 ignore_preprocess_cond_block( Str cond_sig, Code& entry_iter, CodeBody& parsed_body, CodeBody& body )
{ {
b32 found = false; b32 found = false;
CodePreprocessCond cond = cast(CodePreprocessCond, entry_iter); CodePreprocessCond cond = cast(CodePreprocessCond, entry_iter);
if ( cond->Content.is_equal(cond_sig) ) if ( cond->Content.is_equal(cond_sig) )
{ {
//log_fmt("Preprocess cond found: %SC\n", cond->Content); //log_fmt("Preprocess cond found: %S\n", cond->Content);
found = true; found = true;
s32 depth = 1; s32 depth = 1;
@@ -72,7 +72,7 @@ b32 ignore_preprocess_cond_block( StrC cond_sig, Code& entry_iter, CodeBody& par
constexpr bool GenericSel_One_Arg = true; constexpr bool GenericSel_One_Arg = true;
enum GenericSelectionOpts : u32 { GenericSel_Default, GenericSel_By_Ref, GenericSel_Direct_Type }; enum GenericSelectionOpts : u32 { GenericSel_Default, GenericSel_By_Ref, GenericSel_Direct_Type };
Code gen_generic_selection_function_macro( s32 num_slots, StrC macro_name, GenericSelectionOpts opts = GenericSel_Default, bool one_arg = false ) Code gen_generic_selection_function_macro( s32 num_slots, Str macro_name, GenericSelectionOpts opts = GenericSel_Default, bool one_arg = false )
{ {
/* Implements: /* Implements:
#define GEN_FUNCTION_GENERIC_EXAMPLE( selector_arg, ... ) _Generic( \ #define GEN_FUNCTION_GENERIC_EXAMPLE( selector_arg, ... ) _Generic( \
@@ -84,18 +84,18 @@ Code gen_generic_selection_function_macro( s32 num_slots, StrC macro_name, Gener
) GEN_RESOLVED_FUNCTION_CALL( selector_arg ) ) GEN_RESOLVED_FUNCTION_CALL( selector_arg )
*/ */
local_persist local_persist
String define_builder = String::make_reserve(GlobalAllocator, kilobytes(64)); StrBuilder define_builder = StrBuilder::make_reserve(GlobalAllocator, kilobytes(64));
define_builder.clear(); define_builder.clear();
StrC macro_begin; Str macro_begin;
if (opts == GenericSel_Direct_Type) { if (opts == GenericSel_Direct_Type) {
macro_begin = token_fmt( "macro_name", (StrC)macro_name, macro_begin = token_fmt( "macro_name", (Str)macro_name,
R"(#define <macro_name>(selector_arg, ...) _Generic( (*(selector_arg*)NULL ), \ R"(#define <macro_name>(selector_arg, ...) _Generic( (*(selector_arg*)NULL ), \
)" )"
); );
} }
else { else {
macro_begin = token_fmt( "macro_name", (StrC)macro_name, macro_begin = token_fmt( "macro_name", (Str)macro_name,
R"(#define <macro_name>(selector_arg, ...) _Generic( (selector_arg), \ R"(#define <macro_name>(selector_arg, ...) _Generic( (selector_arg), \
)" )"
); );
@@ -104,7 +104,7 @@ R"(#define <macro_name>(selector_arg, ...) _Generic( (selector_arg), \
for ( s32 slot = 1; slot <= num_slots; ++ slot ) for ( s32 slot = 1; slot <= num_slots; ++ slot )
{ {
StrC slot_str = String::fmt_buf(GlobalAllocator, "%d", slot).to_strc(); Str slot_str = StrBuilder::fmt_buf(GlobalAllocator, "%d", slot).to_str();
if (slot == num_slots && false) if (slot == num_slots && false)
{ {
define_builder.append( token_fmt( "macro_name", macro_name, "slot", slot_str, define_builder.append( token_fmt( "macro_name", macro_name, "slot", slot_str,
@@ -152,25 +152,25 @@ R"( GEN_IF_MACRO_DEFINED_INCLUDE_THIS_SLOT( GENERIC_SLOT_<slot>__<macro_name> )
// Add gap for next definition // Add gap for next definition
define_builder.append(txt("\n\n")); define_builder.append(txt("\n\n"));
Code macro = untyped_str(define_builder.to_strc()); Code macro = untyped_str(define_builder.to_str());
return macro; return macro;
} }
CodeFn rename_function_to_unique_symbol(CodeFn fn, StrC optional_prefix = txt("")) CodeFn rename_function_to_unique_symbol(CodeFn fn, Str optional_prefix = txt(""))
{ {
// Get basic components for the name // Get basic components for the name
StrC old_name = fn->Name; Str old_name = fn->Name;
String new_name; StrBuilder new_name;
// Add prefix if provided // Add prefix if provided
if (optional_prefix.Len) if (optional_prefix.Len)
new_name = string_fmt_buf(GlobalAllocator, "%SC_%SC_", optional_prefix, old_name); new_name = strbuilder_fmt_buf(GlobalAllocator, "%S_%S_", optional_prefix, old_name);
else else
new_name = string_fmt_buf(GlobalAllocator, "%SC_", old_name); new_name = strbuilder_fmt_buf(GlobalAllocator, "%S_", old_name);
// Add return type to the signature // Add return type to the signature
if (fn->ReturnType) if (fn->ReturnType)
new_name.append_fmt("_%SC", fn->ReturnType->Name); new_name.append_fmt("_%S", fn->ReturnType->Name);
// Add parameter types to create a unique signature // Add parameter types to create a unique signature
bool first_param = true; bool first_param = true;
@@ -198,11 +198,11 @@ CodeFn rename_function_to_unique_symbol(CodeFn fn, StrC optional_prefix = txt(""
continue; continue;
} }
new_name.append_fmt("%SC_", spec_to_str(spec)); new_name.append_fmt("%S_", spec_to_str(spec));
} }
} }
new_name.append_fmt("%SC", param->ValueType->Name); new_name.append_fmt("%S", param->ValueType->Name);
} }
} }
@@ -214,7 +214,7 @@ CodeFn rename_function_to_unique_symbol(CodeFn fn, StrC optional_prefix = txt(""
spec != end(fn->Specs); spec != end(fn->Specs);
++spec) ++spec)
{ {
new_name.append_fmt("%SC_", spec_to_str(*spec)); new_name.append_fmt("%S_", spec_to_str(*spec));
} }
} }
@@ -223,13 +223,13 @@ CodeFn rename_function_to_unique_symbol(CodeFn fn, StrC optional_prefix = txt(""
} }
using SwapContentProc = CodeBody(void); using SwapContentProc = CodeBody(void);
bool swap_pragma_region_implementation( StrC region_name, SwapContentProc* swap_content, Code& entry_iter, CodeBody& body ) bool swap_pragma_region_implementation( Str region_name, SwapContentProc* swap_content, Code& entry_iter, CodeBody& body )
{ {
bool found = false; bool found = false;
CodePragma possible_region = cast(CodePragma, entry_iter); CodePragma possible_region = cast(CodePragma, entry_iter);
String region_sig = string_fmt_buf(GlobalAllocator, "region %s", region_name.Ptr); StrBuilder region_sig = strbuilder_fmt_buf(GlobalAllocator, "region %s", region_name.Ptr);
String endregion_sig = string_fmt_buf(GlobalAllocator, "endregion %s", region_name.Ptr); StrBuilder endregion_sig = strbuilder_fmt_buf(GlobalAllocator, "endregion %s", region_name.Ptr);
if ( possible_region->Content.contains(region_sig)) if ( possible_region->Content.contains(region_sig))
{ {
found = true; found = true;

2
gen_segmented/segmented.cpp
View File

@@ -117,7 +117,7 @@ int gen_main()
def_include(txt("components/types.hpp")), def_include(txt("components/types.hpp")),
preprocess_endif, preprocess_endif,
fmt_newline, fmt_newline,
untyped_str( to_strc_from_c_str(generation_notice) ) untyped_str( to_str_from_c_str(generation_notice) )
)); ));
// gen.hpp // gen.hpp

12
gen_singleheader/singleheader.cpp
View File

@@ -17,24 +17,24 @@ constexpr char const* generation_notice =
"// This file was generated automatially by gencpp's singleheader.cpp" "// This file was generated automatially by gencpp's singleheader.cpp"
"(See: https://github.com/Ed94/gencpp)\n\n"; "(See: https://github.com/Ed94/gencpp)\n\n";
constexpr StrC implementation_guard_start = txt(R"( constexpr Str implementation_guard_start = txt(R"(
#pragma region GENCPP IMPLEMENTATION GUARD #pragma region GENCPP IMPLEMENTATION GUARD
#if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED) #if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED)
# define GEN_IMPLEMENTED # define GEN_IMPLEMENTED
)"); )");
constexpr StrC implementation_guard_end = txt(R"( constexpr Str implementation_guard_end = txt(R"(
#endif #endif
#pragma endregion GENCPP IMPLEMENTATION GUARD #pragma endregion GENCPP IMPLEMENTATION GUARD
)"); )");
constexpr StrC roll_own_dependencies_guard_start = txt(R"( constexpr Str roll_own_dependencies_guard_start = txt(R"(
//! If its desired to roll your own dependencies, define GEN_ROLL_OWN_DEPENDENCIES before including this file. //! 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 // Dependencies are derived from the c-zpl library: https://github.com/zpl-c/zpl
#ifndef GEN_ROLL_OWN_DEPENDENCIES #ifndef GEN_ROLL_OWN_DEPENDENCIES
)"); )");
constexpr StrC roll_own_dependencies_guard_end = txt(R"( constexpr Str roll_own_dependencies_guard_end = txt(R"(
// GEN_ROLL_OWN_DEPENDENCIES // GEN_ROLL_OWN_DEPENDENCIES
#endif #endif
)"); )");
@@ -77,7 +77,7 @@ int gen_main()
Code basic_types = scan_file( path_base "dependencies/basic_types.hpp" ); Code basic_types = scan_file( path_base "dependencies/basic_types.hpp" );
Code debug = scan_file( path_base "dependencies/debug.hpp" ); Code debug = scan_file( path_base "dependencies/debug.hpp" );
Code memory = scan_file( path_base "dependencies/memory.hpp" ); Code memory = scan_file( path_base "dependencies/memory.hpp" );
Code string_ops = scan_file( path_base "dependencies/string_ops.hpp" ); Code stirng_ops = scan_file( path_base "dependencies/string_ops.hpp" );
Code printing = scan_file( path_base "dependencies/printing.hpp" ); Code printing = scan_file( path_base "dependencies/printing.hpp" );
Code containers = scan_file( path_base "dependencies/containers.hpp" ); Code containers = scan_file( path_base "dependencies/containers.hpp" );
Code hashing = scan_file( path_base "dependencies/hashing.hpp" ); Code hashing = scan_file( path_base "dependencies/hashing.hpp" );
@@ -93,7 +93,7 @@ int gen_main()
header.print( basic_types ); header.print( basic_types );
header.print( debug ); header.print( debug );
header.print( memory ); header.print( memory );
header.print( string_ops ); header.print( stirng_ops );
header.print( printing ); header.print( printing );
header.print( containers ); header.print( containers );
header.print( hashing ); header.print( hashing );

10
gen_unreal_engine/unreal.cpp
View File

@@ -17,25 +17,25 @@ constexpr char const* generation_notice =
"// This file was generated automatially by gencpp's unreal.cpp " "// This file was generated automatially by gencpp's unreal.cpp "
"(See: https://github.com/Ed94/gencpp)\n\n"; "(See: https://github.com/Ed94/gencpp)\n\n";
constexpr StrC implementation_guard_start = txt(R"( constexpr Str implementation_guard_start = txt(R"(
#pragma region GENCPP IMPLEMENTATION GUARD #pragma region GENCPP IMPLEMENTATION GUARD
#if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED) #if defined(GEN_IMPLEMENTATION) && ! defined(GEN_IMPLEMENTED)
# define GEN_IMPLEMENTED # define GEN_IMPLEMENTED
)"); )");
constexpr StrC implementation_guard_end = txt(R"( constexpr Str implementation_guard_end = txt(R"(
#endif #endif
#pragma endregion GENCPP IMPLEMENTATION GUARD #pragma endregion GENCPP IMPLEMENTATION GUARD
)"); )");
constexpr StrC roll_own_dependencies_guard_start = txt(R"( constexpr Str roll_own_dependencies_guard_start = txt(R"(
//! If its desired to roll your own dependencies, define GEN_ROLL_OWN_DEPENDENCIES before including this file. //! 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 // Dependencies are derived from the c-zpl library: https://github.com/zpl-c/zpl
#ifndef GEN_ROLL_OWN_DEPENDENCIES #ifndef GEN_ROLL_OWN_DEPENDENCIES
)"); )");
constexpr StrC roll_own_dependencies_guard_end = txt(R"( constexpr Str roll_own_dependencies_guard_end = txt(R"(
// GEN_ROLL_OWN_DEPENDENCIES // GEN_ROLL_OWN_DEPENDENCIES
#endif #endif
)"); )");
@@ -68,7 +68,7 @@ int gen_main()
CodeBody macros = def_body( CT_Global_Body ); CodeBody macros = def_body( CT_Global_Body );
{ {
FileContents content = file_read_contents( GlobalAllocator, true, path_base "dependencies/macros.hpp" ); FileContents content = file_read_contents( GlobalAllocator, true, path_base "dependencies/macros.hpp" );
CodeBody ori_macros = parse_global_body( StrC { content.size, (char const*)content.data }); CodeBody ori_macros = parse_global_body( Str { content.size, (char const*)content.data });
for (Code code = ori_macros.begin(); for (Code code = ori_macros.begin();
code != ori_macros.end(); code != ori_macros.end();

4
gencpp.sln.DotSettings.user
View File

@@ -1,3 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=53AF600D_002DC09C_002D4F39_002D83E0_002DE022AA9479F2_002Fd_003Athirdparty_002Ff_003Azpl_002Eh/@EntryIndexedValue">ForceIncluded</s:String> <s:StrBuilder x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=53AF600D_002DC09C_002D4F39_002D83E0_002DE022AA9479F2_002Fd_003Athirdparty_002Ff_003Azpl_002Eh/@EntryIndexedValue">ForceIncluded</s:StrBuilder>
<s:String x:Key="/Default/CodeInspection/Highlighting/SweaWarningsMode/@EntryValue">ShowAndRun</s:String></wpf:ResourceDictionary> <s:StrBuilder x:Key="/Default/CodeInspection/Highlighting/SweaWarningsMode/@EntryValue">ShowAndRun</s:StrBuilder></wpf:ResourceDictionary>

2
scripts/genccp.natstepfilter
View File

@@ -25,6 +25,6 @@
<Action>NoStepInto</Action> <Action>NoStepInto</Action>
</Function> </Function>
<Function> <Function>
<Name>gen::String::operator .*</Name> <Name>gen::StrBuilder::operator .*</Name>
</Function> </Function>
</StepFilter> </StepFilter>

6
scripts/gencpp.natvis
View File

@@ -36,11 +36,11 @@
</Expand> </Expand>
</Type> </Type>
<Type Name="gen::StrC"> <Type Name="gen::Str">
<DisplayString>Len:{Len} Ptr:{Ptr, [Len]s}</DisplayString> <DisplayString>Len:{Len} Ptr:{Ptr, [Len]s}</DisplayString>
</Type> </Type>
<Type Name="gen::String"> <Type Name="gen::StrBuilder">
<DisplayString Condition="Data == nullptr">null</DisplayString> <DisplayString Condition="Data == nullptr">null</DisplayString>
<DisplayString>{Data,na}</DisplayString> <DisplayString>{Data,na}</DisplayString>
<Expand> <Expand>
@@ -55,7 +55,7 @@
</Expand> </Expand>
</Type> </Type>
<Type Name="gen::String::Header"> <Type Name="gen::StrBuilder::Header">
<DisplayString>Length: {Length}, Capacity: {Capacity}</DisplayString> <DisplayString>Length: {Length}, Capacity: {Capacity}</DisplayString>
<Expand> <Expand>
<Item Name="Allocator">Allocator</Item> <Item Name="Allocator">Allocator</Item>

16
scripts/helpers/vendor_toolchain.ps1
View File

@@ -197,11 +197,11 @@ if ( $vendor -match "clang" )
$compiler_args += $flag_no_optimization $compiler_args += $flag_no_optimization
} }
if ( $debug ) { if ( $debug ) {
$compiler_args += ( $flag_define + 'Build_Debug=1' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=1' )
$compiler_args += $flag_debug, $flag_debug_codeview, $flag_profiling_debug $compiler_args += $flag_debug, $flag_debug_codeview, $flag_profiling_debug
} }
else { else {
$compiler_args += ( $flag_define + 'Build_Debug=0' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=0' )
} }
$warning_ignores | ForEach-Object { $warning_ignores | ForEach-Object {
@@ -277,11 +277,11 @@ if ( $vendor -match "clang" )
$compiler_args += $flag_no_optimization $compiler_args += $flag_no_optimization
} }
if ( $debug ) { if ( $debug ) {
$compiler_args += ( $flag_define + 'Build_Debug=1' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=1' )
$compiler_args += $flag_debug, $flag_debug_codeview, $flag_profiling_debug $compiler_args += $flag_debug, $flag_debug_codeview, $flag_profiling_debug
} }
else { else {
$compiler_args += ( $flag_define + 'Build_Debug=0' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=0' )
} }
$warning_ignores | ForEach-Object { $warning_ignores | ForEach-Object {
@@ -402,7 +402,7 @@ if ( $vendor -match "msvc" )
if ( $debug ) if ( $debug )
{ {
$compiler_args += $flag_debug $compiler_args += $flag_debug
$compiler_args += ( $flag_define + 'Build_Debug=1' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=1' )
$compiler_args += ( $flag_path_debug + $path_output + '\' ) $compiler_args += ( $flag_path_debug + $path_output + '\' )
$compiler_args += $flag_link_win_rt_static_debug $compiler_args += $flag_link_win_rt_static_debug
@@ -412,7 +412,7 @@ if ( $vendor -match "msvc" )
} }
} }
else { else {
$compiler_args += ( $flag_define + 'Build_Debug=0' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=0' )
$compiler_args += $flag_link_win_rt_static $compiler_args += $flag_link_win_rt_static
} }
$compiler_args += $includes | ForEach-Object { $flag_include + $_ } $compiler_args += $includes | ForEach-Object { $flag_include + $_ }
@@ -489,7 +489,7 @@ if ( $vendor -match "msvc" )
if ( $debug ) if ( $debug )
{ {
$compiler_args += $flag_debug $compiler_args += $flag_debug
$compiler_args += ( $flag_define + 'Build_Debug=1' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=1' )
$compiler_args += ( $flag_path_debug + $path_output + '\' ) $compiler_args += ( $flag_path_debug + $path_output + '\' )
$compiler_args += $flag_link_win_rt_static_debug $compiler_args += $flag_link_win_rt_static_debug
@@ -498,7 +498,7 @@ if ( $vendor -match "msvc" )
} }
} }
else { else {
$compiler_args += ( $flag_define + 'Build_Debug=0' ) $compiler_args += ( $flag_define + 'GEN_BUILD_DEBUG=0' )
$compiler_args += $flag_link_win_rt_static $compiler_args += $flag_link_win_rt_static
} }
$compiler_args += $includes | ForEach-Object { $flag_include + $_ } $compiler_args += $includes | ForEach-Object { $flag_include + $_ }