Another inconclusive session: still nothing works, still making progress.
This commit is contained in:
parent
ef59563e25
commit
eed4711fee
35 changed files with 317 additions and 232 deletions
|
|
@ -57,9 +57,10 @@ struct pso_pointer eval(
|
|||
#ifdef MANAGED_POINTER_ONLY
|
||||
struct pso4 *frame = pointer_to_pso4( frame_pointer );
|
||||
#endif
|
||||
struct pso_pointer result = fetch_arg( frame, 0 );
|
||||
struct pso_pointer arg = fetch_arg( frame, 0 );
|
||||
struct pso_pointer result = nil;
|
||||
|
||||
switch ( get_tag_value( result ) ) {
|
||||
switch ( get_tag_value( arg ) ) {
|
||||
// case CONSTV:
|
||||
// result = eval_cons( frame, frame_pointer, env);
|
||||
// break;
|
||||
|
|
@ -67,9 +68,10 @@ struct pso_pointer eval(
|
|||
case KEYTV:
|
||||
case STRINGTV:
|
||||
// self evaluating
|
||||
result = nil;
|
||||
break;
|
||||
case SYMBOLTV:
|
||||
result = c_assoc( result, fetch_env(frame_pointer) );
|
||||
arg = c_assoc( arg, fetch_env(frame_pointer) );
|
||||
break;
|
||||
// case LAMBDATV:
|
||||
// result = eval_lambda( frame, frame_pointer, env);
|
||||
|
|
@ -81,34 +83,34 @@ struct pso_pointer eval(
|
|||
// result = eval_special( frame, frame_pointer, env);
|
||||
// break;
|
||||
default:
|
||||
result =
|
||||
make_exception( make_cons
|
||||
( frame, c_string_to_lisp_string
|
||||
( frame,
|
||||
arg =
|
||||
make_exception(
|
||||
make_frame(1, frame_pointer,
|
||||
make_cons( frame_pointer,
|
||||
c_string_to_lisp_string( frame_pointer,
|
||||
L"Can't yet evaluate things of this type: " ),
|
||||
result ), frame_pointer, make_cons( frame,
|
||||
arg ),
|
||||
make_cons( frame_pointer,
|
||||
make_cons
|
||||
( frame,
|
||||
( frame_pointer,
|
||||
c_string_to_lisp_keyword
|
||||
( frame,
|
||||
( frame_pointer,
|
||||
L"tag" ),
|
||||
get_tag_string
|
||||
( result ) ),
|
||||
( arg ) ),
|
||||
nil ),
|
||||
nil );
|
||||
nil ));
|
||||
}
|
||||
|
||||
if ( exceptionp( result ) ) {
|
||||
if ( exceptionp( arg ) ) {
|
||||
struct pso3 *x =
|
||||
( struct pso3 * ) pointer_to_object_with_tag_value( result,
|
||||
( struct pso3 * ) pointer_to_object_with_tag_value( arg,
|
||||
EXCEPTIONTV );
|
||||
|
||||
if ( nilp( x->payload.exception.stack ) ) {
|
||||
result =
|
||||
make_exception( x->payload.exception.message, frame_pointer,
|
||||
nil, result );
|
||||
if ( c_nilp( x->payload.exception.stack ) ) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
return arg;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue