diff --git a/lang/ast/ast.go b/lang/ast/ast.go index d6af1b0e..3c731473 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -26,10 +26,10 @@ const ( KBreak KContinue KExpr + KField KFile KFunc KIf - KParam KReturn KStruct KTypeExpr @@ -53,10 +53,10 @@ var kindStrings = [...]string{ KBreak: "KBreak", KContinue: "KContinue", KExpr: "KExpr", + KField: "KField", KFile: "KFile", KFunc: "KFunc", KIf: "KIf", - KParam: "KParam", KReturn: "KReturn", KStruct: "KStruct", 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) Continue() *Continue { return (*Continue)(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) Func() *Func { return (*Func)(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) Return() *Return { return (*Return)(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 // - LHS: -type Param Node +type Field Node -func (n *Param) Node() *Node { return (*Node)(n) } -func (n *Param) Name() t.ID { return n.id1 } -func (n *Param) XType() *TypeExpr { return n.lhs.TypeExpr() } +func (n *Field) Node() *Node { return (*Node)(n) } +func (n *Field) Name() t.ID { return n.id1 } +func (n *Field) XType() *TypeExpr { return n.lhs.TypeExpr() } -func NewParam(name t.ID, xType *TypeExpr) *Param { - return &Param{ - kind: KParam, +func NewField(name t.ID, xType *TypeExpr) *Field { + return &Field{ + kind: KField, id1: name, 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)": // - FlagsSuspendible is "ID1" vs "ID1?" // - ID1: name -// - List0: fields +// - List0: fields type Struct Node func (n *Struct) Node() *Node { return (*Node)(n) } diff --git a/lang/check/check.go b/lang/check/check.go index a1d486c6..0c5f61b2 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -105,14 +105,14 @@ func (c *Checker) checkFields(fields []*a.Node) error { } fieldNames := map[t.ID]bool{} for _, n := range fields { - p := n.Param() - if _, ok := fieldNames[p.Name()]; ok { - return fmt.Errorf("check: duplicate field %q", c.idMap.ByID(p.Name())) + f := n.Field() + if _, ok := fieldNames[f.Name()]; ok { + return fmt.Errorf("check: duplicate field %q", c.idMap.ByID(f.Name())) } - if err := tc.checkTypeExpr(p.XType()); err != nil { - return fmt.Errorf("%v in field %q", err, c.idMap.ByID(p.Name())) + if err := tc.checkTypeExpr(f.XType()); err != nil { + return fmt.Errorf("%v in field %q", err, c.idMap.ByID(f.Name())) } - fieldNames[p.Name()] = true + fieldNames[f.Name()] = true } return nil } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 40da429c..556a013e 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -91,11 +91,11 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { flags |= a.FlagsSuspendible p.src = p.src[1:] } - inParams, err := p.parseList((*parser).parseParamNode) + inFields, err := p.parseList((*parser).parseFieldNode) if err != nil { return nil, err } - outParams, err := p.parseList((*parser).parseParamNode) + outFields, err := p.parseList((*parser).parseFieldNode) if err != nil { 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()) } p.src = p.src[1:] - in := a.NewStruct(0, p.filename, line, t.IDIn, inParams) - out := a.NewStruct(0, p.filename, line, t.IDOut, outParams) + in := a.NewStruct(0, p.filename, line, t.IDIn, inFields) + out := a.NewStruct(0, p.filename, line, t.IDOut, outFields) return a.NewFunc(flags, p.filename, line, id0, id1, in, out, body).Node(), nil case t.IDStruct: @@ -127,7 +127,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { flags |= a.FlagsSuspendible p.src = p.src[1:] } - fields, err := p.parseList((*parser).parseParamNode) + fields, err := p.parseList((*parser).parseFieldNode) if err != nil { 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()) } -func (p *parser) parseParamNode() (*a.Node, error) { +func (p *parser) parseFieldNode() (*a.Node, error) { name, err := p.parseIdent() if err != nil { return nil, err @@ -232,7 +232,7 @@ func (p *parser) parseParamNode() (*a.Node, error) { if err != nil { return nil, err } - return a.NewParam(name, typ).Node(), nil + return a.NewField(name, typ).Node(), nil } func (p *parser) parseTypeExpr() (*a.TypeExpr, error) {