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

pop()

This commit is contained in:
Simon Forman 2023-03-18 11:50:18 -07:00
parent 75ba7db666
commit fcdf8d416a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,13 +571,15 @@ joy_eval(char *symbol, u32 stack, u32 expression)
{ {
MATCH("clear") return (u64)expression; MATCH("clear") return (u64)expression;
MATCH("swaack") { stack = swaack(stack); } MATCH("swaack") { stack = swaack(stack); }
else MATCH("pop") { stack = pop(stack); }
//else MATCH("") {}
CHECK_ERROR CHECK_ERROR
//print_str(symbol);print_endl(); //print_str(symbol);print_endl();
return (u64)stack << 32 | expression; return (u64)stack << 32 | expression;
} }
u64 u32
swaack(u32 stack) swaack(u32 stack)
{ {
u32 list = pop_list(stack); u32 list = pop_list(stack);
@ -586,6 +588,17 @@ swaack(u32 stack)
} }
u32
pop(u32 stack)
{
if (!stack) {
error = NOT_ENOUGH_VALUES_ON_STACK;
return 0;
}
return tail(stack);
}
u32 u32
joy(u32 stack, u32 expression) joy(u32 stack, u32 expression)
{ {
@ -635,7 +648,7 @@ main()
print_endl(); print_endl();
*/ */
u32 expression = text_to_expression("1 2 3 [4 5 6] swaack"); u32 expression = text_to_expression("1 2 3 [4 5 6] swaack pop 23");
//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);