It compiles. It runs. Nothing works, but it also doesn't crash. Victory!

This commit is contained in:
Simon Brooke 2026-04-23 11:50:30 +01:00
parent 8d2acbeb0f
commit aa0d60bbed
20 changed files with 390 additions and 244 deletions

View file

@ -108,8 +108,8 @@ struct pso_pointer assoc(
struct pso_pointer key = fetch_arg( frame, 0 );
struct pso_pointer store = or( make_frame( 2, frame_pointer,
fetch_arg( frame, 1 ),
frame->payload.
stack_frame.env ) );
frame->payload.stack_frame.
env ) );
return c_assoc( key, store );
}
@ -130,8 +130,8 @@ struct pso_pointer interned(
struct pso_pointer key = fetch_arg( frame, 0 );
struct pso_pointer store = or( make_frame( 2, frame_pointer,
fetch_arg( frame, 1 ),
frame->payload.
stack_frame.env ) );
frame->payload.stack_frame.
env ) );
return c_interned( key, store );
}
@ -152,8 +152,8 @@ struct pso_pointer internedp(
struct pso_pointer key = fetch_arg( frame, 0 );
struct pso_pointer store = or( make_frame( 2, frame_pointer,
fetch_arg( frame, 1 ),
frame->payload.
stack_frame.env ) );
frame->payload.stack_frame.
env ) );
return c_internedp( key, store ) ? t : nil;
}

View file

@ -41,7 +41,7 @@
*
* @param dummy
*/
void int_handler( int dummy ) {
void interrupt_handler( int dummy ) {
wprintf( L"TODO: handle ctrl-C in a more interesting way\n" );
}
@ -52,7 +52,7 @@ void repl( struct pso_pointer frame_pointer ) {
struct pso4 *frame = pointer_to_pso4( frame_pointer );
bool show_prompt = c_truep( fetch_arg( frame, 0 ) );
// todo: issue #21: must have stack frame passed in.
signal( SIGINT, int_handler );
signal( SIGINT, interrupt_handler );
debug_print( L"Entered repl\n", DEBUG_REPL, 0 );
struct pso_pointer env = fetch_env( frame_pointer );

View file

@ -8,7 +8,8 @@
*/
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
/*
* wide characters
*/
@ -143,7 +144,7 @@ struct pso_pointer make_symbol( struct pso_pointer frame_pointer, wint_t c,
* Return a lisp string representation of this wide character string.
*/
struct pso_pointer c_string_to_lisp_string( struct pso_pointer frame_pointer,
char32_t *string ) {
wchar_t *string ) {
struct pso_pointer result = nil;
for ( int i = wcslen( string ) - 1; i >= 0; i-- ) {
@ -159,6 +160,53 @@ struct pso_pointer c_string_to_lisp_string( struct pso_pointer frame_pointer,
return result;
}
/**
* Convert this lisp string-like-thing (also works for symbols, and, later
* keywords) into a UTF-8 string. NOTE that the returned value has been
* malloced and must be freed. TODO: candidate to moving into a utilities
* file.
*
* @param s the lisp string or symbol;
* @return the c string.
*/
char *lisp_string_to_c_string( struct pso_pointer s ) {
char *result = NULL;
if ( stringp( s ) || symbolp( s ) ) {
int len = 1;
for ( struct pso_pointer c = s; !c_nilp( c ); c = c_cdr( c ) ) {
len++;
}
wchar_t *buffer = calloc( len, sizeof( char32_t ) );
int i = 0;
for ( struct pso_pointer c = s; !c_nilp( c ); c = c_cdr( c ) ) {
buffer[i++] =
( wchar_t ) ( pointer_to_object( c )->payload.string.
character );
}
mbstate_t ps;
const wchar_t *src = buffer;
memset( &ps, 0, sizeof( ps ) );
result =
calloc( wcsrtombs( NULL, &src, len, &ps ) + 1, sizeof( char ) );
src = buffer;
memset( &ps, 0, sizeof( ps ) );
wcsrtombs( result, &src, len, &ps );
free( buffer );
// mbstate_t ps = mbstate_t();
//
// result = calloc( wcsrtombs( NULL, &buffer, len, &ps) + 1 );
// wcsrtombs( result, &buffer, len, &ps);
// free( buffer );
}
debug_print( L"lisp_string_to_c_string( ", DEBUG_IO, 0 );
debug_print_object( s, DEBUG_IO, 0 );
debug_printf( DEBUG_IO, 0, L") => '%s'\n", result );
return result;
}
/**
* Return a lisp symbol representation of this wide character string. In

View file

@ -31,7 +31,9 @@ struct pso_pointer make_symbol( struct pso_pointer frame_pointer, wint_t c,
struct pso_pointer tail );
struct pso_pointer c_string_to_lisp_string( struct pso_pointer frame_pointer,
char32_t * string );
wchar_t *string );
char *lisp_string_to_c_string( struct pso_pointer s );
struct pso_pointer c_string_to_lisp_keyword( struct pso_pointer frame_pointer,
char32_t * symbol );