diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 7a090ff5..8e69cafc 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -157,8 +157,8 @@ var Funcs = []string{ // avoid collision with a user-defined "T" type. const ( - PlaceholderOldName = t.IDCapitalT - PlaceholderNewName = t.IDDiamond + GenericOldName = t.IDCapitalT + GenericNewName = t.IDDiamond ) var SliceFuncs = []string{ diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 4f71ec0c..039abc39 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -91,7 +91,7 @@ func (c *Checker) builtInSliceFunc(qqid t.QQID) (*a.Func, error) { return c.builtInSliceFuncs[qqid], nil } -func (c *Checker) parseBuiltInFuncs(ss []string, placeholder bool) (map[t.QQID]*a.Func, error) { +func (c *Checker) parseBuiltInFuncs(ss []string, generic bool) (map[t.QQID]*a.Func, error) { m := map[t.QQID]*a.Func{} buf := []byte(nil) opts := parse.Options{ @@ -108,10 +108,10 @@ func (c *Checker) parseBuiltInFuncs(ss []string, placeholder bool) (map[t.QQID]* if err != nil { return nil, fmt.Errorf("check: could not tokenize built-in funcs: %v", err) } - if placeholder { + if generic { for i := range tokens { - if tokens[i].ID == builtin.PlaceholderOldName { - tokens[i].ID = builtin.PlaceholderNewName + if tokens[i].ID == builtin.GenericOldName { + tokens[i].ID = builtin.GenericNewName } } }