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

Minor cleanup.

This commit is contained in:
Simon Forman 2023-03-05 19:26:34 -08:00
parent 65a2787630
commit 14e1b9728c
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
implementations/uvm-ncc/joy_types.c
View File

@ -460,9 +460,18 @@ tokenate(char *str, u32 index, u32 length)
} }
int
is_delimiter(char ch)
{
return ch == '[' || ch == ']' || ch == ' ';
}
u32 t2e_stack[1000]; u32 t2e_stack[1000];
u32 t2e_stack_top = 0; u32 t2e_stack_top = 0;
#define T2E_PUSH(thing) t2e_stack[t2e_stack_top] = (thing); ++t2e_stack_top; (thing) = empty_list;
#define T2E_POP(thing) --t2e_stack_top; (thing) = t2e_stack[t2e_stack_top];
u32 u32
text_to_expression(char *str) text_to_expression(char *str)
@ -480,28 +489,18 @@ text_to_expression(char *str)
} }
if ('[' == ch) { // start new list if ('[' == ch) { // start new list
++index; ++index;
t2e_stack[t2e_stack_top] = end; T2E_PUSH(end)
++t2e_stack_top; T2E_PUSH(top)
t2e_stack[t2e_stack_top] = top;
++t2e_stack_top;
end = empty_list;
top = empty_list;
continue; continue;
} }
if (']' == ch) { // finish list new list if (']' == ch) { // finish list new list
++index; ++index;
tok = top; tok = top;
--t2e_stack_top; T2E_POP(top)
top = t2e_stack[t2e_stack_top]; T2E_POP(end)
--t2e_stack_top;
end = t2e_stack[t2e_stack_top];
} else { } else {
u32 i = index + 1; u32 i = index + 1;
for (; i < str_length; ++i) { for (; i < str_length && !is_delimiter(str[i]); ++i) {}
if (str[i] == '[' || str[i] == ']' || str[i] == ' ') {
break;
}
}
// i == str_length OR str[i] is a delimiter char. // i == str_length OR str[i] is a delimiter char.
tok = tokenate(str, index, i - index); tok = tokenate(str, index, i - index);
index = i; index = i;
@ -543,7 +542,7 @@ main()
print_endl(); print_endl();
*/ */
print_joy_list(text_to_expression(" 1[2[true 3][aa[aa bb] aa bb cc]bob]false[]bob 3[4]5")); print_joy_list(text_to_expression(" 1[2[true 3][aa[aa bb] aa bb cc]bob]false[]bob 3[4]5 gary"));
print_endl(); print_endl();
} }