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

loop 

But it's pretty inefficient, eh?
This commit is contained in:
Simon Forman 2023-02-05 18:43:05 -08:00
parent 26a733f720
commit 3a11fcb834
5 changed files with 123 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
implementations/C/KEYWORDS.in
View File

@ -22,6 +22,7 @@ dip, dip
dup, dup dup, dup
first, first first, first
i, i_joyfunc i, i_joyfunc
loop, loop
pop, pop pop, pop
rest, rest rest, rest
stack, stack stack, stack

1
implementations/C/KEYWORDS.txt
View File

@ -27,6 +27,7 @@ dip, dip
dup, dup dup, dup
first, first first, first
i, i_joyfunc i, i_joyfunc
loop, loop
pop, pop pop, pop
rest, rest rest, rest
stack, stack stack, stack

36
implementations/C/joy.c
View File

@ -45,6 +45,8 @@ const char *TRUE = "true";
JoyTypePtr JoyTrue; JoyTypePtr JoyTrue;
JoyTypePtr JoyFalse; JoyTypePtr JoyFalse;
JoyType loop_symbol = {joySymbol, {"loop"}};
void* void*
reallocate_function (void *ptr, __attribute__((unused)) size_t old_size, size_t new_size) { reallocate_function (void *ptr, __attribute__((unused)) size_t old_size, size_t new_size) {
@ -252,7 +254,8 @@ newIntNode(void) {
void void
push_thing(JoyTypePtr term, JoyListPtr stack) { push_thing(JoyTypePtr term, JoyListPtr stack)
{
JoyList node = newJoyList; JoyList node = newJoyList;
node->head = term; node->head = term;
node->tail = *stack; node->tail = *stack;
@ -272,6 +275,16 @@ concat_lists(JoyList a, JoyList b)
} }
void
push_thing_in_unit_list(JoyTypePtr term, JoyListPtr expression)
{
JoyList x = EMPTY_LIST;
JoyListPtr xPtr = &x;
push_thing(term, xPtr);
push_quote_onto_expression(*xPtr, expression);
}
/* /*
██████╗ ██████╗ ██╗███╗ ██╗████████╗███████╗██████╗ ██████╗ ██████╗ ██╗███╗ ██╗████████╗███████╗██████╗
██╔══██╗██╔══██╗██║████╗ ██║╚══██╔══╝██╔════╝██╔══██╗ ██╔══██╗██╔══██╗██║████╗ ██║╚══██╔══╝██╔════╝██╔══██╗
@ -588,6 +601,22 @@ branch(JoyListPtr stack, JoyListPtr expression)
} }
void
loop(JoyListPtr stack, JoyListPtr expression)
{
JoyList body = pop_list_node(stack);
JoyList x = EMPTY_LIST;
if (pop_bool(stack)) {
JoyListPtr xPtr = &x;
push_thing(&loop_symbol, xPtr);
push_quote(body, xPtr);
push_quote_onto_expression(*xPtr, expression);
push_quote_onto_expression(body, expression);
}
}
void void
clear(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression) clear(JoyListPtr stack, __attribute__((unused)) JoyListPtr expression)
{ {
@ -678,10 +707,7 @@ dip(JoyListPtr stack, JoyListPtr expression)
{ {
JoyList quote = pop_list_node(stack); JoyList quote = pop_list_node(stack);
JoyList node = pop_any(stack); JoyList node = pop_any(stack);
JoyList x = EMPTY_LIST; push_thing_in_unit_list(node->head, expression);
JoyListPtr xPtr = &x;
push_thing(node->head, xPtr);
push_quote_onto_expression(*xPtr, expression);
push_quote_onto_expression(quote, expression); push_quote_onto_expression(quote, expression);
} }

3
implementations/C/joy.h
View File

@ -34,9 +34,9 @@ typedef JoyList* JoyListPtr;
typedef struct { typedef struct {
enum JoyTypeType kind; enum JoyTypeType kind;
union { union {
char *symbol;
mpz_t i; mpz_t i;
JoyList el; JoyList el;
char *symbol;
} value; } value;
} JoyType; } JoyType;
@ -71,6 +71,7 @@ void dip(JoyListPtr stack, JoyListPtr expression);
void dup(JoyListPtr stack, JoyListPtr expression); void dup(JoyListPtr stack, JoyListPtr expression);
void first(JoyListPtr stack, JoyListPtr expression); void first(JoyListPtr stack, JoyListPtr expression);
void i_joyfunc(JoyListPtr stack, JoyListPtr expression); void i_joyfunc(JoyListPtr stack, JoyListPtr expression);
void loop(JoyListPtr stack, JoyListPtr expression);
void pop(JoyListPtr stack, JoyListPtr expression); void pop(JoyListPtr stack, JoyListPtr expression);
void rest(JoyListPtr stack, JoyListPtr expression); void rest(JoyListPtr stack, JoyListPtr expression);
void stack(JoyListPtr stack, JoyListPtr expression); void stack(JoyListPtr stack, JoyListPtr expression);

173
implementations/C/keywords.c
View File

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