Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Begin/end parsing

Browse Source
This commit is contained in:
Bruce Hill 2025-03-16 14:05:43 -04:00
parent 5e85306edb
commit 283b755490
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
parse.c
View File

@ -52,8 +52,8 @@ int op_tightness[] = {
static const char *keywords[] = { static const char *keywords[] = {
"yes", "xor", "while", "when", "use", "unless", "struct", "stop", "skip", "return", "yes", "xor", "while", "when", "use", "unless", "struct", "stop", "skip", "return",
"or", "not", "no", "mutexed", "mod1", "mod", "pass", "lang", "inline", "in", "if", "holding", "or", "not", "none", "no", "mutexed", "mod1", "mod", "pass", "lang", "inline", "in", "if", "holding",
"func", "for", "extern", "enum", "else", "do", "deserialize", "defer", "and", "none", "func", "for", "extern", "enum", "end", "else", "do", "deserialize", "defer", "begin", "and",
"_min_", "_max_", NULL, "_min_", "_max_", NULL,
}; };
@ -1172,11 +1172,44 @@ PARSER(parse_for) {
} }
PARSER(parse_do) { PARSER(parse_do) {
// do: [<indent>] body // [begin: [<indent>] block] [end: [<indent>] block] do: [<indent>] body
const char *start = pos; const char *start = pos;
if (!match_word(&pos, "do")) return NULL; int64_t starting_indent = get_indent(ctx, pos);
ast_t *body = expect(ctx, start, &pos, parse_block, "I expected a body for this 'do'"); ast_t *begin = NULL, *end = NULL;
return NewAST(ctx->file, start, pos, Block, .statements=Match(body, Block)->statements); if (match_word(&pos, "begin"))
begin = optional(ctx, &pos, parse_block);
const char *tmp = pos;
whitespace(&tmp);
if (get_indent(ctx, tmp) == starting_indent && match_word(&tmp, "end")) {
pos = tmp;
end = optional(ctx, &pos, parse_block);
}
tmp = pos;
whitespace(&tmp);
if (get_indent(ctx, tmp) == starting_indent && match_word(&tmp, "do")) {
pos = tmp;
ast_t *body = expect(ctx, start, &pos, parse_block, "I expected a body for this 'do'");
if (begin && end) {
return NewAST(ctx->file, start, pos, Block,
.statements=new(ast_list_t, .ast=begin,
.next=new(ast_list_t, .ast=WrapAST(end, Defer, .body=end),
.next=new(ast_list_t, .ast=body))));
} else if (begin) {
return NewAST(ctx->file, start, pos, Block,
.statements=new(ast_list_t, .ast=begin,
.next=new(ast_list_t, .ast=body)));
} else if (end) {
return NewAST(ctx->file, start, pos, Block,
.statements=new(ast_list_t, .ast=WrapAST(end, Defer, .body=end),
.next=new(ast_list_t, .ast=body)));
} else {
return NewAST(ctx->file, start, pos, Block, .statements=Match(body, Block)->statements);
}
} else {
return NULL;
}
} }
PARSER(parse_while) { PARSER(parse_while) {
@ -1931,6 +1964,7 @@ PARSER(parse_extended_expr) {
PARSER(parse_block) { PARSER(parse_block) {
const char *start = pos; const char *start = pos;
spaces(&pos);
if (!match(&pos, ":")) return NULL; if (!match(&pos, ":")) return NULL;
ast_list_t *statements = NULL; ast_list_t *statements = NULL;