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

Syntax change: table types are now: {K=V; default=...} and tables

Browse Source 
use `{:K=V, ...; default=...}`
This commit is contained in:
Bruce Hill 2025-04-02 16:14:20 -04:00
parent ecaf34247e
commit 6ec8f20fc5
12 changed files with 103 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/arrays.md
View File

@ -235,7 +235,7 @@ variable or dereference a heap pointer, it may trigger copy-on-write behavior.
- [`func binary_search(arr: [T], by: func(x,y:&T->Int32) = T.compare -> Int)`](#binary_search) - [`func binary_search(arr: [T], by: func(x,y:&T->Int32) = T.compare -> Int)`](#binary_search)
- [`func by(arr: [T], step: Int -> [T])`](#by) - [`func by(arr: [T], step: Int -> [T])`](#by)
- [`func clear(arr: @[T] -> Void)`](#clear) - [`func clear(arr: @[T] -> Void)`](#clear)
- [`func counts(arr: [T] -> {T,Int})`](#counts) - [`func counts(arr: [T] -> {T=Int})`](#counts)
- [`func find(arr: [T], target: T -> Int?)`](#find) - [`func find(arr: [T], target: T -> Int?)`](#find)
- [`func first(arr: [T], predicate: func(item:&T -> Bool) -> Int)`](#first) - [`func first(arr: [T], predicate: func(item:&T -> Bool) -> Int)`](#first)
- [`func from(arr: [T], first: Int -> [T])`](#from) - [`func from(arr: [T], first: Int -> [T])`](#from)
@ -334,7 +334,7 @@ Nothing.
Counts the occurrences of each element in the array. Counts the occurrences of each element in the array.
```tomo ```tomo
func counts(arr: [T] -> {T,Int}) func counts(arr: [T] -> {T=Int})
``` ```
- `arr`: The array to count elements in. - `arr`: The array to count elements in.

78
docs/tables.md
View File

@ -7,21 +7,21 @@ support *all* types as both keys and values.
## Syntax ## Syntax
Tables are written using `{}` curly braces with `:` colons associating key Tables are written using `{}` curly braces with `=` equals signs associating key
expressions with value expressions and commas between entries: expressions with value expressions and commas between entries:
```tomo ```tomo
table := {"A": 10, "B": 20} table := {"A"=10, "B"=20}
``` ```
Empty tables must specify the key and value types explicitly: Empty tables must specify the key and value types explicitly:
```tomo ```tomo
empty := {:Text,Int} empty := {:Text=Int}
``` ```
For type annotations, a table that maps keys with type `K` to values of type For type annotations, a table that maps keys with type `K` to values of type
`V` is written as `{K,V}`. `V` is written as `{K=V}`.
### Comprehensions ### Comprehensions
@ -41,9 +41,9 @@ optional value:
```tomo ```tomo
table := {"A"=1, "B"=2} table := {"A"=1, "B"=2}
>> table["A"] >> table["A"]
= 1 : Int? = 1?
>> table["missing"] >> table["missing"]
= none : Int? = none:Int
``` ```
As with all optional values, you can use the `!` postfix operator to assert As with all optional values, you can use the `!` postfix operator to assert
@ -52,10 +52,10 @@ use the `or` operator to provide a fallback value in the case that it's none:
```tomo ```tomo
>> table["A"]! >> table["A"]!
= 1 : Int = 1
>> table["missing"] or -1 >> table["missing"] or -1
= -1 : Int = -1
``` ```
### Fallback Tables ### Fallback Tables
@ -67,7 +67,7 @@ is not found in the table itself:
t := {"A"=10} t := {"A"=10}
t2 := {"B"=20; fallback=t} t2 := {"B"=20; fallback=t}
>> t2["A"] >> t2["A"]
= 10 : Int? = 10?
``` ```
The fallback is available by the `.fallback` field, which returns an optional The fallback is available by the `.fallback` field, which returns an optional
@ -75,11 +75,30 @@ table value:
```tomo ```tomo
>> t2.fallback >> t2.fallback
= {"A"=10} : {Text,Int}? = {"A"=10}?
>> t.fallback >> t.fallback
= none : {Text,Int}? = none:{Text=Int}
``` ```
### Default Values
Tables can specify a default value which will be returned if a value is not
present in the table or its fallback (if any).
```tomo
counts := &{"foo"=12; default=0}
>> counts["foo"]
= 12
>> counts["baz"]
= 0
counts["baz"] += 1
>> counts["baz"]
= 1
```
When values are accessed from a table with a default value, the return type
is non-optional (because a value will always be present).
## Setting Values ## Setting Values
You can assign a new key/value mapping or overwrite an existing one using You can assign a new key/value mapping or overwrite an existing one using
@ -133,19 +152,19 @@ iterating over any of the new values.
## Table Methods ## Table Methods
- [`func bump(t:@{K,V}, key: K, amount: Int = 1 -> Void)`](#bump) - [`func bump(t:&{K=V}, key: K, amount: Int = 1 -> Void)`](#bump)
- [`func clear(t:@{K,V})`](#clear) - [`func clear(t:&{K=V})`](#clear)
- [`func get(t:{K,V}, key: K -> V?)`](#get) - [`func get(t:{K=V}, key: K -> V?)`](#get)
- [`func has(t:{K,V}, key: K -> Bool)`](#has) - [`func has(t:{K=V}, key: K -> Bool)`](#has)
- [`func remove(t:{K,V}, key: K -> Void)`](#remove) - [`func remove(t:{K=V}, key: K -> Void)`](#remove)
- [`func set(t:{K,V}, key: K, value: V -> Void)`](#set) - [`func set(t:{K=V}, key: K, value: V -> Void)`](#set)
### `bump` ### `bump`
Increments the value associated with a key by a specified amount. If the key is Increments the value associated with a key by a specified amount. If the key is
not already in the table, its value will be assumed to be zero. not already in the table, its value will be assumed to be zero.
```tomo ```tomo
func bump(t:@{K,V}, key: K, amount: Int = 1 -> Void) func bump(t:&{K=V}, key: K, amount: Int = 1 -> Void)
``` ```
- `t`: The reference to the table. - `t`: The reference to the table.
@ -170,7 +189,7 @@ t:bump("B", 10)
Removes all key-value pairs from the table. Removes all key-value pairs from the table.
```tomo ```tomo
func clear(t:@{K,V}) func clear(t:&{K=V})
``` ```
- `t`: The reference to the table. - `t`: The reference to the table.
@ -186,32 +205,33 @@ Nothing.
--- ---
### `get` ### `get`
Retrieves the value associated with a key, or returns null if the key is not present. Retrieves the value associated with a key, or returns `none` if the key is not present.
**Note:** default values for the table are ignored.
```tomo ```tomo
func get(t:{K,V}, key: K -> V?) func get(t:{K=V}, key: K -> V?)
``` ```
- `t`: The table. - `t`: The table.
- `key`: The key whose associated value is to be retrieved. - `key`: The key whose associated value is to be retrieved.
**Returns:** **Returns:**
The value associated with the key or null if the key is not found. The value associated with the key or `none` if the key is not found.
**Example:** **Example:**
```tomo ```tomo
>> t := {"A"=1, "B"=2} >> t := {"A"=1, "B"=2}
>> t:get("A") >> t:get("A")
= 1 : Int? = 1?
>> t:get("????") >> t:get("????")
= none : Int? = none:Int
>> t:get("A")! >> t:get("A")!
= 1 : Int = 1
>> t:get("????") or 0 >> t:get("????") or 0
= 0 : Int = 0
``` ```
--- ---
@ -220,7 +240,7 @@ The value associated with the key or null if the key is not found.
Checks if the table contains a specified key. Checks if the table contains a specified key.
```tomo ```tomo
func has(t:{K,V}, key: K -> Bool) func has(t:{K=V}, key: K -> Bool)
``` ```
- `t`: The table. - `t`: The table.
@ -243,7 +263,7 @@ func has(t:{K,V}, key: K -> Bool)
Removes the key-value pair associated with a specified key. Removes the key-value pair associated with a specified key.
```tomo ```tomo
func remove(t:{K,V}, key: K -> Void) func remove(t:{K=V}, key: K -> Void)
``` ```
- `t`: The reference to the table. - `t`: The reference to the table.
@ -266,7 +286,7 @@ t:remove("A")
Sets or updates the value associated with a specified key. Sets or updates the value associated with a specified key.
```tomo ```tomo
func set(t:{K,V}, key: K, value: V -> Void) func set(t:{K=V}, key: K, value: V -> Void)
``` ```
- `t`: The reference to the table. - `t`: The reference to the table.

4
docs/text.md
View File

@ -295,7 +295,7 @@ finding the value because the two texts are equivalent under normalization.
- [`func starts_with(text: Text, prefix: Text -> Bool)`](#starts_with) - [`func starts_with(text: Text, prefix: Text -> Bool)`](#starts_with)
- [`func title(text: Text, language: Text = "C" -> Text)`](#title) - [`func title(text: Text, language: Text = "C" -> Text)`](#title)
- [`func to(text: Text, last: Int -> Text)`](#to) - [`func to(text: Text, last: Int -> Text)`](#to)
- [`func translate(translations:{Text,Text} -> Text)`](#translate) - [`func translate(translations:{Text=Text} -> Text)`](#translate)
- [`func trim(text: Text, to_trim: Text = " $\t\r\n", left: Bool = yes, right: Bool = yes -> Text)`](#trim) - [`func trim(text: Text, to_trim: Text = " $\t\r\n", left: Bool = yes, right: Bool = yes -> Text)`](#trim)
- [`func upper(text: Text, language: Text "C" -> Text)`](#upper) - [`func upper(text: Text, language: Text "C" -> Text)`](#upper)
- [`func utf32_codepoints(text: Text -> [Int32])`](#utf32_codepoints) - [`func utf32_codepoints(text: Text -> [Int32])`](#utf32_codepoints)
@ -1065,7 +1065,7 @@ replacement text, so replacement text is not recursively modified. See
[`replace()`](#replace) for more information about replacement behavior. [`replace()`](#replace) for more information about replacement behavior.
```tomo ```tomo
func translate(translations:{Text,Text} -> Text) func translate(translations:{Text=Text} -> Text)
``` ```
- `text`: The text in which to perform replacements. - `text`: The text in which to perform replacements.

8
examples/commands/commands.tm
View File

@ -3,8 +3,8 @@
use ./commands.c use ./commands.c
use -lunistring use -lunistring
extern run_command:func(exe:Text, args:[Text], env:{Text,Text}, input:[Byte]?, output:&[Byte]?, error:&[Byte]? -> Int32) extern run_command:func(exe:Text, args:[Text], env:{Text=Text}, input:[Byte]?, output:&[Byte]?, error:&[Byte]? -> Int32)
extern command_by_line:func(exe:Text, args:[Text], env:{Text,Text} -> func(->Text?)?) extern command_by_line:func(exe:Text, args:[Text], env:{Text=Text} -> func(->Text?)?)
enum ExitType(Exited(status:Int32), Signaled(signal:Int32), Failed): enum ExitType(Exited(status:Int32), Signaled(signal:Int32), Failed):
func succeeded(e:ExitType -> Bool): func succeeded(e:ExitType -> Bool):
@ -46,8 +46,8 @@ struct ProgramResult(stdout:[Byte], stderr:[Byte], exit_type:ExitType):
else: else:
return no return no
struct Command(command:Text, args=[:Text], env={:Text,Text}): struct Command(command:Text, args=[:Text], env={:Text=Text}):
func from_path(path:Path, args=[:Text], env={:Text,Text} -> Command): func from_path(path:Path, args=[:Text], env={:Text=Text} -> Command):
return Command(Text(path), args, env) return Command(Text(path), args, env)
func result(command:Command, input="", input_bytes=[:Byte] -> ProgramResult): func result(command:Command, input="", input_bytes=[:Byte] -> ProgramResult):

8
examples/ini/ini.tm
View File

@ -9,10 +9,10 @@ _HELP := "
$_USAGE $_USAGE
" "
func parse_ini(path:Path -> {Text,{Text,Text}}): func parse_ini(path:Path -> {Text={Text=Text}}):
text := path:read() or exit("Could not read INI file: $\[31;1]$(path)$\[]") text := path:read() or exit("Could not read INI file: $\[31;1]$(path)$\[]")
sections := @{:Text,@{Text,Text}} sections := @{:Text=@{Text=Text}}
current_section := @{:Text,Text} current_section := @{:Text=Text}
# Line wraps: # Line wraps:
text = text:replace_pattern($Pat/\{1 nl}{0+space}/, " ") text = text:replace_pattern($Pat/\{1 nl}{0+space}/, " ")
@ -22,7 +22,7 @@ func parse_ini(path:Path -> {Text,{Text,Text}}):
skip if line:starts_with(";") or line:starts_with("#") skip if line:starts_with(";") or line:starts_with("#")
if line:matches_pattern($Pat/[?]/): if line:matches_pattern($Pat/[?]/):
section_name := line:replace($Pat/[?]/, "\1"):trim():lower() section_name := line:replace($Pat/[?]/, "\1"):trim():lower()
current_section = @{:Text,Text} current_section = @{:Text=Text}
sections[section_name] = current_section sections[section_name] = current_section
else if line:matches_pattern($Pat/{..}={..}/): else if line:matches_pattern($Pat/{..}={..}/):
key := line:replace_pattern($Pat/{..}={..}/, "\1"):trim():lower() key := line:replace_pattern($Pat/{..}={..}/, "\1"):trim():lower()

4
examples/learnxiny.tm
View File

@ -123,7 +123,7 @@ func main():
= 0 = 0
# Empty tables require specifying the key and value types: # Empty tables require specifying the key and value types:
empty_table := {:Text,Int} empty_table := {:Text=Int}
# Tables can be iterated over either by key or key,value: # Tables can be iterated over either by key or key,value:
for key in table: for key in table:
@ -243,7 +243,7 @@ func takes_many_types(
floating_point_number:Num, floating_point_number:Num,
text_aka_string:Text, text_aka_string:Text,
array_of_ints:[Int], array_of_ints:[Int],
table_of_text_to_bools:{Text,Bool}, table_of_text_to_bools:{Text=Bool},
pointer_to_mutable_array_of_ints:@[Int], pointer_to_mutable_array_of_ints:@[Int],
optional_int:Int?, optional_int:Int?,
function_from_int_to_text:func(x:Int -> Text), function_from_int_to_text:func(x:Int -> Text),

2
examples/patterns/patterns.tm
View File

@ -19,7 +19,7 @@ extend Text:
func replace_pattern(text:Text, pattern:Pat, replacement:Text, backref="@", recursive=yes -> Text): func replace_pattern(text:Text, pattern:Pat, replacement:Text, backref="@", recursive=yes -> Text):
return inline C : Text { Pattern$replace(_$text, _$pattern, _$replacement, _$backref, _$recursive); } return inline C : Text { Pattern$replace(_$text, _$pattern, _$replacement, _$backref, _$recursive); }
func translate_patterns(text:Text, replacements:{Pat,Text}, backref="@", recursive=yes -> Text): func translate_patterns(text:Text, replacements:{Pat=Text}, backref="@", recursive=yes -> Text):
return inline C : Text { Pattern$replace_all(_$text, _$replacements, _$backref, _$recursive); } return inline C : Text { Pattern$replace_all(_$text, _$replacements, _$backref, _$recursive); }
func has_pattern(text:Text, pattern:Pat -> Bool): func has_pattern(text:Text, pattern:Pat -> Bool):

2
src/environment.c
View File

@ -355,7 +355,7 @@ env_t *global_env(void)
{"starts_with", "Text$starts_with", "func(text,prefix:Text -> Bool)"}, {"starts_with", "Text$starts_with", "func(text,prefix:Text -> Bool)"},
{"title", "Text$title", "func(text:Text, language='C' -> Text)"}, {"title", "Text$title", "func(text:Text, language='C' -> Text)"},
{"to", "Text$to", "func(text:Text, last:Int -> Text)"}, {"to", "Text$to", "func(text:Text, last:Int -> Text)"},
{"translate", "Text$translate", "func(text:Text, translations:{Text,Text} -> Text)"}, {"translate", "Text$translate", "func(text:Text, translations:{Text=Text} -> Text)"},
{"trim", "Text$trim", "func(text:Text, to_trim=\" \t\r\n\", left=yes, right=yes -> Text)"}, {"trim", "Text$trim", "func(text:Text, to_trim=\" \t\r\n\", left=yes, right=yes -> Text)"},
{"upper", "Text$upper", "func(text:Text, language='C' -> Text)"}, {"upper", "Text$upper", "func(text:Text, language='C' -> Text)"},
{"utf32_codepoints", "Text$utf32_codepoints", "func(text:Text -> [Int32])"}, {"utf32_codepoints", "Text$utf32_codepoints", "func(text:Text -> [Int32])"},

26
src/parse.c
View File

@ -503,14 +503,17 @@ type_ast_t *parse_table_type(parse_ctx_t *ctx, const char *pos) {
pos = key_type->end; pos = key_type->end;
whitespace(&pos); whitespace(&pos);
type_ast_t *value_type = NULL; type_ast_t *value_type = NULL;
ast_t *default_value = NULL; if (match(&pos, "=")) {
if (match(&pos, ",")) {
value_type = expect(ctx, start, &pos, parse_type, "I couldn't parse the rest of this table type"); value_type = expect(ctx, start, &pos, parse_type, "I couldn't parse the rest of this table type");
} else if (match(&pos, "=")) {
default_value = expect(ctx, start, &pos, parse_extended_expr, "I couldn't parse the rest of this table type");
} else { } else {
return NULL; return NULL;
} }
spaces(&pos);
ast_t *default_value = NULL;
if (match(&pos, ";") && match_word(&pos, "default")) {
expect_str(ctx, pos, &pos, "=", "I expected an '=' here");
default_value = expect(ctx, start, &pos, parse_extended_expr, "I couldn't parse the default value for this table");
}
whitespace(&pos); whitespace(&pos);
expect_closing(ctx, &pos, "}", "I wasn't able to parse the rest of this table type"); expect_closing(ctx, &pos, "}", "I wasn't able to parse the rest of this table type");
return NewTypeAST(ctx->file, start, pos, TableTypeAST, .key=key_type, .value=value_type, .default_value=default_value); return NewTypeAST(ctx->file, start, pos, TableTypeAST, .key=key_type, .value=value_type, .default_value=default_value);
@ -722,15 +725,12 @@ PARSER(parse_table) {
ast_list_t *entries = NULL; ast_list_t *entries = NULL;
type_ast_t *key_type = NULL, *value_type = NULL; type_ast_t *key_type = NULL, *value_type = NULL;
ast_t *default_value = NULL;
if (match(&pos, ":")) { if (match(&pos, ":")) {
whitespace(&pos); whitespace(&pos);
key_type = expect(ctx, pos-1, &pos, parse_type, "I couldn't parse a key type for this table"); key_type = expect(ctx, pos-1, &pos, parse_type, "I couldn't parse a key type for this table");
whitespace(&pos); whitespace(&pos);
if (match(&pos, ",")) { if (match(&pos, "=")) {
value_type = expect(ctx, pos-1, &pos, parse_type, "I couldn't parse the value type for this table"); value_type = expect(ctx, pos-1, &pos, parse_type, "I couldn't parse the value type for this table");
} else if (match(&pos, "=")) {
default_value = expect(ctx, pos-1, &pos, parse_extended_expr, "I couldn't parse the default value for this table");
} else { } else {
return NULL; return NULL;
} }
@ -764,7 +764,7 @@ PARSER(parse_table) {
whitespace(&pos); whitespace(&pos);
ast_t *fallback = NULL; ast_t *fallback = NULL, *default_value = NULL;
if (match(&pos, ";")) { if (match(&pos, ";")) {
for (;;) { for (;;) {
whitespace(&pos); whitespace(&pos);
@ -775,11 +775,17 @@ PARSER(parse_table) {
if (fallback) if (fallback)
parser_err(ctx, attr_start, pos, "This table already has a fallback"); parser_err(ctx, attr_start, pos, "This table already has a fallback");
fallback = expect(ctx, attr_start, &pos, parse_expr, "I expected a fallback table"); fallback = expect(ctx, attr_start, &pos, parse_expr, "I expected a fallback table");
} else if (match_word(&pos, "default")) {
whitespace(&pos);
if (!match(&pos, "=")) parser_err(ctx, attr_start, pos, "I expected an '=' after 'default'");
if (default_value)
parser_err(ctx, attr_start, pos, "This table already has a default");
default_value = expect(ctx, attr_start, &pos, parse_expr, "I expected a default value");
} else { } else {
break; break;
} }
whitespace(&pos); whitespace(&pos);
if (!match(&pos, ";")) break; if (!match(&pos, ",")) break;
} }
} }

6
test/for.tm
View File

@ -15,14 +15,14 @@ func labeled_nums(nums:[Int] -> Text):
return "EMPTY" return "EMPTY"
return result return result
func table_str(t:{Text,Text} -> Text): func table_str(t:{Text=Text} -> Text):
str := "" str := ""
for k,v in t: for k,v in t:
str ++= "$k:$v," str ++= "$k:$v,"
else: return "EMPTY" else: return "EMPTY"
return str return str
func table_key_str(t:{Text,Text} -> Text): func table_key_str(t:{Text=Text} -> Text):
str := "" str := ""
for k in t: for k in t:
str ++= "$k," str ++= "$k,"
@ -43,7 +43,7 @@ func main():
>> t := {"key1"="value1", "key2"="value2"} >> t := {"key1"="value1", "key2"="value2"}
>> table_str(t) >> table_str(t)
= "key1:value1,key2:value2," = "key1:value1,key2:value2,"
>> table_str({:Text,Text}) >> table_str({:Text=Text})
= "EMPTY" = "EMPTY"
>> table_key_str(t) >> table_key_str(t)

2
test/serialization.tm
View File

@ -53,7 +53,7 @@ func main():
do: do:
>> obj := {"A"=10, "B"=20; fallback={"C"=30}} >> obj := {"A"=10, "B"=20; fallback={"C"=30}}
>> bytes := obj:serialized() >> bytes := obj:serialized()
>> deserialize(bytes -> {Text,Int}) == obj >> deserialize(bytes -> {Text=Int}) == obj
= yes = yes
do: do:

21
test/tables.tm
View File

@ -22,7 +22,7 @@ func main():
>> t.length >> t.length
= 2 = 2
>> t.fallback >> t.fallback
= none : {Text,Int} = none : {Text=Int}
>> t.keys >> t.keys
= ["one", "two"] = ["one", "two"]
@ -96,10 +96,25 @@ func main():
>> {1=1, 2=2} <> {2=2, 1=1} >> {1=1, 2=2} <> {2=2, 1=1}
= Int32(0) = Int32(0)
>> [{:Int,Int}, {0=0}, {99=99}, {1=1, 2=2, 3=3}, {1=1, 99=99, 3=3}, {1=1, 2=-99, 3=3}, {1=1, 99=-99, 3=4}]:sorted() >> [{:Int=Int}, {0=0}, {99=99}, {1=1, 2=2, 3=3}, {1=1, 99=99, 3=3}, {1=1, 2=-99, 3=3}, {1=1, 99=-99, 3=4}]:sorted()
= [{:Int,Int}, {0=0}, {1=1, 2=-99, 3=3}, {1=1, 2=2, 3=3}, {1=1, 99=99, 3=3}, {1=1, 99=-99, 3=4}, {99=99}] = [{:Int=Int}, {0=0}, {1=1, 2=-99, 3=3}, {1=1, 2=2, 3=3}, {1=1, 99=99, 3=3}, {1=1, 99=-99, 3=4}, {99=99}]
>> [{:Int}, {1}, {2}, {99}, {0, 3}, {1, 2}, {99}]:sorted() >> [{:Int}, {1}, {2}, {99}, {0, 3}, {1, 2}, {99}]:sorted()
= [{:Int}, {0, 3}, {1}, {1, 2}, {2}, {99}, {99}] = [{:Int}, {0, 3}, {1}, {1, 2}, {2}, {99}, {99}]
do:
# Default values:
counter := &{"x"=10; default=0}
>> counter["x"]
= 10
>> counter["y"]
= 0
>> counter:has("x")
= yes
>> counter:has("y")
= no
>> counter["y"] += 1
>> counter
>> counter
= &{"x"=10, "y"=1; default=0}