Use ast.Patch func

Author: antonmedv

ast/node.go

@@ -7,12 +7,6 @@ import (
 	"github.com/antonmedv/expr/file"
 )
 
-func Patch(node *Node, newNode Node) {
-	newNode.SetType((*node).Type())
-	newNode.SetLocation((*node).Location())
-	*node = newNode
-}
-
 // Node represents items of abstract syntax tree.
 type Node interface {
 	Location() file.Location
@@ -21,6 +15,12 @@ type Node interface {
 	SetType(reflect.Type)
 }
 
+func Patch(node *Node, newNode Node) {
+	newNode.SetType((*node).Type())
+	newNode.SetLocation((*node).Location())
+	*node = newNode
+}
+
 type base struct {
 	loc      file.Location
 	nodeType reflect.Type

compiler/patcher.go

@@ -31,9 +31,7 @@ func (p *operatorPatcher) Exit(node *ast.Node) {
 			Name:      fn,
 			Arguments: []ast.Node{binaryNode.Left, binaryNode.Right},
 		}
-		newNode.SetType((*node).Type())
-		newNode.SetLocation((*node).Location())
-		*node = newNode
+		ast.Patch(node, newNode)
 	}
 }
 

optimizer/const_expr.go

@@ -30,7 +30,7 @@ func (c *constExpr) Exit(node *Node) {
 
 	patch := func(newNode Node) {
 		c.applied = true
-		patch(node, newNode)
+		Patch(node, newNode)
 	}
 
 	switch n := (*node).(type) {

optimizer/const_range.go

@@ -23,7 +23,7 @@ func (*constRange) Exit(node *Node) {
 					for i := range value {
 						value[i] = min.Value + i
 					}
-					patch(node, &ConstantNode{
+					Patch(node, &ConstantNode{
 						Value: value,
 					})
 				}

optimizer/fold.go

@@ -14,7 +14,7 @@ func (*fold) Enter(*Node) {}
 func (fold *fold) Exit(node *Node) {
 	patch := func(newNode Node) {
 		fold.applied = true
-		patch(node, newNode)
+		Patch(node, newNode)
 	}
 
 	switch n := (*node).(type) {

optimizer/in_array.go

@@ -33,7 +33,7 @@ func (*inArray) Exit(node *Node) {
 						for _, a := range array.Nodes {
 							value[a.(*IntegerNode).Value] = struct{}{}
 						}
-						patch(node, &BinaryNode{
+						Patch(node, &BinaryNode{
 							Operator: n.Operator,
 							Left:     n.Left,
 							Right:    &ConstantNode{Value: value},
@@ -51,7 +51,7 @@ func (*inArray) Exit(node *Node) {
 						for _, a := range array.Nodes {
 							value[a.(*StringNode).Value] = struct{}{}
 						}
-						patch(node, &BinaryNode{
+						Patch(node, &BinaryNode{
 							Operator: n.Operator,
 							Left:     n.Left,
 							Right:    &ConstantNode{Value: value},

optimizer/in_range.go

@@ -14,7 +14,7 @@ func (*inRange) Exit(node *Node) {
 			if rng, ok := n.Right.(*BinaryNode); ok && rng.Operator == ".." {
 				if from, ok := rng.Left.(*IntegerNode); ok {
 					if to, ok := rng.Right.(*IntegerNode); ok {
-						patch(node, &BinaryNode{
+						Patch(node, &BinaryNode{
 							Operator: "and",
 							Left: &BinaryNode{
 								Operator: ">=",
@@ -28,7 +28,7 @@ func (*inRange) Exit(node *Node) {
 							},
 						})
 						if n.Operator == "not in" {
-							patch(node, &UnaryNode{
+							Patch(node, &UnaryNode{
 								Operator: "not",
 								Node:     *node,
 							})

optimizer/optimizer.go

@@ -32,9 +32,3 @@ func Optimize(node *Node, config *conf.Config) error {
 	Walk(node, &constRange{})
 	return nil
 }
-
-func patch(node *Node, newNode Node) {
-	newNode.SetType((*node).Type())
-	newNode.SetLocation((*node).Location())
-	*node = newNode
-}