Opaques take @ : %s/\$\([A-Z]\)/@\1/g

This commit is contained in:
Ayaz Hafiz 2022-04-25 12:26:38 -04:00
parent e43994530f
commit f1dc9c8298
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
20 changed files with 201 additions and 206 deletions

View file

@ -5462,7 +5462,7 @@ mod solve_expr {
r#"
Age := U32
$Age 21
@Age 21
"#
),
r#"Age"#,
@ -5477,7 +5477,7 @@ mod solve_expr {
Age := U32
a : Age
a = $Age 21
a = @Age 21
a
"#
@ -5493,7 +5493,7 @@ mod solve_expr {
r#"
Id n := [ Id U32 n ]
$Id (Id 21 "sasha")
@Id (Id 21 "sasha")
"#
),
r#"Id Str"#,
@ -5508,7 +5508,7 @@ mod solve_expr {
Id n := [ Id U32 n ]
a : Id Str
a = $Id (Id 21 "sasha")
a = @Id (Id 21 "sasha")
a
"#
@ -5526,8 +5526,8 @@ mod solve_expr {
condition : Bool
if condition
then $Id (Id 21 (Y "sasha"))
else $Id (Id 21 (Z "felix"))
then @Id (Id 21 (Y "sasha"))
else @Id (Id 21 (Z "felix"))
"#
),
r#"Id [ Y Str, Z Str ]*"#,
@ -5545,8 +5545,8 @@ mod solve_expr {
v : Id [ Y Str, Z Str ]
v =
if condition
then $Id (Id 21 (Y "sasha"))
else $Id (Id 21 (Z "felix"))
then @Id (Id 21 (Y "sasha"))
else @Id (Id 21 (Z "felix"))
v
"#
@ -5562,7 +5562,7 @@ mod solve_expr {
r#"
Age := U32
\$Age n -> n
\@Age n -> n
"#
),
r#"Age -> U32"#,
@ -5577,7 +5577,7 @@ mod solve_expr {
Age := U32
v : Age -> U32
v = \$Age n -> n
v = \@Age n -> n
v
"#
),
@ -5592,7 +5592,7 @@ mod solve_expr {
r#"
Id n := [ Id U32 n ]
\$Id (Id _ n) -> n
\@Id (Id _ n) -> n
"#
),
r#"Id a -> a"#,
@ -5607,7 +5607,7 @@ mod solve_expr {
Id n := [ Id U32 n ]
v : Id a -> a
v = \$Id (Id _ n) -> n
v = \@Id (Id _ n) -> n
v
"#
@ -5625,7 +5625,7 @@ mod solve_expr {
strToBool : Str -> Bool
\$Id (Id _ n) -> strToBool n
\@Id (Id _ n) -> strToBool n
"#
),
r#"Id Str -> Bool"#,
@ -5642,7 +5642,7 @@ mod solve_expr {
strToBool : Str -> Bool
v : Id Str -> Bool
v = \$Id (Id _ n) -> strToBool n
v = \@Id (Id _ n) -> strToBool n
v
"#
@ -5660,9 +5660,9 @@ mod solve_expr {
\id ->
when id is
$Id (Id _ A) -> ""
$Id (Id _ B) -> ""
$Id (Id _ (C { a: "" })) -> ""
@Id (Id _ A) -> ""
@Id (Id _ B) -> ""
@Id (Id _ (C { a: "" })) -> ""
"#
),
r#"Id [ A, B, C { a : Str }* ] -> Str"#,
@ -5679,9 +5679,9 @@ mod solve_expr {
f : Id [ A, B, C { a : Str }e ] -> Str
f = \id ->
when id is
$Id (Id _ A) -> ""
$Id (Id _ B) -> ""
$Id (Id _ (C { a: "" })) -> ""
@Id (Id _ A) -> ""
@Id (Id _ B) -> ""
@Id (Id _ (C { a: "" })) -> ""
f
"#
@ -5703,7 +5703,7 @@ mod solve_expr {
effectAlways = \x ->
inner = \{} -> x
$Effect inner
@Effect inner
"#
),
r#"a -> Effect a"#,
@ -5765,8 +5765,8 @@ mod solve_expr {
insert : Outer k, k -> Outer k
insert = \m, var ->
when m is
$Outer Empty -> $Outer (Wrapped var)
$Outer (Wrapped _) -> $Outer (Wrapped var)
@Outer Empty -> @Outer (Wrapped var)
@Outer (Wrapped _) -> @Outer (Wrapped var)
insert
"#
@ -5782,9 +5782,9 @@ mod solve_expr {
r#"
Outer k := [ Empty, Wrapped k ]
when ($Outer Empty) is
$Outer Empty -> $Outer (Wrapped "")
$Outer (Wrapped k) -> $Outer (Wrapped k)
when (@Outer Empty) is
@Outer Empty -> @Outer (Wrapped "")
@Outer (Wrapped k) -> @Outer (Wrapped k)
"#
),
r#"Outer Str"#,
@ -5798,9 +5798,9 @@ mod solve_expr {
r#"
Outer := [ A, B ]
when ($Outer A) is
$Outer A -> $Outer A
$Outer B -> $Outer B
when (@Outer A) is
@Outer A -> @Outer A
@Outer B -> @Outer B
"#
),
r#"Outer"#,
@ -5857,7 +5857,7 @@ mod solve_expr {
Id := U64
hash = \$Id n -> n
hash = \@Id n -> n
"#
),
[("Hash:hash", "Id")],
@ -5877,8 +5877,8 @@ mod solve_expr {
Id := U64
hash = \$Id n -> n
hash32 = \$Id n -> Num.toU32 n
hash = \@Id n -> n
hash32 = \@Id n -> Num.toU32 n
"#
),
[("Hash:hash", "Id"), ("Hash:hash32", "Id")],
@ -5902,11 +5902,11 @@ mod solve_expr {
Id := U64
hash = \$Id n -> n
hash32 = \$Id n -> Num.toU32 n
hash = \@Id n -> n
hash32 = \@Id n -> Num.toU32 n
eq = \$Id m, $Id n -> m == n
le = \$Id m, $Id n -> m < n
eq = \@Id m, @Id n -> m == n
le = \@Id m, @Id n -> m < n
"#
),
[
@ -5931,7 +5931,7 @@ mod solve_expr {
Id := U64
hash : Id -> U64
hash = \$Id n -> n
hash = \@Id n -> n
"#
),
[("Hash:hash", "Id")],
@ -5969,9 +5969,9 @@ mod solve_expr {
Id := U64
hash = \$Id n -> n
hash = \@Id n -> n
zero = hash ($Id 0)
zero = hash (@Id 0)
"#
),
"U64",
@ -6062,9 +6062,9 @@ mod solve_expr {
hashEq = \x, y -> hash x == hash y
Id := U64
hash = \$Id n -> n
hash = \@Id n -> n
result = hashEq ($Id 100) ($Id 101)
result = hashEq (@Id 100) (@Id 101)
"#
),
"Bool",
@ -6084,12 +6084,12 @@ mod solve_expr {
mulHashes = \x, y -> hash x * hash y
Id := U64
hash = \$Id n -> n
hash = \@Id n -> n
Three := {}
hash = \$Three _ -> 3
hash = \@Three _ -> 3
result = mulHashes ($Id 100) ($Three {})
result = mulHashes (@Id 100) (@Three {})
"#
),
"U64",
@ -6162,7 +6162,7 @@ mod solve_expr {
Task a err : Effect (Result a err)
always : a -> Task a *
always = \x -> $Effect (\{} -> Ok x)
always = \x -> @Effect (\{} -> Ok x)
"#
),
"a -> Task a *",