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

I was post-incrementing when I should have been pre-incrementing! 

D'oh!
This commit is contained in:
Simon Forman 2023-02-02 08:52:27 -08:00
parent b759582439
commit e393016a32
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
implementations/C/joy.c
View File

@ -10,7 +10,7 @@
const char *BLANKS = " \t"; const char *BLANKS = " \t";
/*const char *TEXT = " 23 [dup *] i hi there fr [[] ie]nd [] 23 ";*/ /*const char *TEXT = " 23 [dup *] i hi there fr [[] ie]nd [] 23 ";*/
/*const char *TEXT = " 23 33 [] ";*/ /*const char *TEXT = " 23 33 [] ";*/
const char *TEXT = " 23 45 88 ok wow simple terms already work eh? "; const char *TEXT = "ok [wow] [23 45][1[2]3]simple terms already work eh? ";
enum JoyTypeType { enum JoyTypeType {
@ -162,17 +162,17 @@ parse_list(char **text)
char *rest; char *rest;
ptrdiff_t diff; ptrdiff_t diff;
struct list_node *result = NULL; struct list_node *result = NULL;
/* NULL string input? */
/* NULL string input? */
if (NULL == *text) { if (NULL == *text) {
printf("Missing ']' bracket."); printf("Missing ']' bracket. A\n");
exit(1); exit(1);
}; };
*text = trim_leading_blanks(*text); *text = trim_leading_blanks(*text);
if (NULL == *text) { if (NULL == *text) {
printf("Missing ']' bracket."); printf("Missing ']' bracket. B\n");
exit(1); exit(1);
}; };
@ -185,7 +185,7 @@ parse_list(char **text)
missing a closing bracket! missing a closing bracket!
*/ */
if (NULL == rest) { if (NULL == rest) {
printf("Missing ']' bracket."); printf("Missing ']' bracket. C\n");
exit(1); exit(1);
}; };
@ -196,10 +196,10 @@ parse_list(char **text)
result = make_symbol_node(*text, diff); result = make_symbol_node(*text, diff);
*text = rest; *text = rest;
} else if ('[' == rest[0]) { } else if ('[' == rest[0]) {
*text = rest++; *text = ++rest;
result = make_list_node(parse_list(text)); result = make_list_node(parse_list(text));
} else if (']' == rest[0]) { } else if (']' == rest[0]) {
*text = rest++; *text = ++rest;
return result; return result;
} }
result->tail = parse_list(text); result->tail = parse_list(text);
@ -217,7 +217,6 @@ parse_node(char **text)
ptrdiff_t diff; ptrdiff_t diff;
struct list_node *thing; struct list_node *thing;
printf("enter parse_node: >%s<\n", *text);
/* NULL string input? */ /* NULL string input? */
if (NULL == *text) return EMPTY_LIST; if (NULL == *text) return EMPTY_LIST;
@ -245,11 +244,11 @@ parse_node(char **text)
return thing; return thing;
} }
if ('[' == rest[0]) { if ('[' == rest[0]) {
*text = rest++; *text = ++rest;
return make_list_node(parse_list(text)); return make_list_node(parse_list(text));
} }
if (']' == rest[0]) { if (']' == rest[0]) {
printf("Extra ']' bracket."); printf("Extra ']' bracket.\n");
exit(1); exit(1);
} }
printf("Should be unreachable."); printf("Should be unreachable.");
@ -261,16 +260,11 @@ struct list_node*
text_to_expression(char *text) text_to_expression(char *text)
{ {
struct list_node *result, *head, *tail; struct list_node *result, *head, *tail;
printf("1\n");
result = parse_node(&text); result = parse_node(&text);
printf("2\n");
print_list(result);
printf(" <- eh?\n");
head = result; head = result;
tail = parse_node(&text); tail = parse_node(&text);
while (NULL != tail) { while (NULL != tail) {
print_list(tail);
printf("<- ooh?\n");
head->tail = tail; head->tail = tail;
head = tail; head = tail;
tail = parse_node(&text); tail = parse_node(&text);
@ -296,7 +290,6 @@ main(void)
GC_register_finalizer(pi, my_callback, NULL, NULL, NULL); GC_register_finalizer(pi, my_callback, NULL, NULL, NULL);
el = push_integer_from_str("3141592653589793238462643383279502884", 0); el = push_integer_from_str("3141592653589793238462643383279502884", 0);
printf("BEGIN\n");
el->tail = text_to_expression(text); el->tail = text_to_expression(text);
print_list(el); print_list(el);
printf("\n"); printf("\n");