wip

Author: mccanne

runtime/sam/expr/function/downcast.go

@@ -47,7 +47,7 @@ func (d *downcast) downcast(typ super.Type, bytes scode.Bytes, to super.Type) (s
 			return d.downcast(fusionType.Type, superBytes, subtype)
 		}
 	}
-	//typ, bytes = deunion(typ, bytes)
+	typ, bytes = deunion(typ, bytes)
 	switch to := to.(type) {
 	case *super.TypeRecord:
 		return d.toRecord(typ, bytes, to)
@@ -251,12 +251,16 @@ func (d *downcast) toNamed(typ super.Type, bytes scode.Bytes, to *super.TypeName
 		// from the union options present. XXX devise a torture test that
 		// reconstruct nested unions from the flattened named union...?
 		for _, t := range unionType.Types {
+			//fmt.Println("TO NAMED FROM UNION TRY", sup.String(t))
 			if named, ok := t.(*super.TypeNamed); ok && named.Name == to.Name {
-				val, errVal := d.downcast(typ, bytes, to.Type)
-				if errVal != nil {
-					return super.Value{}, errVal
-				}
-				return super.NewValue(to, val.Bytes()), nil
+				//fmt.Println("TO NAMED FROM UNION MATCH", sup.String(t))
+				typ, bytes = deunion(typ, bytes)
+				return super.NewValue(to, bytes), nil
+				//				val, errVal := d.downcast(typ, bytes, to.Type)
+				//				if errVal != nil {
+				//					return super.Value{}, errVal
+				//				}
+				//				return super.NewValue(to, val.Bytes()), nil
 			}
 
 		}

runtime/sam/expr/function/upcast.go

@@ -174,7 +174,7 @@ func (u *Upcast) toMap(b *scode.Builder, typ super.Type, bytes scode.Bytes, to *
 func (u *Upcast) toUnion(b *scode.Builder, typ super.Type, bytes scode.Bytes, to *super.TypeUnion) bool {
 	// Take the value out of the union (if it is union), then look for it
 	// in the target union.
-	//typ, bytes = deunion(typ, bytes)
+	typ, bytes = deunion(typ, bytes)
 	//if to == typ {
 	//	b.Append(bytes)
 	//	return true

runtime/sam/op/fuse/fuse.go

@@ -1,7 +1,6 @@
 package fuse
 
 import (
-	"fmt"
 	"sync"
 
 	"github.com/brimdata/super"
@@ -184,7 +183,6 @@ func (v *valueFuser) Read() (*super.Value, error) {
 	if !ok {
 		return v.sctx.WrapError("cannot upcast to "+sup.FormatType(v.typ), *val).Ptr(), nil
 	}
-	fmt.Println("FUSE UPCAST", sup.String(*val), "TO", sup.String(v.typ), "IS", sup.String(sval))
 	return sval.Ptr(), nil
 }
 

runtime/ztests/expr/function/defuse.yaml

@@ -40,7 +40,7 @@ input: &input |
   |[|[1::=s1]|::=s2]|::=s3
   |{1::=m1:2::=m2}|::=m3
   "a"::(en1=enum(a,b))
-  1::=u1::(u2=(u1|(u3=string)))
+  1::=u1::(u2=u1|(u3=string))
   error(1::=er1)::=er2
 
 output: *input

runtime/ztests/expr/function/downcast.yaml

@@ -51,8 +51,7 @@ input: |
 
 output: |
   [1,"foo"]::[int64|bool|string]
-  error({message:"downcast: invalid subtype {x:int64}|{y:string}",on:{x:1::(int64|string)}::({x:int64|string}|{y:int64|string})})
-
+  error({message:"downcast: invalid subtype {x:int64}|{y:string}",on:{x:1::(int64|string)}})
 ---
 
 # This should seemingly fail because int64|bool|string is not subtype of 

runtime/ztests/expr/function/upcast.yaml

@@ -13,7 +13,7 @@ input: |
   [|{1::=n1:2::=n2}|::=n3,<n4=|{n5=int64:n6=int64}|>]
   [1::=n1::(n2=n1|(n3=string)),<n4=(n5=int64)|(n6=string)>]
   ["a"::n1=enum(a,b),<n2=enum(a,b)>]
-  [1::=n1,<fusion(int64|string)>]
+  [1::=n1,<fusion((n1=int64)|string)>]
 
 output: |
   error({message:"upcast: value not a subtype of [int8|string]",on:[1,"a"]})
@@ -25,7 +25,7 @@ output: |
   |{1::=n5:2::=n6}|::=n4
   1::=n5::(n4=n5|(n6=string))
   "a"::(n2=enum(a,b))
-  fusion(1::(int64|string),<n1=int64>)
+  fusion(1::((n1=int64)|string),<n1=int64>)
 
 ---
 

runtime/ztests/expr/fuser.yaml

@@ -12,6 +12,6 @@ spq: fuse | defuse(this)
 input: &input |
   "foo"::(int64|string)
   "foo"::=named
-  "foo"::(named=int64|string)
+  "foo"::(named2=int64|string)
 
 output: *input

runtime/ztests/op/blend.yaml

@@ -141,6 +141,6 @@ output: |
   [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)))
   |[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)))
   |{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)))
-  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)))
+  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)))
   "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)))
   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)