From f3b5e90ddc97fd4a571e99114b253a3bd29b94b8 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Sun, 9 Apr 2023 14:51:37 -0400 Subject: [PATCH] Gutting test code, going to be just doing it proeprly when the library upfornt api is done. --- test/Array.cpp | 3 - test/Array.hpp | 660 ------------------------------------- test/c99/meson.build | 8 +- test/c99/table.h | 2 +- test/gen/meson.build | 2 +- test/math.hpp | 86 ----- test/meson.build | 8 +- test/test.cpp | 16 +- test/test.singleheader.cpp | 0 9 files changed, 15 insertions(+), 770 deletions(-) delete mode 100644 test/Array.cpp delete mode 100644 test/Array.hpp delete mode 100644 test/math.hpp delete mode 100644 test/test.singleheader.cpp diff --git a/test/Array.cpp b/test/Array.cpp deleted file mode 100644 index 6ffa06c..0000000 --- a/test/Array.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include Array.cpp - - diff --git a/test/Array.hpp b/test/Array.hpp deleted file mode 100644 index 0c0183f..0000000 --- a/test/Array.hpp +++ /dev/null @@ -1,660 +0,0 @@ -/* - This is based of the array container implementation in the zpl.h library. - - This specific header has two implementations of the array generator; - One showing use of the gen api directly, the other using it's DSL. -*/ - -#pragma once - -#include "Bloat.hpp" -#include "gen.hpp" - -#ifdef gen_time - Code gen__array_base() - { -# ifndef GEN_DEFINE_DSL - using namespace gen; - - Code t_allocator = def_type( txt(allocator) ); - - Code header; - { - Code num = def_variable( t_uw, "Num" ); - Code capacity = def_variable( t_uw, "Capacity" ); - Code allocator_var = def_variable( t_allocator, "Allocator" ); - Code header_body = def_struct_body( 3, num, capacity, allocator_var ); - - header = def_struct( "ArrayHeader", header_body ); - } - - Code grow_formula; - { - Code spec = def_specifiers(1, ESpecifier::Inline); - Code params = def_params(1, t_uw, "value" ); - Code body = untyped_str( txt( return 2 * value * 8; ) ); - - grow_formula = def_function( "grow_formula", spec, params, t_sw, body ); - } - - Code body = def_struct_body(2, header, grow_formula); - Code ArrayBase = def_struct( "ArrayBase", body ); - -# else - Code t_allocator = type( allocator ); - - Code Header; - { - Code Num = variable( uw, Num, ); - Code Capacity = variable( uw, Capacity ); - Code Allocator = variable( allocator, Allocator ); - Code body = struct_body( Num, Capacity, Allocator ); - - Header = struct( Header, __, __, body ); - } - - Code test = params( uw, value ); - - Code grow_formula = function( grow_formula, params( uw, value ), uw, spec_inline, - code_str( return 2 * value * 8 ) - ); - - Code ArrayBase = struct( ArrayBase, __, __, struct_body( Header, grow_formula ) ); -# endif - - return ArrayBase; - } - - Code gen__array( char const* type_str, s32 type_size, Code parent ) - { -# ifndef GEN_DEFINE_DSL - // Make these global consts to be accessed anywhere... - Code t_allocator = def_type( txt(allocator) ); - - Code v_nullptr = untyped_str( "nullptr" ); - - Code spec_ct = def_specifiers(1, ESpecifier::Constexpr ); - - Code type = def_type( type_str ); - Code ptr_type = def_type( bprintf( "%s*", type_str ) ); - Code ref_type = def_type( bprintf( "%s&", type_str ) ); - - // From ArrayBase - Code t_header = def_type( "Header" ); - Code ptr_header = def_type( "Header*" ); - Code ref_header = def_type( "Header&" ); - - Code array_def; - { - Code using_type = def_using( "Type", type ); - Code data = def_variable( ptr_type, "Data" ); - - // This getter is used often in all the member procedures - Code header = def_variable( ref_header, "header", untyped_str( txt( get_header() ))); - - Code init; - { - Code params = def_params( 1, t_allocator, "mem_handler" ); - Code body = untyped_str( txt( return init_reserve( mem_handler, grow_formula(0) ); ) ); - - init = def_function( "init", UnusedCode, params, t_bool, body ); - } - - Code init_reserve; - { - Code params = def_params( 2, t_allocator, "mem_handler", t_sw, "capacity" ); - Code body; - { - Code header_value = untyped_str( txt( - rcast( Header*, alloc( mem_handler, sizeof( Header ) + sizeof(Type) + capacity )) - )); - - Code header = def_variable( ptr_header, "header", header_value ); - - Code null_check = untyped_str( txt( - if (header == nullptr) - return false; - )); - - Code header_init = untyped_str( txt( - header->Num = 0; - header->Capacity = capacity; - header->Allocator = mem_handler; - )); - - Code assign_data = untyped_fmt( - "Data = rcast( %s, header + 1 );", ptr_type - ); - - Code ret_true = untyped_str( txt( - return true - )); - - body = def_function_body( 5 - , header - , null_check - , header_init - , assign_data - , ret_true - ); - } - - init_reserve = def_function( "init_reserve", UnusedCode, params, t_bool, body ); - } - - Code free; - { - Code body = untyped_str( txt( - Header& header = get_header(); - ::free( header.Allocator, & get_header() ); - )); - - free = def_function( "free", UnusedCode, UnusedCode, t_void, body ); - } - - Code append = make_function( "append" ); - { - append->add( def_params( 1, type, "value") ); - append->add( t_bool ); - - Code - body = append.body(); - body->add( - untyped_str( txt( - if ( header.Capacity < header.Num + 1 ) - if ( ! grow(0) ) - return false; - )) - ); - - body->add( untyped_str( txt( - Data[ header.Num ] = value; - header.Num++; - - return true; - ))); - - append->check(); - } - - Code back; - { - Code body = untyped_str( txt( - Header& header = get_header(); - - return data[ header.Num - 1 ]; - )); - - back = def_function( "back", UnusedCode, UnusedCode, type, body ); - } - - Code clear; - { - Code body = untyped_str( txt( get_header().Num = 0; )); - - clear = def_function( "clear", UnusedCode, UnusedCode, t_void, body ); - } - - Code fill; - { - Code params = def_params( 3, t_uw, "begin", t_uw, "end", type, "value" ); - Code body; - { - Code check = untyped_str( txt( - if ( begin < 0 || end >= header.Num ) - fatal( "Range out of bounds" ); - )); - - Code iter = untyped_str( txt( - for ( sw index = begin; index < end; index++ ) - Data[index] = vallue; - )); - - body = def_function_body( 3, header, check, iter ); - } - - fill = def_function( "fill", UnusedCode, params, t_void, body ); - } - - Code get_header; - { - Code body = untyped_str( txt( return pcast( Header, Data - 1 ); )); - - get_header = def_function( "get_header", spec_inline, UnusedCode, ref_header, body ); - } - - Code grow; - { - Code param = def_params( 1, t_uw, "min_capacity" ); - Code body; - { - Code new_capacity = def_variable( t_uw, "new_capacity", untyped_str("grow_formula( header.Capacity )") ); - - Code check_n_set = untyped_str( txt( - if ( new_capacity < min_capacity ) - new_capacity = min_capacity; - )); - - Code ret = untyped_str( "return set_capacity( new_capacity );" ); - - body = def_function_body( 4, header, new_capacity, check_n_set, ret ); - } - - grow = def_function( "grow", UnusedCode, param, t_bool, body ); - } - - Code pop; - { - Code body; - { - Code assertion = untyped_str( "assert( header.Num > 0 );" ); - Code decrement = untyped_str( "header.Num--; " ); - - body = def_function_body( 3, header, assertion, decrement ); - } - - pop = def_function( "pop", UnusedCode, UnusedCode, t_void, body ); - } - - Code reserve; - { - Code params = def_params( 1, t_uw, "new_capacity" ); - Code body; - { - Code check_n_set = untyped_str( - "if ( header.Capacity < new_capacity )" - "\n" "return set_capacity( new_capacity );" - ); - - Code ret = untyped_str( "\t" "return true" ); - - body = def_function_body( 3, header, check_n_set, ret ); - } - - reserve = def_function( "reserve", UnusedCode, params, t_bool, body ); - } - - Code resize; - { - Code param = def_params( 1, t_uw, "new_num" ); - - Code body; - { - Code check_n_grow = untyped_str( txt( - if ( header.Capacity < new_num ) - if ( ! grow( new_num) ) - return false; - )); - - Code set_n_ret = untyped_str( - "header.Count = new_num;" - "\n""return true;" - ); - - body = def_function_body( 3, header, check_n_grow, set_n_ret ); - } - - resize = def_function( "resize", UnusedCode, param, t_bool, body ); - } - - Code set_capacity = parse_proc( txt_with_length( - bool set_capacity( sw new_capacity ) - { - Header& header = get_header(); - - if ( capacity == header.Capacity ) - return true; - - if ( capacity < header.Num ) - header.Num = capacity; - - sw size = sizeof(Header) + sizeof(Type) * capacity; - Header* new_header = rcast( Header* alloc( header.Allocator, size )); - - if ( new_header == nullptr ) - return false; - - memmove( new_header, & header, sizeof( Header ) + sizeof(Type) * header.Num ); - - new_header->Allocator = header.Allocator; - new_header->Num = header.Num; - new_header->Capacity = header.Capacity; - - free( header ); - - *Data = new_header + 1; - - return true; - } - )); - - string name = bprintf( "Array_%s", type_str ); - - Code body = def_struct_body( 15 - , using_type - , data - - , init - , init_reserve - , append - , back - , clear - , fill - , free - , get_header - , grow - , pop - , reserve - , resize - , set_capacity - ); - - array_def = def_struct( name, body, parent ); - } -# else - type( allocator ); - - Code v_nullptr = code_str( nullptr ); - - Code t_elem_type = def_type( type_str ); - Code t_ptr_type = def_type( type_str, spec_ptr ); - Code t_ref_type = type_fmt( type_str, spec_ref ); - - - // From ArrayBase - Code t_Header = type( Header ); - Code t_ref_Header = type( ref_Header, spec_ref ); - Code t_ptr_Header = type( ptr_Header, spec_ptr ); - -# pragma push_macro("rcast") -# undef rcast - Code array_def; - { - Code Type = using( Type, elem_type ); - - Code Data = variable( ptr_type, Data ); - Code header = variable( ref_Header, header, code_str(get_header()) ); - - Code init; - { - Code body = function_body( code_str( - return init_reserve( mem_handler, grow_formula(0) ); - )); - - init = function( init, params( allocator, mem_handler ), bool, __, body ); - } - - make( function, init_reserve, params( ref_type, mem_handler ), bool, __); - { - Code - body = init_reserve.body(); - body->add( variable( ptr_Header, header, - code_str( rcast( Header*, alloc( mem_handler, sizeof(Header) + sizeof(Type) + capacity)) ) - ) ); - - body->add( code_str( - if (header == nullptr) - return false; - )); - - body->add( code_str( - header->Num = 0; - header->Capacity = capacity; - header->Allocator = mem_handler; - )); - - body->add( code_str( - Data = rcast( Type*, header + 1 ); - return true; - )); - } - - Code free = function( free, __, void, __, code_str( - Header& header = get_header(); - - free( header.Allocator, & get_header() ); - )); - - make( function, append ) - { - append->add( params( elem_type, value) ); - append->add( type( void ) ); - - Code - body = append.body(); - body->add( code_str( - if ( header.Capacity < header.Num + 1 ) - if ( ! grow(0) ) - return false; - )); - - body->add( code_str( - Data[ header.Num ] = value; - header.Num++; - - return true; - )); - } - - Code back; - { - Code body = code_str( - Header& header = get_header(); - - return data[ header.Num - 1 ]; - ); - - back = function( back, __, elem_type, __, body ); - } - - Code clear; - function( clear, __, t_void, __, untyped_str("get_header().Num = 0;") ); - - Code fill; - { - Code check = code_str( - if ( begin < 0 || end >= header.Num ) - fatal( "Range out of bounds" ); - ); - - Code iter = code_str( - for ( sw index = begin; index < end; index++ ) - Data[index] = vallue; - ); - - Code body = function_body( header, check, iter ); - - fill = function( fill, params( uw, begin, uw, end, elem_type, value ), void, __, body ); - } - - Code get_header; - function( get_header, __, ref_Header, spec_inline, code_str( return pcast( Header, Data - 1); ) ); - - Code test = function( test, __, void, __, __ ); - - Code grow; - { - Code body; - { - variable( uw, new_capacity, code_str( grow_formula( header.Capacity) )); - - Code check_n_set = code_str( - if ( new_capacity < min_capacity ) - new_capacity = min_capacity; - ); - - Code ret = code_str( return set_capacity( new_capacity ); ); - - body = function_body( header, new_capacity, check_n_set, ret ); - } - - grow = function( grow, params( uw, min_capacity ), bool, body ); - } - - Code pop; - { - Code assertion = code_str( assert( header.Num > 0 ); ); - Code decrement = code_str( header.Num--; ); - - Code body = function_body( header, assertion, decrement ); - - pop = function( pop, __, void, __, body ); - } - - Code reserve; - { - Code check_n_set = code_str( - if ( header.Capacity < new_capacity ) - return set_capacity( new_capacity ); - ); - - Code ret = code_str( return true ); - - Code body = function_body( header, check_n_set, ret ); - - reserve = function( reserve, params( uw, new_capacity ), bool, __, body ); - } - - Code resize; - { - Code body; - { - Code check_n_grow = code_str( - if ( header.Capacity < new_num ) - if ( ! grow( new_num) ) - return false; - ); - - Code set_n_ret = code_str( - header.Count = new_num; - return true; - ); - - body = function_body( header, check_n_grow, set_n_ret ); - } - - resize = function( resize, params( uw, new_num ), bool, __, body ); - } - - Code set_capacity = function_code( - bool set_capacity( new_capacity ) - { - Header& header = get_header(); - - if ( capacity == header.Capacity ) - return true; - - if ( capacity < header.Num ) - header.Num = capacity; - - uw size = sizeof(Header) + sizeof(Type) * capacity; - Header* new_header = rcast( Header*, alloc( header.Allocator, size )); - - if ( new_header == nullptr ) - return false; - - memmove( new_header, & header, sizeof( Header ) + sizeof(Type) * header.Num ); - - new_header->Allocator = header.Allocator; - new_header->Num = header.Num; - new_header->Capacity = header.Capacity; - - free( header ); - - *Data = new_header + 1; - - return true; - } - ); - - char const* name = bprintf( "Array_%s", type_str ); - - Code body = struct_body( - Type - , Data - - , init - , init_reserve - , append - , back - , clear - , fill - , free - , get_header - , grow - , pop - , reserve - , resize - , set_capacity - ); - - array_def = struct( name, parent, body ); - } -# pragma pop_macro("rcast") -# endif - - return array_def; - } - - struct ArrayRequest - { - char const* Name; - sw Size; - }; - - array(ArrayRequest) UserArrayGenQueue; - - #define gen_array( Type_ ) add_gen_array_request( #Type_, sizeof(Type_) ) - - void add_gen_array_request( const char* type_str, sw type_size ) - { - ArrayRequest request = { type_str, type_size }; - - array_append( UserArrayGenQueue, request ); - } - - u32 gen_array_file() - { - Code a_base = gen__array_base(); - - add_gen_array_request( "u32", sizeof(u32) ); - gen_array( char const* ); - - array(Code) array_asts; - array_init( array_asts, g_allocator ); - - sw left = array_count( UserArrayGenQueue ); - sw index = 0; - while( left -- ) - { - ArrayRequest request = UserArrayGenQueue[index]; - - Code result = gen__array( request.Name, request.Size, a_base ); - - array_append( array_asts, result ); - } - - Builder - arraygen; - arraygen.open( "Array.gen.hpp" ); - - left = array_count( array_asts ); - index = 0; - - while( left-- ) - { - Code code = array_asts[index]; - - arraygen.print( code ); - } - - arraygen.write(); - return 0; - } -#endif - -#ifndef gen_time -# include "Array.gen.hpp" - -# define array( Type_ ) array_##Type_ -#endif diff --git a/test/c99/meson.build b/test/c99/meson.build index cd45b44..350c79b 100644 --- a/test/c99/meson.build +++ b/test/c99/meson.build @@ -2,10 +2,10 @@ project( 'test', 'c', default_options : ['buildtype=debug'] ) # add_global_arguments('-E', language : 'cpp') -includes = include_directories( - [ +includes = include_directories( + [ '../gen', - '../../singleheader' + '../../singleheader' ]) # get_sources = files('./get_sources.ps1') @@ -19,4 +19,6 @@ if get_option('buildtype').startswith('debug') endif +add_project_arguments('-Dgentime', language : ['c', 'cpp']) + executable( 'test_c99', sources, include_directories : includes ) diff --git a/test/c99/table.h b/test/c99/table.h index 6f7ec24..1165139 100644 --- a/test/c99/table.h +++ b/test/c99/table.h @@ -5,7 +5,7 @@ typedef u64(*)(void*) HashingFn; #if gen_time -# define gen_table( Type_, HashingFn_ ) gen_request_table( #Type_, sizeof(Type_), HashingFn_ ) +# define gen_table( Type_, HashingFn_ ) gen_request_table( #Type_, sizeof(Type_), HashingFn_ ) u64 table_default_hash_fn( void* address ) { diff --git a/test/gen/meson.build b/test/gen/meson.build index 03522e2..04d8f65 100644 --- a/test/gen/meson.build +++ b/test/gen/meson.build @@ -22,6 +22,6 @@ endif # add_project_arguments('-E', language : ['c', 'cpp']) # add_global_arguments( '-E', language : ['cpp']) - add_project_arguments('-Dgen_time', language : ['c', 'cpp']) +add_project_arguments('-Dgentime', language : ['c', 'cpp']) executable( 'gencpp', sources, include_directories : includes ) diff --git a/test/math.hpp b/test/math.hpp deleted file mode 100644 index a317673..0000000 --- a/test/math.hpp +++ /dev/null @@ -1,86 +0,0 @@ -#pragma once - -#include "Bloat.hpp" -#include "gen.hpp" - -#ifdef gen_time - using namespace gen; - - char* sprintf_buf[ZPL_PRINTF_MAXLEN]; - - /* - What it should generate: - - inline - type square( type value ) - { - return value * value; - } - */ - #define gen_square( Type_ ) gen__square( #Type_ ) - Code gen__square( char const* type ) - { - Code t_integral_type = def_type( type ); - - #ifndef GEN_DEFINE_DSL - string name = string_sprintf( g_allocator, (char*)sprintf_buf, ZPL_PRINTF_MAXLEN, "square", type ); - - #if 1 - Code square; - { - Code params = def_params( 1, integral_type, "value" ); - Code specifiers = def_specifiers( 1, SpecifierT::Inline ); - Code ret_stmt = untyped_str( txt( return value * value; )); - - square = def_function( name, specifiers, params, integral_type, ret_stmt ); - } - - #else - // Test of token template str. - char const* tmpl = txt( - {type} square( {type} value ) - { - return value * value; - } - ); - char const* gen_code = token_fmt( tmpl, 1, "type", type ); - - Code square = parse_function(gen_code, strlen(gen_code)); - #endif - - #else - Code square = function( square, params( integral_type, value), integral_type, __, - code_str(return value * value) - ); - #endif - - if ( ! square ) - fatal( "Failed to generate square function for: %s", type ); - - return square; - } - - u32 gen_math() - { - Code fadd_u8 = gen_square( u8 ); - Code fadd_u16 = gen_square( u16 ); - Code fadd_u32 = gen_square( u32 ); - Code fadd_u64 = gen_square( u64 ); - - Builder - mathgen; - mathgen.open( "math.gen.hpp" ); - mathgen.print( fadd_u8 ); - mathgen.print( fadd_u16 ); - mathgen.print( fadd_u32 ); - mathgen.print( fadd_u64 ); - mathgen.write(); - return 0; - } -#endif - -#ifndef gen_time -# include "math.gen.hpp" -# undef square - -#endif diff --git a/test/meson.build b/test/meson.build index b79b260..18c5f21 100644 --- a/test/meson.build +++ b/test/meson.build @@ -2,11 +2,11 @@ project( 'test', 'c', 'cpp', default_options : ['buildtype=debug'] ) # add_global_arguments('-E', language : 'cpp') -includes = include_directories( - [ +includes = include_directories( + [ './gen', '../project', - '../thirdparty' + '../thirdparty' ]) # get_sources = files('./get_sources.ps1') @@ -20,4 +20,6 @@ if get_option('buildtype').startswith('debug') endif +add_project_arguments('-Druntime', language : ['c', 'cpp']) + executable( 'testcpp', sources, include_directories : includes ) diff --git a/test/test.cpp b/test/test.cpp index 610155b..18d0fdf 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -1,9 +1,7 @@ #include "Bloat.cpp" -#include "math.hpp" -#include "Array.hpp" -#ifdef gen_time +#ifdef gentime #include "gen.cpp" int gen_main() @@ -15,23 +13,15 @@ int gen_main() gen::init(); - int - result = gen_math(); - // result = gen_array_file(); - Memory::cleanup(); return result; } #endif -#ifndef gen_time -#include "math.hpp" - +#ifdef runtime int main() { - u32 result = square( 5U ); - - zpl_printf("TEST RESULT: %d", result); + return 0; } #endif diff --git a/test/test.singleheader.cpp b/test/test.singleheader.cpp deleted file mode 100644 index e69de29..0000000