Make conf top-level package

Author: antonmedv

checker/checker.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 
 	"github.com/antonmedv/expr/ast"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/file"
-	"github.com/antonmedv/expr/internal/conf"
 	"github.com/antonmedv/expr/parser"
 )
 

checker/checker_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/antonmedv/expr"
 	"github.com/antonmedv/expr/checker"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/parser"
 	"github.com/stretchr/testify/assert"
 )

compiler/compiler.go

@@ -7,8 +7,8 @@ import (
 	"reflect"
 
 	"github.com/antonmedv/expr/ast"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/file"
-	"github.com/antonmedv/expr/internal/conf"
 	"github.com/antonmedv/expr/parser"
 	. "github.com/antonmedv/expr/vm"
 )

compiler/compiler_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/antonmedv/expr/compiler"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/parser"
 	"github.com/antonmedv/expr/vm"
 	"github.com/stretchr/testify/assert"

compiler/patcher.go

@@ -2,7 +2,7 @@ package compiler
 
 import (
 	"github.com/antonmedv/expr/ast"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 )
 
 type operatorPatcher struct {

internal/conf/config.go renamed to conf/config.go

@@ -2,9 +2,10 @@ package conf
 
 import (
 	"fmt"
+	"reflect"
+
 	"github.com/antonmedv/expr/ast"
 	"github.com/antonmedv/expr/vm"
-	"reflect"
 )
 
 type Config struct {

internal/conf/operators_table.go renamed to conf/operators_table.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 )
 
 // Kind can be any of array, map, struct, func, string, int, float, bool or any.

internal/conf/types_table.go renamed to conf/types_table.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/antonmedv/expr/checker"
 	"github.com/antonmedv/expr/compiler"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/optimizer"
 	"github.com/antonmedv/expr/parser"
 	"github.com/antonmedv/expr/vm"

docgen/docgen.go

@@ -373,6 +373,48 @@ func ExampleAllowUndefinedVariables_zero_value_functions() {
 	// Output: [foo bar]
 }
 
+func ExamplePatch() {
+	/*
+		type patcher struct{}
+
+		func (p *patcher) Enter(_ *ast.Node) {}
+		func (p *patcher) Exit(node *ast.Node) {
+			switch n := (*node).(type) {
+			case *ast.PropertyNode:
+				ast.Patch(node, &ast.FunctionNode{
+					Name:      "get",
+					Arguments: []ast.Node{n.Node, &ast.StringNode{Value: n.Property}},
+				})
+			}
+		}
+	*/
+
+	program, err := expr.Compile(
+		`greet.you.world + "!"`,
+		expr.Patch(&patcher{}),
+	)
+	if err != nil {
+		fmt.Printf("%v", err)
+		return
+	}
+
+	env := map[string]interface{}{
+		"greet": "Hello",
+		"get": func(a, b string) string {
+			return a + ", " + b
+		},
+	}
+
+	output, err := expr.Run(program, env)
+	if err != nil {
+		fmt.Printf("%v", err)
+		return
+	}
+	fmt.Printf("%v", output)
+
+	// Output : Hello, you, world!
+}
+
 func TestOperator_struct(t *testing.T) {
 	env := &mockEnv{
 		BirthDay: time.Date(2017, time.October, 23, 18, 30, 0, 0, time.UTC),
@@ -944,53 +986,6 @@ func TestConstExpr_error_no_env(t *testing.T) {
 	require.Equal(t, "no environment for const expression: divide", err.Error())
 }
 
-func TestPatch(t *testing.T) {
-	env := map[string]interface{}{
-		"x": map[string]interface{}{
-			"foo": map[string]interface{}{
-				"bar": "hello",
-			},
-		},
-	}
-
-	program, err := expr.Compile(
-		`x.foo.bar`,
-		expr.Env(env),
-		expr.Patch(&patcher{}),
-	)
-	require.NoError(t, err)
-
-	env = map[string]interface{}{
-		"x": map[string]interface{}{
-			"Foo": func() interface{} {
-				return map[string]interface{}{
-					"Bar": func() string {
-						return "patched"
-					},
-				}
-			},
-		},
-	}
-
-	out, err := expr.Run(program, env)
-	require.NoError(t, err)
-	require.Equal(t, "patched", out)
-}
-
-type patcher struct {
-}
-
-func (p *patcher) Enter(_ *ast.Node) {}
-func (p *patcher) Exit(node *ast.Node) {
-	switch n := (*node).(type) {
-	case *ast.PropertyNode:
-		ast.Patch(node, &ast.MethodNode{
-			Node:   n.Node,
-			Method: strings.Title(n.Property),
-		})
-	}
-}
-
 //
 // Mock types
 //
@@ -1118,3 +1113,16 @@ type is struct{}
 func (is) Nil(a interface{}) bool {
 	return a == nil
 }
+
+type patcher struct{}
+
+func (p *patcher) Enter(_ *ast.Node) {}
+func (p *patcher) Exit(node *ast.Node) {
+	switch n := (*node).(type) {
+	case *ast.PropertyNode:
+		ast.Patch(node, &ast.FunctionNode{
+			Name:      "get",
+			Arguments: []ast.Node{n.Node, &ast.StringNode{Value: n.Property}},
+		})
+	}
+}

expr.go

@@ -2,7 +2,7 @@ package optimizer
 
 import (
 	. "github.com/antonmedv/expr/ast"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 )
 
 func Optimize(node *Node, config *conf.Config) error {

expr_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/antonmedv/expr/ast"
 	"github.com/antonmedv/expr/checker"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/optimizer"
 	"github.com/antonmedv/expr/parser"
 	"github.com/stretchr/testify/assert"

optimizer/optimizer.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/antonmedv/expr/checker"
 	"github.com/antonmedv/expr/compiler"
-	"github.com/antonmedv/expr/internal/conf"
+	"github.com/antonmedv/expr/conf"
 	"github.com/antonmedv/expr/parser"
 	"github.com/antonmedv/expr/vm"
 	"github.com/stretchr/testify/require"