This commit is contained in:
Simon Forman 2023-02-05 09:54:52 -08:00
parent 9563f738bd
commit 8f4c98a051
4 changed files with 68 additions and 53 deletions

View File

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

View File

@ -596,6 +596,16 @@ pop(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
} }
void
swaack(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{
JoyList quote = pop_list_node(stack);
JoyListPtr qPtr = &quote;
push_quote(*stack, qPtr);
*stack = *qPtr;
}
void void
dip(JoyListPtr stack, JoyListPtr expression) dip(JoyListPtr stack, JoyListPtr expression)
{ {

View File

@ -65,6 +65,7 @@ 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 pop(JoyListPtr stack, JoyListPtr expression);
void swaack(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);

View File

@ -35,7 +35,7 @@
#line 7 "KEYWORDS.txt" #line 7 "KEYWORDS.txt"
struct dict_entry; struct dict_entry;
#include <string.h> #include <string.h>
/* maximum key range = 51, duplicates = 0 */ /* maximum key range = 56, duplicates = 0 */
#ifdef __GNUC__ #ifdef __GNUC__
__inline __inline
@ -49,32 +49,32 @@ keyword_hash (register const char *str, register size_t len)
{ {
static const unsigned char asso_values[] = static const unsigned char asso_values[] =
{ {
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 50, 52, 52, 57, 57, 57, 57, 57, 57, 57, 55, 57, 57,
52, 52, 45, 40, 52, 35, 52, 30, 52, 35, 57, 57, 50, 45, 57, 40, 57, 35, 57, 35,
30, 25, 52, 52, 52, 52, 52, 52, 52, 52, 30, 25, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 20, 52, 57, 57, 57, 57, 57, 57, 57, 57, 20, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 0, 0, 57, 57, 57, 57, 57, 57, 57, 57, 0, 0,
15, 5, 52, 52, 10, 5, 52, 52, 15, 10, 15, 5, 57, 57, 25, 5, 57, 5, 15, 10,
0, 0, 10, 52, 0, 0, 0, 15, 0, 52, 0, 0, 10, 57, 0, 0, 0, 15, 0, 5,
52, 0, 52, 52, 52, 52, 52, 52, 52, 52, 57, 0, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
52, 52, 52, 52, 52, 52 57, 57, 57, 57, 57, 57
}; };
register unsigned int hval = len; register unsigned int hval = len;
@ -94,47 +94,47 @@ in_word_set (register const char *str, register size_t len)
{ {
enum enum
{ {
TOTAL_KEYWORDS = 33, TOTAL_KEYWORDS = 34,
MIN_WORD_LENGTH = 1, MIN_WORD_LENGTH = 1,
MAX_WORD_LENGTH = 12, MAX_WORD_LENGTH = 12,
MIN_HASH_VALUE = 1, MIN_HASH_VALUE = 1,
MAX_HASH_VALUE = 51 MAX_HASH_VALUE = 56
}; };
static const struct dict_entry wordlist[] = static const struct dict_entry wordlist[] =
{ {
{""}, {""},
#line 31 "KEYWORDS.txt" #line 32 "KEYWORDS.txt"
{"b", def_b}, {"b", def_b},
#line 29 "KEYWORDS.txt" #line 30 "KEYWORDS.txt"
{"at", def_at}, {"at", def_at},
#line 23 "KEYWORDS.txt" #line 24 "KEYWORDS.txt"
{"abs", def_abs}, {"abs", def_abs},
#line 18 "KEYWORDS.txt" #line 18 "KEYWORDS.txt"
{"cons", cons}, {"cons", cons},
#line 34 "KEYWORDS.txt" #line 35 "KEYWORDS.txt"
{"ccons", def_ccons}, {"ccons", def_ccons},
#line 21 "KEYWORDS.txt" #line 21 "KEYWORDS.txt"
{"i", i_joyfunc}, {"i", i_joyfunc},
#line 33 "KEYWORDS.txt" #line 34 "KEYWORDS.txt"
{"ccccons", def_ccccons}, {"ccccons", def_ccccons},
#line 38 "KEYWORDS.txt" #line 39 "KEYWORDS.txt"
{"codireco", def_codireco}, {"codireco", def_codireco},
#line 37 "KEYWORDS.txt" #line 38 "KEYWORDS.txt"
{"codi", def_codi}, {"codi", def_codi},
{""}, {""},
#line 32 "KEYWORDS.txt" #line 33 "KEYWORDS.txt"
{"binary", def_binary}, {"binary", def_binary},
#line 30 "KEYWORDS.txt" #line 31 "KEYWORDS.txt"
{"average", def_average}, {"average", def_average},
#line 22 "KEYWORDS.txt" #line 22 "KEYWORDS.txt"
{"pop", pop}, {"pop", pop},
#line 39 "KEYWORDS.txt" #line 40 "KEYWORDS.txt"
{"dinfrirst", def_dinfrirst}, {"dinfrirst", def_dinfrirst},
{""}, {""},
#line 15 "KEYWORDS.txt" #line 23 "KEYWORDS.txt"
{"branch", branch}, {"swaack", swaack},
#line 41 "KEYWORDS.txt" #line 42 "KEYWORDS.txt"
{"disenstacken", def_disenstacken}, {"disenstacken", def_disenstacken},
#line 19 "KEYWORDS.txt" #line 19 "KEYWORDS.txt"
{"dip", dip}, {"dip", dip},
@ -142,46 +142,49 @@ 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 24 "KEYWORDS.txt" #line 25 "KEYWORDS.txt"
{"anamorphism", def_anamorphism}, {"anamorphism", def_anamorphism},
{""}, {""},
#line 17 "KEYWORDS.txt" #line 17 "KEYWORDS.txt"
{"cmp", cmp_joyfunc}, {"cmp", cmp_joyfunc},
#line 40 "KEYWORDS.txt" #line 41 "KEYWORDS.txt"
{"dipd", def_dipd}, {"dipd", def_dipd},
{""}, {""},
#line 35 "KEYWORDS.txt" #line 36 "KEYWORDS.txt"
{"cleave", def_cleave}, {"cleave", def_cleave},
{""}, {""},
#line 20 "KEYWORDS.txt" #line 20 "KEYWORDS.txt"
{"dup", dup}, {"dup", dup},
#line 36 "KEYWORDS.txt" #line 37 "KEYWORDS.txt"
{"clop", def_clop}, {"clop", def_clop},
{""}, {""},
#line 15 "KEYWORDS.txt"
{"branch", branch},
{""}, {""},
#line 29 "KEYWORDS.txt"
{"appN", def_appN},
{""},
#line 13 "KEYWORDS.txt" #line 13 "KEYWORDS.txt"
{"/", tdiv_q}, {"/", tdiv_q},
{""}, {""}, {""}, {""},
#line 28 "KEYWORDS.txt" #line 28 "KEYWORDS.txt"
{"appN", def_appN}, {"app3", def_app3},
{""}, {""},
#line 12 "KEYWORDS.txt" #line 12 "KEYWORDS.txt"
{"-", sub}, {"-", sub},
{""}, {""}, {""}, {""},
#line 27 "KEYWORDS.txt" #line 27 "KEYWORDS.txt"
{"app3", def_app3}, {"app2", def_app2},
{""}, {""},
#line 11 "KEYWORDS.txt" #line 11 "KEYWORDS.txt"
{"+", add}, {"+", add},
{""}, {""}, {""}, {""},
#line 26 "KEYWORDS.txt" #line 26 "KEYWORDS.txt"
{"app2", def_app2}, {"app1", def_app1},
{""}, {""},
#line 10 "KEYWORDS.txt" #line 10 "KEYWORDS.txt"
{"*", mul}, {"*", mul},
{""}, {""}, {""}, {""}, {""}, {""},
#line 25 "KEYWORDS.txt"
{"app1", def_app1},
{""},
#line 9 "KEYWORDS.txt" #line 9 "KEYWORDS.txt"
{"%", tdiv_r} {"%", tdiv_r}
}; };