Major step forward: equal is now working, and consequently so is assoc.
This commit is contained in:
parent
271b7da46a
commit
5e64a33965
11 changed files with 168 additions and 137 deletions
|
|
@ -46,7 +46,7 @@ struct pso_pointer initialise_environment( uint32_t node ) {
|
|||
struct pso_pointer frame_pointer = nil; // can't have a frame pointer before we've initialised nil and t
|
||||
|
||||
if ( c_truep( result ) ) {
|
||||
debug_print( U"Initialising `nil`... ", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"Initialising `nil`... ", DEBUG_BOOTSTRAP, 0 );
|
||||
struct pso_pointer n = allocate( frame_pointer, NILTAG, 2 );
|
||||
|
||||
if ( ( n.page == 0 ) && ( n.offset == 0 ) ) {
|
||||
|
|
@ -56,14 +56,14 @@ struct pso_pointer initialise_environment( uint32_t node ) {
|
|||
|
||||
nil = n;
|
||||
lock_object( nil );
|
||||
debug_print( U"success\n", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"success\n", DEBUG_BOOTSTRAP, 0 );
|
||||
} else {
|
||||
result = nil;
|
||||
debug_print( U"fail\n", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"fail\n", DEBUG_BOOTSTRAP, 0 );
|
||||
}
|
||||
}
|
||||
if ( !c_nilp( result ) ) {
|
||||
debug_print( U"Initialising `t`... ", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"Initialising `t`... ", DEBUG_BOOTSTRAP, 0 );
|
||||
struct pso_pointer n = allocate( frame_pointer, TRUETAG, 2 );
|
||||
|
||||
// offset is in words, and size of a pso2 is four words
|
||||
|
|
@ -74,10 +74,10 @@ struct pso_pointer initialise_environment( uint32_t node ) {
|
|||
|
||||
t = n;
|
||||
lock_object( t );
|
||||
debug_print( U"success\n", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"success\n", DEBUG_BOOTSTRAP, 0 );
|
||||
} else {
|
||||
result = nil;
|
||||
debug_print( U"fail\n", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"fail\n", DEBUG_BOOTSTRAP, 0 );
|
||||
}
|
||||
}
|
||||
if ( !exceptionp( result ) ) {
|
||||
|
|
@ -85,22 +85,22 @@ struct pso_pointer initialise_environment( uint32_t node ) {
|
|||
result =
|
||||
lisp_bind( make_frame
|
||||
( 3, frame_pointer,
|
||||
c_string_to_lisp_symbol( frame_pointer, U"nil" ), nil,
|
||||
c_string_to_lisp_symbol( frame_pointer, L"nil" ), nil,
|
||||
nil ) );
|
||||
debug_print( U"Environment after binding `nil`: ", DEBUG_BOOTSTRAP,
|
||||
debug_print( L"Environment after binding `nil`: ", DEBUG_BOOTSTRAP,
|
||||
0 );
|
||||
debug_print_object( result, DEBUG_BOOTSTRAP, 0 );
|
||||
result =
|
||||
lisp_bind( make_frame
|
||||
( 3, frame_pointer,
|
||||
c_string_to_lisp_symbol( frame_pointer, U"t" ), t,
|
||||
c_string_to_lisp_symbol( frame_pointer, L"t" ), t,
|
||||
result ) );
|
||||
|
||||
environment_initialised = true;
|
||||
debug_print( U"Environment after binding `t`: ", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print( L"Environment after binding `t`: ", DEBUG_BOOTSTRAP, 0 );
|
||||
debug_print_object( result, DEBUG_BOOTSTRAP, 0 );
|
||||
|
||||
debug_print( U"\nEnvironment initialised successfully.\n",
|
||||
debug_print( L"\nEnvironment initialised successfully.\n",
|
||||
DEBUG_BOOTSTRAP, 0 );
|
||||
|
||||
initialise_privileged_keywords(frame_pointer);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue