refactor: rename Op.Execute() to Op.EvalExpr()

Author: tyru

dsl/ops/func_do.go

@@ -50,7 +50,7 @@ func (*doOp) InvertExpr(args []types.Value) (types.Value, error) {
 	return DoOp.Bind(newargs...)
 }
 
-func (*doOp) Execute(ctx context.Context, args []types.Value) (val types.Value, rollback func(), err error) {
+func (*doOp) EvalExpr(ctx context.Context, args []types.Value) (val types.Value, rollback func(), err error) {
 	g := util.FuncGuard(DoOp.String())
 	defer func() { err = g.Rollback(recover()) }()
 	rollback = g.RollbackForcefully

dsl/ops/macro_array.go

@@ -18,14 +18,14 @@ type arrayOp struct {
 var ArrayOp = &arrayOp{macroBase("$array")}
 
 func (op *arrayOp) InvertExpr(args []types.Value) (types.Value, error) {
-	return op.macroInvertExpr(op.Execute(context.Background(), args))
+	return op.macroInvertExpr(op.EvalExpr(context.Background(), args))
 }
 
 func (*arrayOp) Bind(args ...types.Value) (*types.Expr, error) {
 	expr := types.NewExpr(ArrayOp, args, types.NewArrayType(types.AnyValue))
 	return expr, nil
 }
 
-func (*arrayOp) Execute(ctx context.Context, args []types.Value) (types.Value, func(), error) {
+func (*arrayOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
 	return types.NewArray(args, types.AnyValue), NoRollback, nil
 }

dsl/ops/macro_eval.go

@@ -19,15 +19,15 @@ type evalOp struct {
 var EvalOp = &evalOp{macroBase("$eval")}
 
 func (op *evalOp) InvertExpr(args []types.Value) (types.Value, error) {
-	return op.macroInvertExpr(op.Execute(context.Background(), args))
+	return op.macroInvertExpr(op.EvalExpr(context.Background(), args))
 }
 
 func (*evalOp) Bind(args ...types.Value) (*types.Expr, error) {
 	expr := types.NewExpr(ArrayOp, args, types.NewArrayType(types.AnyValue))
 	return expr, nil
 }
 
-func (*evalOp) Execute(ctx context.Context, args []types.Value) (types.Value, func(), error) {
+func (*evalOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
 	if err := util.Signature(types.AnyValue).Check(args); err != nil {
 		return nil, NoRollback, err
 	}

dsl/ops/macro_invert.go

@@ -19,15 +19,15 @@ type invertOp struct {
 var InvertOp = &invertOp{macroBase("$invert")}
 
 func (op *invertOp) InvertExpr(args []types.Value) (types.Value, error) {
-	return op.macroInvertExpr(op.Execute(context.Background(), args))
+	return op.macroInvertExpr(op.EvalExpr(context.Background(), args))
 }
 
 func (*invertOp) Bind(args ...types.Value) (*types.Expr, error) {
 	expr := types.NewExpr(ArrayOp, args, types.NewArrayType(types.AnyValue))
 	return expr, nil
 }
 
-func (*invertOp) Execute(ctx context.Context, args []types.Value) (types.Value, func(), error) {
+func (*invertOp) EvalExpr(ctx context.Context, args []types.Value) (types.Value, func(), error) {
 	if err := util.Signature(types.AnyValue).Check(args); err != nil {
 		return nil, NoRollback, err
 	}

dsl/parse.go

@@ -58,7 +58,7 @@ func parseArray(array []interface{}) (types.Value, error) {
 	}
 	// Expand macro's expression at parsing time
 	if op.IsMacro() {
-		val, _, err := op.Execute(context.Background(), args)
+		val, _, err := op.EvalExpr(context.Background(), args)
 		return val, err
 	}
 	return op.Bind(args...)

dsl/types/expr.go

@@ -31,7 +31,7 @@ func NewExpr(op Op, args []Value, retType Type) *Expr {
 
 // Eval evaluates given expression expr with given transaction ID trxID.
 func (expr *Expr) Eval(ctx context.Context) (val Value, rollback func(), err error) {
-	return expr.op.Execute(ctx, expr.args)
+	return expr.op.EvalExpr(ctx, expr.args)
 }
 
 // Invert inverts this expression.

dsl/types/op.go

@@ -13,8 +13,11 @@ type Op interface {
 	// Bind binds its arguments, and check if the types of values are correct
 	Bind(args ...Value) (*Expr, error)
 
-	// Execute executes this operation and returns its result value and error
-	Execute(ctx context.Context, args []Value) (ret Value, rollback func(), err error)
+	// EvalExpr evaluates expression (this operator + given arguments).
+	// If this operator is a function, it executes the operation and returns its
+	// result and error.
+	// If this operator is a macro, this expands expression.
+	EvalExpr(ctx context.Context, args []Value) (ret Value, rollback func(), err error)
 
 	// IsMacro returns true if this operator is a macro
 	IsMacro() bool