passing tests

Author: mccanne

runtime/ztests/expr/function/upcast.yaml

@@ -11,7 +11,7 @@ input: |
   [[[1::=n1]::=n2]::=n3,<n4=[n5=[n6=int64]]>]
   [|[|[1::=n1]|::=n2]|::=n3,<n4=|[n5=|[n6=int64]|]|>]
   [|{1::=n1:2::=n2}|::=n3,<n4=|{n5=int64:n6=int64}|>]
-  [1::=n1::(n2=n1|(n3=string)),<n4=(n5=int64)|(n6=string)>]
+  [1::(n4=(n5=int64)),<n4=(n5=int64)|(n6=string)>]
   ["a"::n1=enum(a,b),<n2=enum(a,b)>]
   [1::=n1,<fusion((n1=int64)|string)>]
 
@@ -25,7 +25,7 @@ output: |
   |{1::=n5:2::=n6}|::=n4
   1::=n5::(n4=n5|(n6=string))
   "a"::(n2=enum(a,b))
-  fusion(1::((n1=int64)|string),<n1=int64>)
+  fusion(1::=n1::(n1|string),<n1=int64>)
 
 ---
 

runtime/ztests/op/fuse.yaml

@@ -141,6 +141,6 @@ output: |
   fusion([1::=a1]::=a2::((p1=int64)|(r2={a:r1=int64})|a2|(s2=|[s1=int64]|)|(m3=|{m1=int64:m2=int64}|)|(u2=(u1=int64)|(u3=string))|(en1=enum(a,b))|(er2=error(er1=int64))),<a2=[a1=int64]>)
   fusion(|[1::=s1]|::=s2::((p1=int64)|(r2={a:r1=int64})|(a2=[a1=int64])|s2|(m3=|{m1=int64:m2=int64}|)|(u2=(u1=int64)|(u3=string))|(en1=enum(a,b))|(er2=error(er1=int64))),<s2=|[s1=int64]|>)
   fusion(|{1::=m1:2::=m2}|::=m3::((p1=int64)|(r2={a:r1=int64})|(a2=[a1=int64])|(s2=|[s1=int64]|)|m3|(u2=(u1=int64)|(u3=string))|(en1=enum(a,b))|(er2=error(er1=int64))),<m3=|{m1=int64:m2=int64}|>)
-  fusion(1::=p1::(p1|(r2={a:r1=int64})|(a2=[a1=int64])|(s2=|[s1=int64]|)|(m3=|{m1=int64:m2=int64}|)|(u2=(u1=int64)|(u3=string))|(en1=enum(a,b))|(er2=error(er1=int64))),<u2=(u1=int64)|(u3=string)>)
+  fusion(1::=u1::(u2=u1|(u3=string))::((p1=int64)|(r2={a:r1=int64})|(a2=[a1=int64])|(s2=|[s1=int64]|)|(m3=|{m1=int64:m2=int64}|)|u2|(en1=enum(a,b))|(er2=error(er1=int64))),<u2=(u1=int64)|(u3=string)>)
   fusion("a"::(en1=enum(a,b))::((p1=int64)|(r2={a:r1=int64})|(a2=[a1=int64])|(s2=|[s1=int64]|)|(m3=|{m1=int64:m2=int64}|)|(u2=(u1=int64)|(u3=string))|en1|(er2=error(er1=int64))),<en1=enum(a,b)>)
   fusion(error(1::=er1)::=er2::((p1=int64)|(r2={a:r1=int64})|(a2=[a1=int64])|(s2=|[s1=int64]|)|(m3=|{m1=int64:m2=int64}|)|(u2=(u1=int64)|(u3=string))|(en1=enum(a,b))|er2),<er2=error(er1=int64)>)