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

swap

This commit is contained in:
Simon Forman 2023-02-05 10:27:17 -08:00
parent 514eaef70f
commit 6ee3226a88
4 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
implementations/C/KEYWORDS.txt
View File

@ -22,6 +22,7 @@ i, i_joyfunc
pop, pop pop, pop
stack, stack stack, stack
swaack, swaack swaack, swaack
swap, swap
abs, def_abs abs, def_abs
anamorphism, def_anamorphism anamorphism, def_anamorphism
app1, def_app1 app1, def_app1

10
implementations/C/joy.c
View File

@ -613,6 +613,16 @@ stack(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
} }
void
swap(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{
JoyList a = pop_any(stack);
JoyList b = pop_any(stack);
push_thing(a->head, stack);
push_thing(b->head, stack);
}
void void
dip(JoyListPtr stack, JoyListPtr expression) dip(JoyListPtr stack, JoyListPtr expression)
{ {

1
implementations/C/joy.h
View File

@ -67,6 +67,7 @@ void i_joyfunc(JoyListPtr stack, JoyListPtr expression);
void pop(JoyListPtr stack, JoyListPtr expression); void pop(JoyListPtr stack, JoyListPtr expression);
void stack(JoyListPtr stack, JoyListPtr expression); void stack(JoyListPtr stack, JoyListPtr expression);
void swaack(JoyListPtr stack, JoyListPtr expression); void swaack(JoyListPtr stack, JoyListPtr expression);
void swap(JoyListPtr stack, JoyListPtr expression);
void mul(JoyListPtr stack, JoyListPtr expression); void mul(JoyListPtr stack, JoyListPtr expression);
void sub(JoyListPtr stack, JoyListPtr expression); void sub(JoyListPtr stack, JoyListPtr expression);
void tdiv_q(JoyListPtr stack, JoyListPtr expression); void tdiv_q(JoyListPtr stack, JoyListPtr expression);

83
implementations/C/keywords.c
View File

@ -53,14 +53,14 @@ keyword_hash (register const char *str, register size_t len)
57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 55, 57, 57, 57, 57, 57, 57, 57, 57, 57, 55, 57, 57,
57, 57, 50, 45, 57, 40, 57, 35, 57, 35, 57, 57, 50, 45, 57, 40, 57, 35, 57, 40,
30, 25, 57, 57, 57, 57, 57, 57, 57, 57, 35, 30, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 20, 57, 57, 57, 57, 57, 57, 57, 57, 57, 25, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 0, 0, 57, 57, 57, 57, 57, 57, 57, 57, 0, 5,
15, 5, 57, 57, 25, 5, 57, 5, 15, 10, 25, 5, 57, 57, 25, 5, 57, 0, 15, 10,
0, 0, 10, 57, 0, 0, 0, 15, 0, 5, 0, 0, 10, 57, 0, 0, 0, 15, 10, 10,
57, 0, 57, 57, 57, 57, 57, 57, 57, 57, 57, 0, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
@ -94,7 +94,7 @@ in_word_set (register const char *str, register size_t len)
{ {
enum enum
{ {
TOTAL_KEYWORDS = 35, TOTAL_KEYWORDS = 36,
MIN_WORD_LENGTH = 1, MIN_WORD_LENGTH = 1,
MAX_WORD_LENGTH = 12, MAX_WORD_LENGTH = 12,
MIN_HASH_VALUE = 1, MIN_HASH_VALUE = 1,
@ -104,38 +104,37 @@ in_word_set (register const char *str, register size_t len)
static const struct dict_entry wordlist[] = static const struct dict_entry wordlist[] =
{ {
{""}, {""},
#line 33 "KEYWORDS.txt" #line 34 "KEYWORDS.txt"
{"b", def_b}, {"b", def_b},
#line 31 "KEYWORDS.txt" #line 32 "KEYWORDS.txt"
{"at", def_at}, {"at", def_at},
#line 25 "KEYWORDS.txt" #line 26 "KEYWORDS.txt"
{"abs", def_abs}, {"abs", def_abs},
#line 18 "KEYWORDS.txt" #line 18 "KEYWORDS.txt"
{"cons", cons}, {"cons", cons},
#line 36 "KEYWORDS.txt"
{"ccons", def_ccons},
#line 21 "KEYWORDS.txt"
{"i", i_joyfunc},
#line 35 "KEYWORDS.txt"
{"ccccons", def_ccccons},
#line 40 "KEYWORDS.txt"
{"codireco", def_codireco},
#line 39 "KEYWORDS.txt"
{"codi", def_codi},
#line 23 "KEYWORDS.txt" #line 23 "KEYWORDS.txt"
{"stack", stack}, {"stack", stack},
#line 34 "KEYWORDS.txt" #line 21 "KEYWORDS.txt"
{"i", i_joyfunc},
{""},
#line 41 "KEYWORDS.txt"
{"codireco", def_codireco},
#line 40 "KEYWORDS.txt"
{"codi", def_codi},
#line 37 "KEYWORDS.txt"
{"ccons", def_ccons},
#line 35 "KEYWORDS.txt"
{"binary", def_binary}, {"binary", def_binary},
#line 32 "KEYWORDS.txt" #line 36 "KEYWORDS.txt"
{"average", def_average}, {"ccccons", def_ccccons},
#line 22 "KEYWORDS.txt" #line 22 "KEYWORDS.txt"
{"pop", pop}, {"pop", pop},
#line 41 "KEYWORDS.txt" #line 42 "KEYWORDS.txt"
{"dinfrirst", def_dinfrirst}, {"dinfrirst", def_dinfrirst},
{""}, {""},
#line 24 "KEYWORDS.txt" #line 24 "KEYWORDS.txt"
{"swaack", swaack}, {"swaack", swaack},
#line 43 "KEYWORDS.txt" #line 44 "KEYWORDS.txt"
{"disenstacken", def_disenstacken}, {"disenstacken", def_disenstacken},
#line 19 "KEYWORDS.txt" #line 19 "KEYWORDS.txt"
{"dip", dip}, {"dip", dip},
@ -143,49 +142,53 @@ in_word_set (register const char *str, register size_t len)
{"bool", truthy}, {"bool", truthy},
#line 16 "KEYWORDS.txt" #line 16 "KEYWORDS.txt"
{"clear", clear}, {"clear", clear},
#line 26 "KEYWORDS.txt" #line 27 "KEYWORDS.txt"
{"anamorphism", def_anamorphism}, {"anamorphism", def_anamorphism},
{""}, #line 33 "KEYWORDS.txt"
{"average", def_average},
#line 17 "KEYWORDS.txt" #line 17 "KEYWORDS.txt"
{"cmp", cmp_joyfunc}, {"cmp", cmp_joyfunc},
#line 42 "KEYWORDS.txt" #line 25 "KEYWORDS.txt"
{"dipd", def_dipd}, {"swap", swap},
{""}, {""},
#line 37 "KEYWORDS.txt" #line 38 "KEYWORDS.txt"
{"cleave", def_cleave}, {"cleave", def_cleave},
{""}, {""},
#line 20 "KEYWORDS.txt" #line 20 "KEYWORDS.txt"
{"dup", dup}, {"dup", dup},
#line 38 "KEYWORDS.txt" #line 39 "KEYWORDS.txt"
{"clop", def_clop}, {"clop", def_clop},
{""}, {""},
#line 15 "KEYWORDS.txt" #line 15 "KEYWORDS.txt"
{"branch", branch}, {"branch", branch},
{""}, {""}, {""}, {""},
#line 30 "KEYWORDS.txt" #line 43 "KEYWORDS.txt"
{"appN", def_appN}, {"dipd", def_dipd},
{""}, {""},
#line 13 "KEYWORDS.txt" #line 13 "KEYWORDS.txt"
{"/", tdiv_q}, {"/", tdiv_q},
{""}, {""}, {""}, {""},
#line 29 "KEYWORDS.txt" #line 31 "KEYWORDS.txt"
{"app3", def_app3}, {"appN", def_appN},
{""}, {""},
#line 12 "KEYWORDS.txt" #line 12 "KEYWORDS.txt"
{"-", sub}, {"-", sub},
{""}, {""}, {""}, {""},
#line 28 "KEYWORDS.txt" #line 30 "KEYWORDS.txt"
{"app2", def_app2}, {"app3", def_app3},
{""}, {""},
#line 11 "KEYWORDS.txt" #line 11 "KEYWORDS.txt"
{"+", add}, {"+", add},
{""}, {""}, {""}, {""},
#line 27 "KEYWORDS.txt" #line 29 "KEYWORDS.txt"
{"app1", def_app1}, {"app2", def_app2},
{""}, {""},
#line 10 "KEYWORDS.txt" #line 10 "KEYWORDS.txt"
{"*", mul}, {"*", mul},
{""}, {""}, {""}, {""}, {""}, {""},
#line 28 "KEYWORDS.txt"
{"app1", def_app1},
{""},
#line 9 "KEYWORDS.txt" #line 9 "KEYWORDS.txt"
{"%", tdiv_r} {"%", tdiv_r}
}; };