sforman
/
Thun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swaack and error macro.

This commit is contained in:
Simon Forman 2023-03-18 11:26:27 -07:00
parent 61039475a5
commit e39b9460bb
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
implementations/uvm-ncc/joy.c
View File

@ -43,6 +43,11 @@ u64 error = 0;
#define EXTRA_CLOSING_BRACKET 3 #define EXTRA_CLOSING_BRACKET 3
#define CONS_HEAP_OOM 4 #define CONS_HEAP_OOM 4
#define STRING_HEAP_OOM 5 #define STRING_HEAP_OOM 5
#define NOT_ENOUGH_VALUES_ON_STACK 6
#define NOT_A_LIST 7
#define CHECK_ERROR if (error != NO_ERROR) return 0;
/* /*
char *error_messages[3] = { char *error_messages[3] = {
@ -112,7 +117,7 @@ cons(u32 head, u32 tail)
{ {
if (free >= HEAP_SIZE) { if (free >= HEAP_SIZE) {
error = CONS_HEAP_OOM; error = CONS_HEAP_OOM;
return -1; return 0;
} }
heads[free] = head; heads[free] = head;
tails[free] = tail; tails[free] = tail;
@ -553,9 +558,21 @@ joy_eval(char *symbol, u32 stack, u32 expression)
u64 u64
swaack(u32 stack, u32 expression) swaack(u32 stack, u32 expression)
{ {
if (!stack) {
error = NOT_ENOUGH_VALUES_ON_STACK;
return 0;
}
u32 list = head(stack);
if (TYPE_OF(list) != joyList) {
error = NOT_A_LIST;
return 0;
}
stack = cons(tail(stack), list);
CHECK_ERROR
return (u64)stack << 32 | expression; return (u64)stack << 32 | expression;
} }
u32 u32
joy(u32 stack, u32 expression) joy(u32 stack, u32 expression)
{ {
@ -564,15 +581,10 @@ joy(u32 stack, u32 expression)
term = head(expression); term = head(expression);
expression = tail(expression); expression = tail(expression);
if (TYPE_OF(term) == joySymbol) { if (TYPE_OF(term) == joySymbol) {
char *symbol = ht_lookup(VALUE_OF(term)); char *symbol = ht_lookup(VALUE_OF(term));
if (error != NO_ERROR) CHECK_ERROR
return 0;
u64 new_state = joy_eval(symbol, stack, expression); u64 new_state = joy_eval(symbol, stack, expression);
if (error != NO_ERROR) CHECK_ERROR
return 0;
stack = new_state >> 32; stack = new_state >> 32;
expression = new_state & 0xffffffff; expression = new_state & 0xffffffff;
} }
@ -610,11 +622,18 @@ main()
print_endl(); print_endl();
*/ */
u32 expression = text_to_expression("1 2 3 clear 4 5 6"); u32 expression = text_to_expression("1 2 3 [4 5 6] swaack");
//u32 expression = text_to_expression("1 2 3 clear 4 5 6");
//u32 expression = text_to_expression(" 1[2[true 3][aa[aa bb] aa bb cc]bob]false[]bob 3[4] ga[]ry"); //u32 expression = text_to_expression(" 1[2[true 3][aa[aa bb] aa bb cc]bob]false[]bob 3[4] ga[]ry");
print_joy_list(expression); print_joy_list(expression);
print_endl(); print_endl();
u32 stack = joy(empty_list, expression); u32 stack = joy(empty_list, expression);
if (error) {
print_str("error: ");
print_i64(error);
print_endl();
} else {
print_joy_list(stack); print_joy_list(stack);
print_endl(); print_endl();
}
} }