diff options
| author | Bruce Hill <bruce@bruce-hill.com> | 2025-09-21 18:01:19 -0400 |
|---|---|---|
| committer | Bruce Hill <bruce@bruce-hill.com> | 2025-09-21 18:01:19 -0400 |
| commit | 68bedd3c23757a8576e77f38e38ddcf9ecd26d19 (patch) | |
| tree | 86ce1610143efc43453f50d3413925797601c48a /test | |
| parent | 0815de981c683cac7dbac082ee14c11894089f31 (diff) | |
Use colons instead of '=' for tables (e.g. {1: 2})
Diffstat (limited to 'test')
| -rw-r--r-- | test/for.tm | 6 | ||||
| -rw-r--r-- | test/lang.tm | 10 | ||||
| -rw-r--r-- | test/serialization.tm | 4 | ||||
| -rw-r--r-- | test/structs.tm | 4 | ||||
| -rw-r--r-- | test/tables.tm | 40 | ||||
| -rw-r--r-- | test/text.tm | 2 |
6 files changed, 33 insertions, 33 deletions
diff --git a/test/for.tm b/test/for.tm index 3598df85..906a4df9 100644 --- a/test/for.tm +++ b/test/for.tm @@ -15,14 +15,14 @@ func labeled_nums(nums:[Int] -> Text) return "EMPTY" return result -func table_str(t:{Text=Text} -> Text) +func table_str(t:{Text:Text} -> Text) str := "" for k,v in t str ++= "$k:$v," else return "EMPTY" return str -func table_key_str(t:{Text=Text} -> Text) +func table_key_str(t:{Text:Text} -> Text) str := "" for k in t str ++= "$k," @@ -36,7 +36,7 @@ func main() assert labeled_nums([10,20,30]) == "1:10,2:20,3:30," assert labeled_nums([]) == "EMPTY" - >> t := {"key1"="value1", "key2"="value2"} + >> t := {"key1": "value1", "key2": "value2"} assert table_str(t) == "key1:value1,key2:value2," assert table_str({}) == "EMPTY" diff --git a/test/lang.tm b/test/lang.tm index 9db69dbe..90c4f6f3 100644 --- a/test/lang.tm +++ b/test/lang.tm @@ -2,11 +2,11 @@ lang HTML HEADER := $HTML"<!DOCTYPE HTML>" convert(t:Text->HTML) t = t.translate({ - "&"="&", - "<"="<", - ">"=">", - '"'=""", - "'"="'", + "&": "&", + "<": "<", + ">": ">", + '"': """, + "'": "'", }) return HTML.from_text(t) diff --git a/test/serialization.tm b/test/serialization.tm index 5653d1f9..b97b122f 100644 --- a/test/serialization.tm +++ b/test/serialization.tm @@ -42,9 +42,9 @@ func main() assert roundtrip[] == obj[] do - >> obj := {"A"=10, "B"=20; fallback={"C"=30}} + >> obj := {"A":10, "B":20; fallback={"C":30}} >> bytes := obj.serialized() - >> roundtrip := deserialize(bytes -> {Text=Int}) + >> roundtrip := deserialize(bytes -> {Text:Int}) assert roundtrip == obj assert roundtrip.fallback == obj.fallback diff --git a/test/structs.tm b/test/structs.tm index fdf92d18..05349068 100644 --- a/test/structs.tm +++ b/test/structs.tm @@ -58,8 +58,8 @@ func main() >> my_pass := Password("Swordfish") assert my_pass == Password("Swordfish") assert "$my_pass" == "Password(...)" - >> users_by_password := {my_pass="User1", Password("xxx")="User2"} - assert "$users_by_password" == '{Password(...)="User1", Password(...)="User2"}' + >> users_by_password := {my_pass: "User1", Password("xxx"): "User2"} + assert "$users_by_password" == '{Password(...): "User1", Password(...): "User2"}' assert users_by_password[my_pass]! == "User1" >> CorecursiveA(@CorecursiveB()) diff --git a/test/tables.tm b/test/tables.tm index e13576a0..85ca9101 100644 --- a/test/tables.tm +++ b/test/tables.tm @@ -1,6 +1,6 @@ func main() - t := {"one"=1, "two"=2} - assert t == {"one"=1, "two"=2} + t := {"one": 1, "two": 2} + assert t == {"one": 1, "two": 2} assert t["one"] == 1 assert t["two"] == 2 @@ -19,58 +19,58 @@ func main() assert t.keys == ["one", "two"] assert t.values == [1, 2] - t2 := {"three"=3; fallback=t} - assert t2 == {"three"=3; fallback={"one"=1, "two"=2}} + t2 := {"three": 3; fallback=t} + assert t2 == {"three": 3; fallback={"one": 1, "two": 2}} assert t2["one"] == 1 assert t2["three"] == 3 assert t2["???"] == none assert t2.length == 1 - assert t2.fallback == {"one"=1, "two"=2} + assert t2.fallback == {"one": 1, "two": 2} t2_str := "" for k,v in t2 t2_str ++= "($k=$v)" assert t2_str == "(three=3)" - assert {i=10*i for i in 5} == {1=10, 2=20, 3=30, 4=40, 5=50} - assert {i=10*i for i in 5 if i mod 2 != 0} == {1=10, 3=30, 5=50} - assert {x=10*x for x in y if x > 1 for y in [3, 4, 5] if y < 5} == {2=20, 3=30, 4=40} + assert {i: 10*i for i in 5} == {1: 10, 2: 20, 3: 30, 4: 40, 5: 50} + assert {i: 10*i for i in 5 if i mod 2 != 0} == {1: 10, 3: 30, 5: 50} + assert {x: 10*x for x in y if x > 1 for y in [3, 4, 5] if y < 5} == {2: 20, 3: 30, 4: 40} - >> t3 := @{1=10, 2=20, 3=30} + >> t3 := @{1: 10, 2: 20, 3: 30} >> t3.remove(3) - assert t3[] == {1=10, 2=20} + assert t3[] == {1: 10, 2: 20} do - >> plain := {1=10, 2=20, 3=30} + >> plain := {1: 10, 2: 20, 3: 30} assert plain[2]! == 20 assert plain[2]! == 20 assert plain[456] or -999 == -999 assert plain.has(2) == yes assert plain.has(456) == no - >> fallback := {4=40; fallback=plain} + >> fallback := {4: 40; fallback=plain} assert fallback.has(1) == yes assert fallback[1] or -999 == 10 do - >> t4 := &{"one"= 1} + >> t4 := &{"one": 1} >> t4["one"] = 999 >> t4["two"] = 222 - assert t4[] == {"one"=999, "two"=222} + assert t4[] == {"one": 999, "two": 222} do - assert {1=1, 2=2} == {2=2, 1=1} - assert {1=1, 2=2} != {1=1, 2=999} + assert {1: 1, 2: 2} == {2: 2, 1: 1} + assert {1: 1, 2: 2} != {1: 1, 2: 999} - assert ({1=1, 2=2} <> {2=2, 1=1}) == Int32(0) - ints : [{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}] - assert ints.sorted() == [{}, {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}] + assert ({1: 1, 2: 2} <> {2: 2, 1: 1}) == Int32(0) + ints : [{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}] + assert ints.sorted() == [{}, {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}] do # Default values: - counter := &{"x"=10; default=0} + counter := &{"x": 10; default=0} assert counter["x"] == 10 assert counter["y"] == 0 assert counter.has("x") == yes diff --git a/test/text.tm b/test/text.tm index c12e7a78..6631b94e 100644 --- a/test/text.tm +++ b/test/text.tm @@ -127,7 +127,7 @@ func main() assert "Hello".replace("ello", "i") == "Hi" - assert "<tag>".translate({"<"="<", ">"=">"}) == "<tag>" + assert "<tag>".translate({"<": "<", ">": ">"}) == "<tag>" assert "Abc".repeat(3) == "AbcAbcAbc" |