mirror of
https://github.com/Ed94/gencpp.git
synced 2025-07-31 09:26:58 -07:00
working to towards https://github.com/Ed94/gencpp/issues/56
This commit is contained in:
@@ -48,7 +48,7 @@
|
||||
local_persist thread_local \
|
||||
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); \
|
||||
} \
|
||||
while (0)
|
||||
@@ -57,7 +57,7 @@
|
||||
# define GEN_FATAL( ... ) \
|
||||
do \
|
||||
{ \
|
||||
str_fmt_out_err( __VA_ARGS__ ); \
|
||||
c_str_fmt_out_err( __VA_ARGS__ ); \
|
||||
process_exit(1); \
|
||||
} \
|
||||
while (0)
|
||||
|
@@ -18,7 +18,7 @@ wchar_t* _alloc_utf8_to_ucs2( AllocatorInfo a, char const* text, ssize* w_len_ )
|
||||
*w_len_ = w_len;
|
||||
return NULL;
|
||||
}
|
||||
len = str_len( text );
|
||||
len = c_str_len( text );
|
||||
if ( len == 0 )
|
||||
{
|
||||
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 err = EFileError_NONE;
|
||||
ssize len = str_len( filename );
|
||||
ssize len = c_str_len( filename );
|
||||
|
||||
f->ops = ops;
|
||||
f->fd = fd;
|
||||
|
@@ -93,7 +93,7 @@ struct DirInfo
|
||||
|
||||
// Internals
|
||||
char** filenames; // zpl_array
|
||||
String buf;
|
||||
StrBuilder buf;
|
||||
};
|
||||
|
||||
struct FileInfo
|
||||
|
@@ -8,7 +8,7 @@
|
||||
#define _adt_fprintf( s_, fmt_, ... ) \
|
||||
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; \
|
||||
} 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++ )
|
||||
{
|
||||
if ( ! str_compare( node->nodes[ i ].name, name ) )
|
||||
if ( ! c_str_compare( node->nodes[ i ].name, name ) )
|
||||
{
|
||||
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_STRING :
|
||||
{
|
||||
if ( node->string && ! str_compare( node->string, value ) )
|
||||
if ( node->string && ! c_str_compare( node->string, value ) )
|
||||
{
|
||||
return node;
|
||||
}
|
||||
@@ -115,7 +115,7 @@ internal ADT_Node* _adt_get_value( ADT_Node* node, char const* value )
|
||||
ssize fsize = 0;
|
||||
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 );
|
||||
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++ )
|
||||
{
|
||||
if ( ! str_compare( node->nodes[ i ].name, name ) )
|
||||
if ( ! c_str_compare( node->nodes[ i ].name, name ) )
|
||||
{
|
||||
ADT_Node* child = &node->nodes[ i ];
|
||||
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
|
||||
str_fmt_out( "uri: %s\n", uri );
|
||||
c_str_fmt_out( "uri: %s\n", uri );
|
||||
#endif
|
||||
|
||||
char * p = ( char* )uri, *b = p, *e = p;
|
||||
ADT_Node* found_node = NULL;
|
||||
|
||||
b = p;
|
||||
p = e = ( char* )str_skip( p, '/' );
|
||||
char* buf = str_fmt_buf( "%.*s", ( int )( e - b ), b );
|
||||
p = e = ( char* )c_str_skip( p, '/' );
|
||||
char* buf = c_str_fmt_buf( "%.*s", ( int )( e - b ), b );
|
||||
|
||||
/* handle field value lookup */
|
||||
if ( *b == '[' )
|
||||
{
|
||||
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_e2 = ( char* )str_skip( l_p, ']' );
|
||||
l_e = ( char* )c_str_skip( l_p, '=' );
|
||||
l_e2 = ( char* )c_str_skip( l_p, ']' );
|
||||
|
||||
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 */
|
||||
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)) )
|
||||
{
|
||||
found_node = &node->nodes[ idx ];
|
||||
@@ -511,7 +511,7 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
|
||||
}
|
||||
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;
|
||||
}
|
||||
@@ -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 )
|
||||
{
|
||||
node->integer = str_to_i64( buf, 0, 0 );
|
||||
node->integer = c_str_to_i64( buf, 0, 0 );
|
||||
#ifndef GEN_PARSER_DISABLE_ANALYSIS
|
||||
/* special case: negative zero */
|
||||
if ( node->integer == 0 && buf[ 0 ] == '-' )
|
||||
@@ -595,19 +595,19 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
|
||||
}
|
||||
else
|
||||
{
|
||||
node->real = str_to_f64( buf, 0 );
|
||||
node->real = c_str_to_f64( buf, 0 );
|
||||
|
||||
#ifndef GEN_PARSER_DISABLE_ANALYSIS
|
||||
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_string2 = base_string + 1;
|
||||
char* base_string_off = base_string2;
|
||||
while ( *base_string_off++ == '0' )
|
||||
char* base_strbuilder_off = base_string2;
|
||||
while ( *base_strbuilder_off++ == '0' )
|
||||
base2_offset++;
|
||||
|
||||
base = ( s32 )str_to_i64( q, 0, 0 );
|
||||
base2 = ( s32 )str_to_i64( base_string2, 0, 0 );
|
||||
base = ( s32 )c_str_to_i64( q, 0, 0 );
|
||||
base2 = ( s32 )c_str_to_i64( base_string2, 0, 0 );
|
||||
if ( exp )
|
||||
{
|
||||
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
|
||||
{
|
||||
p = str_skip_any( p, escaped_chars );
|
||||
p = c_str_skip_any( p, escaped_chars );
|
||||
_adt_fprintf( file, "%.*s", pointer_diff( b, p ), b );
|
||||
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;
|
||||
}
|
||||
|
||||
ADT_Error adt_str_to_number( ADT_Node* node )
|
||||
ADT_Error adt_c_str_to_number( ADT_Node* node )
|
||||
{
|
||||
GEN_ASSERT( node );
|
||||
|
||||
@@ -779,7 +779,7 @@ ADT_Error adt_str_to_number( ADT_Node* node )
|
||||
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 );
|
||||
|
||||
@@ -826,7 +826,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
|
||||
do
|
||||
{
|
||||
char delimiter = 0;
|
||||
currentChar = ccast( char*, str_trim( currentChar, false ));
|
||||
currentChar = ccast( char*, c_str_trim( currentChar, false ));
|
||||
|
||||
if ( *currentChar == 0 )
|
||||
break;
|
||||
@@ -850,7 +850,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
|
||||
#endif
|
||||
do
|
||||
{
|
||||
endChar = ccast( char*, str_skip( endChar, '"' ));
|
||||
endChar = ccast( char*, c_str_skip( endChar, '"' ));
|
||||
|
||||
if ( *endChar && *( endChar + 1 ) == '"' )
|
||||
{
|
||||
@@ -869,7 +869,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
|
||||
}
|
||||
|
||||
*endChar = 0;
|
||||
currentChar = ccast( char*, str_trim( endChar + 1, true ));
|
||||
currentChar = ccast( char*, c_str_trim( endChar + 1, true ));
|
||||
delimiter = * currentChar;
|
||||
|
||||
/* 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 ) == '"' )
|
||||
{
|
||||
mem_move( escapedChar, escapedChar + 1, str_len( escapedChar ) );
|
||||
mem_move( escapedChar, escapedChar + 1, c_str_len( escapedChar ) );
|
||||
}
|
||||
escapedChar++;
|
||||
}
|
||||
@@ -906,7 +906,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
|
||||
|
||||
if ( * endChar )
|
||||
{
|
||||
currentChar = ccast( char*, str_trim( endChar, true ));
|
||||
currentChar = ccast( char*, c_str_trim( endChar, true ));
|
||||
|
||||
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;
|
||||
|
||||
// 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
|
||||
do
|
||||
@@ -946,7 +946,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
|
||||
|
||||
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 :
|
||||
{
|
||||
str_fmt_file( file, "\"" );
|
||||
c_str_fmt_file( file, "\"" );
|
||||
adt_print_string( file, node, "\"", "\"" );
|
||||
str_fmt_file( file, "\"" );
|
||||
c_str_fmt_file( file, "\"" );
|
||||
}
|
||||
break;
|
||||
|
||||
case EADT_NAME_STYLE_NO_QUOTES :
|
||||
{
|
||||
#endif
|
||||
str_fmt_file( file, "%s", node->string );
|
||||
c_str_fmt_file( file, "%s", node->string );
|
||||
#ifndef GEN_PARSER_DISABLE_ANALYSIS
|
||||
}
|
||||
break;
|
||||
@@ -1078,10 +1078,10 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
|
||||
_csv_write_header( file, &obj->nodes[ i ] );
|
||||
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++ )
|
||||
@@ -1091,14 +1091,14 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
|
||||
_csv_write_record( file, &obj->nodes[ i ].nodes[ r ] );
|
||||
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;
|
||||
file_stream_new( &tmp, a );
|
||||
@@ -1106,7 +1106,7 @@ String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delimi
|
||||
|
||||
ssize 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 );
|
||||
return output;
|
||||
}
|
||||
|
@@ -350,7 +350,7 @@ char* adt_parse_number_strict( ADT_Node* node, char* base_str );
|
||||
* @param node
|
||||
* @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.
|
||||
@@ -359,7 +359,7 @@ ADT_Error adt_str_to_number( ADT_Node* node );
|
||||
* @param node
|
||||
* @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.
|
||||
@@ -406,9 +406,9 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator,
|
||||
void csv_free( 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 );
|
||||
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 */
|
||||
|
||||
@@ -425,9 +425,9 @@ void csv_write( FileInfo* file, CSV_Object* obj )
|
||||
}
|
||||
|
||||
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
|
||||
|
@@ -1,6 +1,6 @@
|
||||
#ifdef GEN_INTELLISENSE_DIRECTIVES
|
||||
# pragma once
|
||||
# include "string_ops.cpp"
|
||||
# include "strbuilder_ops.cpp"
|
||||
#endif
|
||||
|
||||
#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 )
|
||||
{
|
||||
res += str_copy_nulpad( text, "(null)", 6 );
|
||||
res += c_str_copy_nulpad( text, "(null)", 6 );
|
||||
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.
|
||||
len = info->precision;
|
||||
else
|
||||
len = str_len( str );
|
||||
len = c_str_len( str );
|
||||
|
||||
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;
|
||||
if ( res + len > max_len )
|
||||
return res;
|
||||
res += str_copy_nulpad( text, str, len );
|
||||
res += c_str_copy_nulpad( text, str, len );
|
||||
text += 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 )
|
||||
return res;
|
||||
res += str_copy_nulpad( text, str, len );
|
||||
res += c_str_copy_nulpad( text, str, len );
|
||||
}
|
||||
|
||||
if ( info )
|
||||
{
|
||||
if ( info->flags & GEN_FMT_UPPER )
|
||||
str_to_upper( begin );
|
||||
c_str_to_upper( begin );
|
||||
else if ( info->flags & GEN_FMT_LOWER )
|
||||
str_to_lower( begin );
|
||||
c_str_to_lower( begin );
|
||||
}
|
||||
|
||||
return res;
|
||||
@@ -238,7 +238,7 @@ internal ssize _print_f64( char* text, ssize max_len, _format_info* info, b32 is
|
||||
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;
|
||||
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
|
||||
{
|
||||
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 )
|
||||
{
|
||||
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
|
||||
{
|
||||
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;
|
||||
}
|
||||
@@ -419,19 +419,20 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
|
||||
|
||||
case 'S':
|
||||
{
|
||||
if ( *(fmt + 1) == 'C' )
|
||||
if ( *(fmt + 1) == 'B' )
|
||||
{
|
||||
|
||||
++ fmt;
|
||||
StrC gen_str = va_arg( va, StrC);
|
||||
info.precision = gen_str.Len;
|
||||
len = _print_string( text, remaining, &info, gen_str.Ptr );
|
||||
StrBuilder gen_str = { va_arg( va, char*) };
|
||||
|
||||
info.precision = strbuilder_length(gen_str);
|
||||
len = _print_string( text, remaining, &info, gen_str );
|
||||
break;
|
||||
}
|
||||
|
||||
String gen_str = { va_arg( va, char*) };
|
||||
|
||||
info.precision = string_length(gen_str);
|
||||
len = _print_string( text, remaining, &info, gen_str );
|
||||
Str gen_str = va_arg( va, Str);
|
||||
info.precision = gen_str.Len;
|
||||
len = _print_string( text, remaining, &info, gen_str.Ptr );
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
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 ];
|
||||
str_fmt_va( buffer, size_of( buffer ), fmt, va );
|
||||
c_str_fmt_va( buffer, size_of( buffer ), fmt, va );
|
||||
return buffer;
|
||||
}
|
||||
|
||||
char* str_fmt_buf( char const* fmt, ... )
|
||||
char* c_str_fmt_buf( char const* fmt, ... )
|
||||
{
|
||||
va_list va;
|
||||
char* str;
|
||||
va_start( va, fmt );
|
||||
str = str_fmt_buf_va( fmt, va );
|
||||
str = c_str_fmt_buf_va( fmt, va );
|
||||
va_end( va );
|
||||
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 ];
|
||||
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
|
||||
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;
|
||||
va_list va;
|
||||
va_start( va, fmt );
|
||||
res = str_fmt_file_va( f, fmt, va );
|
||||
res = c_str_fmt_file_va( f, fmt, va );
|
||||
va_end( va );
|
||||
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;
|
||||
va_list va;
|
||||
va_start( va, fmt );
|
||||
res = str_fmt_va( str, n, fmt, va );
|
||||
res = c_str_fmt_va( str, n, fmt, va );
|
||||
va_end( va );
|
||||
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;
|
||||
va_list va;
|
||||
va_start( va, fmt );
|
||||
res = str_fmt_out_err_va( fmt, va );
|
||||
res = c_str_fmt_out_err_va( fmt, va );
|
||||
va_end( va );
|
||||
return res;
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
#ifdef GEN_INTELLISENSE_DIRECTIVES
|
||||
# pragma once
|
||||
# include "string_ops.hpp"
|
||||
# include "strbuilder_ops.hpp"
|
||||
#endif
|
||||
|
||||
#pragma region Printing
|
||||
@@ -13,15 +13,15 @@ typedef struct FileInfo FileInfo;
|
||||
typedef char PrintF_Buffer[GEN_PRINTF_MAXLEN];
|
||||
|
||||
// NOTE: A locally persisting buffer is used internally
|
||||
char* str_fmt_buf ( char const* fmt, ... );
|
||||
char* str_fmt_buf_va ( char const* fmt, va_list va );
|
||||
ssize str_fmt ( char* str, ssize n, char const* fmt, ... );
|
||||
ssize 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 str_fmt_out_err ( char const* fmt, ... );
|
||||
ssize str_fmt_out_err_va( char const* fmt, va_list va );
|
||||
ssize str_fmt_file ( FileInfo* f, char const* fmt, ... );
|
||||
ssize str_fmt_file_va ( FileInfo* f, char const* fmt, va_list va );
|
||||
char* c_str_fmt_buf ( char const* fmt, ... );
|
||||
char* c_str_fmt_buf_va ( char const* fmt, va_list va );
|
||||
ssize c_str_fmt ( char* str, ssize n, char const* fmt, ... );
|
||||
ssize c_str_fmt_va ( char* str, ssize n, char const* fmt, va_list va );
|
||||
ssize c_str_fmt_out_va ( char const* fmt, va_list va );
|
||||
ssize c_str_fmt_out_err ( char const* fmt, ... );
|
||||
ssize c_str_fmt_out_err_va( char const* fmt, va_list va );
|
||||
ssize c_str_fmt_file ( FileInfo* f, char const* fmt, ... );
|
||||
ssize c_str_fmt_file_va ( FileInfo* f, char const* fmt, va_list va );
|
||||
|
||||
constexpr
|
||||
char const* Msg_Invalid_Value = "INVALID VALUE PROVIDED";
|
||||
@@ -33,7 +33,7 @@ ssize log_fmt(char const* fmt, ...)
|
||||
va_list va;
|
||||
|
||||
va_start(va, fmt);
|
||||
res = str_fmt_out_va(fmt, va);
|
||||
res = c_str_fmt_out_va(fmt, va);
|
||||
va_end(va);
|
||||
|
||||
return res;
|
||||
|
@@ -13,9 +13,9 @@
|
||||
# define _printf_err( fmt, ... ) fprintf( stderr, fmt, __VA_ARGS__ )
|
||||
# define _printf_err_va( fmt, va ) vfprintf( stderr, fmt, va )
|
||||
# else
|
||||
# define _strlen str_len
|
||||
# define _printf_err( fmt, ... ) str_fmt_out_err( fmt, __VA_ARGS__ )
|
||||
# define _printf_err_va( fmt, va ) str_fmt_out_err_va( fmt, va )
|
||||
# define _strlen c_str_len
|
||||
# define _printf_err( fmt, ... ) c_str_fmt_out_err( fmt, __VA_ARGS__ )
|
||||
# define _printf_err_va( fmt, va ) c_str_fmt_out_err_va( fmt, va )
|
||||
# endif
|
||||
# endif
|
||||
#
|
||||
|
@@ -3,7 +3,7 @@
|
||||
# include "debug.cpp"
|
||||
#endif
|
||||
|
||||
#pragma region String Ops
|
||||
#pragma region StrBuilder Ops
|
||||
|
||||
internal
|
||||
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++;
|
||||
}
|
||||
|
||||
if ( base == 16 && str_compare_len( text, "0x", 2 ) == 0 )
|
||||
if ( base == 16 && c_str_compare_len( text, "0x", 2 ) == 0 )
|
||||
text += 2;
|
||||
|
||||
for ( ;; )
|
||||
@@ -53,14 +53,14 @@ global const char _num_to_char_table[] =
|
||||
"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;
|
||||
s64 value;
|
||||
|
||||
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;
|
||||
else
|
||||
base = 10;
|
||||
@@ -100,7 +100,7 @@ void i64_to_str( s64 value, char* string, s32 base )
|
||||
if ( negative )
|
||||
*buf++ = '-';
|
||||
*buf = '\0';
|
||||
str_reverse( string );
|
||||
c_str_reverse( string );
|
||||
}
|
||||
|
||||
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';
|
||||
|
||||
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;
|
||||
s32 frac;
|
||||
@@ -211,4 +211,4 @@ f64 str_to_f64( const char* str, char** end_ptr )
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma endregion String Ops
|
||||
#pragma endregion StrBuilder Ops
|
||||
|
@@ -3,7 +3,7 @@
|
||||
# include "memory.hpp"
|
||||
#endif
|
||||
|
||||
#pragma region String Ops
|
||||
#pragma region StrBuilder Ops
|
||||
|
||||
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 hex_digit_to_int( char c );
|
||||
|
||||
s32 str_compare( const char* s1, const char* s2 );
|
||||
s32 str_compare_len( const char* s1, const char* s2, ssize len );
|
||||
char* str_copy( char* dest, const char* source, ssize len );
|
||||
ssize str_copy_nulpad( char* dest, const char* source, ssize len );
|
||||
ssize str_len( const char* str );
|
||||
ssize str_len_capped( const char* str, ssize max_len );
|
||||
char* str_reverse( char* str ); // NOTE: ASCII only
|
||||
char const* str_skip( char const* str, char c );
|
||||
char const* str_skip_any( char const* str, char const* char_list );
|
||||
char const* str_trim( char const* str, b32 catch_newline );
|
||||
s32 c_str_compare( const char* s1, const char* s2 );
|
||||
s32 c_str_compare_len( const char* s1, const char* s2, ssize len );
|
||||
char* c_str_copy( char* dest, const char* source, ssize len );
|
||||
ssize c_str_copy_nulpad( char* dest, const char* source, ssize len );
|
||||
ssize c_str_len( const char* str );
|
||||
ssize c_str_len_capped( const char* str, ssize max_len );
|
||||
char* c_str_reverse( char* str ); // NOTE: ASCII only
|
||||
char const* c_str_skip( char const* str, char c );
|
||||
char const* c_str_skip_any( char const* str, char const* char_list );
|
||||
char const* c_str_trim( char const* str, b32 catch_newline );
|
||||
|
||||
// NOTE: ASCII only
|
||||
void str_to_lower( char* str );
|
||||
void str_to_upper( char* str );
|
||||
void c_str_to_lower( 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 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
|
||||
const char* char_first_occurence( const char* s, char c )
|
||||
@@ -122,7 +122,7 @@ s32 hex_digit_to_int( char c )
|
||||
}
|
||||
|
||||
inline
|
||||
s32 str_compare( const char* s1, const char* s2 )
|
||||
s32 c_str_compare( const char* s1, const char* s2 )
|
||||
{
|
||||
while ( *s1 && ( *s1 == *s2 ) )
|
||||
{
|
||||
@@ -132,7 +132,7 @@ s32 str_compare( const char* s1, const char* s2 )
|
||||
}
|
||||
|
||||
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-- )
|
||||
{
|
||||
@@ -145,7 +145,7 @@ s32 str_compare_len( const char* s1, const char* s2, ssize len )
|
||||
}
|
||||
|
||||
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 );
|
||||
if ( source )
|
||||
@@ -166,7 +166,7 @@ char* str_copy( char* dest, const char* source, ssize len )
|
||||
}
|
||||
|
||||
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;
|
||||
GEN_ASSERT_NOT_NULL( dest );
|
||||
@@ -191,7 +191,7 @@ ssize str_copy_nulpad( char* dest, const char* source, ssize len )
|
||||
}
|
||||
|
||||
inline
|
||||
ssize str_len( const char* str )
|
||||
ssize c_str_len( const char* str )
|
||||
{
|
||||
if ( str == NULL )
|
||||
{
|
||||
@@ -204,7 +204,7 @@ ssize str_len( const char* str )
|
||||
}
|
||||
|
||||
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 ));
|
||||
if ( end )
|
||||
@@ -213,9 +213,9 @@ ssize str_len_capped( const char* str, ssize max_len )
|
||||
}
|
||||
|
||||
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* b = str + len - 1;
|
||||
len /= 2;
|
||||
@@ -228,7 +228,7 @@ char* str_reverse( char* str )
|
||||
}
|
||||
|
||||
inline
|
||||
char const* str_skip( char const* str, char c )
|
||||
char const* c_str_skip( char const* str, char c )
|
||||
{
|
||||
while ( *str && *str != c )
|
||||
{
|
||||
@@ -238,20 +238,20 @@ char const* str_skip( char const* str, char c )
|
||||
}
|
||||
|
||||
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 ) ));
|
||||
ssize char_list_count = str_len( char_list );
|
||||
char const* closest_ptr = rcast( char const*, pointer_add_const( rcast(mem_ptr_const, str), c_str_len( str ) ));
|
||||
ssize char_list_count = c_str_len( char_list );
|
||||
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 );
|
||||
}
|
||||
return closest_ptr;
|
||||
}
|
||||
|
||||
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' ) ) )
|
||||
{
|
||||
@@ -261,7 +261,7 @@ char const* str_trim( char const* str, b32 catch_newline )
|
||||
}
|
||||
|
||||
inline
|
||||
void str_to_lower( char* str )
|
||||
void c_str_to_lower( char* str )
|
||||
{
|
||||
if ( ! str )
|
||||
return;
|
||||
@@ -273,7 +273,7 @@ void str_to_lower( char* str )
|
||||
}
|
||||
|
||||
inline
|
||||
void str_to_upper( char* str )
|
||||
void c_str_to_upper( char* str )
|
||||
{
|
||||
if ( ! str )
|
||||
return;
|
||||
@@ -284,4 +284,4 @@ void str_to_upper( char* str )
|
||||
}
|
||||
}
|
||||
|
||||
#pragma endregion String Ops
|
||||
#pragma endregion StrBuilder Ops
|
||||
|
@@ -3,27 +3,27 @@
|
||||
# include "hashing.cpp"
|
||||
#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;
|
||||
void* allocation = alloc( allocator, alloc_size );
|
||||
|
||||
if ( allocation == nullptr ) {
|
||||
String null_string = {nullptr};
|
||||
StrBuilder null_string = {nullptr};
|
||||
return null_string;
|
||||
}
|
||||
|
||||
StringHeader*
|
||||
header = rcast(StringHeader*, allocation);
|
||||
StrBuilderHeader*
|
||||
header = rcast(StrBuilderHeader*, allocation);
|
||||
header->Allocator = allocator;
|
||||
header->Capacity = length;
|
||||
header->Length = length;
|
||||
|
||||
String result = { rcast( char*, allocation) + header_size };
|
||||
StrBuilder result = { rcast( char*, allocation) + header_size };
|
||||
|
||||
if ( length && str )
|
||||
mem_copy( result, str, length );
|
||||
@@ -35,27 +35,27 @@ String string_make_length( AllocatorInfo allocator, char const* str, ssize lengt
|
||||
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;
|
||||
void* allocation = alloc( allocator, alloc_size );
|
||||
|
||||
if ( allocation == nullptr ) {
|
||||
String null_string = {nullptr};
|
||||
StrBuilder null_string = {nullptr};
|
||||
return null_string;
|
||||
}
|
||||
mem_set( allocation, 0, alloc_size );
|
||||
|
||||
StringHeader*
|
||||
header = rcast(StringHeader*, allocation);
|
||||
StrBuilderHeader*
|
||||
header = rcast(StrBuilderHeader*, allocation);
|
||||
header->Allocator = allocator;
|
||||
header->Capacity = capacity;
|
||||
header->Length = 0;
|
||||
|
||||
String result = { rcast(char*, allocation) + header_size };
|
||||
StrBuilder result = { rcast(char*, allocation) + header_size };
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma endregion String
|
||||
#pragma endregion StrBuilder
|
||||
|
@@ -5,18 +5,18 @@
|
||||
|
||||
#pragma region Strings
|
||||
|
||||
struct StrC;
|
||||
struct Str;
|
||||
|
||||
StrC to_strc_from_c_str (char const* bad_string);
|
||||
bool strc_are_equal (StrC lhs, StrC rhs);
|
||||
char const* strc_back (StrC str);
|
||||
bool strc_contains (StrC str, StrC substring);
|
||||
StrC strc_duplicate (StrC str, AllocatorInfo allocator);
|
||||
b32 strc_starts_with (StrC str, StrC substring);
|
||||
StrC strc_visualize_whitespace(StrC str, AllocatorInfo allocator);
|
||||
Str to_str_from_c_str (char const* bad_string);
|
||||
bool str_are_equal (Str lhs, Str rhs);
|
||||
char const* str_back (Str str);
|
||||
bool str_contains (Str str, Str substring);
|
||||
Str str_duplicate (Str str, AllocatorInfo allocator);
|
||||
b32 str_starts_with (Str str, Str substring);
|
||||
Str str_visualize_whitespace(Str str, AllocatorInfo allocator);
|
||||
|
||||
// Constant string with length.
|
||||
struct StrC
|
||||
struct Str
|
||||
{
|
||||
ssize Len;
|
||||
char const* Ptr;
|
||||
@@ -26,40 +26,40 @@ struct StrC
|
||||
forceinline char const& operator[]( ssize index ) const { return Ptr[index]; }
|
||||
|
||||
#if ! GEN_C_LIKE_CPP
|
||||
forceinline bool is_equal (StrC rhs) const { return strc_are_equal(* this, rhs); }
|
||||
forceinline char const* back () const { return strc_back(* this); }
|
||||
forceinline bool contains (StrC substring) const { return strc_contains(* this, substring); }
|
||||
forceinline StrC duplicate (AllocatorInfo allocator) const { return strc_duplicate(* this, allocator); }
|
||||
forceinline b32 starts_with (StrC substring) const { return strc_starts_with(* this, substring); }
|
||||
forceinline StrC visualize_whitespace(AllocatorInfo allocator) const { return strc_visualize_whitespace(* this, allocator); }
|
||||
forceinline bool is_equal (Str rhs) const { return str_are_equal(* this, rhs); }
|
||||
forceinline char const* back () const { return str_back(* this); }
|
||||
forceinline bool contains (Str substring) const { return str_contains(* this, substring); }
|
||||
forceinline Str duplicate (AllocatorInfo allocator) const { return str_duplicate(* this, allocator); }
|
||||
forceinline b32 starts_with (Str substring) const { return str_starts_with(* this, substring); }
|
||||
forceinline Str visualize_whitespace(AllocatorInfo allocator) const { return str_visualize_whitespace(* this, allocator); }
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
#define cast_to_strc( str ) * rcast( StrC*, (str) - sizeof(ssize) )
|
||||
#define cast_to_str( str ) * rcast( Str*, (str) - sizeof(ssize) )
|
||||
|
||||
#ifndef txt
|
||||
# if GEN_COMPILER_CPP
|
||||
# define txt( text ) StrC { sizeof( text ) - 1, ( text ) }
|
||||
# define txt( text ) Str { sizeof( text ) - 1, ( text ) }
|
||||
# else
|
||||
# define txt( text ) (StrC){ sizeof( text ) - 1, ( text ) }
|
||||
# define txt( text ) (Str){ sizeof( text ) - 1, ( text ) }
|
||||
# endif
|
||||
#endif
|
||||
|
||||
GEN_API_C_BEGIN
|
||||
forceinline char const* strc_begin(StrC str) { return str.Ptr; }
|
||||
forceinline char const* strc_end (StrC str) { return str.Ptr + str.Len; }
|
||||
forceinline char const* strc_next (StrC str, char const* iter) { return iter + 1; }
|
||||
forceinline char const* str_begin(Str str) { return str.Ptr; }
|
||||
forceinline char const* str_end (Str str) { return str.Ptr + str.Len; }
|
||||
forceinline char const* str_next (Str str, char const* iter) { return iter + 1; }
|
||||
GEN_API_C_END
|
||||
|
||||
#if GEN_COMPILER_CPP
|
||||
forceinline char const* begin(StrC str) { return str.Ptr; }
|
||||
forceinline char const* end (StrC str) { return str.Ptr + str.Len; }
|
||||
forceinline char const* next (StrC str, char const* iter) { return iter + 1; }
|
||||
forceinline char const* begin(Str str) { return str.Ptr; }
|
||||
forceinline char const* end (Str str) { return str.Ptr + str.Len; }
|
||||
forceinline char const* next (Str str, char const* iter) { return iter + 1; }
|
||||
#endif
|
||||
|
||||
inline
|
||||
bool strc_are_equal(StrC lhs, StrC rhs)
|
||||
bool str_are_equal(Str lhs, Str rhs)
|
||||
{
|
||||
if (lhs.Len != rhs.Len)
|
||||
return false;
|
||||
@@ -72,12 +72,12 @@ bool strc_are_equal(StrC lhs, StrC rhs)
|
||||
}
|
||||
|
||||
inline
|
||||
char const* strc_back(StrC str) {
|
||||
char const* str_back(Str str) {
|
||||
return & str.Ptr[str.Len - 1];
|
||||
}
|
||||
|
||||
inline
|
||||
bool strc_contains(StrC str, StrC substring)
|
||||
bool str_contains(Str str, Str substring)
|
||||
{
|
||||
if (substring.Len > str.Len)
|
||||
return false;
|
||||
@@ -86,97 +86,97 @@ bool strc_contains(StrC str, StrC substring)
|
||||
ssize sub_len = substring.Len;
|
||||
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 false;
|
||||
}
|
||||
|
||||
inline
|
||||
b32 strc_starts_with(StrC str, StrC substring) {
|
||||
b32 str_starts_with(Str str, Str substring) {
|
||||
if (substring.Len > str.Len)
|
||||
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;
|
||||
}
|
||||
|
||||
inline
|
||||
StrC to_strc_from_c_str( char const* bad_str ) {
|
||||
StrC result = { str_len( bad_str ), bad_str };
|
||||
Str to_str_from_c_str( char const* bad_str ) {
|
||||
Str result = { c_str_len( bad_str ), bad_str };
|
||||
return result;
|
||||
}
|
||||
|
||||
// Dynamic String
|
||||
// Dynamic StrBuilder
|
||||
// This is directly based off the ZPL string api.
|
||||
// They used a header pattern
|
||||
// I kept it for simplicty of porting but its not necessary to keep it that way.
|
||||
#pragma region String
|
||||
struct StringHeader;
|
||||
#pragma region StrBuilder
|
||||
struct StrBuilderHeader;
|
||||
|
||||
#if GEN_COMPILER_C
|
||||
typedef char* String;
|
||||
typedef char* StrBuilder;
|
||||
#else
|
||||
struct String;
|
||||
struct StrBuilder;
|
||||
#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);
|
||||
String string_make_strc (AllocatorInfo allocator, StrC str);
|
||||
String string_make_reserve (AllocatorInfo allocator, ssize capacity);
|
||||
String string_make_length (AllocatorInfo allocator, char const* str, ssize length);
|
||||
String string_fmt (AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...);
|
||||
String string_fmt_buf (AllocatorInfo allocator, char const* fmt, ...);
|
||||
String string_join (AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue);
|
||||
bool string_are_equal (String const lhs, String const rhs);
|
||||
bool string_are_equal_strc (String const lhs, StrC rhs);
|
||||
bool string_make_space_for (String* str, char const* to_append, ssize add_len);
|
||||
bool string_append_char (String* str, char c);
|
||||
bool string_append_c_str (String* str, char const* str_to_append);
|
||||
bool string_append_c_str_len (String* str, char const* str_to_append, ssize length);
|
||||
bool string_append_strc (String* str, StrC str_to_append);
|
||||
bool string_append_string (String* str, String const other);
|
||||
bool string_append_fmt (String* str, char const* fmt, ...);
|
||||
ssize string_avail_space (String const str);
|
||||
char* string_back (String str);
|
||||
bool string_contains_strc (String const str, StrC substring);
|
||||
bool string_contains_string (String const str, String const substring);
|
||||
ssize string_capacity (String const str);
|
||||
void string_clear (String str);
|
||||
String string_duplicate (String const str, AllocatorInfo allocator);
|
||||
void string_free (String* str);
|
||||
StringHeader* string_get_header (String str);
|
||||
ssize string_length (String const str);
|
||||
b32 string_starts_with_strc (String const str, StrC substring);
|
||||
b32 string_starts_with_string (String const str, String substring);
|
||||
void string_skip_line (String str);
|
||||
void string_strip_space (String str);
|
||||
StrC string_to_strc (String str);
|
||||
void string_trim (String str, char const* cut_set);
|
||||
void string_trim_space (String str);
|
||||
String string_visualize_whitespace(String const str);
|
||||
StrBuilder strbuilder_make_c_str (AllocatorInfo allocator, char const* str);
|
||||
StrBuilder strbuilder_make_str (AllocatorInfo allocator, Str str);
|
||||
StrBuilder strbuilder_make_reserve (AllocatorInfo allocator, ssize capacity);
|
||||
StrBuilder strbuilder_make_length (AllocatorInfo allocator, char const* str, ssize length);
|
||||
StrBuilder strbuilder_fmt (AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...);
|
||||
StrBuilder strbuilder_fmt_buf (AllocatorInfo allocator, char const* fmt, ...);
|
||||
StrBuilder strbuilder_join (AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue);
|
||||
bool strbuilder_are_equal (StrBuilder const lhs, StrBuilder const rhs);
|
||||
bool strbuilder_are_equal_str (StrBuilder const lhs, Str rhs);
|
||||
bool strbuilder_make_space_for (StrBuilder* str, char const* to_append, ssize add_len);
|
||||
bool strbuilder_append_char (StrBuilder* str, char c);
|
||||
bool strbuilder_append_c_str (StrBuilder* str, char const* c_str_to_append);
|
||||
bool strbuilder_append_c_str_len (StrBuilder* str, char const* c_str_to_append, ssize length);
|
||||
bool strbuilder_append_str (StrBuilder* str, Str c_str_to_append);
|
||||
bool strbuilder_append_string (StrBuilder* str, StrBuilder const other);
|
||||
bool strbuilder_append_fmt (StrBuilder* str, char const* fmt, ...);
|
||||
ssize strbuilder_avail_space (StrBuilder const str);
|
||||
char* strbuilder_back (StrBuilder str);
|
||||
bool strbuilder_contains_str (StrBuilder const str, Str substring);
|
||||
bool strbuilder_contains_string (StrBuilder const str, StrBuilder const substring);
|
||||
ssize strbuilder_capacity (StrBuilder const str);
|
||||
void strbuilder_clear (StrBuilder str);
|
||||
StrBuilder strbuilder_duplicate (StrBuilder const str, AllocatorInfo allocator);
|
||||
void strbuilder_free (StrBuilder* str);
|
||||
StrBuilderHeader* strbuilder_get_header (StrBuilder str);
|
||||
ssize strbuilder_length (StrBuilder const str);
|
||||
b32 strbuilder_starts_with_str (StrBuilder const str, Str substring);
|
||||
b32 strbuilder_starts_with_string (StrBuilder const str, StrBuilder substring);
|
||||
void strbuilder_skip_line (StrBuilder str);
|
||||
void strbuilder_strip_space (StrBuilder str);
|
||||
Str strbuilder_to_str (StrBuilder str);
|
||||
void strbuilder_trim (StrBuilder str, char const* cut_set);
|
||||
void strbuilder_trim_space (StrBuilder str);
|
||||
StrBuilder strbuilder_visualize_whitespace(StrBuilder const str);
|
||||
|
||||
struct StringHeader {
|
||||
struct StrBuilderHeader {
|
||||
AllocatorInfo Allocator;
|
||||
ssize Capacity;
|
||||
ssize Length;
|
||||
};
|
||||
|
||||
#if GEN_COMPILER_CPP
|
||||
struct String
|
||||
struct StrBuilder
|
||||
{
|
||||
char* Data;
|
||||
|
||||
forceinline operator char*() { 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)
|
||||
return *this;
|
||||
|
||||
String* this_ = ccast(String*, this);
|
||||
StrBuilder* this_ = ccast(StrBuilder*, this);
|
||||
this_->Data = other.Data;
|
||||
|
||||
return *this;
|
||||
@@ -185,69 +185,69 @@ struct String
|
||||
forceinline char& operator[](ssize index) { 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; }
|
||||
friend forceinline bool operator==(std::nullptr_t, const String str) { return str.Data == nullptr; }
|
||||
friend forceinline bool operator!=(std::nullptr_t, const String str) { return str.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 StrBuilder str) { return str.Data == nullptr; }
|
||||
friend forceinline bool operator!=(std::nullptr_t, const StrBuilder str) { return str.Data != nullptr; }
|
||||
|
||||
#if ! GEN_C_LIKE_CPP
|
||||
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
|
||||
forceinline static String make(AllocatorInfo allocator, char const* str) { return string_make_c_str(allocator, str); }
|
||||
forceinline static String make(AllocatorInfo allocator, StrC str) { return string_make_strc(allocator, str); }
|
||||
forceinline static String make_reserve(AllocatorInfo allocator, ssize cap) { return string_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 String join(AllocatorInfo a, char const** p, ssize n, char const* g) { return string_join(a, p, n, g); }
|
||||
forceinline static usize grow_formula(usize value) { return string_grow_formula(value); }
|
||||
forceinline static StrBuilder make(AllocatorInfo allocator, char const* str) { return strbuilder_make_c_str(allocator, str); }
|
||||
forceinline static StrBuilder make(AllocatorInfo allocator, Str str) { return strbuilder_make_str(allocator, str); }
|
||||
forceinline static StrBuilder make_reserve(AllocatorInfo allocator, ssize cap) { return strbuilder_make_reserve(allocator, cap); }
|
||||
forceinline static StrBuilder make_length(AllocatorInfo a, char const* s, ssize l) { return strbuilder_make_length(a, s, l); }
|
||||
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 strbuilder_grow_formula(value); }
|
||||
|
||||
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_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);
|
||||
return string_make_length(allocator, buf, res);
|
||||
return strbuilder_make_length(allocator, buf, res);
|
||||
}
|
||||
|
||||
static
|
||||
String fmt_buf(AllocatorInfo allocator, char const* fmt, ...) {
|
||||
StrBuilder fmt_buf(AllocatorInfo allocator, char const* fmt, ...) {
|
||||
local_persist thread_local
|
||||
char buf[GEN_PRINTF_MAXLEN] = { 0 };
|
||||
va_list va;
|
||||
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);
|
||||
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 append(char c) { return string_append_char(this, c); }
|
||||
forceinline bool append(char const* str) { return string_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(StrC str) { return string_append_strc(this, str); }
|
||||
forceinline bool append(const String other) { return string_append_string(this, other); }
|
||||
forceinline ssize avail_space() const { return string_avail_space(* this); }
|
||||
forceinline char* back() { return string_back(* this); }
|
||||
forceinline bool contains(StrC substring) const { return string_contains_strc(* this, substring); }
|
||||
forceinline bool contains(String const& substring) const { return string_contains_string(* this, substring); }
|
||||
forceinline ssize capacity() const { return string_capacity(* this); }
|
||||
forceinline void clear() { string_clear(* this); }
|
||||
forceinline String duplicate(AllocatorInfo allocator) const { return string_duplicate(* this, allocator); }
|
||||
forceinline void free() { string_free(this); }
|
||||
forceinline bool is_equal(String const& other) const { return string_are_equal(* this, other); }
|
||||
forceinline bool is_equal(StrC other) const { return string_are_equal_strc(* this, other); }
|
||||
forceinline ssize length() const { return string_length(* this); }
|
||||
forceinline b32 starts_with(StrC substring) const { return string_starts_with_strc(* this, substring); }
|
||||
forceinline b32 starts_with(String substring) const { return string_starts_with_string(* this, substring); }
|
||||
forceinline void skip_line() { string_skip_line(* this); }
|
||||
forceinline void strip_space() { string_strip_space(* this); }
|
||||
forceinline StrC to_strc() { return { string_length(*this), Data}; }
|
||||
forceinline void trim(char const* cut_set) { string_trim(* this, cut_set); }
|
||||
forceinline void trim_space() { string_trim_space(* this); }
|
||||
forceinline String visualize_whitespace() const { return string_visualize_whitespace(* this); }
|
||||
forceinline StringHeader& get_header() { return * string_get_header(* this); }
|
||||
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 strbuilder_append_char(this, c); }
|
||||
forceinline bool append(char const* str) { return strbuilder_append_c_str(this, str); }
|
||||
forceinline bool append(char const* str, ssize length) { return strbuilder_append_c_str_len(this, str, length); }
|
||||
forceinline bool append(Str str) { return strbuilder_append_str(this, str); }
|
||||
forceinline bool append(const StrBuilder other) { return strbuilder_append_string(this, other); }
|
||||
forceinline ssize avail_space() const { return strbuilder_avail_space(* this); }
|
||||
forceinline char* back() { return strbuilder_back(* this); }
|
||||
forceinline bool contains(Str substring) const { return strbuilder_contains_str(* this, substring); }
|
||||
forceinline bool contains(StrBuilder const& substring) const { return strbuilder_contains_string(* this, substring); }
|
||||
forceinline ssize capacity() const { return strbuilder_capacity(* this); }
|
||||
forceinline void clear() { strbuilder_clear(* this); }
|
||||
forceinline StrBuilder duplicate(AllocatorInfo allocator) const { return strbuilder_duplicate(* this, allocator); }
|
||||
forceinline void free() { strbuilder_free(this); }
|
||||
forceinline bool is_equal(StrBuilder const& other) const { return strbuilder_are_equal(* this, other); }
|
||||
forceinline bool is_equal(Str other) const { return strbuilder_are_equal_str(* this, other); }
|
||||
forceinline ssize length() const { return strbuilder_length(* this); }
|
||||
forceinline b32 starts_with(Str substring) const { return strbuilder_starts_with_str(* this, substring); }
|
||||
forceinline b32 starts_with(StrBuilder substring) const { return strbuilder_starts_with_string(* this, substring); }
|
||||
forceinline void skip_line() { strbuilder_skip_line(* this); }
|
||||
forceinline void strip_space() { strbuilder_strip_space(* this); }
|
||||
forceinline Str to_str() { return { strbuilder_length(*this), Data}; }
|
||||
forceinline void trim(char const* cut_set) { strbuilder_trim(* this, cut_set); }
|
||||
forceinline void trim_space() { strbuilder_trim_space(* this); }
|
||||
forceinline StrBuilder visualize_whitespace() const { return strbuilder_visualize_whitespace(* this); }
|
||||
forceinline StrBuilderHeader& get_header() { return * strbuilder_get_header(* this); }
|
||||
|
||||
bool append_fmt(char const* fmt, ...) {
|
||||
ssize res;
|
||||
@@ -255,163 +255,163 @@ struct String
|
||||
|
||||
va_list va;
|
||||
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);
|
||||
|
||||
return string_append_c_str_len(this, buf, res);
|
||||
return strbuilder_append_c_str_len(this, buf, res);
|
||||
}
|
||||
#pragma endregion Member Mapping
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
forceinline char* string_begin(String str) { return ((char*) str); }
|
||||
forceinline char* string_end (String str) { return ((char*) str + string_length(str)); }
|
||||
forceinline char* string_next (String str, char const* iter) { return ((char*) iter + 1); }
|
||||
forceinline char* strbuilder_begin(StrBuilder str) { return ((char*) str); }
|
||||
forceinline char* strbuilder_end (StrBuilder str) { return ((char*) str + strbuilder_length(str)); }
|
||||
forceinline char* strbuilder_next (StrBuilder str, char const* iter) { return ((char*) iter + 1); }
|
||||
|
||||
#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
|
||||
forceinline char* begin(String str) { return ((char*) str); }
|
||||
forceinline char* end (String str) { return ((char*) str + string_length(str)); }
|
||||
forceinline char* next (String str, char* iter) { return ((char*) iter + 1); }
|
||||
forceinline char* begin(StrBuilder str) { return ((char*) str); }
|
||||
forceinline char* end (StrBuilder str) { return ((char*) str + strbuilder_length(str)); }
|
||||
forceinline char* next (StrBuilder str, char* iter) { return ((char*) iter + 1); }
|
||||
#endif
|
||||
|
||||
#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
|
||||
forceinline bool make_space_for(String& str, char const* to_append, ssize add_len);
|
||||
forceinline bool append(String& str, char c);
|
||||
forceinline bool append(String& str, char const* str_to_append);
|
||||
forceinline bool append(String& str, char const* str_to_append, ssize length);
|
||||
forceinline bool append(String& str, StrC str_to_append);
|
||||
forceinline bool append(String& str, const String other);
|
||||
forceinline bool append_fmt(String& str, char const* fmt, ...);
|
||||
forceinline char& back(String& str);
|
||||
forceinline void clear(String& str);
|
||||
forceinline void free(String& str);
|
||||
forceinline bool make_space_for(StrBuilder& str, char const* to_append, ssize add_len);
|
||||
forceinline bool append(StrBuilder& str, char c);
|
||||
forceinline bool append(StrBuilder& str, char const* c_str_to_append);
|
||||
forceinline bool append(StrBuilder& str, char const* c_str_to_append, ssize length);
|
||||
forceinline bool append(StrBuilder& str, Str c_str_to_append);
|
||||
forceinline bool append(StrBuilder& str, const StrBuilder other);
|
||||
forceinline bool append_fmt(StrBuilder& str, char const* fmt, ...);
|
||||
forceinline char& back(StrBuilder& str);
|
||||
forceinline void clear(StrBuilder& str);
|
||||
forceinline void free(StrBuilder& str);
|
||||
#endif
|
||||
|
||||
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.
|
||||
return 4 * value + 8;
|
||||
}
|
||||
|
||||
forceinline
|
||||
String string_make_c_str(AllocatorInfo allocator, char const* str) {
|
||||
ssize length = str ? str_len(str) : 0;
|
||||
return string_make_length(allocator, str, length);
|
||||
StrBuilder strbuilder_make_c_str(AllocatorInfo allocator, char const* str) {
|
||||
ssize length = str ? c_str_len(str) : 0;
|
||||
return strbuilder_make_length(allocator, str, length);
|
||||
}
|
||||
|
||||
forceinline
|
||||
String string_make_strc(AllocatorInfo allocator, StrC str) {
|
||||
return string_make_length(allocator, str.Ptr, str.Len);
|
||||
StrBuilder strbuilder_make_str(AllocatorInfo allocator, Str str) {
|
||||
return strbuilder_make_length(allocator, str.Ptr, str.Len);
|
||||
}
|
||||
|
||||
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_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);
|
||||
|
||||
return string_make_length(allocator, buf, res);
|
||||
return strbuilder_make_length(allocator, buf, res);
|
||||
}
|
||||
|
||||
inline
|
||||
String string_fmt_buf(AllocatorInfo allocator, char const* fmt, ...)
|
||||
StrBuilder strbuilder_fmt_buf(AllocatorInfo allocator, char const* fmt, ...)
|
||||
{
|
||||
local_persist thread_local
|
||||
PrintF_Buffer buf = struct_init(PrintF_Buffer, {0});
|
||||
|
||||
va_list va;
|
||||
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);
|
||||
|
||||
return string_make_length(allocator, buf, res);
|
||||
return strbuilder_make_length(allocator, buf, res);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
string_append_c_str(& result, parts[idx]);
|
||||
strbuilder_append_c_str(& result, parts[idx]);
|
||||
|
||||
if (idx < num_parts - 1)
|
||||
string_append_c_str(& result, glue);
|
||||
strbuilder_append_c_str(& result, glue);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
forceinline
|
||||
bool string_append_char(String* str, char c) {
|
||||
bool strbuilder_append_char(StrBuilder* str, char c) {
|
||||
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
|
||||
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);
|
||||
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
|
||||
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);
|
||||
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;
|
||||
|
||||
StringHeader* header = string_get_header(* str);
|
||||
StrBuilderHeader* header = strbuilder_get_header(* 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';
|
||||
|
||||
header->Length = curr_len + append_length;
|
||||
}
|
||||
return str_to_append != nullptr;
|
||||
return c_str_to_append != nullptr;
|
||||
}
|
||||
|
||||
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);
|
||||
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
|
||||
bool string_append_string(String* str, String const other) {
|
||||
bool strbuilder_append_string(StrBuilder* str, StrBuilder const other) {
|
||||
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);
|
||||
ssize res;
|
||||
char buf[GEN_PRINTF_MAXLEN] = { 0 };
|
||||
|
||||
va_list va;
|
||||
va_start(va, fmt);
|
||||
res = str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
|
||||
res = c_str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
|
||||
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
|
||||
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;
|
||||
|
||||
for (ssize idx = 0; idx < string_length(lhs); ++idx)
|
||||
for (ssize idx = 0; idx < strbuilder_length(lhs); ++idx)
|
||||
if (lhs[idx] != rhs[idx])
|
||||
return false;
|
||||
|
||||
@@ -419,12 +419,12 @@ bool string_are_equal_string(String const lhs, String const rhs)
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
for (ssize idx = 0; idx < string_length(lhs); ++idx)
|
||||
for (ssize idx = 0; idx < strbuilder_length(lhs); ++idx)
|
||||
if (lhs[idx] != rhs.Ptr[idx])
|
||||
return false;
|
||||
|
||||
@@ -432,20 +432,20 @@ bool string_are_equal_strc(String const lhs, StrC rhs)
|
||||
}
|
||||
|
||||
forceinline
|
||||
ssize string_avail_space(String const str) {
|
||||
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
|
||||
ssize strbuilder_avail_space(StrBuilder const str) {
|
||||
StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
|
||||
return header->Capacity - header->Length;
|
||||
}
|
||||
|
||||
forceinline
|
||||
char* string_back(String str) {
|
||||
return & (str)[string_length(str) - 1];
|
||||
char* strbuilder_back(StrBuilder str) {
|
||||
return & (str)[strbuilder_length(str) - 1];
|
||||
}
|
||||
|
||||
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)
|
||||
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)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -463,19 +463,19 @@ bool string_contains_StrC(String const str, StrC substring)
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
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)
|
||||
{
|
||||
if (str_compare_len(str + idx, substring, sub_len) == 0)
|
||||
if (c_str_compare_len(str + idx, substring, sub_len) == 0)
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -483,47 +483,47 @@ bool string_contains_string(String const str, String const substring)
|
||||
}
|
||||
|
||||
forceinline
|
||||
ssize string_capacity(String const str) {
|
||||
StringHeader const* header = rcast(StringHeader const*, scast(char const*, str) - sizeof(StringHeader));
|
||||
ssize strbuilder_capacity(StrBuilder const str) {
|
||||
StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
|
||||
return header->Capacity;
|
||||
}
|
||||
|
||||
forceinline
|
||||
void string_clear(String str) {
|
||||
string_get_header(str)->Length = 0;
|
||||
void strbuilder_clear(StrBuilder str) {
|
||||
strbuilder_get_header(str)->Length = 0;
|
||||
}
|
||||
|
||||
forceinline
|
||||
String string_duplicate(String const str, AllocatorInfo allocator) {
|
||||
return string_make_length(allocator, str, string_length(str));
|
||||
StrBuilder strbuilder_duplicate(StrBuilder const str, AllocatorInfo allocator) {
|
||||
return strbuilder_make_length(allocator, str, strbuilder_length(str));
|
||||
}
|
||||
|
||||
forceinline
|
||||
void string_free(String* str) {
|
||||
void strbuilder_free(StrBuilder* str) {
|
||||
GEN_ASSERT(str != nullptr);
|
||||
if (! (* str))
|
||||
return;
|
||||
|
||||
StringHeader* header = string_get_header(* str);
|
||||
StrBuilderHeader* header = strbuilder_get_header(* str);
|
||||
allocator_free(header->Allocator, header);
|
||||
}
|
||||
|
||||
forceinline
|
||||
StringHeader* string_get_header(String str) {
|
||||
return (StringHeader*)(scast(char*, str) - sizeof(StringHeader));
|
||||
StrBuilderHeader* strbuilder_get_header(StrBuilder str) {
|
||||
return (StrBuilderHeader*)(scast(char*, str) - sizeof(StrBuilderHeader));
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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) {
|
||||
return true;
|
||||
@@ -534,20 +534,20 @@ bool string_make_space_for(String* str, char const* to_append, ssize add_len)
|
||||
void* ptr;
|
||||
void* new_ptr;
|
||||
|
||||
AllocatorInfo allocator = string_get_header(* str)->Allocator;
|
||||
StringHeader* header = nullptr;
|
||||
AllocatorInfo allocator = strbuilder_get_header(* str)->Allocator;
|
||||
StrBuilderHeader* header = nullptr;
|
||||
|
||||
new_len = string_grow_formula(string_length(* str) + add_len);
|
||||
ptr = string_get_header(* str);
|
||||
old_size = size_of(StringHeader) + string_length(* str) + 1;
|
||||
new_size = size_of(StringHeader) + new_len + 1;
|
||||
new_len = strbuilder_grow_formula(strbuilder_length(* str) + add_len);
|
||||
ptr = strbuilder_get_header(* str);
|
||||
old_size = size_of(StrBuilderHeader) + strbuilder_length(* str) + 1;
|
||||
new_size = size_of(StrBuilderHeader) + new_len + 1;
|
||||
|
||||
new_ptr = resize(allocator, ptr, old_size, new_size);
|
||||
|
||||
if (new_ptr == nullptr)
|
||||
return false;
|
||||
|
||||
header = rcast(StringHeader*, new_ptr);
|
||||
header = rcast(StrBuilderHeader*, new_ptr);
|
||||
header->Allocator = allocator;
|
||||
header->Capacity = new_len;
|
||||
|
||||
@@ -559,25 +559,25 @@ bool string_make_space_for(String* str, char const* to_append, ssize add_len)
|
||||
}
|
||||
|
||||
forceinline
|
||||
b32 string_starts_with_strc(String const str, StrC substring) {
|
||||
if (substring.Len > string_length(str))
|
||||
b32 strbuilder_starts_with_str(StrBuilder const str, Str substring) {
|
||||
if (substring.Len > strbuilder_length(str))
|
||||
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;
|
||||
}
|
||||
|
||||
forceinline
|
||||
b32 string_starts_with_string(String const str, String substring) {
|
||||
if (string_length(substring) > string_length(str))
|
||||
b32 strbuilder_starts_with_string(StrBuilder const str, StrBuilder substring) {
|
||||
if (strbuilder_length(substring) > strbuilder_length(str))
|
||||
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;
|
||||
}
|
||||
|
||||
inline
|
||||
void string_skip_line(String str)
|
||||
void strbuilder_skip_line(StrBuilder str)
|
||||
{
|
||||
#define current (*scanner)
|
||||
char* scanner = str;
|
||||
@@ -593,13 +593,13 @@ void string_skip_line(String str)
|
||||
|
||||
mem_move((char*)str, scanner, new_length);
|
||||
|
||||
StringHeader* header = string_get_header(str);
|
||||
StrBuilderHeader* header = strbuilder_get_header(str);
|
||||
header->Length = new_length;
|
||||
#undef current
|
||||
}
|
||||
|
||||
inline
|
||||
void strip_space(String str)
|
||||
void strip_space(StrBuilder str)
|
||||
{
|
||||
char* write_pos = str;
|
||||
char* read_pos = str;
|
||||
@@ -616,22 +616,22 @@ void strip_space(String str)
|
||||
write_pos[0] = '\0'; // Null-terminate the modified string
|
||||
|
||||
// Update the length if needed
|
||||
string_get_header(str)->Length = write_pos - str;
|
||||
strbuilder_get_header(str)->Length = write_pos - str;
|
||||
}
|
||||
|
||||
forceinline
|
||||
StrC string_to_strc(String str) {
|
||||
StrC result = { string_length(str), (char const*)str };
|
||||
Str strbuilder_to_str(StrBuilder str) {
|
||||
Str result = { strbuilder_length(str), (char const*)str };
|
||||
return result;
|
||||
}
|
||||
|
||||
inline
|
||||
void string_trim(String str, char const* cut_set)
|
||||
void strbuilder_trim(StrBuilder str, char const* cut_set)
|
||||
{
|
||||
ssize len = 0;
|
||||
|
||||
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))
|
||||
start_pos++;
|
||||
@@ -646,98 +646,98 @@ void string_trim(String str, char const* cut_set)
|
||||
|
||||
str[len] = '\0';
|
||||
|
||||
string_get_header(str)->Length = len;
|
||||
strbuilder_get_header(str)->Length = len;
|
||||
}
|
||||
|
||||
forceinline
|
||||
void string_trim_space(String str) {
|
||||
string_trim(str, " \t\r\n\v\f");
|
||||
void strbuilder_trim_space(StrBuilder str) {
|
||||
strbuilder_trim(str, " \t\r\n\v\f");
|
||||
}
|
||||
|
||||
inline
|
||||
String string_visualize_whitespace(String const str)
|
||||
StrBuilder strbuilder_visualize_whitespace(StrBuilder const str)
|
||||
{
|
||||
StringHeader* header = (StringHeader*)(scast(char const*, str) - sizeof(StringHeader));
|
||||
String result = string_make_reserve(header->Allocator, string_length(str) * 2); // Assume worst case for space requirements.
|
||||
StrBuilderHeader* header = (StrBuilderHeader*)(scast(char const*, str) - sizeof(StrBuilderHeader));
|
||||
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 )
|
||||
{
|
||||
case ' ':
|
||||
string_append_strc(& result, txt("·"));
|
||||
strbuilder_append_str(& result, txt("·"));
|
||||
break;
|
||||
case '\t':
|
||||
string_append_strc(& result, txt("→"));
|
||||
strbuilder_append_str(& result, txt("→"));
|
||||
break;
|
||||
case '\n':
|
||||
string_append_strc(& result, txt("↵"));
|
||||
strbuilder_append_str(& result, txt("↵"));
|
||||
break;
|
||||
case '\r':
|
||||
string_append_strc(& result, txt("⏎"));
|
||||
strbuilder_append_str(& result, txt("⏎"));
|
||||
break;
|
||||
case '\v':
|
||||
string_append_strc(& result, txt("⇕"));
|
||||
strbuilder_append_str(& result, txt("⇕"));
|
||||
break;
|
||||
case '\f':
|
||||
string_append_strc(& result, txt("⌂"));
|
||||
strbuilder_append_str(& result, txt("⌂"));
|
||||
break;
|
||||
default:
|
||||
string_append_char(& result, * c);
|
||||
strbuilder_append_char(& result, * c);
|
||||
break;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
#pragma endregion String
|
||||
#pragma endregion StrBuilder
|
||||
|
||||
#if GEN_COMPILER_CPP
|
||||
struct String_POD {
|
||||
struct StrBuilder_POD {
|
||||
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
|
||||
|
||||
forceinline
|
||||
StrC strc_duplicate(StrC str, AllocatorInfo allocator) {
|
||||
StrC result = string_to_strc( string_make_length(allocator, str.Ptr, str.Len));
|
||||
Str str_duplicate(Str str, AllocatorInfo allocator) {
|
||||
Str result = strbuilder_to_str( strbuilder_make_length(allocator, str.Ptr, str.Len));
|
||||
return result;
|
||||
}
|
||||
|
||||
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.
|
||||
for (char const* c = strc_begin(str); c != strc_end(str); c = strc_next(str, c))
|
||||
StrBuilder result = strbuilder_make_reserve(allocator, str.Len * 2); // Assume worst case for space requirements.
|
||||
for (char const* c = str_begin(str); c != str_end(str); c = str_next(str, c))
|
||||
switch ( * c )
|
||||
{
|
||||
case ' ':
|
||||
string_append_strc(& result, txt("·"));
|
||||
strbuilder_append_str(& result, txt("·"));
|
||||
break;
|
||||
case '\t':
|
||||
string_append_strc(& result, txt("→"));
|
||||
strbuilder_append_str(& result, txt("→"));
|
||||
break;
|
||||
case '\n':
|
||||
string_append_strc(& result, txt("↵"));
|
||||
strbuilder_append_str(& result, txt("↵"));
|
||||
break;
|
||||
case '\r':
|
||||
string_append_strc(& result, txt("⏎"));
|
||||
strbuilder_append_str(& result, txt("⏎"));
|
||||
break;
|
||||
case '\v':
|
||||
string_append_strc(& result, txt("⇕"));
|
||||
strbuilder_append_str(& result, txt("⇕"));
|
||||
break;
|
||||
case '\f':
|
||||
string_append_strc(& result, txt("⌂"));
|
||||
strbuilder_append_str(& result, txt("⌂"));
|
||||
break;
|
||||
default:
|
||||
string_append_char(& result, * c);
|
||||
strbuilder_append_char(& result, * c);
|
||||
break;
|
||||
}
|
||||
return string_to_strc(result);
|
||||
return strbuilder_to_str(result);
|
||||
}
|
||||
|
||||
// Represents strings cached with the string table.
|
||||
// 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.
|
||||
typedef HashTable(StringCached) StringTable;
|
||||
|
Reference in New Issue
Block a user