wit/bindgen: use cm.Case directly instead of calling a case method on generated variant

Author: ydnar

wit/bindgen/generator.go

@@ -1124,7 +1124,7 @@ func (g *generator) lowerFlags(file *gen.File, dir wit.Direction, t *wit.TypeDef
 }
 
 func (g *generator) lowerVariant(file *gen.File, dir wit.Direction, t *wit.TypeDef, input string) string {
-	decl, _ := g.typeDecl(dir, t)
+	// decl, _ := g.typeDecl(dir, t)
 	v := t.Kind.(*wit.Variant)
 	flat := t.Flat()
 	if v.Enum() != nil {
@@ -1139,9 +1139,10 @@ func (g *generator) lowerVariant(file *gen.File, dir wit.Direction, t *wit.TypeD
 			continue
 		}
 		caseNum := strconv.Itoa(i)
-		caseName := decl.scope.GetName(GoName(c.Name, true))
+		// caseName := decl.scope.GetName(GoName(c.Name, true))
+		input := "*" + g.cmCall(abiFile, "Case["+g.typeRep(file, dir, c.Type)+"]", "&v, "+caseNum)
 		stringio.Write(&b, "case ", caseNum, ": // ", c.Name, "\n")
-		b.WriteString(g.lowerVariantCaseInto(abiFile, dir, c.Type, flat[1:], "*v."+caseName+"()"))
+		b.WriteString(g.lowerVariantCaseInto(abiFile, dir, c.Type, flat[1:], input))
 	}
 	b.WriteString("}\n")
 	b.WriteString("return\n")