Small refactorings

vknabel · Sep 16, 2021 · 053dcab · 053dcab
1 parent 9d1e8e6
commit 053dcab
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 350 deletions.
diff --git a/interpreter/errors.go b/interpreter/errors.go
@@ -13,7 +13,7 @@ type SyntaxError struct {
 	ModuleFile ModuleFile
 }
 
-func (ex *ExecutionContext) SyntaxErrorf(format string, args ...interface{}) SyntaxError {
+func (ex *EvaluationContext) SyntaxErrorf(format string, args ...interface{}) SyntaxError {
 	return SyntaxError{
 		Message:    fmt.Sprintf(format, args...),
 		Node:       ex.node,
@@ -33,7 +33,7 @@ type RuntimeError struct {
 	ModuleFile ModuleFile
 }
 
-func (ex *ExecutionContext) RuntimeErrorf(format string, args ...interface{}) RuntimeError {
+func (ex *EvaluationContext) RuntimeErrorf(format string, args ...interface{}) RuntimeError {
 	return RuntimeError{
 		Message:    fmt.Sprintf(format, args...),
 		Node:       ex.node,

diff --git a/interpreter/func-binary-operators.go b/interpreter/func-binary-operators.go
@@ -2,7 +2,7 @@ package interpreter
 
 import "reflect"
 
-func (ex *ExecutionContext) BinaryOperatorFunction(operator string) (func(*LazyRuntimeValue, *LazyRuntimeValue) (RuntimeValue, error), error) {
+func (ex *EvaluationContext) BinaryOperatorFunction(operator string) (func(*LazyRuntimeValue, *LazyRuntimeValue) (RuntimeValue, error), error) {
 	switch operator {
 	case "==":
 		return func(lazyLeft, lazyRight *LazyRuntimeValue) (RuntimeValue, error) {
@@ -105,7 +105,7 @@ func (ex *ExecutionContext) BinaryOperatorFunction(operator string) (func(*LazyR
 	}
 }
 
-func (ex *ExecutionContext) genericGreedyComparision(
+func (ex *EvaluationContext) genericGreedyComparision(
 	lazyLeft, lazyRight *LazyRuntimeValue,
 	compare func(RuntimeValue, RuntimeValue) bool,
 ) (RuntimeValue, error) {
@@ -124,7 +124,7 @@ func (ex *ExecutionContext) genericGreedyComparision(
 	}
 }
 
-func (ex *ExecutionContext) numericGreedyComparision(
+func (ex *EvaluationContext) numericGreedyComparision(
 	lazyLeft, lazyRight *LazyRuntimeValue,
 	compareInt func(PreludeInt, PreludeInt) bool,
 	compareFloat func(PreludeFloat, PreludeFloat) bool,
@@ -165,7 +165,7 @@ func (ex *ExecutionContext) numericGreedyComparision(
 	}
 }
 
-func (ex *ExecutionContext) numericGreedyOperation(
+func (ex *EvaluationContext) numericGreedyOperation(
 	lazyLeft, lazyRight *LazyRuntimeValue,
 	combineInt func(PreludeInt, PreludeInt) PreludeInt,
 	combineFloat func(PreludeFloat, PreludeFloat) PreludeFloat,
@@ -206,7 +206,7 @@ func (ex *ExecutionContext) numericGreedyOperation(
 	}
 }
 
-func (ex *ExecutionContext) lazyLogicComparision(
+func (ex *EvaluationContext) lazyLogicComparision(
 	lazyLeft, lazyRight *LazyRuntimeValue,
 	compare func(bool, func() (bool, error)) (bool, error),
 ) (RuntimeValue, error) {

diff --git a/interpreter/functions.go b/interpreter/functions.go
@@ -19,8 +19,8 @@ type CurriedCallable struct {
 type Function struct {
 	name      string
 	arguments []string
-	body      func(*ExecutionContext) ([]*LazyRuntimeValue, error)
-	parent    *ExecutionContext
+	body      func(*EvaluationContext) ([]*LazyRuntimeValue, error)
+	parent    *EvaluationContext
 }
 
 func (f Function) String() string {

diff --git a/interpreter/interpreter-visitor.go b/interpreter/interpreter-visitor.go