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

More code, closer to working, still builds.

Browse source
This commit is contained in:
Simon Brooke 2026-04-15 22:47:44 +01:00
parent c9f50572ab
commit f751fc8a09
14 changed files with 138 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/c/ops/assoc.c
View file

@ -74,7 +74,8 @@ struct pso_pointer c_assoc( struct pso_pointer key, struct pso_pointer store ) {
*
* @return a pointer to the copy of the key in the store, or nil if not found.
*/
struct pso_pointer c_interned( struct pso_pointer key, struct pso_pointer store ) {
struct pso_pointer c_interned( struct pso_pointer key,
struct pso_pointer store ) {
return search( key, store, true );
}
@ -95,11 +96,12 @@ bool c_internedp( struct pso_pointer key, struct pso_pointer store ) {
*
* @return a pointer to the value of the key in the store, or nil if not found
*/
struct pso_pointer assoc(
struct pso_pointer assoc(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer, struct pso_pointer env) {
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
#ifdef MANAGED_POINTER_ONLY
struct pso4 *frame = pointer_to_pso4( frame_pointer );
#endif
@ -114,11 +116,12 @@ struct pso_pointer assoc(
*
* @return a pointer to the copy of the key in the store, or nil if not found.
*/
struct pso_pointer interned(
struct pso_pointer interned(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer, struct pso_pointer env) {
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
#ifdef MANAGED_POINTER_ONLY
struct pso4 *frame = pointer_to_pso4( frame_pointer );
#endif
@ -133,11 +136,12 @@ struct pso_pointer interned(
*
* @return `t` if a pointer to a copy of `key` is found in the store, or `nil` if not found.
*/
struct pso_pointer internedp(
struct pso_pointer internedp(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer, struct pso_pointer env) {
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
#ifdef MANAGED_POINTER_ONLY
struct pso4 *frame = pointer_to_pso4( frame_pointer );
#endif
@ -145,4 +149,4 @@ struct pso_pointer internedp(
struct pso_pointer store = fetch_arg( frame, 1 );
return c_interned( key, store );
}
}

4
src/c/ops/assoc.h
View file

@ -17,12 +17,12 @@
#include "memory/pointer.h"
struct pso_pointer search( struct pso_pointer key,
struct pso_pointer store, bool return_key );
struct pso_pointer store, bool return_key );
struct pso_pointer c_assoc( struct pso_pointer key, struct pso_pointer store );
struct pso_pointer c_interned( struct pso_pointer key,
struct pso_pointer store );
struct pso_pointer store );
bool c_internedp( struct pso_pointer key, struct pso_pointer store );
#endif

13
src/c/ops/bind.c
View file

@ -21,11 +21,12 @@
#include "payloads/cons.h"
#include "payloads/stack.h"
struct pso_pointer bind(
struct pso_pointer lisp_bind(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer, struct pso_pointer env) {
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
#ifdef MANAGED_POINTER_ONLY
struct pso4 *frame = pointer_to_pso4( frame_pointer );
#endif
@ -42,11 +43,11 @@ struct pso_pointer c_bind( struct pso_pointer key,
struct pso_pointer result = nil;
struct pso_pointer next = make_frame( nil, key, value, store );
inc_ref( next );
result = bind(
result = lisp_bind(
#ifndef MANAGED_POINTER_ONLY
pointer_to_pso4( next),
pointer_to_pso4( next ),
#endif
next, nil );
next, nil );
dec_ref( next );
return result;

10
src/c/ops/bind.h
View file

@ -14,17 +14,17 @@
#include <stdbool.h>
#include "memory/pointer.h"
#include "memory/pso4.h"
struct pso_pointer c_bind( struct pso_pointer key,
struct pso_pointer value,
struct pso_pointer store );
struct pso_pointer bind(
struct pso_pointer lisp_bind(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer,
struct pso_pointer env
);
struct pso_pointer frame_pointer,
struct pso_pointer env );
#endif

20
src/c/ops/eq.c
View file

@ -91,14 +91,15 @@ bool c_equal( struct pso_pointer a, struct pso_pointer b ) {
*
* @return `t` if all args are pointers to the same object, else `nil`;
*/
struct pso_pointer eq(
struct pso_pointer eq(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer, struct pso_pointer env) {
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
#ifdef MANAGED_POINTER_ONLY
struct pso4 *frame = pointer_to_pso4( frame_pointer );
#endif
struct pso_pointer result = t;
@ -130,14 +131,15 @@ struct pso_pointer eq(
*
* @return `t` if all args are pointers to the same object, else `nil`;
*/
struct pso_pointer equal(
struct pso_pointer equal(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer, struct pso_pointer env) {
struct pso_pointer frame_pointer,
struct pso_pointer env ) {
#ifdef MANAGED_POINTER_ONLY
struct pso4 *frame = pointer_to_pso4( frame_pointer );
#endif
return c_equal( fetch_arg( frame, 0), fetch_arg( frame, 1)) ? t : nil;
return c_equal( fetch_arg( frame, 0 ), fetch_arg( frame, 1 ) ) ? t : nil;
}

18
src/c/ops/eq.h
View file

@ -25,21 +25,19 @@ struct pso_pointer eq( struct pso_pointer frame_pointer,
bool c_equal( struct pso_pointer a, struct pso_pointer b );
struct pso_pointer eq(
struct pso_pointer eq(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer,
struct pso_pointer env
);
struct pso_pointer frame_pointer,
struct pso_pointer env );
struct pso_pointer equal(
struct pso_pointer equal(
#ifndef MANAGED_POINTER_ONLY
struct pso4 * frame,
struct pso4 *frame,
#endif
struct pso_pointer frame_pointer,
struct pso_pointer env
);
struct pso_pointer frame_pointer,
struct pso_pointer env );
#endif

76
src/c/ops/eval.c
View file

@ -1,76 +0,0 @@
/**
* ops/eval.c
*
* Post Scarcity Software Environment: eval.
*
* Evaluate an arbitrary Lisp expression.
*
* (c) 2026 Simon Brooke <simon@journeyman.cc>
* Licensed under GPL version 2.0, or, at your option, any later version.
*/
#include "memory/pointer.h"
#include "memory/pso.h"
#include "memory/pso2.h"
#include "memory/pso3.h"
#include "memory/pso4.h"
#include "memory/tags.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"
#include "ops/truth.h"
/**
* @brief Despatch eval based on tag of the form in the first position.
*
* @param frame The current stack frame;
* @param frame_pointer A pointer to the current stack frame;
* @param env the evaluation environment.
* @return struct pso_pointer
*/
struct pso_pointer lisp_eval( struct pso_pointer frame_pointer,
struct pso_pointer env ) {
struct pso4 *frame = pointer_to_pso4( frame_pointer );
struct pso_pointer result = frame->payload.stack_frame.arg[0];
// switch ( get_tag_value( result)) {
// case CONSTV:
// result = eval_cons( frame, frame_pointer, env);
// break;
// case KEYTV:
// case SYMBOLTV:
// result = eval_symbol( frame, frame_pointer, env);
// break;
// case LAMBDATV:
// result = eval_lambda( frame, frame_pointer, env);
// break;
// case NLAMBDATV:
// result = eval_nlambda( frame, frame_pointer, env);
// break;
// case SPECIALTV:
// result = eval_special( frame, frame_pointer, env);
// break;
// }
if ( exceptionp( result ) ) {
struct pso3 *x =
( struct pso3 * ) pointer_to_object_with_tag_value( result,
EXCEPTIONTV );
if ( nilp( x->payload.exception.stack ) ) {
inc_ref( result );
result =
make_exception( x->payload.exception.message, frame_pointer,
result );
}
}
return result;
}

19
src/c/ops/string_ops.c
View file

@ -145,6 +145,25 @@ struct pso_pointer c_string_to_lisp_string( wchar_t *string ) {
return result;
}
/**
* Return a lisp symbol representation of this wide character string. In
* symbols, I am accepting only lower case characters.
*/
struct pso_pointer c_string_to_lisp_symbol( wchar_t *symbol ) {
struct pso_pointer result = nil;
for ( int i = wcslen( symbol ) - 1; i >= 0; i-- ) {
wchar_t c = towlower( symbol[i] );
if ( iswalpha( c ) || c == L'-' ) {
result = make_symbol( c, result );
}
}
return result;
}
/**
* Return a lisp keyword representation of this wide character string. In
* keywords, I am accepting only lower case characters and numbers.

2
src/c/ops/string_ops.h
View file

@ -29,4 +29,6 @@ struct pso_pointer c_string_to_lisp_string( wchar_t *string );
struct pso_pointer c_string_to_lisp_keyword( wchar_t *symbol );
struct pso_pointer c_string_to_lisp_symbol( wchar_t *symbol );
#endif