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

Replace "begin"/"end" with "do_begin"/"do_end"

Browse Source
This commit is contained in:
Bruce Hill 2025-03-19 16:22:29 -04:00
parent f3b8529e01
commit e0a386fa8f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/pthreads/pthreads.tm
View File

@ -58,14 +58,14 @@ 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):
begin: q._mutex:lock() do_begin: q._mutex:lock()
end: q._mutex:unlock() do_end: q._mutex:unlock()
do: 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):
begin: q._mutex:lock() do_begin: q._mutex:lock()
end: q._mutex:unlock() do_end: q._mutex:unlock()
do: do:
repeat: repeat:
if n := q._queue:pop(1): if n := q._queue:pop(1):
@ -79,8 +79,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):
begin: say_mutex:lock() do_begin: say_mutex:lock()
end: say_mutex:unlock() do_end: say_mutex:unlock()
do: 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():

8
parse.c
View File

@ -53,7 +53,7 @@ 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", "holding",
"func", "for", "extern", "enum", "end", "else", "do", "deserialize", "defer", "begin", "and", "func", "for", "extern", "enum", "do_end", "else", "do", "deserialize", "defer", "do_begin", "and",
"_min_", "_max_", NULL, "_min_", "_max_", NULL,
}; };
@ -1172,16 +1172,16 @@ PARSER(parse_for) {
} }
PARSER(parse_do) { PARSER(parse_do) {
// [begin: [<indent>] block] [end: [<indent>] block] do: [<indent>] body // [do_begin: [<indent>] block] [do_end: [<indent>] block] do: [<indent>] body
const char *start = pos; const char *start = pos;
int64_t starting_indent = get_indent(ctx, pos); int64_t starting_indent = get_indent(ctx, pos);
ast_t *begin = NULL, *end = NULL; ast_t *begin = NULL, *end = NULL;
if (match_word(&pos, "begin")) if (match_word(&pos, "do_begin"))
begin = optional(ctx, &pos, parse_block); begin = optional(ctx, &pos, parse_block);
const char *tmp = pos; const char *tmp = pos;
whitespace(&tmp); whitespace(&tmp);
if (get_indent(ctx, tmp) == starting_indent && match_word(&tmp, "end")) { if (get_indent(ctx, tmp) == starting_indent && match_word(&tmp, "do_end")) {
pos = tmp; pos = tmp;
end = optional(ctx, &pos, parse_block); end = optional(ctx, &pos, parse_block);
} }