Much more progress, still doesn't compile.

This commit is contained in:
Simon Brooke 2026-03-30 09:35:34 +01:00
parent 1ce9fbda77
commit 60921be3d4
25 changed files with 326 additions and 89 deletions

View file

@ -10,8 +10,10 @@
*/
#include "memory/memory.h"
#include "memory/node.h"
#include "memory/pointer.h"
#include "memory/stack.h"
#include "payloads/stack.h"
#include "ops/truth.h"
/**
* @brief Function; do these two pointers point to the same object?
@ -41,14 +43,14 @@ bool eq( struct pso_pointer a, struct pso_pointer b ) {
* @param env my environment (ignored).
* @return `t` if all args are pointers to the same object, else `nil`;
*/
struct pso_pointer lisp_eq( struct stack_frame *frame,
struct pso_pointer lisp_eq( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
struct pso_pointer result = t;
if ( frame->args > 1 ) {
for ( int b = 1; ( truep( result ) ) && ( b < frame->args ); b++ ) {
result = eq( frame->arg[0], fetch_arg( frame, b ) ) ? t : nil;
result = eq( fetch_arg(frame, 0), fetch_arg( frame, b ) ) ? t : nil;
}
}

View file

@ -11,10 +11,14 @@
#ifndef __psse_ops_eq_h
#define __psse_ops_eq_h
#include <stdbool.h>
#include "memory/pointer.h"
#include "memory/pso4.h"
bool eq( struct pso_pointer a, struct pso_pointer b );
struct pso_pointer lisp_eq( struct stack_frame *frame,
struct pso_pointer lisp_eq( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env );

View file

@ -9,14 +9,16 @@
* Licensed under GPL version 2.0, or, at your option, any later version.
*/
#include "memory/pointer"
#include "memory/stack.h"
#include "memory/pointer.h"
#include "memory/pso4.h"
#include "payloads/cons.h"
#include "payloads/exception.h"
#include "payloads/function.h"
#include "payloads/keyword.h"
#include "payloads/lambda.h"
#include "payloads/nlambda.h"
#include "payloads/special.h"
#include "payloads/stack.h"
/**
* @brief Despatch eval based on tag of the form in the first position.
@ -26,10 +28,10 @@
* @param env the evaluation environment.
* @return struct pso_pointer
*/
struct pso_pointer eval_despatch( struct stack_frame *frame,
struct pso_pointer eval_despatch( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
struct pso_pointer result = frame->arg[0];
struct pso_pointer result = frame->payload.stack_frame.arg[0];
// switch ( get_tag_value( result)) {
// case CONSTV:
@ -53,7 +55,7 @@ struct pso_pointer eval_despatch( struct stack_frame *frame,
return result;
}
struct pso_pointer lisp_eval( struct stack_frame *frame,
struct pso_pointer lisp_eval( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
struct pso_pointer result = eval_despatch( frame, frame_pointer, env );

View file

@ -58,10 +58,10 @@ bool truep( struct pso_pointer p) {
* @param env the evaluation environment.
* @return `t` if the first argument in this frame is `nil`, else `t`
*/
pso_pointer lisp_nilp( struct stack_frame *frame,
pso_pointer lisp_nilp( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env ){
return (nilp(frame->arg[0]) ? t : nil);
return (nilp(frame->payload.stack_frame.arg[0]) ? t : nil);
}
/**
@ -72,10 +72,10 @@ pso_pointer lisp_nilp( struct stack_frame *frame,
* @param env the evaluation environment.
* @return `t` if the first argument in this frame is `t`, else `nil`.
*/
pso_pointer lisp_truep( struct stack_frame *frame,
pso_pointer lisp_truep( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env ){
return (truep(frame->arg[0]) ? t : nil);
return (truep(frame->payload.stack_frame.arg[0]) ? t : nil);
}
/**
@ -87,8 +87,8 @@ pso_pointer lisp_truep( struct stack_frame *frame,
* @param env the evaluation environment.
* @return `t` if the first argument in this frame is not `nil`, else `t`.
*/
pso_pointer lisp_not( struct stack_frame *frame,
pso_pointer lisp_not( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env ){
return (not(frame->arg[0]) ? t : nil);
}
return (not(frame->payload.stack_frame.arg[0]) ? t : nil);
}

View file

@ -12,21 +12,21 @@
#ifndef __psse_ops_truth_h
#define __psse_ops_truth_h
bool nilp( struct pso_pointer a, struct pso_pointer b );
bool nilp( struct pso_pointer p );
struct pso_pointer lisp_nilp( struct stack_frame *frame,
struct pso_pointer lisp_nilp( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env );
bool not( struct pso_pointer a, struct pso_pointer b );
bool not( struct pso_pointer p );
struct pso_pointer lisp_not( struct stack_frame *frame,
struct pso_pointer lisp_not( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env );
bool truep( struct pso_pointer a, struct pso_pointer b );
bool truep( struct pso_pointer p );
struct pso_pointer lisp_truep( struct stack_frame *frame,
struct pso_pointer lisp_truep( struct pso4 *frame,
struct pso_pointer frame_pointer,
struct pso_pointer env );