simon/post-scarcity
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Reformatted code; made paths in generated documentation relative.

Browse source
This commit is contained in:
Simon Brooke 2026-02-14 15:32:59 +00:00
parent 222368bf64
commit 08a7c4153c
24 changed files with 496 additions and 716 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doxyfile
View file

@ -162,7 +162,7 @@ FULL_PATH_NAMES = YES
# will be relative from the directory where doxygen is started. # will be relative from the directory where doxygen is started.
# This tag requires that the tag FULL_PATH_NAMES is set to YES. # This tag requires that the tag FULL_PATH_NAMES is set to YES.
STRIP_FROM_PATH = src/ STRIP_FROM_PATH = ../../
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
# path mentioned in the documentation of a class, which tells the reader which # path mentioned in the documentation of a class, which tells the reader which

4
docs/Home.md
View file

@ -6,6 +6,10 @@ Work towards the implementation of a software system like that described in [Pos
*Originally most of this documentation was on a wiki attached to the [GitHub project](https://github.com/simon-brooke/post-scarcity); when that was transferred to [my own foregejo instance](https://git.journeyman.cc/simon/post-scarcity) the wiki was copied. However, it's more convenient to keep documentation in the project with the source files, and version controlled in the same Git repository. So while both wikis still exist, they should no longer be considered canonical. The canonical version is in `/docs`, and is incorporated by [Doxygen](https://www.doxygen.nl/) into the generated documentation — which is generated into `/doc` using the command `make doc`.* *Originally most of this documentation was on a wiki attached to the [GitHub project](https://github.com/simon-brooke/post-scarcity); when that was transferred to [my own foregejo instance](https://git.journeyman.cc/simon/post-scarcity) the wiki was copied. However, it's more convenient to keep documentation in the project with the source files, and version controlled in the same Git repository. So while both wikis still exist, they should no longer be considered canonical. The canonical version is in `/docs`, and is incorporated by [Doxygen](https://www.doxygen.nl/) into the generated documentation — which is generated into `/doc` using the command `make doc`.*
## State of Play
You can read about the current [state of play](md_home_2simon_2workspace_2post-scarcity_2docs_2state-of-play.html).
## AWFUL WARNING 1 ## AWFUL WARNING 1
This does not work. It isn't likely to work any time soon. If you want to learn Lisp, don't start here; try Clojure, Scheme or Common Lisp (in which case I recommend Steel Bank Common Lisp). If you want to learn how Lisp works, still don't start here. This isn't ever going to be anything like a conventional Lisp environment. This does not work. It isn't likely to work any time soon. If you want to learn Lisp, don't start here; try Clojure, Scheme or Common Lisp (in which case I recommend Steel Bank Common Lisp). If you want to learn how Lisp works, still don't start here. This isn't ever going to be anything like a conventional Lisp environment.

91
src/arith/integer.c
View file

@ -90,10 +90,11 @@ struct cons_pointer make_integer( int64_t value, struct cons_pointer more ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
debug_print( L"Entering make_integer\n", DEBUG_ALLOC ); debug_print( L"Entering make_integer\n", DEBUG_ALLOC );
if ( integerp(more) && (pointer2cell( more ).payload.integer.value < 0)) if ( integerp( more )
{ && ( pointer2cell( more ).payload.integer.value < 0 ) ) {
printf("WARNING: negative value %" PRId64 " passed as `more` to `make_integer`\n", printf( "WARNING: negative value %" PRId64
pointer2cell( more ).payload.integer.value); " passed as `more` to `make_integer`\n",
pointer2cell( more ).payload.integer.value );
} }
if ( integerp( more ) || nilp( more ) ) { if ( integerp( more ) || nilp( more ) ) {
@ -128,20 +129,23 @@ struct cons_pointer make_integer( int64_t value, struct cons_pointer more ) {
struct cons_pointer acquire_integer( int64_t value, struct cons_pointer more ) { struct cons_pointer acquire_integer( int64_t value, struct cons_pointer more ) {
struct cons_pointer result; struct cons_pointer result;
if ( !nilp( more) || value < 0 || value >= SMALL_INT_LIMIT) { if ( !nilp( more ) || value < 0 || value >= SMALL_INT_LIMIT ) {
debug_print( L"acquire_integer passing to make_integer (outside small int range)\n", DEBUG_ALLOC ); debug_print
result = make_integer( value, more); ( L"acquire_integer passing to make_integer (outside small int range)\n",
DEBUG_ALLOC );
result = make_integer( value, more );
} else { } else {
if ( !small_int_cache_initialised) { if ( !small_int_cache_initialised ) {
for (int64_t i = 0; i < SMALL_INT_LIMIT; i++) { for ( int64_t i = 0; i < SMALL_INT_LIMIT; i++ ) {
small_int_cache[i] = make_integer( i, NIL); small_int_cache[i] = make_integer( i, NIL );
pointer2cell(small_int_cache[i]).count = UINT32_MAX; // lock it in so it can't be GC'd pointer2cell( small_int_cache[i] ).count = UINT32_MAX; // lock it in so it can't be GC'd
} }
small_int_cache_initialised = true; small_int_cache_initialised = true;
debug_print( L"small_int_cache initialised.\n", DEBUG_ALLOC ); debug_print( L"small_int_cache initialised.\n", DEBUG_ALLOC );
} }
debug_printf( DEBUG_ALLOC, L"acquire_integer: returning %" PRId64 "\n", value); debug_printf( DEBUG_ALLOC, L"acquire_integer: returning %" PRId64 "\n",
value );
result = small_int_cache[value]; result = small_int_cache[value];
} }
return result; return result;
@ -156,15 +160,17 @@ struct cons_pointer acquire_integer( int64_t value, struct cons_pointer more ) {
* *
* @param p a pointer, expected to be to an integer. * @param p a pointer, expected to be to an integer.
*/ */
void release_integer( struct cons_pointer p) { void release_integer( struct cons_pointer p ) {
struct cons_space_object o = pointer2cell( p); struct cons_space_object o = pointer2cell( p );
if ( !integerp( p) || // what I've been passed isn't an integer; if ( !integerp( p ) || // what I've been passed isn't an integer;
!nilp( o.payload.integer.more) || // or it's a bignum; !nilp( o.payload.integer.more ) || // or it's a bignum;
o.payload.integer.value >= SMALL_INT_LIMIT || // or it's bigger than the small int cache limit; o.payload.integer.value >= SMALL_INT_LIMIT || // or it's bigger than the small int cache limit;
!eq( p, small_int_cache[ o.payload.integer.value]) // or it's simply not the copy in the cache... !eq( p, small_int_cache[o.payload.integer.value] ) // or it's simply not the copy in the cache...
) { dec_ref( p); } else { ) {
dec_ref( p );
} else {
debug_printf( DEBUG_ALLOC, L"release_integer: releasing %" PRId64 "\n", debug_printf( DEBUG_ALLOC, L"release_integer: releasing %" PRId64 "\n",
o.payload.integer.value); o.payload.integer.value );
} }
} }
@ -200,7 +206,7 @@ __int128_t int128_to_integer( __int128_t val,
} }
struct cons_space_object *newc = &pointer2cell( new ); struct cons_space_object *newc = &pointer2cell( new );
newc->payload.integer.value = (int64_t)val; newc->payload.integer.value = ( int64_t ) val;
if ( integerp( less_significant ) ) { if ( integerp( less_significant ) ) {
struct cons_space_object *lsc = &pointer2cell( less_significant ); struct cons_space_object *lsc = &pointer2cell( less_significant );
@ -239,7 +245,7 @@ struct cons_pointer add_integers( struct cons_pointer a,
while ( !nilp( a ) || !nilp( b ) || carry != 0 ) { while ( !nilp( a ) || !nilp( b ) || carry != 0 ) {
__int128_t av = cell_value( a, '+', is_first_cell ); __int128_t av = cell_value( a, '+', is_first_cell );
__int128_t bv = cell_value( b, '+', is_first_cell ); __int128_t bv = cell_value( b, '+', is_first_cell );
__int128_t rv = (av + bv) + carry; __int128_t rv = ( av + bv ) + carry;
debug_print( L"add_integers: av = ", DEBUG_ARITH ); debug_print( L"add_integers: av = ", DEBUG_ARITH );
debug_print_128bit( av, DEBUG_ARITH ); debug_print_128bit( av, DEBUG_ARITH );
@ -251,8 +257,9 @@ struct cons_pointer add_integers( struct cons_pointer a,
debug_print_128bit( rv, DEBUG_ARITH ); debug_print_128bit( rv, DEBUG_ARITH );
debug_print( L"\n", DEBUG_ARITH ); debug_print( L"\n", DEBUG_ARITH );
if ( carry == 0 && ( rv >= 0 || rv < SMALL_INT_LIMIT)) { if ( carry == 0 && ( rv >= 0 || rv < SMALL_INT_LIMIT ) ) {
result = acquire_integer( (int64_t)(rv & 0xffffffff), NIL); result =
acquire_integer( ( int64_t ) ( rv & 0xffffffff ), NIL );
break; break;
} else { } else {
struct cons_pointer new = make_integer( 0, NIL ); struct cons_pointer new = make_integer( 0, NIL );
@ -281,7 +288,7 @@ struct cons_pointer add_integers( struct cons_pointer a,
struct cons_pointer base_partial( int depth ) { struct cons_pointer base_partial( int depth ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
debug_printf( DEBUG_ARITH, L"base_partial: depth = %d\n", depth); debug_printf( DEBUG_ARITH, L"base_partial: depth = %d\n", depth );
for ( int i = 0; i < depth; i++ ) { for ( int i = 0; i < depth; i++ ) {
result = acquire_integer( 0, result ); result = acquire_integer( 0, result );
@ -299,15 +306,15 @@ struct cons_pointer base_partial( int depth ) {
* numbering system here is base INT_CELL_BASE, currently x0fffffffffffffffL * numbering system here is base INT_CELL_BASE, currently x0fffffffffffffffL
*/ */
struct cons_pointer append_cell( struct cons_pointer partial, struct cons_pointer append_cell( struct cons_pointer partial,
struct cons_pointer digit ) { struct cons_pointer digit ) {
struct cons_space_object cell = pointer2cell( partial); struct cons_space_object cell = pointer2cell( partial );
// TODO: I should recursively copy the whole bignum chain, because // TODO: I should recursively copy the whole bignum chain, because
// we're still destructively modifying the end of it. // we're still destructively modifying the end of it.
struct cons_pointer c = make_integer( cell.payload.integer.value, struct cons_pointer c = make_integer( cell.payload.integer.value,
cell.payload.integer.more); cell.payload.integer.more );
struct cons_pointer result = partial; struct cons_pointer result = partial;
if ( nilp( partial)) { if ( nilp( partial ) ) {
result = digit; result = digit;
} else { } else {
// find the last digit in the chain... // find the last digit in the chain...
@ -376,9 +383,10 @@ struct cons_pointer multiply_integers( struct cons_pointer a,
/* if xj exceeds one digit, break it into the digit dj and /* if xj exceeds one digit, break it into the digit dj and
* the carry */ * the carry */
carry = xj >> INTEGER_BIT_SHIFT; carry = xj >> INTEGER_BIT_SHIFT;
struct cons_pointer dj = acquire_integer( xj & MAX_INTEGER, NIL ); struct cons_pointer dj =
acquire_integer( xj & MAX_INTEGER, NIL );
replace_integer_p( ri, append_cell( ri, dj )); replace_integer_p( ri, append_cell( ri, dj ) );
// struct cons_pointer new_ri = append_cell( ri, dj ); // struct cons_pointer new_ri = append_cell( ri, dj );
// release_integer( ri); // release_integer( ri);
// ri = new_ri; // ri = new_ri;
@ -387,7 +395,7 @@ struct cons_pointer multiply_integers( struct cons_pointer a,
/* if carry is not equal to zero, append it as a final cell /* if carry is not equal to zero, append it as a final cell
* to ri */ * to ri */
if ( carry != 0 ) { if ( carry != 0 ) {
replace_integer_i( ri, carry) replace_integer_i( ri, carry )
} }
/* add ri to result */ /* add ri to result */
@ -412,14 +420,16 @@ struct cons_pointer multiply_integers( struct cons_pointer a,
struct cons_pointer integer_to_string_add_digit( int digit, int digits, struct cons_pointer integer_to_string_add_digit( int digit, int digits,
struct cons_pointer tail ) { struct cons_pointer tail ) {
wint_t character = btowc( hex_digits[digit] ); wint_t character = btowc( hex_digits[digit] );
debug_printf( DEBUG_IO, L"integer_to_string_add_digit: digit is %d, digits is %d; returning: ", digit, digits); debug_printf( DEBUG_IO,
struct cons_pointer r = ( digits % 3 == 0 ) ? L"integer_to_string_add_digit: digit is %d, digits is %d; returning: ",
make_string( L',', make_string( character, digit, digits );
tail ) ) : struct cons_pointer r =
( digits % 3 == 0 ) ? make_string( L',', make_string( character,
tail ) ) :
make_string( character, tail ); make_string( character, tail );
debug_print_object( r, DEBUG_IO); debug_print_object( r, DEBUG_IO );
debug_println( DEBUG_IO); debug_println( DEBUG_IO );
return r; return r;
} }
@ -460,7 +470,8 @@ struct cons_pointer integer_to_string( struct cons_pointer int_pointer,
while ( accumulator > 0 || !nilp( next ) ) { while ( accumulator > 0 || !nilp( next ) ) {
if ( accumulator < MAX_INTEGER && !nilp( next ) ) { if ( accumulator < MAX_INTEGER && !nilp( next ) ) {
accumulator += accumulator +=
( pointer2cell( next ).payload.integer.value % INT_CELL_BASE ); ( pointer2cell( next ).payload.integer.value %
INT_CELL_BASE );
next = pointer2cell( next ).payload.integer.more; next = pointer2cell( next ).payload.integer.more;
} }
int offset = ( int ) ( accumulator % base ); int offset = ( int ) ( accumulator % base );

2
src/arith/integer.h
View file

@ -21,7 +21,7 @@ struct cons_pointer make_integer( int64_t value, struct cons_pointer more );
struct cons_pointer acquire_integer( int64_t value, struct cons_pointer more ); struct cons_pointer acquire_integer( int64_t value, struct cons_pointer more );
void release_integer( struct cons_pointer p); void release_integer( struct cons_pointer p );
struct cons_pointer add_integers( struct cons_pointer a, struct cons_pointer add_integers( struct cons_pointer a,
struct cons_pointer b ); struct cons_pointer b );

24
src/arith/ratio.c
View file

@ -65,7 +65,8 @@ struct cons_pointer simplify_ratio( struct cons_pointer pointer ) {
result = acquire_integer( ddrv / gcd, NIL ); result = acquire_integer( ddrv / gcd, NIL );
} else { } else {
debug_printf( DEBUG_ARITH, debug_printf( DEBUG_ARITH,
L"simplify_ratio: %ld/%ld => %ld/%ld\n", ddrv, drrv, ddrv/gcd, drrv/gcd); L"simplify_ratio: %ld/%ld => %ld/%ld\n",
ddrv, drrv, ddrv / gcd, drrv / gcd );
result = result =
make_ratio( acquire_integer( ddrv / gcd, NIL ), make_ratio( acquire_integer( ddrv / gcd, NIL ),
acquire_integer( drrv / gcd, NIL ) ); acquire_integer( drrv / gcd, NIL ) );
@ -126,8 +127,12 @@ struct cons_pointer add_ratio_ratio( struct cons_pointer arg1,
r = add_ratio_ratio( r1, r2 ); r = add_ratio_ratio( r1, r2 );
if (!eq( r, r1)) { dec_ref( r1);} if ( !eq( r, r1 ) ) {
if (!eq( r, r2)) { dec_ref( r2);} dec_ref( r1 );
}
if ( !eq( r, r2 ) ) {
dec_ref( r2 );
}
/* because the references on dd1vm, dr1vm, dd2vm and dr2vm were /* because the references on dd1vm, dr1vm, dd2vm and dr2vm were
* never incremented except when making r1 and r2, decrementing * never incremented except when making r1 and r2, decrementing
@ -238,12 +243,11 @@ struct cons_pointer multiply_ratio_ratio( struct
struct cons_pointer dividend = acquire_integer( ddrv, NIL ); struct cons_pointer dividend = acquire_integer( ddrv, NIL );
struct cons_pointer divisor = acquire_integer( drrv, NIL ); struct cons_pointer divisor = acquire_integer( drrv, NIL );
struct cons_pointer unsimplified = struct cons_pointer unsimplified = make_ratio( dividend, divisor );
make_ratio( dividend, divisor);
result = simplify_ratio( unsimplified ); result = simplify_ratio( unsimplified );
release_integer( dividend); release_integer( dividend );
release_integer( divisor); release_integer( divisor );
if ( !eq( unsimplified, result ) ) { if ( !eq( unsimplified, result ) ) {
dec_ref( unsimplified ); dec_ref( unsimplified );
@ -320,8 +324,10 @@ struct cons_pointer make_ratio( struct cons_pointer dividend,
cell->payload.ratio.dividend = dividend; cell->payload.ratio.dividend = dividend;
cell->payload.ratio.divisor = divisor; cell->payload.ratio.divisor = divisor;
result = simplify_ratio( unsimplified); result = simplify_ratio( unsimplified );
if ( !eq( result, unsimplified)) { dec_ref( unsimplified); } if ( !eq( result, unsimplified ) ) {
dec_ref( unsimplified );
}
} else { } else {
result = result =
throw_exception( c_string_to_lisp_string throw_exception( c_string_to_lisp_string

151
src/init.c
View file

@ -45,19 +45,20 @@
* @param location_descriptor a description of where the pointer was caught. * @param location_descriptor a description of where the pointer was caught.
* @return struct cons_pointer * @return struct cons_pointer
*/ */
struct cons_pointer check_exception( struct cons_pointer pointer, char * location_descriptor) { struct cons_pointer check_exception( struct cons_pointer pointer,
char *location_descriptor ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
struct cons_space_object * object = &pointer2cell( pointer); struct cons_space_object *object = &pointer2cell( pointer );
if ( exceptionp( pointer)) { if ( exceptionp( pointer ) ) {
fprintf( stderr, "ERROR: Exception at %s: ", location_descriptor); fprintf( stderr, "ERROR: Exception at %s: ", location_descriptor );
URL_FILE *ustderr = file_to_url_file( stderr ); URL_FILE *ustderr = file_to_url_file( stderr );
fwide( stderr, 1 ); fwide( stderr, 1 );
print( ustderr, object->payload.exception.payload ); print( ustderr, object->payload.exception.payload );
free( ustderr ); free( ustderr );
dec_ref( pointer); dec_ref( pointer );
} else { } else {
result = pointer; result = pointer;
} }
@ -68,21 +69,21 @@ struct cons_pointer check_exception( struct cons_pointer pointer, char * locatio
struct cons_pointer init_name_symbol = NIL; struct cons_pointer init_name_symbol = NIL;
struct cons_pointer init_primitive_symbol = NIL; struct cons_pointer init_primitive_symbol = NIL;
void maybe_bind_init_symbols() { void maybe_bind_init_symbols( ) {
if ( nilp( init_name_symbol)) { if ( nilp( init_name_symbol ) ) {
init_name_symbol = c_string_to_lisp_keyword( L"name" ); init_name_symbol = c_string_to_lisp_keyword( L"name" );
} }
if ( nilp( init_primitive_symbol)) { if ( nilp( init_primitive_symbol ) ) {
init_primitive_symbol = c_string_to_lisp_keyword( L"primitive" ); init_primitive_symbol = c_string_to_lisp_keyword( L"primitive" );
} }
if ( nilp( privileged_symbol_nil)) { if ( nilp( privileged_symbol_nil ) ) {
privileged_symbol_nil = c_string_to_lisp_symbol( L"nil"); privileged_symbol_nil = c_string_to_lisp_symbol( L"nil" );
} }
} }
void free_init_symbols() { void free_init_symbols( ) {
dec_ref( init_name_symbol); dec_ref( init_name_symbol );
dec_ref( init_primitive_symbol); dec_ref( init_primitive_symbol );
} }
/** /**
@ -92,20 +93,22 @@ void free_init_symbols() {
* the name on the source pointer. Would make stack frames potentially * the name on the source pointer. Would make stack frames potentially
* more readable and aid debugging generally. * more readable and aid debugging generally.
*/ */
struct cons_pointer bind_function( wchar_t *name, struct cons_pointer ( *executable ) struct cons_pointer bind_function( wchar_t *name,
( struct stack_frame *, struct cons_pointer ( *executable )
struct cons_pointer, struct cons_pointer ) ) { ( struct stack_frame *,
struct cons_pointer,
struct cons_pointer ) ) {
struct cons_pointer n = c_string_to_lisp_symbol( name ); struct cons_pointer n = c_string_to_lisp_symbol( name );
struct cons_pointer meta = struct cons_pointer meta =
make_cons( make_cons( init_primitive_symbol, TRUE ), make_cons( make_cons( init_primitive_symbol, TRUE ),
make_cons( make_cons( init_name_symbol, n ), make_cons( make_cons( init_name_symbol, n ),
NIL ) ); NIL ) );
struct cons_pointer r = check_exception( struct cons_pointer r =
deep_bind( n, make_function( meta, executable ) ), check_exception( deep_bind( n, make_function( meta, executable ) ),
"bind_function"); "bind_function" );
dec_ref( n); dec_ref( n );
return r; return r;
} }
@ -114,20 +117,21 @@ struct cons_pointer bind_function( wchar_t *name, struct cons_pointer ( *executa
* Bind this compiled `executable` function, as a Lisp special form, to * Bind this compiled `executable` function, as a Lisp special form, to
* this `name` in the `oblist`. * this `name` in the `oblist`.
*/ */
struct cons_pointer bind_special( wchar_t *name, struct cons_pointer ( *executable ) struct cons_pointer bind_special( wchar_t *name,
( struct stack_frame *, struct cons_pointer ( *executable )
struct cons_pointer, struct cons_pointer ) ) { ( struct stack_frame *, struct cons_pointer,
struct cons_pointer ) ) {
struct cons_pointer n = c_string_to_lisp_symbol( name ); struct cons_pointer n = c_string_to_lisp_symbol( name );
struct cons_pointer meta = struct cons_pointer meta =
make_cons( make_cons( init_primitive_symbol, TRUE ), make_cons( make_cons( init_primitive_symbol, TRUE ),
make_cons( make_cons( init_name_symbol, n), NIL ) ); make_cons( make_cons( init_name_symbol, n ), NIL ) );
struct cons_pointer r = struct cons_pointer r =
check_exception(deep_bind( n, make_special( meta, executable ) ), check_exception( deep_bind( n, make_special( meta, executable ) ),
"bind_special"); "bind_special" );
dec_ref( n); dec_ref( n );
return r; return r;
} }
@ -136,13 +140,13 @@ struct cons_pointer bind_special( wchar_t *name, struct cons_pointer ( *executab
* Bind this `value` to this `symbol` in the `oblist`. * Bind this `value` to this `symbol` in the `oblist`.
*/ */
struct cons_pointer struct cons_pointer
bind_symbol_value( struct cons_pointer symbol, struct cons_pointer value, bool lock) { bind_symbol_value( struct cons_pointer symbol, struct cons_pointer value,
struct cons_pointer r = check_exception( bool lock ) {
deep_bind( symbol, value ), struct cons_pointer r = check_exception( deep_bind( symbol, value ),
"bind_symbol_value"); "bind_symbol_value" );
if ( lock && !exceptionp( r)){ if ( lock && !exceptionp( r ) ) {
struct cons_space_object * cell = & pointer2cell( r); struct cons_space_object *cell = &pointer2cell( r );
cell->count = UINT32_MAX; cell->count = UINT32_MAX;
} }
@ -153,12 +157,13 @@ bind_symbol_value( struct cons_pointer symbol, struct cons_pointer value, bool l
/** /**
* Bind this `value` to this `name` in the `oblist`. * Bind this `value` to this `name` in the `oblist`.
*/ */
struct cons_pointer bind_value( wchar_t *name, struct cons_pointer value, bool lock ) { struct cons_pointer bind_value( wchar_t *name, struct cons_pointer value,
bool lock ) {
struct cons_pointer p = c_string_to_lisp_symbol( name ); struct cons_pointer p = c_string_to_lisp_symbol( name );
struct cons_pointer r = bind_symbol_value( p, value, lock); struct cons_pointer r = bind_symbol_value( p, value, lock );
dec_ref( p); dec_ref( p );
return r; return r;
} }
@ -173,7 +178,7 @@ void print_banner( ) {
* *
* @stream the stream to print to. * @stream the stream to print to.
*/ */
void print_options( FILE * stream ) { void print_options( FILE *stream ) {
fwprintf( stream, L"Expected options are:\n" ); fwprintf( stream, L"Expected options are:\n" );
fwprintf( stream, fwprintf( stream,
L"\t-d\tDump memory to standard out at end of run (copious!);\n" ); L"\t-d\tDump memory to standard out at end of run (copious!);\n" );
@ -201,7 +206,7 @@ int main( int argc, char *argv[] ) {
int option; int option;
bool dump_at_end = false; bool dump_at_end = false;
bool show_prompt = false; bool show_prompt = false;
char * infilename = NULL; char *infilename = NULL;
setlocale( LC_ALL, "" ); setlocale( LC_ALL, "" );
if ( io_init( ) != 0 ) { if ( io_init( ) != 0 ) {
@ -219,7 +224,7 @@ int main( int argc, char *argv[] ) {
print_options( stdout ); print_options( stdout );
exit( 0 ); exit( 0 );
break; break;
case 'i' : case 'i':
infilename = optarg; infilename = optarg;
break; break;
case 'p': case 'p':
@ -236,9 +241,9 @@ int main( int argc, char *argv[] ) {
} }
} }
initialise_cons_pages(); initialise_cons_pages( );
maybe_bind_init_symbols(); maybe_bind_init_symbols( );
if ( show_prompt ) { if ( show_prompt ) {
@ -254,7 +259,7 @@ int main( int argc, char *argv[] ) {
/* /*
* privileged variables (keywords) * privileged variables (keywords)
*/ */
bind_symbol_value( privileged_symbol_nil, NIL, true); bind_symbol_value( privileged_symbol_nil, NIL, true );
bind_value( L"t", TRUE, true ); bind_value( L"t", TRUE, true );
/* /*
@ -267,43 +272,49 @@ int main( int argc, char *argv[] ) {
fwide( stderr, 1 ); fwide( stderr, 1 );
fwide( sink->handle.file, 1 ); fwide( sink->handle.file, 1 );
FILE *infile = infilename == NULL ? stdin : fopen( infilename, "r"); FILE *infile = infilename == NULL ? stdin : fopen( infilename, "r" );
lisp_io_in = bind_value( C_IO_IN, make_read_stream( file_to_url_file(infile), lisp_io_in =
make_cons( make_cons bind_value( C_IO_IN,
( c_string_to_lisp_keyword make_read_stream( file_to_url_file( infile ),
( L"url" ), make_cons( make_cons
c_string_to_lisp_string ( c_string_to_lisp_keyword
( L"system:standard input" ) ), ( L"url" ),
NIL ) ), false ); c_string_to_lisp_string
lisp_io_out = bind_value( C_IO_OUT, ( L"system:standard input" ) ),
make_write_stream( file_to_url_file( stdout ), NIL ) ), false );
lisp_io_out =
bind_value( C_IO_OUT,
make_write_stream( file_to_url_file( stdout ),
make_cons( make_cons
( c_string_to_lisp_keyword
( L"url" ),
c_string_to_lisp_string
( L"system:standard output]" ) ),
NIL ) ), false );
bind_value( L"*log*",
make_write_stream( file_to_url_file( stderr ),
make_cons( make_cons make_cons( make_cons
( c_string_to_lisp_keyword ( c_string_to_lisp_keyword
( L"url" ), ( L"url" ),
c_string_to_lisp_string c_string_to_lisp_string
( L"system:standard output]" ) ), ( L"system:standard log" ) ),
NIL ) ), false); NIL ) ), false );
bind_value( L"*log*", make_write_stream( file_to_url_file( stderr ), bind_value( L"*sink*",
make_cons( make_cons make_write_stream( sink,
( c_string_to_lisp_keyword make_cons( make_cons
( L"url" ), ( c_string_to_lisp_keyword
c_string_to_lisp_string ( L"url" ),
( L"system:standard log" ) ), c_string_to_lisp_string
NIL ) ), false ); ( L"system:standard sink" ) ),
bind_value( L"*sink*", make_write_stream( sink, NIL ) ), false );
make_cons( make_cons
( c_string_to_lisp_keyword
( L"url" ),
c_string_to_lisp_string
( L"system:standard sink" ) ),
NIL ) ), false );
/* /*
* the default prompt * the default prompt
*/ */
prompt_name = bind_value( L"*prompt*", prompt_name = bind_value( L"*prompt*",
show_prompt ? c_string_to_lisp_symbol( L":: " ) : NIL, false ); show_prompt ? c_string_to_lisp_symbol( L":: " ) :
NIL, false );
/* /*
* primitive function operations * primitive function operations
*/ */
@ -377,7 +388,7 @@ int main( int argc, char *argv[] ) {
debug_print( L"Freeing oblist\n", DEBUG_BOOTSTRAP ); debug_print( L"Freeing oblist\n", DEBUG_BOOTSTRAP );
dec_ref( oblist ); dec_ref( oblist );
free_init_symbols(); free_init_symbols( );
summarise_allocation( ); summarise_allocation( );
curl_global_cleanup( ); curl_global_cleanup( );

14
src/io/fopen.c
View file

@ -99,7 +99,7 @@ static size_t write_callback( char *buffer,
} }
/* use to attempt to fill the read buffer up to requested number of bytes */ /* use to attempt to fill the read buffer up to requested number of bytes */
static int fill_buffer( URL_FILE * file, size_t want ) { static int fill_buffer( URL_FILE *file, size_t want ) {
fd_set fdread; fd_set fdread;
fd_set fdwrite; fd_set fdwrite;
fd_set fdexcep; fd_set fdexcep;
@ -181,7 +181,7 @@ static int fill_buffer( URL_FILE * file, size_t want ) {
} }
/* use to remove want bytes from the front of a files buffer */ /* use to remove want bytes from the front of a files buffer */
static int use_buffer( URL_FILE * file, size_t want ) { static int use_buffer( URL_FILE *file, size_t want ) {
/* sort out buffer */ /* sort out buffer */
if ( ( file->buffer_pos - want ) <= 0 ) { if ( ( file->buffer_pos - want ) <= 0 ) {
/* ditch buffer - write will recreate */ /* ditch buffer - write will recreate */
@ -255,7 +255,7 @@ URL_FILE *url_fopen( const char *url, const char *operation ) {
return file; return file;
} }
int url_fclose( URL_FILE * file ) { int url_fclose( URL_FILE *file ) {
int ret = 0; /* default is good return */ int ret = 0; /* default is good return */
switch ( file->type ) { switch ( file->type ) {
@ -283,7 +283,7 @@ int url_fclose( URL_FILE * file ) {
return ret; return ret;
} }
int url_feof( URL_FILE * file ) { int url_feof( URL_FILE *file ) {
int ret = 0; int ret = 0;
switch ( file->type ) { switch ( file->type ) {
@ -304,7 +304,7 @@ int url_feof( URL_FILE * file ) {
return ret; return ret;
} }
size_t url_fread( void *ptr, size_t size, size_t nmemb, URL_FILE * file ) { size_t url_fread( void *ptr, size_t size, size_t nmemb, URL_FILE *file ) {
size_t want; size_t want;
switch ( file->type ) { switch ( file->type ) {
@ -343,7 +343,7 @@ size_t url_fread( void *ptr, size_t size, size_t nmemb, URL_FILE * file ) {
return want; return want;
} }
char *url_fgets( char *ptr, size_t size, URL_FILE * file ) { char *url_fgets( char *ptr, size_t size, URL_FILE *file ) {
size_t want = size - 1; /* always need to leave room for zero termination */ size_t want = size - 1; /* always need to leave room for zero termination */
size_t loop; size_t loop;
@ -390,7 +390,7 @@ char *url_fgets( char *ptr, size_t size, URL_FILE * file ) {
return ptr; /*success */ return ptr; /*success */
} }
void url_rewind( URL_FILE * file ) { void url_rewind( URL_FILE *file ) {
switch ( file->type ) { switch ( file->type ) {
case CFTYPE_FILE: case CFTYPE_FILE:
rewind( file->handle.file ); /* passthrough */ rewind( file->handle.file ); /* passthrough */

15
src/io/io.c
View file

@ -131,7 +131,7 @@ char *lisp_string_to_c_string( struct cons_pointer s ) {
* @param f the file to be wrapped; * @param f the file to be wrapped;
* @return the new handle, or null if no such handle could be allocated. * @return the new handle, or null if no such handle could be allocated.
*/ */
URL_FILE *file_to_url_file( FILE * f ) { URL_FILE *file_to_url_file( FILE *f ) {
URL_FILE *result = ( URL_FILE * ) malloc( sizeof( URL_FILE ) ); URL_FILE *result = ( URL_FILE * ) malloc( sizeof( URL_FILE ) );
if ( result != NULL ) { if ( result != NULL ) {
@ -148,7 +148,7 @@ URL_FILE *file_to_url_file( FILE * f ) {
* @param file the stream to read from; * @param file the stream to read from;
* @return the next wide character on the stream, or zero if no more. * @return the next wide character on the stream, or zero if no more.
*/ */
wint_t url_fgetwc( URL_FILE * input ) { wint_t url_fgetwc( URL_FILE *input ) {
wint_t result = -1; wint_t result = -1;
if ( ungotten != 0 ) { if ( ungotten != 0 ) {
@ -217,7 +217,7 @@ wint_t url_fgetwc( URL_FILE * input ) {
return result; return result;
} }
wint_t url_ungetwc( wint_t wc, URL_FILE * input ) { wint_t url_ungetwc( wint_t wc, URL_FILE *input ) {
wint_t result = -1; wint_t result = -1;
switch ( input->type ) { switch ( input->type ) {
@ -284,7 +284,7 @@ struct cons_pointer add_meta_string( struct cons_pointer meta, wchar_t *key,
} }
struct cons_pointer add_meta_time( struct cons_pointer meta, wchar_t *key, struct cons_pointer add_meta_time( struct cons_pointer meta, wchar_t *key,
time_t * value ) { time_t *value ) {
/* I don't yet have a concept of a date-time object, which is a /* I don't yet have a concept of a date-time object, which is a
* bit of an oversight! */ * bit of an oversight! */
char datestring[256]; char datestring[256];
@ -410,8 +410,7 @@ void collect_meta( struct cons_pointer stream, char *url ) {
*/ */
struct cons_pointer get_default_stream( bool inputp, struct cons_pointer env ) { struct cons_pointer get_default_stream( bool inputp, struct cons_pointer env ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
struct cons_pointer stream_name = struct cons_pointer stream_name = inputp ? lisp_io_in : lisp_io_out;
inputp ? lisp_io_in : lisp_io_out;
result = c_assoc( stream_name, env ); result = c_assoc( stream_name, env );
@ -509,8 +508,8 @@ lisp_read_char( struct stack_frame *frame, struct cons_pointer frame_pointer,
if ( readp( frame->arg[0] ) ) { if ( readp( frame->arg[0] ) ) {
result = result =
make_string( url_fgetwc make_string( url_fgetwc
( pointer2cell( frame->arg[0] ).payload.stream. ( pointer2cell( frame->arg[0] ).payload.
stream ), NIL ); stream.stream ), NIL );
} }
return result; return result;

18
src/io/print.c
View file

@ -32,7 +32,7 @@
* onto this `output`; if `pointer` does not indicate a string or symbol, * onto this `output`; if `pointer` does not indicate a string or symbol,
* don't print anything but just return. * don't print anything but just return.
*/ */
void print_string_contents( URL_FILE * output, struct cons_pointer pointer ) { void print_string_contents( URL_FILE *output, struct cons_pointer pointer ) {
while ( stringp( pointer ) || symbolp( pointer ) || keywordp( pointer ) ) { while ( stringp( pointer ) || symbolp( pointer ) || keywordp( pointer ) ) {
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
wchar_t c = cell->payload.string.character; wchar_t c = cell->payload.string.character;
@ -49,7 +49,7 @@ void print_string_contents( URL_FILE * output, struct cons_pointer pointer ) {
* the stream at this `output`, prepending and appending double quote * the stream at this `output`, prepending and appending double quote
* characters. * characters.
*/ */
void print_string( URL_FILE * output, struct cons_pointer pointer ) { void print_string( URL_FILE *output, struct cons_pointer pointer ) {
url_fputwc( btowc( '"' ), output ); url_fputwc( btowc( '"' ), output );
print_string_contents( output, pointer ); print_string_contents( output, pointer );
url_fputwc( btowc( '"' ), output ); url_fputwc( btowc( '"' ), output );
@ -61,7 +61,7 @@ void print_string( URL_FILE * output, struct cons_pointer pointer ) {
* a space character. * a space character.
*/ */
void void
print_list_contents( URL_FILE * output, struct cons_pointer pointer, print_list_contents( URL_FILE *output, struct cons_pointer pointer,
bool initial_space ) { bool initial_space ) {
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
@ -82,13 +82,13 @@ print_list_contents( URL_FILE * output, struct cons_pointer pointer,
} }
} }
void print_list( URL_FILE * output, struct cons_pointer pointer ) { void print_list( URL_FILE *output, struct cons_pointer pointer ) {
url_fputws( L"(", output ); url_fputws( L"(", output );
print_list_contents( output, pointer, false ); print_list_contents( output, pointer, false );
url_fputws( L")", output ); url_fputws( L")", output );
} }
void print_map( URL_FILE * output, struct cons_pointer map ) { void print_map( URL_FILE *output, struct cons_pointer map ) {
if ( hashmapp( map ) ) { if ( hashmapp( map ) ) {
struct vector_space_object *vso = pointer_to_vso( map ); struct vector_space_object *vso = pointer_to_vso( map );
@ -110,7 +110,7 @@ void print_map( URL_FILE * output, struct cons_pointer map ) {
} }
} }
void print_vso( URL_FILE * output, struct cons_pointer pointer ) { void print_vso( URL_FILE *output, struct cons_pointer pointer ) {
struct vector_space_object *vso = pointer_to_vso( pointer ); struct vector_space_object *vso = pointer_to_vso( pointer );
switch ( vso->header.tag.value ) { switch ( vso->header.tag.value ) {
case HASHTV: case HASHTV:
@ -126,7 +126,7 @@ void print_vso( URL_FILE * output, struct cons_pointer pointer ) {
/** /**
* stolen from https://stackoverflow.com/questions/11656241/how-to-print-uint128-t-number-using-gcc * stolen from https://stackoverflow.com/questions/11656241/how-to-print-uint128-t-number-using-gcc
*/ */
void print_128bit( URL_FILE * output, __int128_t n ) { void print_128bit( URL_FILE *output, __int128_t n ) {
if ( n == 0 ) { if ( n == 0 ) {
fwprintf( stderr, L"0" ); fwprintf( stderr, L"0" );
} else { } else {
@ -148,7 +148,7 @@ void print_128bit( URL_FILE * output, __int128_t n ) {
* Print the cons-space object indicated by `pointer` to the stream indicated * Print the cons-space object indicated by `pointer` to the stream indicated
* by `output`. * by `output`.
*/ */
struct cons_pointer print( URL_FILE * output, struct cons_pointer pointer ) { struct cons_pointer print( URL_FILE *output, struct cons_pointer pointer ) {
struct cons_space_object cell = pointer2cell( pointer ); struct cons_space_object cell = pointer2cell( pointer );
char *buffer; char *buffer;
@ -272,6 +272,6 @@ struct cons_pointer print( URL_FILE * output, struct cons_pointer pointer ) {
return pointer; return pointer;
} }
void println( URL_FILE * output ) { void println( URL_FILE *output ) {
url_fputws( L"\n", output ); url_fputws( L"\n", output );
} }

33
src/io/read.c
View file

@ -83,14 +83,14 @@ struct cons_pointer c_quote( struct cons_pointer arg ) {
* 3. one or more symbols separated by slashes; or * 3. one or more symbols separated by slashes; or
* 4. keywords (with leading colons) interspersed with symbols (prefixed by slashes). * 4. keywords (with leading colons) interspersed with symbols (prefixed by slashes).
*/ */
struct cons_pointer read_path( URL_FILE * input, wint_t initial, struct cons_pointer read_path( URL_FILE *input, wint_t initial,
struct cons_pointer q ) { struct cons_pointer q ) {
bool done = false; bool done = false;
struct cons_pointer prefix = NIL; struct cons_pointer prefix = NIL;
switch ( initial ) { switch ( initial ) {
case '/': case '/':
prefix = c_string_to_lisp_symbol( L"oblist" ); prefix = make_cons( c_string_to_lisp_symbol( L"oblist" ), NIL);
break; break;
case '$': case '$':
case LSESSION: case LSESSION:
@ -155,7 +155,7 @@ struct cons_pointer read_path( URL_FILE * input, wint_t initial,
struct cons_pointer read_continuation( struct stack_frame *frame, struct cons_pointer read_continuation( struct stack_frame *frame,
struct cons_pointer frame_pointer, struct cons_pointer frame_pointer,
struct cons_pointer env, struct cons_pointer env,
URL_FILE * input, wint_t initial ) { URL_FILE *input, wint_t initial ) {
debug_print( L"entering read_continuation\n", DEBUG_IO ); debug_print( L"entering read_continuation\n", DEBUG_IO );
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
@ -287,7 +287,7 @@ struct cons_pointer read_continuation( struct stack_frame *frame,
*/ */
struct cons_pointer read_number( struct stack_frame *frame, struct cons_pointer read_number( struct stack_frame *frame,
struct cons_pointer frame_pointer, struct cons_pointer frame_pointer,
URL_FILE * input, URL_FILE *input,
wint_t initial, bool seen_period ) { wint_t initial, bool seen_period ) {
debug_print( L"entering read_number\n", DEBUG_IO ); debug_print( L"entering read_number\n", DEBUG_IO );
@ -308,7 +308,8 @@ struct cons_pointer read_number( struct stack_frame *frame,
initial ); initial );
for ( c = initial; iswdigit( c ) for ( c = initial; iswdigit( c )
|| c == LPERIOD || c == LSLASH || c == LCOMMA; c = url_fgetwc( input ) ) { || c == LPERIOD || c == LSLASH || c == LCOMMA;
c = url_fgetwc( input ) ) {
switch ( c ) { switch ( c ) {
case LPERIOD: case LPERIOD:
if ( seen_period || !nilp( dividend ) ) { if ( seen_period || !nilp( dividend ) ) {
@ -342,8 +343,8 @@ struct cons_pointer read_number( struct stack_frame *frame,
break; break;
default: default:
result = add_integers( multiply_integers( result, base ), result = add_integers( multiply_integers( result, base ),
acquire_integer( ( int ) c - ( int ) '0', acquire_integer( ( int ) c -
NIL ) ); ( int ) '0', NIL ) );
debug_printf( DEBUG_IO, debug_printf( DEBUG_IO,
L"read_number: added character %c, result now ", L"read_number: added character %c, result now ",
@ -366,10 +367,10 @@ struct cons_pointer read_number( struct stack_frame *frame,
debug_print( L"read_number: converting result to real\n", DEBUG_IO ); debug_print( L"read_number: converting result to real\n", DEBUG_IO );
struct cons_pointer div = make_ratio( result, struct cons_pointer div = make_ratio( result,
acquire_integer( powl acquire_integer( powl
( to_long_double ( to_long_double
( base ), ( base ),
places_of_decimals ), places_of_decimals ),
NIL ) ); NIL ) );
inc_ref( div ); inc_ref( div );
result = make_real( to_long_double( div ) ); result = make_real( to_long_double( div ) );
@ -400,7 +401,7 @@ struct cons_pointer read_number( struct stack_frame *frame,
struct cons_pointer read_list( struct stack_frame *frame, struct cons_pointer read_list( struct stack_frame *frame,
struct cons_pointer frame_pointer, struct cons_pointer frame_pointer,
struct cons_pointer env, struct cons_pointer env,
URL_FILE * input, wint_t initial ) { URL_FILE *input, wint_t initial ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
wint_t c; wint_t c;
@ -440,7 +441,7 @@ struct cons_pointer read_list( struct stack_frame *frame,
struct cons_pointer read_map( struct stack_frame *frame, struct cons_pointer read_map( struct stack_frame *frame,
struct cons_pointer frame_pointer, struct cons_pointer frame_pointer,
struct cons_pointer env, struct cons_pointer env,
URL_FILE * input, wint_t initial ) { URL_FILE *input, wint_t initial ) {
// set write ACL to true whilst creating to prevent GC churn // set write ACL to true whilst creating to prevent GC churn
struct cons_pointer result = struct cons_pointer result =
make_hashmap( DFLT_HASHMAP_BUCKETS, NIL, TRUE ); make_hashmap( DFLT_HASHMAP_BUCKETS, NIL, TRUE );
@ -480,7 +481,7 @@ struct cons_pointer read_map( struct stack_frame *frame,
* so delimited in which case it may not contain whitespace (unless escaped) * so delimited in which case it may not contain whitespace (unless escaped)
* but may contain a double quote character (probably not a good idea!) * but may contain a double quote character (probably not a good idea!)
*/ */
struct cons_pointer read_string( URL_FILE * input, wint_t initial ) { struct cons_pointer read_string( URL_FILE *input, wint_t initial ) {
struct cons_pointer cdr = NIL; struct cons_pointer cdr = NIL;
struct cons_pointer result; struct cons_pointer result;
switch ( initial ) { switch ( initial ) {
@ -503,7 +504,7 @@ struct cons_pointer read_string( URL_FILE * input, wint_t initial ) {
return result; return result;
} }
struct cons_pointer read_symbol_or_key( URL_FILE * input, uint32_t tag, struct cons_pointer read_symbol_or_key( URL_FILE *input, uint32_t tag,
wint_t initial ) { wint_t initial ) {
struct cons_pointer cdr = NIL; struct cons_pointer cdr = NIL;
struct cons_pointer result; struct cons_pointer result;
@ -558,7 +559,7 @@ struct cons_pointer read_symbol_or_key( URL_FILE * input, uint32_t tag,
struct cons_pointer read( struct struct cons_pointer read( struct
stack_frame stack_frame
*frame, struct cons_pointer frame_pointer, *frame, struct cons_pointer frame_pointer,
struct cons_pointer env, URL_FILE * input ) { struct cons_pointer env, URL_FILE *input ) {
return read_continuation( frame, frame_pointer, env, input, return read_continuation( frame, frame_pointer, env, input,
url_fgetwc( input ) ); url_fgetwc( input ) );
} }

12
src/memory/conspage.c
View file

@ -121,7 +121,7 @@ void make_cons_page( ) {
/** /**
* dump the allocated pages to this `output` stream. * dump the allocated pages to this `output` stream.
*/ */
void dump_pages( URL_FILE * output ) { void dump_pages( URL_FILE *output ) {
for ( int i = 0; i < initialised_cons_pages; i++ ) { for ( int i = 0; i < initialised_cons_pages; i++ ) {
url_fwprintf( output, L"\nDUMPING PAGE %d\n", i ); url_fwprintf( output, L"\nDUMPING PAGE %d\n", i );
@ -188,7 +188,8 @@ void free_cell( struct cons_pointer pointer ) {
free_vso( pointer ); free_vso( pointer );
break; break;
default: default:
fprintf( stderr, "WARNING: Freeing object of type %s!", (char *) &(cell->tag.bytes)); fprintf( stderr, "WARNING: Freeing object of type %s!",
( char * ) &( cell->tag.bytes ) );
} }
strncpy( &cell->tag.bytes[0], FREETAG, TAGLENGTH ); strncpy( &cell->tag.bytes[0], FREETAG, TAGLENGTH );
@ -240,8 +241,8 @@ struct cons_pointer allocate_cell( uint32_t tag ) {
total_cells_allocated++; total_cells_allocated++;
debug_printf( DEBUG_ALLOC, debug_printf( DEBUG_ALLOC,
L"Allocated cell of type '%4.4s' at %d, %d \n", cell->tag.bytes, L"Allocated cell of type '%4.4s' at %d, %d \n",
result.page, result.offset ); cell->tag.bytes, result.page, result.offset );
} else { } else {
debug_printf( DEBUG_ALLOC, L"WARNING: Allocating non-free cell!" ); debug_printf( DEBUG_ALLOC, L"WARNING: Allocating non-free cell!" );
} }
@ -270,5 +271,6 @@ void initialise_cons_pages( ) {
void summarise_allocation( ) { void summarise_allocation( ) {
fwprintf( stderr, fwprintf( stderr,
L"Allocation summary: allocated %lld; deallocated %lld; not deallocated %lld.\n", L"Allocation summary: allocated %lld; deallocated %lld; not deallocated %lld.\n",
total_cells_allocated, total_cells_freed, total_cells_allocated - total_cells_freed ); total_cells_allocated, total_cells_freed,
total_cells_allocated - total_cells_freed );
} }

384
src/memory/consspaceobject.c
View file

@ -33,22 +33,22 @@
* vectorspace object indicated by the cell is this `value`, else false. * vectorspace object indicated by the cell is this `value`, else false.
*/ */
bool check_tag( struct cons_pointer pointer, uint32_t value ) { bool check_tag( struct cons_pointer pointer, uint32_t value ) {
bool result = false; bool result = false;
struct cons_space_object cell = pointer2cell( pointer ); struct cons_space_object cell = pointer2cell( pointer );
result = cell.tag.value == value; result = cell.tag.value == value;
if ( result == false ) { if ( result == false ) {
if ( cell.tag.value == VECTORPOINTTV ) { if ( cell.tag.value == VECTORPOINTTV ) {
struct vector_space_object *vec = pointer_to_vso( pointer ); struct vector_space_object *vec = pointer_to_vso( pointer );
if ( vec != NULL ) { if ( vec != NULL ) {
result = vec->header.tag.value == value; result = vec->header.tag.value == value;
} }
}
} }
}
return result; return result;
} }
/** /**
@ -60,13 +60,13 @@ bool check_tag( struct cons_pointer pointer, uint32_t value ) {
* Returns the `pointer`. * Returns the `pointer`.
*/ */
struct cons_pointer inc_ref( struct cons_pointer pointer ) { struct cons_pointer inc_ref( struct cons_pointer pointer ) {
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
if ( cell->count < MAXREFERENCE ) { if ( cell->count < MAXREFERENCE ) {
cell->count++; cell->count++;
} }
return pointer; return pointer;
} }
/** /**
@ -78,18 +78,18 @@ struct cons_pointer inc_ref( struct cons_pointer pointer ) {
* Returns the `pointer`, or, if the cell has been freed, NIL. * Returns the `pointer`, or, if the cell has been freed, NIL.
*/ */
struct cons_pointer dec_ref( struct cons_pointer pointer ) { struct cons_pointer dec_ref( struct cons_pointer pointer ) {
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
if ( cell->count > 0 && cell->count != UINT32_MAX) { if ( cell->count > 0 && cell->count != UINT32_MAX ) {
cell->count--; cell->count--;
if ( cell->count == 0 ) { if ( cell->count == 0 ) {
free_cell( pointer ); free_cell( pointer );
pointer = NIL; pointer = NIL;
}
} }
}
return pointer; return pointer;
} }
/** /**
@ -98,22 +98,24 @@ struct cons_pointer dec_ref( struct cons_pointer pointer ) {
* @return As a Lisp string, the tag of the object which is at that pointer. * @return As a Lisp string, the tag of the object which is at that pointer.
*/ */
struct cons_pointer c_type( struct cons_pointer pointer ) { struct cons_pointer c_type( struct cons_pointer pointer ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
struct cons_space_object cell = pointer2cell( pointer ); struct cons_space_object cell = pointer2cell( pointer );
if ( strncmp( (char *)&cell.tag.bytes, VECTORPOINTTAG, TAGLENGTH ) == 0 ) { if ( strncmp( ( char * ) &cell.tag.bytes, VECTORPOINTTAG, TAGLENGTH ) ==
struct vector_space_object *vec = pointer_to_vso( pointer ); 0 ) {
struct vector_space_object *vec = pointer_to_vso( pointer );
for ( int i = TAGLENGTH - 1; i >= 0; i-- ) { for ( int i = TAGLENGTH - 1; i >= 0; i-- ) {
result = make_string( (wchar_t)vec->header.tag.bytes[i], result ); result =
make_string( ( wchar_t ) vec->header.tag.bytes[i], result );
}
} else {
for ( int i = TAGLENGTH - 1; i >= 0; i-- ) {
result = make_string( ( wchar_t ) cell.tag.bytes[i], result );
}
} }
} else {
for ( int i = TAGLENGTH - 1; i >= 0; i-- ) {
result = make_string( (wchar_t)cell.tag.bytes[i], result );
}
}
return result; return result;
} }
/** /**
@ -121,13 +123,13 @@ struct cons_pointer c_type( struct cons_pointer pointer ) {
* authorised to read it, does not error but returns nil. * authorised to read it, does not error but returns nil.
*/ */
struct cons_pointer c_car( struct cons_pointer arg ) { struct cons_pointer c_car( struct cons_pointer arg ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
if ( truep( authorised( arg, NIL ) ) && consp( arg ) ) { if ( truep( authorised( arg, NIL ) ) && consp( arg ) ) {
result = pointer2cell( arg ).payload.cons.car; result = pointer2cell( arg ).payload.cons.car;
} }
return result; return result;
} }
/** /**
@ -135,24 +137,24 @@ struct cons_pointer c_car( struct cons_pointer arg ) {
* not authorised to read it,does not error but returns nil. * not authorised to read it,does not error but returns nil.
*/ */
struct cons_pointer c_cdr( struct cons_pointer arg ) { struct cons_pointer c_cdr( struct cons_pointer arg ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
if ( truep( authorised( arg, NIL ) ) ) { if ( truep( authorised( arg, NIL ) ) ) {
struct cons_space_object *cell = &pointer2cell( arg ); struct cons_space_object *cell = &pointer2cell( arg );
switch ( cell->tag.value ) { switch ( cell->tag.value ) {
case CONSTV: case CONSTV:
result = cell->payload.cons.cdr; result = cell->payload.cons.cdr;
break; break;
case KEYTV: case KEYTV:
case STRINGTV: case STRINGTV:
case SYMBOLTV: case SYMBOLTV:
result = cell->payload.string.cdr; result = cell->payload.string.cdr;
break; break;
}
} }
}
return result; return result;
} }
/** /**
@ -160,13 +162,13 @@ struct cons_pointer c_cdr( struct cons_pointer arg ) {
* returns 0. * returns 0.
*/ */
int c_length( struct cons_pointer arg ) { int c_length( struct cons_pointer arg ) {
int result = 0; int result = 0;
for ( struct cons_pointer c = arg; !nilp( c ); c = c_cdr( c ) ) { for ( struct cons_pointer c = arg; !nilp( c ); c = c_cdr( c ) ) {
result++; result++;
} }
return result; return result;
} }
/** /**
@ -174,18 +176,18 @@ int c_length( struct cons_pointer arg ) {
*/ */
struct cons_pointer make_cons( struct cons_pointer car, struct cons_pointer make_cons( struct cons_pointer car,
struct cons_pointer cdr ) { struct cons_pointer cdr ) {
struct cons_pointer pointer = NIL; struct cons_pointer pointer = NIL;
pointer = allocate_cell( CONSTV ); pointer = allocate_cell( CONSTV );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
inc_ref( car ); inc_ref( car );
inc_ref( cdr ); inc_ref( cdr );
cell->payload.cons.car = car; cell->payload.cons.car = car;
cell->payload.cons.cdr = cdr; cell->payload.cons.cdr = cdr;
return pointer; return pointer;
} }
/** /**
@ -197,35 +199,39 @@ struct cons_pointer make_cons( struct cons_pointer car,
*/ */
struct cons_pointer make_exception( struct cons_pointer message, struct cons_pointer make_exception( struct cons_pointer message,
struct cons_pointer frame_pointer ) { struct cons_pointer frame_pointer ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
struct cons_pointer pointer = allocate_cell( EXCEPTIONTV ); struct cons_pointer pointer = allocate_cell( EXCEPTIONTV );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
inc_ref( frame_pointer ); inc_ref( frame_pointer );
cell->payload.exception.payload = message; cell->payload.exception.payload = message;
cell->payload.exception.frame = frame_pointer; cell->payload.exception.frame = frame_pointer;
result = pointer; result = pointer;
return result; return result;
} }
/** /**
* Construct a cell which points to an executable Lisp function. * Construct a cell which points to an executable Lisp function.
*/ */
struct cons_pointer make_function( struct cons_pointer make_function( struct cons_pointer meta,
struct cons_pointer meta, struct cons_pointer ( *executable ) ( struct
struct cons_pointer ( *executable )( struct stack_frame *, stack_frame
struct cons_pointer, *,
struct cons_pointer ) ) { struct
struct cons_pointer pointer = allocate_cell( FUNCTIONTV ); cons_pointer,
struct cons_space_object *cell = &pointer2cell( pointer ); struct
inc_ref( meta ); cons_pointer ) )
{
struct cons_pointer pointer = allocate_cell( FUNCTIONTV );
struct cons_space_object *cell = &pointer2cell( pointer );
inc_ref( meta );
cell->payload.function.meta = meta; cell->payload.function.meta = meta;
cell->payload.function.executable = executable; cell->payload.function.executable = executable;
return pointer; return pointer;
} }
/** /**
@ -233,15 +239,15 @@ struct cons_pointer make_function(
*/ */
struct cons_pointer make_lambda( struct cons_pointer args, struct cons_pointer make_lambda( struct cons_pointer args,
struct cons_pointer body ) { struct cons_pointer body ) {
struct cons_pointer pointer = allocate_cell( LAMBDATV ); struct cons_pointer pointer = allocate_cell( LAMBDATV );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
inc_ref( args ); inc_ref( args );
inc_ref( body ); inc_ref( body );
cell->payload.lambda.args = args; cell->payload.lambda.args = args;
cell->payload.lambda.body = body; cell->payload.lambda.body = body;
return pointer; return pointer;
} }
/** /**
@ -250,15 +256,15 @@ struct cons_pointer make_lambda( struct cons_pointer args,
*/ */
struct cons_pointer make_nlambda( struct cons_pointer args, struct cons_pointer make_nlambda( struct cons_pointer args,
struct cons_pointer body ) { struct cons_pointer body ) {
struct cons_pointer pointer = allocate_cell( NLAMBDATV ); struct cons_pointer pointer = allocate_cell( NLAMBDATV );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
inc_ref( args ); inc_ref( args );
inc_ref( body ); inc_ref( body );
cell->payload.lambda.args = args; cell->payload.lambda.args = args;
cell->payload.lambda.body = body; cell->payload.lambda.body = body;
return pointer; return pointer;
} }
/** /**
@ -273,22 +279,24 @@ struct cons_pointer make_nlambda( struct cons_pointer args,
* returns 0 for things which are not string like. * returns 0 for things which are not string like.
*/ */
uint32_t calculate_hash( wint_t c, struct cons_pointer ptr ) { uint32_t calculate_hash( wint_t c, struct cons_pointer ptr ) {
struct cons_space_object *cell = &pointer2cell( ptr ); struct cons_space_object *cell = &pointer2cell( ptr );
uint32_t result = 0; uint32_t result = 0;
switch ( cell->tag.value ) { switch ( cell->tag.value ) {
case KEYTV: case KEYTV:
case STRINGTV: case STRINGTV:
case SYMBOLTV: case SYMBOLTV:
if ( nilp( cell->payload.string.cdr ) ) { if ( nilp( cell->payload.string.cdr ) ) {
result = (uint32_t)c; result = ( uint32_t ) c;
} else { } else {
result = ( (uint32_t)c * cell->payload.string.hash ) & 0xffffffff; result =
} ( ( uint32_t ) c *
break; cell->payload.string.hash ) & 0xffffffff;
} }
break;
}
return result; return result;
} }
/** /**
@ -299,24 +307,24 @@ uint32_t calculate_hash( wint_t c, struct cons_pointer ptr ) {
*/ */
struct cons_pointer make_string_like_thing( wint_t c, struct cons_pointer tail, struct cons_pointer make_string_like_thing( wint_t c, struct cons_pointer tail,
uint32_t tag ) { uint32_t tag ) {
struct cons_pointer pointer = NIL; struct cons_pointer pointer = NIL;
if ( check_tag( tail, tag ) || check_tag( tail, NILTV ) ) { if ( check_tag( tail, tag ) || check_tag( tail, NILTV ) ) {
pointer = allocate_cell( tag ); pointer = allocate_cell( tag );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
cell->payload.string.character = c; cell->payload.string.character = c;
cell->payload.string.cdr = tail; cell->payload.string.cdr = tail;
cell->payload.string.hash = calculate_hash( c, tail ); cell->payload.string.hash = calculate_hash( c, tail );
} else { } else {
// \todo should throw an exception! // \todo should throw an exception!
debug_printf( DEBUG_ALLOC, debug_printf( DEBUG_ALLOC,
L"Warning: only NIL and %4.4s can be prepended to %4.4s\n", L"Warning: only NIL and %4.4s can be prepended to %4.4s\n",
tag, tag ); tag, tag );
} }
return pointer; return pointer;
} }
/** /**
@ -328,7 +336,7 @@ struct cons_pointer make_string_like_thing( wint_t c, struct cons_pointer tail,
* @param tail the string which is being built. * @param tail the string which is being built.
*/ */
struct cons_pointer make_string( wint_t c, struct cons_pointer tail ) { struct cons_pointer make_string( wint_t c, struct cons_pointer tail ) {
return make_string_like_thing( c, tail, STRINGTV ); return make_string_like_thing( c, tail, STRINGTV );
} }
/** /**
@ -341,45 +349,51 @@ struct cons_pointer make_string( wint_t c, struct cons_pointer tail ) {
*/ */
struct cons_pointer make_symbol_or_key( wint_t c, struct cons_pointer tail, struct cons_pointer make_symbol_or_key( wint_t c, struct cons_pointer tail,
uint32_t tag ) { uint32_t tag ) {
struct cons_pointer result; struct cons_pointer result;
if ( tag == SYMBOLTV || tag == KEYTV ) { if ( tag == SYMBOLTV || tag == KEYTV ) {
result = make_string_like_thing( c, tail, tag ); result = make_string_like_thing( c, tail, tag );
if ( tag == KEYTV ) { if ( tag == KEYTV ) {
struct cons_pointer r = internedp( result, oblist ); struct cons_pointer r = internedp( result, oblist );
if ( nilp( r ) ) { if ( nilp( r ) ) {
intern( result, oblist ); intern( result, oblist );
} else { } else {
result = r; result = r;
} }
}
} else {
result =
make_exception( c_string_to_lisp_string
( L"Unexpected tag when making symbol or key." ),
NIL );
} }
} else {
result = make_exception(
c_string_to_lisp_string( L"Unexpected tag when making symbol or key." ),
NIL);
}
return result; return result;
} }
/** /**
* Construct a cell which points to an executable Lisp special form. * Construct a cell which points to an executable Lisp special form.
*/ */
struct cons_pointer make_special( struct cons_pointer make_special( struct cons_pointer meta,
struct cons_pointer meta, struct cons_pointer ( *executable ) ( struct
struct cons_pointer ( *executable )( struct stack_frame *frame, stack_frame
struct cons_pointer, *frame,
struct cons_pointer env ) ) { struct
struct cons_pointer pointer = allocate_cell( SPECIALTV ); cons_pointer,
struct cons_space_object *cell = &pointer2cell( pointer ); struct
inc_ref( meta ); cons_pointer
env ) )
{
struct cons_pointer pointer = allocate_cell( SPECIALTV );
struct cons_space_object *cell = &pointer2cell( pointer );
inc_ref( meta );
cell->payload.special.meta = meta; cell->payload.special.meta = meta;
cell->payload.special.executable = executable; cell->payload.special.executable = executable;
return pointer; return pointer;
} }
/** /**
@ -390,13 +404,13 @@ struct cons_pointer make_special(
*/ */
struct cons_pointer make_read_stream( URL_FILE *input, struct cons_pointer make_read_stream( URL_FILE *input,
struct cons_pointer metadata ) { struct cons_pointer metadata ) {
struct cons_pointer pointer = allocate_cell( READTV ); struct cons_pointer pointer = allocate_cell( READTV );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
cell->payload.stream.stream = input; cell->payload.stream.stream = input;
cell->payload.stream.meta = metadata; cell->payload.stream.meta = metadata;
return pointer; return pointer;
} }
/** /**
@ -407,13 +421,13 @@ struct cons_pointer make_read_stream( URL_FILE *input,
*/ */
struct cons_pointer make_write_stream( URL_FILE *output, struct cons_pointer make_write_stream( URL_FILE *output,
struct cons_pointer metadata ) { struct cons_pointer metadata ) {
struct cons_pointer pointer = allocate_cell( WRITETV ); struct cons_pointer pointer = allocate_cell( WRITETV );
struct cons_space_object *cell = &pointer2cell( pointer ); struct cons_space_object *cell = &pointer2cell( pointer );
cell->payload.stream.stream = output; cell->payload.stream.stream = output;
cell->payload.stream.meta = metadata; cell->payload.stream.meta = metadata;
return pointer; return pointer;
} }
/** /**
@ -421,43 +435,43 @@ struct cons_pointer make_write_stream( URL_FILE *output,
* keywords, I am accepting only lower case characters and numbers. * keywords, I am accepting only lower case characters and numbers.
*/ */
struct cons_pointer c_string_to_lisp_keyword( wchar_t *symbol ) { struct cons_pointer c_string_to_lisp_keyword( wchar_t *symbol ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
for ( int i = wcslen( symbol ) - 1; i >= 0; i-- ) { for ( int i = wcslen( symbol ) - 1; i >= 0; i-- ) {
wchar_t c = towlower( symbol[i] ); wchar_t c = towlower( symbol[i] );
if ( iswalnum( c ) || c == L'-' ) { if ( iswalnum( c ) || c == L'-' ) {
result = make_keyword( c, result ); result = make_keyword( c, result );
}
} }
}
return result; return result;
} }
/** /**
* Return a lisp string representation of this wide character string. * Return a lisp string representation of this wide character string.
*/ */
struct cons_pointer c_string_to_lisp_string( wchar_t *string ) { struct cons_pointer c_string_to_lisp_string( wchar_t *string ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
for ( int i = wcslen( string ) - 1; i >= 0; i-- ) { for ( int i = wcslen( string ) - 1; i >= 0; i-- ) {
if ( iswprint( string[i] ) && string[i] != '"' ) { if ( iswprint( string[i] ) && string[i] != '"' ) {
result = make_string( string[i], result ); result = make_string( string[i], result );
}
} }
}
return result; return result;
} }
/** /**
* Return a lisp symbol representation of this wide character string. * Return a lisp symbol representation of this wide character string.
*/ */
struct cons_pointer c_string_to_lisp_symbol( wchar_t *symbol ) { struct cons_pointer c_string_to_lisp_symbol( wchar_t *symbol ) {
struct cons_pointer result = NIL; struct cons_pointer result = NIL;
for ( int i = wcslen( symbol ); i > 0; i-- ) { for ( int i = wcslen( symbol ); i > 0; i-- ) {
result = make_symbol( symbol[i - 1], result ); result = make_symbol( symbol[i - 1], result );
} }
return result; return result;
} }

12
src/memory/dump.c
View file

@ -29,7 +29,7 @@
#include "memory/vectorspace.h" #include "memory/vectorspace.h"
void dump_string_cell( URL_FILE * output, wchar_t *prefix, void dump_string_cell( URL_FILE *output, wchar_t *prefix,
struct cons_pointer pointer ) { struct cons_pointer pointer ) {
struct cons_space_object cell = pointer2cell( pointer ); struct cons_space_object cell = pointer2cell( pointer );
if ( cell.payload.string.character == 0 ) { if ( cell.payload.string.character == 0 ) {
@ -56,7 +56,7 @@ void dump_string_cell( URL_FILE * output, wchar_t *prefix,
/** /**
* dump the object at this cons_pointer to this output stream. * dump the object at this cons_pointer to this output stream.
*/ */
void dump_object( URL_FILE * output, struct cons_pointer pointer ) { void dump_object( URL_FILE *output, struct cons_pointer pointer ) {
struct cons_space_object cell = pointer2cell( pointer ); struct cons_space_object cell = pointer2cell( pointer );
url_fwprintf( output, L"\t%4.4s (%d) at page %d, offset %d count %u\n", url_fwprintf( output, L"\t%4.4s (%d) at page %d, offset %d count %u\n",
cell.tag.bytes, cell.tag.value, pointer.page, pointer.offset, cell.tag.bytes, cell.tag.value, pointer.page, pointer.offset,
@ -114,10 +114,10 @@ void dump_object( URL_FILE * output, struct cons_pointer pointer ) {
case RATIOTV: case RATIOTV:
url_fwprintf( output, url_fwprintf( output,
L"\t\tRational cell: value %ld/%ld, count %u\n", L"\t\tRational cell: value %ld/%ld, count %u\n",
pointer2cell( cell.payload.ratio.dividend ).payload. pointer2cell( cell.payload.ratio.dividend ).
integer.value, payload.integer.value,
pointer2cell( cell.payload.ratio.divisor ).payload. pointer2cell( cell.payload.ratio.divisor ).
integer.value, cell.count ); payload.integer.value, cell.count );
break; break;
case READTV: case READTV:
url_fputws( L"\t\tInput stream; metadata: ", output ); url_fputws( L"\t\tInput stream; metadata: ", output );

15
src/memory/hashmap.c
View file

@ -54,12 +54,12 @@ struct cons_pointer lisp_make_hashmap( struct stack_frame *frame,
} }
} }
if ( frame->args > 1 ) { if ( frame->args > 1 ) {
if ( functionp( frame->arg[1])) { if ( functionp( frame->arg[1] ) ) {
hash_fn = frame->arg[1]; hash_fn = frame->arg[1];
} else if ( nilp(frame->arg[1])){ } else if ( nilp( frame->arg[1] ) ) {
/* that's allowed */ /* that's allowed */
} else { } else {
result = result =
make_exception( c_string_to_lisp_string make_exception( c_string_to_lisp_string
( L"Second arg to `hashmap`, if passed, must " ( L"Second arg to `hashmap`, if passed, must "
L"be a function or `nil`.`" ), NIL ); L"be a function or `nil`.`" ), NIL );
@ -88,8 +88,7 @@ struct cons_pointer lisp_make_hashmap( struct stack_frame *frame,
map->payload.hashmap.buckets[bucket_no] = map->payload.hashmap.buckets[bucket_no] =
make_cons( make_cons( key, val ), make_cons( make_cons( key, val ),
map->payload.hashmap. map->payload.hashmap.buckets[bucket_no] );
buckets[bucket_no] );
} }
} }
} }
@ -114,7 +113,7 @@ struct cons_pointer lisp_hashmap_put( struct stack_frame *frame,
struct cons_pointer val = frame->arg[2]; struct cons_pointer val = frame->arg[2];
struct cons_pointer result = hashmap_put( mapp, key, val ); struct cons_pointer result = hashmap_put( mapp, key, val );
struct cons_space_object *cell = &pointer2cell( result); struct cons_space_object *cell = &pointer2cell( result );
return result; return result;
// TODO: else clone and return clone. // TODO: else clone and return clone.
@ -136,7 +135,7 @@ struct cons_pointer lisp_hashmap_keys( struct stack_frame *frame,
return hashmap_keys( frame->arg[0] ); return hashmap_keys( frame->arg[0] );
} }
void dump_map( URL_FILE * output, struct cons_pointer pointer ) { void dump_map( URL_FILE *output, struct cons_pointer pointer ) {
struct hashmap_payload *payload = struct hashmap_payload *payload =
&pointer_to_vso( pointer )->payload.hashmap; &pointer_to_vso( pointer )->payload.hashmap;
url_fwprintf( output, L"Hashmap with %d buckets:\n", payload->n_buckets ); url_fwprintf( output, L"Hashmap with %d buckets:\n", payload->n_buckets );

12
src/memory/lookup3.c
View file

@ -170,7 +170,7 @@ and these came close:
hashlittle() has to dance around fitting the key bytes into registers. hashlittle() has to dance around fitting the key bytes into registers.
-------------------------------------------------------------------- --------------------------------------------------------------------
*/ */
uint32_t hashword( const uint32_t * k, /* the key, an array of uint32_t values */ uint32_t hashword( const uint32_t *k, /* the key, an array of uint32_t values */
size_t length, /* the length of the key, in uint32_ts */ size_t length, /* the length of the key, in uint32_ts */
uint32_t initval ) { /* the previous hash, or an arbitrary value */ uint32_t initval ) { /* the previous hash, or an arbitrary value */
uint32_t a, b, c; uint32_t a, b, c;
@ -213,10 +213,10 @@ both be initialized with seeds. If you pass in (*pb)==0, the output
(*pc) will be the same as the return value from hashword(). (*pc) will be the same as the return value from hashword().
-------------------------------------------------------------------- --------------------------------------------------------------------
*/ */
void hashword2( const uint32_t * k, /* the key, an array of uint32_t values */ void hashword2( const uint32_t *k, /* the key, an array of uint32_t values */
size_t length, /* the length of the key, in uint32_ts */ size_t length, /* the length of the key, in uint32_ts */
uint32_t * pc, /* IN: seed OUT: primary hash value */ uint32_t *pc, /* IN: seed OUT: primary hash value */
uint32_t * pb ) { /* IN: more seed OUT: secondary hash value */ uint32_t *pb ) { /* IN: more seed OUT: secondary hash value */
uint32_t a, b, c; uint32_t a, b, c;
/* Set up the internal state */ /* Set up the internal state */
@ -538,8 +538,8 @@ uint32_t hashlittle( const void *key, size_t length, uint32_t initval ) {
*/ */
void hashlittle2( const void *key, /* the key to hash */ void hashlittle2( const void *key, /* the key to hash */
size_t length, /* length of the key */ size_t length, /* length of the key */
uint32_t * pc, /* IN: primary initval, OUT: primary hash */ uint32_t *pc, /* IN: primary initval, OUT: primary hash */
uint32_t * pb ) { /* IN: secondary initval, OUT: secondary hash */ uint32_t *pb ) { /* IN: secondary initval, OUT: secondary hash */
uint32_t a, b, c; /* internal state */ uint32_t a, b, c; /* internal state */
union { union {
const void *ptr; const void *ptr;

4
src/memory/stack.c
View file

@ -241,7 +241,7 @@ void free_stack_frame( struct stack_frame *frame ) {
* @param output the stream * @param output the stream
* @param frame_pointer the pointer to the frame * @param frame_pointer the pointer to the frame
*/ */
void dump_frame( URL_FILE * output, struct cons_pointer frame_pointer ) { void dump_frame( URL_FILE *output, struct cons_pointer frame_pointer ) {
struct stack_frame *frame = get_stack_frame( frame_pointer ); struct stack_frame *frame = get_stack_frame( frame_pointer );
if ( frame != NULL ) { if ( frame != NULL ) {
@ -265,7 +265,7 @@ void dump_frame( URL_FILE * output, struct cons_pointer frame_pointer ) {
} }
} }
void dump_stack_trace( URL_FILE * output, struct cons_pointer pointer ) { void dump_stack_trace( URL_FILE *output, struct cons_pointer pointer ) {
if ( exceptionp( pointer ) ) { if ( exceptionp( pointer ) ) {
print( output, pointer2cell( pointer ).payload.exception.payload ); print( output, pointer2cell( pointer ).payload.exception.payload );
url_fputws( L"\n", output ); url_fputws( L"\n", output );

2
src/memory/vectorspace.c
View file

@ -85,7 +85,7 @@ struct cons_pointer make_vso( uint32_t tag, uint64_t payload_size ) {
if ( vso != NULL ) { if ( vso != NULL ) {
memset( vso, 0, padded ); memset( vso, 0, padded );
vso->header.tag.value = tag; vso->header.tag.value = tag;
debug_printf( DEBUG_ALLOC, debug_printf( DEBUG_ALLOC,
L"make_vso: written tag '%4.4s' into vso at %p\n", L"make_vso: written tag '%4.4s' into vso at %p\n",

60
src/ops/intern.c
View file

@ -191,20 +191,20 @@ struct cons_pointer hashmap_put_all( struct cons_pointer mapp,
pair = c_car( assoc ) ) { pair = c_car( assoc ) ) {
/* TODO: this is really hammering the memory management system, because /* TODO: this is really hammering the memory management system, because
* it will make a new lone for every key/value pair added. Fix. */ * it will make a new lone for every key/value pair added. Fix. */
if (consp( pair)) { if ( consp( pair ) ) {
mapp = hashmap_put( mapp, c_car( pair ), c_cdr( pair ) ); mapp = hashmap_put( mapp, c_car( pair ), c_cdr( pair ) );
} else if (hashmapp( pair)) { } else if ( hashmapp( pair ) ) {
hashmap_put_all( mapp, pair); hashmap_put_all( mapp, pair );
} else { } else {
hashmap_put( mapp, pair, TRUE); hashmap_put( mapp, pair, TRUE );
} }
assoc = c_cdr( assoc); assoc = c_cdr( assoc );
} }
} else if (hashmapp( assoc)) { } else if ( hashmapp( assoc ) ) {
for (struct cons_pointer keys = hashmap_keys( assoc); !nilp( keys); for ( struct cons_pointer keys = hashmap_keys( assoc );
keys = c_cdr( keys)) { !nilp( keys ); keys = c_cdr( keys ) ) {
struct cons_pointer key = c_car( keys); struct cons_pointer key = c_car( keys );
hashmap_put( mapp, key, hashmap_get( assoc, key)); hashmap_put( mapp, key, hashmap_get( assoc, key ) );
} }
} }
} }
@ -246,7 +246,8 @@ struct cons_pointer clone_hashmap( struct cons_pointer ptr ) {
result = result =
make_hashmap( from_pl.n_buckets, from_pl.hash_fn, make_hashmap( from_pl.n_buckets, from_pl.hash_fn,
from_pl.write_acl ); from_pl.write_acl );
struct vector_space_object const *to = pointer_to_vso( result ); struct vector_space_object const *to =
pointer_to_vso( result );
struct hashmap_payload to_pl = to->payload.hashmap; struct hashmap_payload to_pl = to->payload.hashmap;
for ( int i = 0; i < to_pl.n_buckets; i++ ) { for ( int i = 0; i < to_pl.n_buckets; i++ ) {
@ -257,9 +258,9 @@ struct cons_pointer clone_hashmap( struct cons_pointer ptr ) {
} }
} else { } else {
result = result =
make_exception( c_string_to_lisp_string make_exception( c_string_to_lisp_string
( L"Arg to `clone_hashmap` must " ( L"Arg to `clone_hashmap` must "
L"be a readable hashmap.`" ), NIL ); L"be a readable hashmap.`" ), NIL );
} }
return result; return result;
@ -299,9 +300,9 @@ internedp( struct cons_pointer key, struct cons_pointer store ) {
// if ( equal( key, entry.payload.cons.car ) ) { // if ( equal( key, entry.payload.cons.car ) ) {
// result = entry.payload.cons.car; // result = entry.payload.cons.car;
// } // }
if (!nilp( c_assoc( key, store))) { if ( !nilp( c_assoc( key, store ) ) ) {
result = key; result = key;
} else if ( equal( key, privileged_symbol_nil)) { } else if ( equal( key, privileged_symbol_nil ) ) {
result = privileged_symbol_nil; result = privileged_symbol_nil;
} }
} else { } else {
@ -349,9 +350,10 @@ struct cons_pointer c_assoc( struct cons_pointer key,
result = hashmap_get( entry_ptr, key ); result = hashmap_get( entry_ptr, key );
break; break;
default: default:
throw_exception( c_append( throw_exception( c_append
c_string_to_lisp_string( L"Store entry is of unknown type: " ), ( c_string_to_lisp_string
c_type( entry_ptr)), NIL); ( L"Store entry is of unknown type: " ),
c_type( entry_ptr ) ), NIL );
} }
} }
} }
@ -359,13 +361,13 @@ struct cons_pointer c_assoc( struct cons_pointer key,
result = hashmap_get( store, key ); result = hashmap_get( store, key );
} else if ( !nilp( store ) ) { } else if ( !nilp( store ) ) {
debug_print( L"c_assoc; store is of unknown type `", DEBUG_BIND ); debug_print( L"c_assoc; store is of unknown type `", DEBUG_BIND );
debug_print_object( c_type( store), DEBUG_BIND ); debug_print_object( c_type( store ), DEBUG_BIND );
debug_print( L"`\n", DEBUG_BIND ); debug_print( L"`\n", DEBUG_BIND );
result = result =
throw_exception( throw_exception( c_append
c_append( ( c_string_to_lisp_string
c_string_to_lisp_string( L"Store is of unknown type: " ), ( L"Store is of unknown type: " ),
c_type( store)), NIL ); c_type( store ) ), NIL );
} }
debug_print( L"c_assoc returning ", DEBUG_BIND ); debug_print( L"c_assoc returning ", DEBUG_BIND );
@ -419,14 +421,14 @@ struct cons_pointer set( struct cons_pointer key, struct cons_pointer value,
debug_dump_object( store, DEBUG_BIND ); debug_dump_object( store, DEBUG_BIND );
debug_println( DEBUG_BIND ); debug_println( DEBUG_BIND );
debug_printf( DEBUG_BIND, L"set: store is %s\n`", lisp_string_to_c_string( c_type( store)) ); debug_printf( DEBUG_BIND, L"set: store is %s\n`",
if (nilp( value)) { lisp_string_to_c_string( c_type( store ) ) );
if ( nilp( value ) ) {
result = store; result = store;
} } else if ( nilp( store ) || consp( store ) ) {
else if ( nilp( store ) || consp( store ) ) {
result = make_cons( make_cons( key, value ), store ); result = make_cons( make_cons( key, value ), store );
} else if ( hashmapp( store ) ) { } else if ( hashmapp( store ) ) {
debug_print( L"set: storing in hashmap\n", DEBUG_BIND); debug_print( L"set: storing in hashmap\n", DEBUG_BIND );
result = hashmap_put( store, key, value ); result = hashmap_put( store, key, value );
} }

39
src/ops/lispops.c
View file

@ -446,9 +446,10 @@ c_apply( struct stack_frame *frame, struct cons_pointer frame_pointer,
result = next_pointer; result = next_pointer;
} else { } else {
result = result =
( *fn_cell.payload.special. ( *fn_cell.payload.
executable ) ( get_stack_frame( next_pointer ), special.executable ) ( get_stack_frame
next_pointer, env ); ( next_pointer ),
next_pointer, env );
debug_print( L"Special form returning: ", DEBUG_EVAL ); debug_print( L"Special form returning: ", DEBUG_EVAL );
debug_print_object( result, DEBUG_EVAL ); debug_print_object( result, DEBUG_EVAL );
debug_println( DEBUG_EVAL ); debug_println( DEBUG_EVAL );
@ -1245,7 +1246,8 @@ lisp_exception( struct stack_frame *frame, struct cons_pointer frame_pointer,
struct cons_pointer env ) { struct cons_pointer env ) {
struct cons_pointer message = frame->arg[0]; struct cons_pointer message = frame->arg[0];
return exceptionp( message ) ? message : throw_exception( message, return exceptionp( message ) ? message : throw_exception( message,
frame->previous ); frame->
previous );
} }
/** /**
@ -1265,7 +1267,7 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
struct cons_pointer env ) { struct cons_pointer env ) {
struct cons_pointer expr = NIL; struct cons_pointer expr = NIL;
debug_printf(DEBUG_REPL, L"Entering new inner REPL\n"); debug_printf( DEBUG_REPL, L"Entering new inner REPL\n" );
struct cons_pointer input = get_default_stream( true, env ); struct cons_pointer input = get_default_stream( true, env );
struct cons_pointer output = get_default_stream( false, env ); struct cons_pointer output = get_default_stream( false, env );
@ -1273,15 +1275,17 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
struct cons_pointer old_oblist = oblist; struct cons_pointer old_oblist = oblist;
struct cons_pointer new_env = env; struct cons_pointer new_env = env;
if (truep(frame->arg[0])) { if ( truep( frame->arg[0] ) ) {
new_env = set( prompt_name, frame->arg[0], new_env); new_env = set( prompt_name, frame->arg[0], new_env );
} }
if (readp(frame->arg[1])) { if ( readp( frame->arg[1] ) ) {
new_env = set( c_string_to_lisp_symbol(L"*in*"), frame->arg[1], new_env); new_env =
set( c_string_to_lisp_symbol( L"*in*" ), frame->arg[1], new_env );
input = frame->arg[1]; input = frame->arg[1];
} }
if (readp(frame->arg[2])) { if ( readp( frame->arg[2] ) ) {
new_env = set( c_string_to_lisp_symbol(L"*out*"), frame->arg[2], new_env); new_env =
set( c_string_to_lisp_symbol( L"*out*" ), frame->arg[2], new_env );
output = frame->arg[2]; output = frame->arg[2];
} }
@ -1353,9 +1357,9 @@ struct cons_pointer lisp_repl( struct stack_frame *frame,
dec_ref( input ); dec_ref( input );
dec_ref( output ); dec_ref( output );
dec_ref( prompt_name ); dec_ref( prompt_name );
dec_ref( new_env); dec_ref( new_env );
debug_printf(DEBUG_REPL, L"Leaving inner repl\n"); debug_printf( DEBUG_REPL, L"Leaving inner repl\n" );
return expr; return expr;
} }
@ -1426,13 +1430,14 @@ struct cons_pointer c_append( struct cons_pointer l1, struct cons_pointer l2 ) {
if ( pointer2cell( l1 ).tag.value == pointer2cell( l2 ).tag.value ) { if ( pointer2cell( l1 ).tag.value == pointer2cell( l2 ).tag.value ) {
if ( nilp( c_cdr( l1 ) ) ) { if ( nilp( c_cdr( l1 ) ) ) {
return return
make_string_like_thing( ( pointer2cell( l1 ).payload. make_string_like_thing( ( pointer2cell( l1 ).
string.character ), l2, payload.string.character ),
l2,
pointer2cell( l1 ).tag.value ); pointer2cell( l1 ).tag.value );
} else { } else {
return return
make_string_like_thing( ( pointer2cell( l1 ).payload. make_string_like_thing( ( pointer2cell( l1 ).
string.character ), payload.string.character ),
c_append( c_cdr( l1 ), l2 ), c_append( c_cdr( l1 ), l2 ),
pointer2cell( l1 ).tag.value ); pointer2cell( l1 ).tag.value );
} }

6
src/repl.c
View file

@ -23,15 +23,15 @@
* *
* @param dummy * @param dummy
*/ */
void int_handler(int dummy) { void int_handler( int dummy ) {
wprintf(L"TODO: handle ctrl-C in a more interesting way\n"); wprintf( L"TODO: handle ctrl-C in a more interesting way\n" );
} }
/** /**
* The read/eval/print loop. * The read/eval/print loop.
*/ */
void repl( ) { void repl( ) {
signal(SIGINT, int_handler); signal( SIGINT, int_handler );
debug_print( L"Entered repl\n", DEBUG_REPL ); debug_print( L"Entered repl\n", DEBUG_REPL );
struct cons_pointer env = struct cons_pointer env =

274
state-of-play.md
View file

@ -1,274 +0,0 @@
# State of Play
## 20260204
### Testing what is leaking memory
#### Analysis
If you just start up and immediately abort the current build of psse, you get:
> Allocation summary: allocated 19986; deallocated 245; not deallocated 19741.
Allocation summaries from the current unit tests give the following ranges of values:
| | Min | Max | |
| --------------- | ----- | ----- | ---- |
| Allocated | 19991 | 39009 | |
| Deallocated | 238 | 1952 | |
| Not deallocated | 19741 | 37057 | |
The numbers go up broadly in sinc with one another &mdash; that is to say, broadly, as the number allocated rises, so do both the numbers deallocated and the numbers not deallocated. But not exactly.
#### Strategy: what doesn't get cleaned up?
Write a test wrapper which reads a file of forms, one per line, from standard input, and passes each in turn to a fresh invocation of psse, reporting the form and the allocation summary.
```bash
#1/bin/bash
while IFS= read -r form; do
allocation=`echo ${form} | ../../target/psse 2>&1 | grep Allocation`
echo "* ${allocation}: ${form}"
done
```
So, from this:
* Allocation summary: allocated 19986; deallocated 245; not deallocated 19741.:
* Allocation summary: allocated 19990; deallocated 249; not deallocated 19741.: ()
* Allocation summary: allocated 20019; deallocated 253; not deallocated 19766.: nil
Allocating an empty list allocates four additional cells, all of which are deallocated. Allocating 'nil' allocates a further **29** cells, 25 of which are not deallocated. WTF?
Following further work I have this, showing the difference added to the base case of cells allocated, cells deallocated, and, most critically, cells not deallocated.
From this we see that reading and printing `nil` allocates an additional 33 cells, of which eight are not cleaned up. That's startling, and worrying.
But the next row shows us that reading and printing an empty list costs only four cells, each of which is cleaned up. Further down the table we see that an empty map is also correctly cleaned up. Where we're leaking memory is in reading (or printing, although I doubt this) symbols, either atoms, numbers, or keywords (I haven't yet tried strings, but I expect they're similar.)
| **Case** | **Delta Allocated** | **Delta Deallocated** | **Delta Not Deallocated** |
| --------------------------------- | ------------------- | --------------------- | ------------------------- |
| **Basecase** | 0 | 0 | 0 |
| **nil** | 33 | 8 | 25 |
| **()** | 4 | 4 | 0 |
| **(quote ())** | 39 | 2 | 37 |
| **(list )** | 37 | 12 | 25 |
| **(list 1)** | 47 | 14 | 33 |
| **(list 1 1)** | 57 | 16 | 41 |
| **(list 1 1 1)** | 67 | 18 | 49 |
| **(list 1 2 3)** | 67 | 18 | 49 |
| **(+)** | 36 | 10 | 26 |
| **(+ 1)** | 44 | 12 | 32 |
| **(+ 1 1)** | 53 | 14 | 39 |
| **(+ 1 1 1)** | 62 | 16 | 46 |
| **(+ 1 2 3)** | 62 | 16 | 46 |
| **(list 'a 'a 'a)** | 151 | 33 | 118 |
| **(list 'a 'b 'c)** | 151 | 33 | 118 |
| **(list :a :b :c)** | 121 | 15 | 106 |
| **(list :alpha :bravo :charlie)** | 485 | 15 | 470 |
| **{}** | 6 | 6 | 0 |
| **{:z 0}** | 43 | 10 | 33 |
| **{:zero 0}** | 121 | 10 | 111 |
| **{:z 0 :o 1}** | 80 | 11 | 69 |
| **{:zero 0 :one 1}** | 210 | 14 | 196 |
| **{:z 0 :o 1 :t 2}** | 117 | 12 | 105 |
Looking at the entries, we see that
1. each number read costs ten allocations, of which only two are successfully deallocated;
2. the symbol `list` costs 33 cells, of which 25 are not deallocated, whereas the symbol `+` costs only one cell fewer, and an additional cell is not deallocated. So it doesn't seem that cell allocation scales with the length of the symbol;
3. Keyword allocation does scale with the length of the keyword, apparently, since `(list :a :b :c)` allocates 121 and deallocates 15, while `(list :alpha :bravo :charlie)` allocates 485 and deallocates the same 15;
4. The fact that both those two deallocate 15, and a addition of three numbers `(+ 1 2 3)` or `(+ 1 1 1)` deallocates 16 suggest to me that the list structure is being fully reclaimed but atoms are not being.
5. The atom `'a` costs more to read than the keyword `:a` because the reader macro is expanding `'a` to `(quote a)` behind the scenes.
### The integer allocation bug
Looking at what happens when we read a single digit number, we get the following:
```
2
Entering make_integer
Allocated cell of type 'INTR' at 19, 507
make_integer: returning
INTR (1381256777) at page 19, offset 507 count 0
Integer cell: value 0, count 0
Entering make_integer
Allocated cell of type 'INTR' at 19, 508
make_integer: returning
INTR (1381256777) at page 19, offset 508 count 0
Integer cell: value 10, count 0
Entering make_integer
Allocated cell of type 'INTR' at 19, 509
make_integer: returning
INTR (1381256777) at page 19, offset 509 count 0
Integer cell: value 2, count 0
Entering make_integer
Allocated cell of type 'INTR' at 19, 510
make_integer: returning
INTR (1381256777) at page 19, offset 510 count 0
Integer cell: value 0, count 0
Entering make_integer
Allocated cell of type 'INTR' at 19, 506
make_integer: returning
INTR (1381256777) at page 19, offset 506 count 0
Integer cell: value 0, count 0
Entering make_integer
Allocated cell of type 'INTR' at 19, 505
make_integer: returning
INTR (1381256777) at page 19, offset 505 count 0
Integer cell: value 0, count 0
Entering make_integer
Allocated cell of type 'INTR' at 19, 504
make_integer: returning
INTR (1381256777) at page 19, offset 504 count 0
Integer cell: value 0, count 0
Allocated cell of type 'STRG' at 19, 503
Freeing cell STRG (1196577875) at page 19, offset 503 count 0
String cell: character '2' (50) with hash 0; next at page 0 offset 0, count 0
value: "2"
Freeing cell INTR (1381256777) at page 19, offset 504 count 0
Integer cell: value 2, count 0
2
Allocated cell of type 'SYMB' at 19, 504
Allocated cell of type 'SYMB' at 19, 503
Allocated cell of type 'SYMB' at 19, 502
Allocated cell of type 'SYMB' at 19, 501
Freeing cell SYMB (1112365395) at page 19, offset 501 count 0
Symbol cell: character '*' (42) with hash 485100; next at page 19 offset 502, count 0
value: *in*
Freeing cell SYMB (1112365395) at page 19, offset 502 count 0
Symbol cell: character 'i' (105) with hash 11550; next at page 19 offset 503, count 0
value: in*
Freeing cell SYMB (1112365395) at page 19, offset 503 count 0
Symbol cell: character 'n' (110) with hash 110; next at page 19 offset 504, count 0
value: n*
Freeing cell SYMB (1112365395) at page 19, offset 504 count 0
Symbol cell: character '*' (42) with hash 0; next at page 0 offset 0, count 0
value: *
```
Many things are worrying here.
1. The only thing being freed here is the symbol to which the read stream is bound &mdash; and I didn't see where that got allocated, but we shouldn't be allocating and tearing down a symbol for every read! This implies that when I create a string with `c_string_to_lisp_string`, I need to make damn sure that that string is deallocated as soon as I'm done with it &mdash; and wherever I'm dealing with symbols which will be referred to repeatedly in `C` code, I need either
1. to bind a global on the C side of the world, which will become messy;
2. or else write a hash function which returns, for a `C` string, the same value that the standard hashing function will return for the lexically equivalent `Lisp` string, so that I can search hashmap structures from C without having to allocate and deallocate a fresh copy of the `Lisp` string;
3. In reading numbers, I'm generating a fresh instance of `Lisp zero` and `Lisp ten`, each time `read_integer` is called, and I'm not deallocating them.
4. I am correctly deallocating the number I did read, though!
## 20260203
I'm consciously avoiding the bignum issue for now. My current thinking is that if the C code only handles 64 bit integers, and bignums have to be done in Lisp code, that's perfectly fine with me.
### Hashmaps, assoc lists, and generalised key/value stores
I now have the oblist working as a hashmap, and also hybrid assoc lists which incorporate hashmaps working. I don't 100% have consistent methods for reading stores which may be plain old assoc lists, new hybrid assoc lists, or hashmaps working but it isn't far off. This also takes me streets further towards doing hierarchies of hashmaps, allowing my namespace idea to work &mdash; and hybrid assoc lists provide a very sound basis for building environment structures.
Currently all hashmaps are mutable, and my doctrine is that that is fixable when access control lists are actually implemented.
#### assoc
The function `(assoc store key) => value` should be the standard way of getting a value out of a store.
#### put!
The function `(put! store key value) => store` should become the standard way of setting a value in a store (of course, if the store is an assoc list or an immutable map, a new store will be returned which holds the additional key/value binding).
### State of unit tests
Currently:
> Tested 45, passed 39, failed 6
But the failures are as follows:
```
unit-tests/bignum-add.sh => checking a bignum was created: Fail
unit-tests/bignum-add.sh => adding 1152921504606846977 to 1: Fail: expected 't', got 'nil'
unit-tests/bignum-add.sh => adding 1 to 1152921504606846977: Fail: expected 't', got 'nil'
unit-tests/bignum-add.sh => adding 1152921504606846977 to 1152921504606846977: Fail: expected 't', got 'nil'
unit-tests/bignum-add.sh => adding 10000000000000000000 to 10000000000000000000: Fail: expected 't', got 'nil'
unit-tests/bignum-add.sh => adding 1 to 1329227995784915872903807060280344576: Fail: expected 't', got 'nil'
unit-tests/bignum-add.sh => adding 1 to 3064991081731777716716694054300618367237478244367204352: Fail: expected 't', got 'nil'
unit-tests/bignum-expt.sh => (expt 2 60): Fail: expected '1152921504606846976', got '1'
unit-tests/bignum-expt.sh => (expt 2 61): Fail: expected '2305843009213693952', got '2'
unit-tests/bignum-expt.sh => (expt 2 64): Fail: expected '18446744073709551616', got '16'
unit-tests/bignum-expt.sh => (expt 2 65): Fail: expected '36893488147419103232', got '32'
unit-tests/bignum-print.sh => printing 1152921504606846976: Fail: expected '1152921504606846976', got '1'
unit-tests/bignum-print.sh => printing 1152921504606846977: Fail: expected '1152921504606846977', got '2'
unit-tests/bignum-print.sh => printing 1329227995784915872903807060280344576: Fail: expected '1329227995784915872903807060280344576', \n got '1151321504605245376'
unit-tests/bignum.sh => unit-tests/bignum.sh => Fail: expected '1,152,921,504,606,846,976', got '1'
unit-tests/bignum-subtract.sh => unit-tests/bignum-subtract.sh => subtracting 1 from 1152921504606846976: Fail: expected '1152921504606846975', got '0'
unit-tests/bignum-subtract.sh => subtracting 1 from 1152921504606846977: Fail: expected '1152921504606846976', got '1'
unit-tests/bignum-subtract.sh => subtracting 1 from 1152921504606846978: Fail: expected '1152921504606846977', got '2'
unit-tests/bignum-subtract.sh => subtracting 1152921504606846977 from 1: Fail: expected '-1152921504606846976', got '1'
unit-tests/bignum-subtract.sh => subtracting 10000000000000000000 from 20000000000000000000: Fail: expected '10000000000000000000', got '-376293541461622793'
unit-tests/memory.sh
```
In other words, all failures are in bignum arithmetic **except** that I still have a major memory leak due to not decrefing somewhere where I ought to.
### Zig
I've also experimented with autotranslating my C into Zig, but this failed. Although I don't think C is the right language for implementing my base Lisp in, it's what I've got; and until I can get some form of autotranslate to bootstrap me into some more modern systems language, I think I need to stick with it.
## 20250704
Right, I'm getting second and subsequent integer cells with negative values, which should not happen. This is probably the cause of (at least some of) the bignum problems. I need to find out why. This is (probably) fixable.
```lisp
:: (inspect 10000000000000000000)
INTR (1381256777) at page 3, offset 873 count 2
Integer cell: value 776627963145224192, count 2
BIGNUM! More at:
INTR (1381256777) at page 3, offset 872 count 1
Integer cell: value -8, count 1
```
Also, `print` is printing bignums wrong on ploughwright, but less wrong on mason, which implies a code difference. Investigate.
## 20250314
Thinking further about this, I think at least part of the problem is that I'm storing bignums as cons-space objects, which means that the integer representation I can store has to fit into the size of a cons pointer, which is 64 bits. Which means that to store integers larger than 64 bits I need chains of these objects.
If I stored bignums in vector space, this problem would go away (especially as I have not implemented vector space yet).
However, having bignums in vector space would cause a churn of non-standard-sized objects in vector space, which would mean much more frequent garbage collection, which has to be mark-and-sweep because unequal-sized objects, otherwise you get heap fragmentation.
So maybe I just have to put more work into debugging my cons-space bignums.
Bother, bother.
There are no perfect solutions.
However however, it's only the node that's short on vector space which has to pause to do a mark and sweep. It doesn't interrupt any other node, because their reference to the object will remain the same, even if it is the 'home node' of the object which is sweeping. So all the node has to do is set its busy flag, do GC, and clear its busy flag, The rest of the system can just be carrying on as normal.
So... maybe mark and sweep isn't the big deal I think it is?
## 20250313
OK, the 60 bit integer cell happens in `int128_to_integer` in `arith/integer.c`. It seems to be being done consistently; but there is no obvious reason. `MAX_INTEGER` is defined in `arith/peano.h`. I've changed both to use 63 bits, and this makes no change to the number of unit tests that fail.
With this change, `(fact 21)`, which was previously printing nothing, now prints a value, `11,891,611,015,076,642,816`. However, this value is definitively wrong, should be `51,090,942,171,709,440,000`. But, I hadn't fixed the shift in `integer_to_string`; have now... still no change in number of failed tests...
But `(fact 21)` gives a different wrong value, `4,974,081,987,435,560,960`. Factorial values returned by `fact` are correct (agree with SBCL running the same code) up to `(fact 20)`, with both 60 bit integer cells and 63 bit integer cells giving correct values.
Uhhhmmm... but I'd missed two other places where I'd had the number of significant bits as a numeric literal. Fixed those and now `(fact 21)` does not return a printable answer at all, although the internal representation is definitely wrong. So we may be seeing why I chose 60 bits.
Bother.
## 20250312
Printing of bignums definitely doesn't work; I'm not persuaded that reading of bignums works right either, and there are probably problems with bignum arithmetic too.
The internal memory representation of a number rolls over from one cell to two cells at 1152921504606846976, and I'm not at all certain why it does because this is neither 2<sup>63</sup> nor 2<sup>64</sup>.
| | | |
| -------------- | -------------------- | ---- |
| 2<sup>62</sup> | 4611686018427387904 | |
| 2<sup>63</sup> | 9223372036854775808 | |
| 2<sup>64</sup> | 18446744073709551616 | |
| Mystery number | 1152921504606846976 | |
In fact, our mystery number turns out (by inspection) to be 2<sup>60</sup>. But **why**?