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

cons

This commit is contained in:
Simon Forman 2023-02-05 09:40:47 -08:00
parent fe4ce60541
commit 3d0b5ba266
4 changed files with 95 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
implementations/C/KEYWORDS.txt
View File

@ -15,6 +15,7 @@ bool, truthy
branch, branch branch, branch
clear, clear clear, clear
cmp, cmp_joyfunc cmp, cmp_joyfunc
cons, cons
dip, dip dip, dip
dup, dup dup, dup
i, i_joyfunc i, i_joyfunc

11
implementations/C/joy.c
View File

@ -578,6 +578,17 @@ clear(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
} }
void
cons(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{
JoyList quote = pop_list_node(stack);
JoyListPtr qPtr = &quote;
JoyList node = pop_any(stack);
push_thing(node->head, qPtr);
push_quote(*qPtr, stack);
}
void void
dip(JoyListPtr stack, JoyListPtr expression) dip(JoyListPtr stack, JoyListPtr expression)
{ {

1
implementations/C/joy.h
View File

@ -60,6 +60,7 @@ void add(JoyListPtr stack, JoyListPtr expression);
void branch(JoyListPtr stack, JoyListPtr expression); void branch(JoyListPtr stack, JoyListPtr expression);
void clear(JoyListPtr stack, JoyListPtr expression); void clear(JoyListPtr stack, JoyListPtr expression);
void cmp_joyfunc(JoyListPtr stack, JoyListPtr expression); void cmp_joyfunc(JoyListPtr stack, JoyListPtr expression);
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);

154
implementations/C/keywords.c
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 = 44, duplicates = 0 */ /* maximum key range = 51, 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[] =
{ {
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 9, 45, 45, 52, 52, 52, 52, 52, 52, 52, 50, 52, 52,
45, 45, 31, 26, 45, 21, 45, 30, 45, 30, 52, 52, 45, 40, 52, 35, 52, 30, 52, 35,
25, 20, 45, 45, 45, 45, 45, 45, 45, 45, 30, 25, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 15, 45, 52, 52, 52, 52, 52, 52, 52, 52, 20, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 20, 0, 52, 52, 52, 52, 52, 52, 52, 52, 5, 0,
15, 10, 45, 45, 5, 0, 45, 45, 10, 5, 25, 5, 52, 52, 20, 0, 52, 52, 10, 5,
0, 0, 10, 45, 0, 0, 0, 15, 0, 45, 0, 0, 10, 52, 0, 15, 0, 15, 5, 52,
45, 0, 45, 45, 45, 45, 45, 45, 45, 45, 52, 5, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
45, 45, 45, 45, 45, 45 52, 52, 52, 52, 52, 52
}; };
register unsigned int hval = len; register unsigned int hval = len;
@ -94,85 +94,95 @@ in_word_set (register const char *str, register size_t len)
{ {
enum enum
{ {
TOTAL_KEYWORDS = 31, TOTAL_KEYWORDS = 32,
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 = 44 MAX_HASH_VALUE = 51
}; };
static const struct dict_entry wordlist[] = static const struct dict_entry wordlist[] =
{ {
{""}, {""},
#line 20 "KEYWORDS.txt" #line 21 "KEYWORDS.txt"
{"i", i_joyfunc}, {"i", i_joyfunc},
#line 27 "KEYWORDS.txt" #line 28 "KEYWORDS.txt"
{"at", def_at}, {"at", def_at},
{""}, {""},
#line 35 "KEYWORDS.txt"
{"codi", def_codi},
#line 32 "KEYWORDS.txt"
{"ccons", def_ccons},
#line 30 "KEYWORDS.txt"
{"binary", def_binary},
#line 31 "KEYWORDS.txt"
{"ccccons", def_ccccons},
#line 36 "KEYWORDS.txt" #line 36 "KEYWORDS.txt"
{"codireco", def_codireco}, {"codi", def_codi},
{""},
#line 30 "KEYWORDS.txt"
{"b", def_b},
{""},
#line 37 "KEYWORDS.txt" #line 37 "KEYWORDS.txt"
{"codireco", def_codireco},
#line 38 "KEYWORDS.txt"
{"dinfrirst", def_dinfrirst}, {"dinfrirst", def_dinfrirst},
#line 9 "KEYWORDS.txt" {""},
{"%", tdiv_r}, #line 31 "KEYWORDS.txt"
#line 15 "KEYWORDS.txt" {"binary", def_binary},
{"branch", branch}, #line 40 "KEYWORDS.txt"
#line 39 "KEYWORDS.txt"
{"disenstacken", def_disenstacken}, {"disenstacken", def_disenstacken},
#line 18 "KEYWORDS.txt" #line 19 "KEYWORDS.txt"
{"dip", dip}, {"dip", dip},
#line 14 "KEYWORDS.txt" #line 14 "KEYWORDS.txt"
{"bool", truthy}, {"bool", truthy},
#line 16 "KEYWORDS.txt" #line 16 "KEYWORDS.txt"
{"clear", clear}, {"clear", clear},
#line 22 "KEYWORDS.txt" #line 23 "KEYWORDS.txt"
{"anamorphism", def_anamorphism}, {"anamorphism", def_anamorphism},
#line 28 "KEYWORDS.txt" #line 29 "KEYWORDS.txt"
{"average", def_average}, {"average", def_average},
#line 17 "KEYWORDS.txt" #line 17 "KEYWORDS.txt"
{"cmp", cmp_joyfunc}, {"cmp", cmp_joyfunc},
#line 38 "KEYWORDS.txt" #line 18 "KEYWORDS.txt"
{"dipd", def_dipd}, {"cons", cons},
{""}, #line 33 "KEYWORDS.txt"
#line 29 "KEYWORDS.txt" {"ccons", def_ccons},
{"b", def_b},
#line 12 "KEYWORDS.txt"
{"-", sub},
#line 21 "KEYWORDS.txt"
{"abs", def_abs},
#line 34 "KEYWORDS.txt" #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}, {"clop", def_clop},
{""}, {""},
#line 33 "KEYWORDS.txt" #line 15 "KEYWORDS.txt"
{"cleave", def_cleave}, {"branch", branch},
#line 11 "KEYWORDS.txt" {""},
{"+", add}, #line 20 "KEYWORDS.txt"
#line 19 "KEYWORDS.txt"
{"dup", dup}, {"dup", dup},
#line 26 "KEYWORDS.txt" #line 39 "KEYWORDS.txt"
{"appN", def_appN}, {"dipd", def_dipd},
{""}, {""},
#line 13 "KEYWORDS.txt" #line 13 "KEYWORDS.txt"
{"/", tdiv_q}, {"/", tdiv_q},
{""}, {""},
#line 27 "KEYWORDS.txt"
{"appN", def_appN},
{""},
#line 12 "KEYWORDS.txt"
{"-", sub},
{""}, {""},
#line 26 "KEYWORDS.txt"
{"app3", def_app3},
{""},
#line 11 "KEYWORDS.txt"
{"+", add},
{""}, {""},
#line 25 "KEYWORDS.txt"
{"app2", def_app2},
{""},
#line 10 "KEYWORDS.txt" #line 10 "KEYWORDS.txt"
{"*", mul}, {"*", mul},
{""}, {""}, {""},
#line 25 "KEYWORDS.txt"
{"app3", def_app3},
{""}, {""}, {""}, {""},
#line 24 "KEYWORDS.txt" #line 24 "KEYWORDS.txt"
{"app2", def_app2}, {"app1", def_app1},
{""}, {""}, {""}, {""}, {""},
#line 23 "KEYWORDS.txt" #line 9 "KEYWORDS.txt"
{"app1", def_app1} {"%", tdiv_r}
}; };
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)