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

pop

This commit is contained in:
Simon Forman 2023-02-05 09:50:41 -08:00
parent 3d0b5ba266
commit 9563f738bd
4 changed files with 50 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

@ -19,6 +19,7 @@ cons, cons
dip, dip dip, dip
dup, dup dup, dup
i, i_joyfunc i, i_joyfunc
pop, pop
abs, def_abs abs, def_abs
anamorphism, def_anamorphism anamorphism, def_anamorphism
app1, def_app1 app1, def_app1

7
implementations/C/joy.c
View File

@ -589,6 +589,13 @@ cons(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
} }
void
pop(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{
pop_any(stack);
}
void void
dip(JoyListPtr stack, JoyListPtr expression) dip(JoyListPtr stack, JoyListPtr expression)
{ {

1
implementations/C/joy.h
View File

@ -64,6 +64,7 @@ void cons(JoyListPtr stack, JoyListPtr expression);
void dip(JoyListPtr stack, JoyListPtr expression); void dip(JoyListPtr stack, JoyListPtr expression);
void dup(JoyListPtr stack, JoyListPtr expression); void dup(JoyListPtr stack, JoyListPtr expression);
void i_joyfunc(JoyListPtr stack, JoyListPtr expression); void i_joyfunc(JoyListPtr stack, JoyListPtr expression);
void pop(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);

81
implementations/C/keywords.c
View File

@ -58,10 +58,10 @@ keyword_hash (register const char *str, register size_t len)
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
52, 52, 52, 52, 52, 52, 52, 52, 20, 52, 52, 52, 52, 52, 52, 52, 52, 52, 20, 52,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
52, 52, 52, 52, 52, 52, 52, 52, 5, 0, 52, 52, 52, 52, 52, 52, 52, 52, 0, 0,
25, 5, 52, 52, 20, 0, 52, 52, 10, 5, 15, 5, 52, 52, 10, 5, 52, 52, 15, 10,
0, 0, 10, 52, 0, 15, 0, 15, 5, 52, 0, 0, 10, 52, 0, 0, 0, 15, 0, 52,
52, 5, 52, 52, 52, 52, 52, 52, 52, 52, 52, 0, 52, 52, 52, 52, 52, 52, 52, 52,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
@ -94,7 +94,7 @@ in_word_set (register const char *str, register size_t len)
{ {
enum enum
{ {
TOTAL_KEYWORDS = 32, TOTAL_KEYWORDS = 33,
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,25 +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 31 "KEYWORDS.txt"
{"b", def_b},
#line 29 "KEYWORDS.txt"
{"at", def_at},
#line 23 "KEYWORDS.txt"
{"abs", def_abs},
#line 18 "KEYWORDS.txt"
{"cons", cons},
#line 34 "KEYWORDS.txt"
{"ccons", def_ccons},
#line 21 "KEYWORDS.txt" #line 21 "KEYWORDS.txt"
{"i", i_joyfunc}, {"i", i_joyfunc},
#line 28 "KEYWORDS.txt" #line 33 "KEYWORDS.txt"
{"at", def_at}, {"ccccons", def_ccccons},
{""}, #line 38 "KEYWORDS.txt"
#line 36 "KEYWORDS.txt" {"codireco", def_codireco},
#line 37 "KEYWORDS.txt"
{"codi", def_codi}, {"codi", def_codi},
{""}, {""},
#line 32 "KEYWORDS.txt"
{"binary", def_binary},
#line 30 "KEYWORDS.txt" #line 30 "KEYWORDS.txt"
{"b", def_b}, {"average", def_average},
{""}, #line 22 "KEYWORDS.txt"
#line 37 "KEYWORDS.txt" {"pop", pop},
{"codireco", def_codireco}, #line 39 "KEYWORDS.txt"
#line 38 "KEYWORDS.txt"
{"dinfrirst", def_dinfrirst}, {"dinfrirst", def_dinfrirst},
{""}, {""},
#line 31 "KEYWORDS.txt" #line 15 "KEYWORDS.txt"
{"binary", def_binary}, {"branch", branch},
#line 40 "KEYWORDS.txt" #line 41 "KEYWORDS.txt"
{"disenstacken", def_disenstacken}, {"disenstacken", def_disenstacken},
#line 19 "KEYWORDS.txt" #line 19 "KEYWORDS.txt"
{"dip", dip}, {"dip", dip},
@ -130,55 +142,44 @@ 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 23 "KEYWORDS.txt" #line 24 "KEYWORDS.txt"
{"anamorphism", def_anamorphism}, {"anamorphism", def_anamorphism},
#line 29 "KEYWORDS.txt" {""},
{"average", def_average},
#line 17 "KEYWORDS.txt" #line 17 "KEYWORDS.txt"
{"cmp", cmp_joyfunc}, {"cmp", cmp_joyfunc},
#line 18 "KEYWORDS.txt" #line 40 "KEYWORDS.txt"
{"cons", cons}, {"dipd", def_dipd},
#line 33 "KEYWORDS.txt"
{"ccons", def_ccons},
#line 34 "KEYWORDS.txt"
{"cleave", def_cleave},
#line 32 "KEYWORDS.txt"
{"ccccons", def_ccccons},
#line 22 "KEYWORDS.txt"
{"abs", def_abs},
#line 35 "KEYWORDS.txt"
{"clop", def_clop},
{""}, {""},
#line 15 "KEYWORDS.txt" #line 35 "KEYWORDS.txt"
{"branch", branch}, {"cleave", def_cleave},
{""}, {""},
#line 20 "KEYWORDS.txt" #line 20 "KEYWORDS.txt"
{"dup", dup}, {"dup", dup},
#line 39 "KEYWORDS.txt" #line 36 "KEYWORDS.txt"
{"dipd", def_dipd}, {"clop", def_clop},
{""}, {""},
#line 13 "KEYWORDS.txt" #line 13 "KEYWORDS.txt"
{"/", tdiv_q}, {"/", tdiv_q},
{""}, {""}, {""}, {""},
#line 27 "KEYWORDS.txt" #line 28 "KEYWORDS.txt"
{"appN", def_appN}, {"appN", def_appN},
{""}, {""},
#line 12 "KEYWORDS.txt" #line 12 "KEYWORDS.txt"
{"-", sub}, {"-", sub},
{""}, {""}, {""}, {""},
#line 26 "KEYWORDS.txt" #line 27 "KEYWORDS.txt"
{"app3", def_app3}, {"app3", def_app3},
{""}, {""},
#line 11 "KEYWORDS.txt" #line 11 "KEYWORDS.txt"
{"+", add}, {"+", add},
{""}, {""}, {""}, {""},
#line 25 "KEYWORDS.txt" #line 26 "KEYWORDS.txt"
{"app2", def_app2}, {"app2", def_app2},
{""}, {""},
#line 10 "KEYWORDS.txt" #line 10 "KEYWORDS.txt"
{"*", mul}, {"*", mul},
{""}, {""}, {""}, {""},
#line 24 "KEYWORDS.txt" #line 25 "KEYWORDS.txt"
{"app1", def_app1}, {"app1", def_app1},
{""}, {""},
#line 9 "KEYWORDS.txt" #line 9 "KEYWORDS.txt"