Commit 5ac4a1a

authored

make ast.Node return *nature.Nature (#849)

1 parent 3d0aec6 commit 5ac4a1aCopy full SHA for 5ac4a1a

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var (`
`15`	`15`	`type Node interface {`
`16`	`16`	`Location() file.Location`
`17`	`17`	`SetLocation(file.Location)`
`18`		`- Nature() nature.Nature`
	`18`	`+ Nature() *nature.Nature`
`19`	`19`	`SetNature(nature.Nature)`
`20`	`20`	`Type() reflect.Type`
`21`	`21`	`SetType(reflect.Type)`
`@@ -47,8 +47,8 @@ func (n *base) SetLocation(loc file.Location) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Nature returns the nature of the node.`
`50`		`-func (n *base) Nature() nature.Nature {`
`51`		`- return n.nature`
	`50`	`+func (n base) Nature() nature.Nature {`
	`51`	`+ return &n.nature`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// SetNature sets the nature of the node.`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,8 +635,7 @@ func (v Checker) callNode(node ast.CallNode) Nature {`
`635`	`635`	`// checker pass we should replace anyType on method node`
`636`	`636`	`// with new correct function return type.`
`637`	`637`	`if typ := node.Type(); typ != nil && typ != anyType {`
`638`		`- nt := node.Nature()`
`639`		`- return nt`
	`638`	`+ return *node.Nature()`
`640`	`639`	`}`
`641`	`640`
`642`	`641`	`nt := v.visit(node.Callee)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ func FieldIndex(c *Cache, env Nature, node ast.Node) (bool, []int, string) {`
`15`	`15`	`return true, idx, n.Value`
`16`	`16`	`}`
`17`	`17`	`case *ast.MemberNode:`
`18`		`- base := n.Node.Nature()`
`19`		`- base = base.Deref(c)`
	`18`	`+ base := n.Node.Nature().Deref(c)`
`20`	`19`	`if base.Kind == reflect.Struct {`
`21`	`20`	`if prop, ok := n.Property.(*ast.StringNode); ok {`
`22`	`21`	`if idx, ok := base.FieldIndex(c, prop.Value); ok {`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1088,8 +1088,7 @@ func (c compiler) BuiltinNode(node ast.BuiltinNode) {`
`1088`	`1088`	`for i, arg := range node.Arguments {`
`1089`	`1089`	`c.compile(arg)`
`1090`	`1090`	`argType := arg.Type()`
`1091`		`- argNature := arg.Nature()`
`1092`		`- if argType.Kind() == reflect.Ptr \|\| argNature.IsUnknown(c.ntCache) {`
	`1091`	`+ if argType.Kind() == reflect.Ptr \|\| arg.Nature().IsUnknown(c.ntCache) {`
`1093`	`1092`	`if f.Deref == nil {`
`1094`	`1093`	`// By default, builtins expect arguments to be dereferenced.`
`1095`	`1094`	`c.emit(OpDeref)`

Comments

(0)