examples/examples_test.go

@@ -1,53 +0,0 @@
-package examples_test
-
-import (
-	"embed"
-	"fmt"
-	"testing"
-
-	"code.betamike.com/mediocregopher/ginger/gg"
-	"code.betamike.com/mediocregopher/ginger/vm"
-	"github.com/stretchr/testify/assert"
-)
-
-//go:embed *.gg
-var examplesFS embed.FS
-
-func TestAllExamples(t *testing.T) {
-
-	tests := []struct {
-		path string
-		in   vm.Value
-		exp  vm.Value
-	}{
-		{
-			path: "fib.gg",
-			in:   vm.Value{Value: gg.Number(5)},
-			exp:  vm.Value{Value: gg.Number(5)},
-		},
-		{
-			path: "fib.gg",
-			in:   vm.Value{Value: gg.Number(10)},
-			exp:  vm.Value{Value: gg.Number(55)},
-		},
-		{
-			path: "fib.gg",
-			in:   vm.Value{Value: gg.Number(69)},
-			exp:  vm.Value{Value: gg.Number(117669030460994)},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(fmt.Sprintf("%s_%v", test.path, test.in), func(t *testing.T) {
-			f, err := examplesFS.Open(test.path)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer f.Close()
-
-			got, err := vm.EvaluateSource(f, test.in, vm.GlobalScope)
-			assert.NoError(t, err)
-			assert.True(t, test.exp.Equal(got), "%v != %v", test.exp, got)
-		})
-	}
-}

vm/function.go

@@ -1,7 +1,6 @@
 package vm
 
 import (
-	"errors"
 	"fmt"
 
 	"code.betamike.com/mediocregopher/ginger/gg"
@@ -80,6 +79,8 @@ func FunctionFromGraph(g *gg.Graph, scope Scope) (Function, error) {
 			return edgeFn(Identity(val)), nil
 		}
 
+		name := *val.Name
+
 		if val.Equal(valNameIn) {
 			return edgeFn(FunctionFunc(func(inArg Value) Value {
 				return inArg
@@ -88,17 +89,15 @@ func FunctionFromGraph(g *gg.Graph, scope Scope) (Function, error) {
 
 		edgesIn := g.ValueIns(val.Value)
 
-		name := *val.Name
-
 		if l := len(edgesIn); l == 0 {
-			resolvedVal, err := scope.Resolve(name)
+
-			if errors.Is(err, ErrNameNotDefined) {
+			val, err := scope.Resolve(name)
-				return edgeFn(Identity(val)), nil
+
-			} else if err != nil {
+			if err != nil {
 				return nil, fmt.Errorf("resolving name %q from the outer scope: %w", name, err)
 			}
 
-			return edgeFn(Identity(resolvedVal)), nil
+			return edgeFn(Identity(val)), nil
 
 		} else if l != 1 {
 			return nil, fmt.Errorf("resolved name %q to %d input edges, rather than one", name, l)
@@ -124,6 +123,7 @@ func FunctionFromGraph(g *gg.Graph, scope Scope) (Function, error) {
 				return valToEdgeFn(Value{Value: ggVal})
 			},
 			func(ggEdgeVal gg.OptionalValue, inEdgeFns []edgeFn) (edgeFn, error) {
+
 				if ggEdgeVal.Equal(valNameIf.Value) {
 
 					if len(inEdgeFns) != 3 {
@@ -177,7 +177,11 @@ func FunctionFromGraph(g *gg.Graph, scope Scope) (Function, error) {
 
 				if edgeVal.Graph != nil {
 
-					opFromGraph, err := FunctionFromGraph(edgeVal.Graph, scope)
+					opFromGraph, err := FunctionFromGraph(
+						edgeVal.Graph,
+						scope.NewScope(),
+					)
+
 					if err != nil {
 						return nil, fmt.Errorf("compiling graph to operation: %w", err)
 					}
@@ -194,7 +198,7 @@ func FunctionFromGraph(g *gg.Graph, scope Scope) (Function, error) {
 					})), nil
 				}
 
-				// the edgeVal is not a Function at compile time, and so
+				// the edgeVal is not an Function at compile time, and so
 				// it must become one at runtime. We must resolve edgeVal to an
 				// edgeFn as well (edgeEdgeFn), and then at runtime that is
 				// given the inArg and (hopefully) the resultant Function is
@@ -213,7 +217,8 @@ func FunctionFromGraph(g *gg.Graph, scope Scope) (Function, error) {
 					if runtimeEdgeVal.Graph != nil {
 
 						runtimeFn, err := FunctionFromGraph(
-							runtimeEdgeVal.Graph, scope,
+							runtimeEdgeVal.Graph,
+							scope.NewScope(),
 						)
 
 						if err != nil {

vm/scope.go

@@ -1,19 +1,18 @@
 package vm
 
 import (
-	"errors"
+	"fmt"
 )
 
-// ErrNameNotDefined is returned from Scope.Resolve when a name could not be
-// resolved within a Scope.
-var ErrNameNotDefined = errors.New("not defined")
-
 // Scope encapsulates a set of name->Value mappings.
 type Scope interface {
 
-	// Resolve accepts a name and returns an Value, or returns
+	// Resolve accepts a name and returns an Value.
-	// ErrNameNotDefined.
 	Resolve(string) (Value, error)
+
+	// NewScope returns a new Scope which sub-operations within this Scope
+	// should use for themselves.
+	NewScope() Scope
 }
 
 // ScopeMap implements the Scope interface.
@@ -28,12 +27,17 @@ func (m ScopeMap) Resolve(name string) (Value, error) {
 	v, ok := m[name]
 
 	if !ok {
-		return Value{}, ErrNameNotDefined
+		return Value{}, fmt.Errorf("%q not defined", name)
 	}
 
 	return v, nil
 }
 
+// NewScope returns the ScopeMap as-is.
+func (m ScopeMap) NewScope() Scope {
+	return m
+}
+
 type scopeWith struct {
 	Scope // parent
 	name  string

vm/vm.go

@@ -114,7 +114,7 @@ func EvaluateSource(opSrc io.Reader, input Value, scope Scope) (Value, error) {
 		return Value{}, errors.New("value must be a graph")
 	}
 
-	fn, err := FunctionFromGraph(v.Value.Graph, scope)
+	fn, err := FunctionFromGraph(v.Value.Graph, scope.NewScope())
 	if err != nil {
 		return Value{}, err
 	}

vm/vm_test.go

@@ -32,16 +32,10 @@ func TestVM(t *testing.T) {
 			in:     Value{Value: gg.Number(1)},
 			expErr: "name !foo cannot start with a '!'",
 		},
-		{
-			src: `{foo = bar; !out = foo;}`,
-			in:  Value{},
-			exp: Value{Value: gg.Name("bar")},
-		},
 	}
 
 	for i, test := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
-			t.Log(test.src)
 			val, err := EvaluateSource(
 				bytes.NewBufferString(test.src), test.in, GlobalScope,
 			)