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

Deprecate do_begin/do_end

Browse Source
This commit is contained in:
Bruce Hill 2025-03-31 01:58:49 -04:00
parent 0f11502a7d
commit d3655740cc
2 changed files with 11 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/pthreads/pthreads.tm
View File

@ -69,15 +69,12 @@ struct IntQueue(_queue:@[Int], _mutex:@pthread_mutex_t, _cond:@pthread_cond_t):
return IntQueue(@initial, pthread_mutex_t.new(), pthread_cond_t.new()) return IntQueue(@initial, pthread_mutex_t.new(), pthread_cond_t.new())
func give(q:IntQueue, n:Int): func give(q:IntQueue, n:Int):
do_begin: q._mutex:lock() do: q._mutex:lock(); defer: q._mutex:unlock()
do_end: q._mutex:unlock() q._queue:insert(n)
do: q._queue:insert(n)
q._cond:signal() q._cond:signal()
func take(q:IntQueue -> Int): func take(q:IntQueue -> Int):
do_begin: q._mutex:lock() do: q._mutex:lock(); defer: q._mutex:unlock()
do_end: q._mutex:unlock()
do:
repeat: repeat:
if n := q._queue:pop(1): if n := q._queue:pop(1):
return n return n
@ -90,9 +87,8 @@ func main():
say_mutex := pthread_mutex_t.new() say_mutex := pthread_mutex_t.new()
announce := func(speaker:Text, text:Text): announce := func(speaker:Text, text:Text):
do_begin: say_mutex:lock() do: say_mutex:lock(); defer: say_mutex:unlock()
do_end: say_mutex:unlock() say("$\033[2m[$speaker]$\033[m $text")
do: say("$\033[2m[$speaker]$\033[m $text")
worker := pthread_t.new(func(): worker := pthread_t.new(func():
say("I'm in the thread!") say("I'm in the thread!")

49
src/parse.c
View File

@ -63,8 +63,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", "none", "no", "mutexed", "mod1", "mod", "pass", "lang", "inline", "in", "if", "holding", "or", "not", "none", "no", "mutexed", "mod1", "mod", "pass", "lang", "inline", "in", "if",
"func", "for", "extern", "enum", "do_end", "else", "do", "deserialize", "defer", "do_begin", "and", "holding", "func", "for", "extern", "enum", "else", "do", "deserialize", "defer", "and",
"_min_", "_max_", NULL, "_min_", "_max_", NULL,
}; };
@ -1106,48 +1106,11 @@ PARSER(parse_for) {
} }
PARSER(parse_do) { PARSER(parse_do) {
// [do_begin: [<indent>] block] [do_end: [<indent>] block] do: [<indent>] body // do: [<indent>] body
const char *start = pos; const char *start = pos;
int64_t starting_indent = get_indent(ctx, pos); if (!match_word(&pos, "do")) return NULL;
ast_t *begin = NULL, *end = NULL; ast_t *body = expect(ctx, start, &pos, parse_block, "I expected a body for this 'do'");
if (match_word(&pos, "do_begin")) return NewAST(ctx->file, start, pos, Block, .statements=Match(body, Block)->statements);
begin = optional(ctx, &pos, parse_block);
const char *tmp = pos;
whitespace(&tmp);
if (get_indent(ctx, tmp) == starting_indent && match_word(&tmp, "do_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) {
ast_list_t *statements = Match(begin, Block)->statements;
REVERSE_LIST(statements);
statements = new(ast_list_t, .ast=WrapAST(end, Defer, .body=end), .next=statements);
statements = new(ast_list_t, .ast=body, .next=statements);
REVERSE_LIST(statements);
return NewAST(ctx->file, start, pos, Block, .statements=statements);
} else if (begin) {
ast_list_t *statements = Match(begin, Block)->statements;
REVERSE_LIST(statements);
statements = new(ast_list_t, .ast=body, .next=statements);
REVERSE_LIST(statements);
return NewAST(ctx->file, start, pos, Block, .statements=statements);
} 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) {