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

pop_list <=> pop_list_node 

These names seem like they should be swapped.
This commit is contained in:
Simon Forman 2023-02-05 19:47:32 -08:00
parent b70231bcff
commit 5b12385253
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
implementations/C/joy.c
View File

@ -206,7 +206,7 @@ pop_bool(JoyListPtr stack)
JoyList JoyList
pop_list(JoyListPtr stack) pop_list_node(JoyListPtr stack)
{ {
JoyList node; JoyList node;
node = pop_any(stack); node = pop_any(stack);
@ -221,9 +221,9 @@ pop_list(JoyListPtr stack)
JoyList JoyList
pop_list_node(JoyListPtr stack) pop_list(JoyListPtr stack)
{ {
return pop_list(stack)->head->value.el; return pop_list_node(stack)->head->value.el;
} }
@ -512,7 +512,7 @@ next_term(JoyListPtr expression)
printf("Do not call next_term on an empty expression.\n"); printf("Do not call next_term on an empty expression.\n");
exit(1); exit(1);
} }
quote = pop_list_node(expression); quote = pop_list(expression);
if (!quote) { if (!quote) {
printf("How did an empty list get onto the expression!?\n"); printf("How did an empty list get onto the expression!?\n");
exit(1); exit(1);
@ -571,9 +571,9 @@ neq [true] [false] [true] cmp
void void
cmp_joyfunc(JoyListPtr stack, JoyListPtr expression) cmp_joyfunc(JoyListPtr stack, JoyListPtr expression)
{ {
JoyList L = pop_list_node(stack); JoyList L = pop_list(stack);
JoyList E = pop_list_node(stack); JoyList E = pop_list(stack);
JoyList G = pop_list_node(stack); JoyList G = pop_list(stack);
mpz_t *b = pop_int(stack); mpz_t *b = pop_int(stack);
mpz_t *a = pop_int(stack); mpz_t *a = pop_int(stack);
int hmm = mpz_cmp(*a, *b); int hmm = mpz_cmp(*a, *b);
@ -584,15 +584,15 @@ cmp_joyfunc(JoyListPtr stack, JoyListPtr expression)
void void
i_joyfunc(JoyListPtr stack, JoyListPtr expression) i_joyfunc(JoyListPtr stack, JoyListPtr expression)
{ {
push_quote_onto_expression(pop_list_node(stack), expression); push_quote_onto_expression(pop_list(stack), expression);
} }
void void
branch(JoyListPtr stack, JoyListPtr expression) branch(JoyListPtr stack, JoyListPtr expression)
{ {
JoyList T = pop_list_node(stack); JoyList T = pop_list(stack);
JoyList F = pop_list_node(stack); JoyList F = pop_list(stack);
push_quote_onto_expression((pop_bool(stack) ? T : F), expression); push_quote_onto_expression((pop_bool(stack) ? T : F), expression);
} }
@ -600,7 +600,7 @@ branch(JoyListPtr stack, JoyListPtr expression)
void void
loop(JoyListPtr stack, JoyListPtr expression) loop(JoyListPtr stack, JoyListPtr expression)
{ {
JoyList body = pop_list_node(stack); JoyList body = pop_list(stack);
JoyList x = EMPTY_LIST; JoyList x = EMPTY_LIST;
if (pop_bool(stack)) { if (pop_bool(stack)) {
@ -623,7 +623,7 @@ clear(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
void void
cons(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression) cons(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{ {
JoyList quote = pop_list_node(stack); JoyList quote = pop_list(stack);
JoyListPtr qPtr = &quote; JoyListPtr qPtr = &quote;
JoyList node = pop_any(stack); JoyList node = pop_any(stack);
push_thing(node->head, qPtr); push_thing(node->head, qPtr);
@ -641,7 +641,7 @@ pop(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
void void
swaack(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression) swaack(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{ {
JoyList quote = pop_list_node(stack); JoyList quote = pop_list(stack);
JoyListPtr qPtr = &quote; JoyListPtr qPtr = &quote;
push_quote(*stack, qPtr); push_quote(*stack, qPtr);
*stack = *qPtr; *stack = *qPtr;
@ -668,8 +668,8 @@ swap(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
void void
concat(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression) concat(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{ {
JoyList b = pop_list_node(stack); JoyList b = pop_list(stack);
JoyList a = pop_list_node(stack); JoyList a = pop_list(stack);
push_quote(concat_lists(a, b), stack); push_quote(concat_lists(a, b), stack);
} }
@ -677,7 +677,7 @@ concat(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
void void
first(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression) first(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{ {
JoyList quote = pop_list_node(stack); JoyList quote = pop_list(stack);
if (!quote) { if (!quote) {
printf("Cannot take first of empty list.\n"); printf("Cannot take first of empty list.\n");
exit(1); exit(1);
@ -689,7 +689,7 @@ first(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
void void
rest(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression) rest(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{ {
JoyList quote = pop_list_node(stack); JoyList quote = pop_list(stack);
if (!quote) { if (!quote) {
printf("Cannot take rest of empty list.\n"); printf("Cannot take rest of empty list.\n");
exit(1); exit(1);
@ -701,7 +701,7 @@ rest(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
void void
dip(JoyListPtr stack, JoyListPtr expression) dip(JoyListPtr stack, JoyListPtr expression)
{ {
JoyList quote = pop_list_node(stack); JoyList quote = pop_list(stack);
JoyList node = pop_any(stack); JoyList node = pop_any(stack);
push_thing_in_unit_list(node->head, expression); push_thing_in_unit_list(node->head, expression);
push_quote_onto_expression(quote, expression); push_quote_onto_expression(quote, expression);