Rename ast.Param to ast.Field.

This commit is contained in:
Nigel Tao committed 2017-05-13 16:14:42 +10:00
1 parent 85f3cca0cd
commit 27b33b77df
3 files changed
+25 -25

No files matched your search

+12 -12
View File
@@ -26,10 +26,10 @@ const (
KBreak KBreak
KContinue KContinue
KExpr KExpr
KField
KFile KFile
KFunc KFunc
KIf KIf
KParam
KReturn KReturn
KStruct KStruct
KTypeExpr KTypeExpr
@@ -53,10 +53,10 @@ var kindStrings = [...]string{
KBreak: "KBreak", KBreak: "KBreak",
KContinue: "KContinue", KContinue: "KContinue",
KExpr: "KExpr", KExpr: "KExpr",
KField: "KField",
KFile: "KFile", KFile: "KFile",
KFunc: "KFunc", KFunc: "KFunc",
KIf: "KIf", KIf: "KIf",
KParam: "KParam",
KReturn: "KReturn", KReturn: "KReturn",
KStruct: "KStruct", KStruct: "KStruct",
KTypeExpr: "KTypeExpr", KTypeExpr: "KTypeExpr",
@@ -97,10 +97,10 @@ func (n *Node) Assign() *Assign { return (*Assign)(n) }
func (n *Node) Break() *Break { return (*Break)(n) } func (n *Node) Break() *Break { return (*Break)(n) }
func (n *Node) Continue() *Continue { return (*Continue)(n) } func (n *Node) Continue() *Continue { return (*Continue)(n) }
func (n *Node) Expr() *Expr { return (*Expr)(n) } func (n *Node) Expr() *Expr { return (*Expr)(n) }
func (n *Node) Field() *Field { return (*Field)(n) }
func (n *Node) File() *File { return (*File)(n) } func (n *Node) File() *File { return (*File)(n) }
func (n *Node) Func() *Func { return (*Func)(n) } func (n *Node) Func() *Func { return (*Func)(n) }
func (n *Node) If() *If { return (*If)(n) } func (n *Node) If() *If { return (*If)(n) }
func (n *Node) Param() *Param { return (*Param)(n) }
func (n *Node) Raw() *Raw { return (*Raw)(n) } func (n *Node) Raw() *Raw { return (*Raw)(n) }
func (n *Node) Return() *Return { return (*Return)(n) } func (n *Node) Return() *Return { return (*Return)(n) }
func (n *Node) Struct() *Struct { return (*Struct)(n) } func (n *Node) Struct() *Struct { return (*Struct)(n) }
@@ -263,18 +263,18 @@ func NewVar(name t.ID, xType *TypeExpr, value *Expr) *Var {
} }
} }
// Param is a "name type" parameter: // Field is a "name type" struct field:
// - ID1: name // - ID1: name
// - LHS: <TypeExpr> // - LHS: <TypeExpr>
type Param Node type Field Node
func (n *Param) Node() *Node { return (*Node)(n) } func (n *Field) Node() *Node { return (*Node)(n) }
func (n *Param) Name() t.ID { return n.id1 } func (n *Field) Name() t.ID { return n.id1 }
func (n *Param) XType() *TypeExpr { return n.lhs.TypeExpr() } func (n *Field) XType() *TypeExpr { return n.lhs.TypeExpr() }
func NewParam(name t.ID, xType *TypeExpr) *Param { func NewField(name t.ID, xType *TypeExpr) *Field {
return &Param{ return &Field{
kind: KParam, kind: KField,
id1: name, id1: name,
lhs: xType.Node(), lhs: xType.Node(),
} }
@@ -434,7 +434,7 @@ func NewFunc(flags Flags, filename string, line uint32, receiver t.ID, name t.ID
// Struct is "struct ID1(List0)": // Struct is "struct ID1(List0)":
// - FlagsSuspendible is "ID1" vs "ID1?" // - FlagsSuspendible is "ID1" vs "ID1?"
// - ID1: name // - ID1: name
// - List0: <Param> fields // - List0: <Field> fields
type Struct Node type Struct Node
func (n *Struct) Node() *Node { return (*Node)(n) } func (n *Struct) Node() *Node { return (*Node)(n) }
+6 -6
View File
@@ -105,14 +105,14 @@ func (c *Checker) checkFields(fields []*a.Node) error {
} }
fieldNames := map[t.ID]bool{} fieldNames := map[t.ID]bool{}
for _, n := range fields { for _, n := range fields {
p := n.Param() f := n.Field()
if _, ok := fieldNames[p.Name()]; ok { if _, ok := fieldNames[f.Name()]; ok {
return fmt.Errorf("check: duplicate field %q", c.idMap.ByID(p.Name())) return fmt.Errorf("check: duplicate field %q", c.idMap.ByID(f.Name()))
} }
if err := tc.checkTypeExpr(p.XType()); err != nil { if err := tc.checkTypeExpr(f.XType()); err != nil {
return fmt.Errorf("%v in field %q", err, c.idMap.ByID(p.Name())) return fmt.Errorf("%v in field %q", err, c.idMap.ByID(f.Name()))
} }
fieldNames[p.Name()] = true fieldNames[f.Name()] = true
} }
return nil return nil
} }
+7 -7
View File
@@ -91,11 +91,11 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
flags |= a.FlagsSuspendible flags |= a.FlagsSuspendible
p.src = p.src[1:] p.src = p.src[1:]
} }
inParams, err := p.parseList((*parser).parseParamNode) inFields, err := p.parseList((*parser).parseFieldNode)
if err != nil { if err != nil {
return nil, err return nil, err
} }
outParams, err := p.parseList((*parser).parseParamNode) outFields, err := p.parseList((*parser).parseFieldNode)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -108,8 +108,8 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
return nil, fmt.Errorf("parse: expected (implicit) \";\", got %q at %s:%d", got, p.filename, p.line()) return nil, fmt.Errorf("parse: expected (implicit) \";\", got %q at %s:%d", got, p.filename, p.line())
} }
p.src = p.src[1:] p.src = p.src[1:]
in := a.NewStruct(0, p.filename, line, t.IDIn, inParams) in := a.NewStruct(0, p.filename, line, t.IDIn, inFields)
out := a.NewStruct(0, p.filename, line, t.IDOut, outParams) out := a.NewStruct(0, p.filename, line, t.IDOut, outFields)
return a.NewFunc(flags, p.filename, line, id0, id1, in, out, body).Node(), nil return a.NewFunc(flags, p.filename, line, id0, id1, in, out, body).Node(), nil
case t.IDStruct: case t.IDStruct:
@@ -127,7 +127,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
flags |= a.FlagsSuspendible flags |= a.FlagsSuspendible
p.src = p.src[1:] p.src = p.src[1:]
} }
fields, err := p.parseList((*parser).parseParamNode) fields, err := p.parseList((*parser).parseFieldNode)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -223,7 +223,7 @@ func (p *parser) parseList(parseElem func(*parser) (*a.Node, error)) ([]*a.Node,
return nil, fmt.Errorf("parse: expected \")\" at %s:%d", p.filename, p.line()) return nil, fmt.Errorf("parse: expected \")\" at %s:%d", p.filename, p.line())
} }
func (p *parser) parseParamNode() (*a.Node, error) { func (p *parser) parseFieldNode() (*a.Node, error) {
name, err := p.parseIdent() name, err := p.parseIdent()
if err != nil { if err != nil {
return nil, err return nil, err
@@ -232,7 +232,7 @@ func (p *parser) parseParamNode() (*a.Node, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return a.NewParam(name, typ).Node(), nil return a.NewField(name, typ).Node(), nil
} }
func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { func (p *parser) parseTypeExpr() (*a.TypeExpr, error) {