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

cons

This commit is contained in:
Simon Forman 2023-03-21 12:34:28 -07:00
parent f8016a84e3
commit e83745e6ec
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,14 +586,15 @@ u64
joy_eval(char *symbol, u32 stack, u32 expression) joy_eval(char *symbol, u32 stack, u32 expression)
{ {
MATCH("clear") return (u64)expression; MATCH("clear") return (u64)expression;
MATCH("dup") { stack = dup(stack); } MATCH("cons") { stack = cons_joy_func(stack); }
else MATCH("dup") { stack = dup(stack); }
else MATCH("first") { stack = first(stack); } else MATCH("first") { stack = first(stack); }
else MATCH("pop") { stack = pop(stack); } else MATCH("pop") { stack = pop(stack); }
else MATCH("rest") { stack = rest(stack); } else MATCH("rest") { stack = rest(stack); }
else MATCH("stack") { stack = cons(stack, stack); } else MATCH("stack") { stack = cons(stack, stack); }
else MATCH("swaack") { stack = swaack(stack); } else MATCH("swaack") { stack = swaack(stack); }
else MATCH("swap") { stack = swap(stack); } else MATCH("swap") { stack = swap(stack); }
// first ... // concat ...
//else MATCH("") { stack = (stack); } //else MATCH("") { stack = (stack); }
CHECK_ERROR CHECK_ERROR
//print_str(symbol);print_endl(); //print_str(symbol);print_endl();
@ -601,6 +602,19 @@ joy_eval(char *symbol, u32 stack, u32 expression)
} }
u32
cons_joy_func(u32 stack)
{
u32 list = pop_list(stack); CHECK_ERROR
stack = tail(stack);
u32 tos = pop_any(stack); CHECK_ERROR
stack = tail(stack);
list = cons(tos, list); CHECK_ERROR
stack = cons(list, stack); CHECK_ERROR
return stack;
}
u32 u32
swaack(u32 stack) swaack(u32 stack)
{ {
@ -716,7 +730,7 @@ main()
print_endl(); print_endl();
*/ */
u32 expression = text_to_expression("1 2 3 stack rest first"); u32 expression = text_to_expression("1 2 3 stack rest first [] cons cons");
//u32 expression = text_to_expression("1 2 3 clear 4 5 6"); //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);