Skip to content

compiler/semantic: remove fuser.Type parameter #6362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nwt merged 1 commit into from
Nov 14, 2025
Merged

compiler/semantic: remove fuser.Type parameter #6362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions compiler/semantic/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ func (c *checker) arrayElems(typ super.Type, elems []sem.ArrayElem) super.Type {
panic(elem)
}
}
return fuser.Type(c)
return fuser.Type()
}

func (c *checker) recordElems(typ super.Type, elems []sem.RecordElem) super.Type {
Expand All @@ -474,7 +474,7 @@ func (c *checker) recordElems(typ super.Type, elems []sem.RecordElem) super.Type
panic(elem)
}
}
return fuser.Type(c)
return fuser.Type()
}

func (c *checker) callBuiltin(call *sem.CallExpr, args []super.Type) super.Type {
Expand Down Expand Up @@ -520,7 +520,7 @@ func (c *checker) pathsToType(paths []pathType) super.Type {
for _, path := range paths {
fuser.fuse(c.pathToRec(path.typ, path.elems))
}
return fuser.Type(c)
return fuser.Type()
}

func (c *checker) pathToRec(typ super.Type, elems []string) super.Type {
Expand Down Expand Up @@ -593,7 +593,7 @@ func (c *checker) putPaths(typ super.Type, puts []pathType) super.Type {
for _, put := range puts {
fuser.fuse(c.pathToRec(put.typ, put.elems))
}
return fuser.Type(c)
return fuser.Type()
}

type path struct {
Expand Down Expand Up @@ -624,7 +624,7 @@ func (c *checker) fuse(types []super.Type) super.Type {
for _, typ := range types {
fuser.fuse(typ)
}
return fuser.Type(c)
return fuser.Type()
}

func (c *checker) boolean(loc ast.Node, typ super.Type) bool {
Expand Down Expand Up @@ -1063,13 +1063,15 @@ func (c *checker) error(loc ast.Node, err error) {
}

func (c *checker) newFuser() *fuser {
return &fuser{sctx: c.t.sctx}
return &fuser{sctx: c.t.sctx, unknown: c.unknown}
}

type fuser struct {
sctx *super.Context
typ super.Type
sch *agg.Schema
sctx *super.Context
unknown super.Type

typ super.Type
sch *agg.Schema
}

func (f *fuser) fuse(typ super.Type) {
Expand All @@ -1084,12 +1086,12 @@ func (f *fuser) fuse(typ super.Type) {
}
}

func (f *fuser) Type(c *checker) super.Type {
func (f *fuser) Type() super.Type {
if f.sch != nil {
return f.sch.Type()
}
if f.typ != nil {
return f.typ
}
return c.unknown
return f.unknown
}
2 changes: 1 addition & 1 deletion compiler/semantic/op.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ func (t *translator) semOp(o ast.Op, seq sem.Seq) sem.Seq {
}
var typ super.Type
if fuser != nil {
typ = fuser.Type(t.checker)
typ = fuser.Type()
}
return append(seq, &sem.FileScan{
Node: o,
Expand Down