Skip to content

Commit 3da277a

Browse files
k1LoWk1LoW
committed
Rename internal/eval to internal/expr
1 parent b55e130 commit 3da277a

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎alias.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
package runn
22

33
import (
4-
"github.com/k1LoW/runn/internal/eval"
4+
"github.com/k1LoW/runn/internal/expr"
55
"github.com/k1LoW/runn/internal/exprtrace"
66
)
77

88
func EvalWithTrace(e string, store exprtrace.EvalEnv) (*exprtrace.EvalResult, error) {
9-
return eval.EvalWithTrace(e, store)
9+
return expr.EvalWithTrace(e, store)
1010
}
1111

1212
func Eval(e string, store exprtrace.EvalEnv) (any, error) {
13-
return eval.Eval(e, store)
13+
return expr.Eval(e, store)
1414
}
1515

1616
// EvalAny evaluate any type. but, EvalAny do not evaluate map key.
1717
func EvalAny(e any, store exprtrace.EvalEnv) (any, error) {
18-
return eval.EvalAny(e, store)
18+
return expr.EvalAny(e, store)
1919
}
2020

2121
func EvalCond(cond string, store exprtrace.EvalEnv) (bool, error) {
22-
return eval.EvalCond(cond, store)
22+
return expr.EvalCond(cond, store)
2323
}
2424

2525
func EvalCount(count string, store exprtrace.EvalEnv) (int, error) {
26-
return eval.EvalCount(count, store)
26+
return expr.EvalCount(count, store)
2727
}
2828

2929
// EvalExpand evaluates `in` and expand `{{ }}` in `in` using `store`.
3030
func EvalExpand(in any, store exprtrace.EvalEnv) (any, error) {
31-
return eval.EvalExpand(in, store)
31+
return expr.EvalExpand(in, store)
3232
}

‎dump.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/goccy/go-json"
1212
"github.com/k1LoW/donegroup"
13-
"github.com/k1LoW/runn/internal/eval"
13+
"github.com/k1LoW/runn/internal/expr"
1414
"github.com/k1LoW/runn/internal/store"
1515
)
1616

@@ -52,7 +52,7 @@ func (rnr *dumpRunner) Run(ctx context.Context, s *step, first bool) error {
5252
out = o.stdout
5353
}
5454
} else {
55-
p, err := eval.EvalExpand(r.out, sm)
55+
p, err := expr.EvalExpand(r.out, sm)
5656
if err != nil {
5757
return err
5858
}
@@ -79,7 +79,7 @@ func (rnr *dumpRunner) Run(ctx context.Context, s *step, first bool) error {
7979
return fmt.Errorf("invalid dump out: %v", pp)
8080
}
8181
}
82-
v, err := eval.Eval(r.expr, sm)
82+
v, err := expr.Eval(r.expr, sm)
8383
if err != nil {
8484
return err
8585
}

‎internal/eval/eval.go ‎internal/expr/expr.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eval
1+
package expr
22

33
import (
44
"fmt"

‎internal/eval/eval_test.go ‎internal/expr/expr_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eval
1+
package expr
22

33
import (
44
"fmt"

‎internal/store/store.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/expr-lang/expr/parser"
1515
"github.com/goccy/go-json"
1616
"github.com/k1LoW/maskedio"
17-
"github.com/k1LoW/runn/internal/eval"
17+
"github.com/k1LoW/runn/internal/expr"
1818
"github.com/k1LoW/runn/internal/kv"
1919
"github.com/mattn/go-isatty"
2020
"github.com/samber/lo"
@@ -459,7 +459,7 @@ func (s *Store) SetMaskKeywords(store map[string]any) {
459459
}()
460460

461461
for _, key := range s.secrets {
462-
v, err := eval.Eval(key, store)
462+
v, err := expr.Eval(key, store)
463463
if err != nil {
464464
continue
465465
}
@@ -532,7 +532,7 @@ func convertStepListToList(l map[int]map[string]any) []map[string]any {
532532
}
533533

534534
func evalBindKeyValue(bindVars map[string]any, k string, v any, store map[string]any) (map[string]any, error) {
535-
vv, err := eval.EvalAny(v, store)
535+
vv, err := expr.EvalAny(v, store)
536536
if err != nil {
537537
return nil, err
538538
}
@@ -578,7 +578,7 @@ func nodeToMap(n ast.Node, v any, store map[string]any) (map[string]any, error)
578578
}
579579
switch p := nn.Property.(type) {
580580
case *ast.IdentifierNode:
581-
kk, err := eval.EvalAny(p.Value, store)
581+
kk, err := expr.EvalAny(p.Value, store)
582582
if err != nil {
583583
return nil, err
584584
}
@@ -597,7 +597,7 @@ func nodeToMap(n ast.Node, v any, store map[string]any) (map[string]any, error)
597597
p.Value: v,
598598
}
599599
case *ast.MemberNode:
600-
kk, err := eval.EvalAny(p.String(), store)
600+
kk, err := expr.EvalAny(p.String(), store)
601601
if err != nil {
602602
return nil, err
603603
}
@@ -614,7 +614,7 @@ func nodeToMap(n ast.Node, v any, store map[string]any) (map[string]any, error)
614614
var vv map[any]any
615615
switch p := nn.Property.(type) {
616616
case *ast.IdentifierNode:
617-
kk, err := eval.EvalAny(p.Value, store)
617+
kk, err := expr.EvalAny(p.Value, store)
618618
if err != nil {
619619
return nil, err
620620
}
@@ -633,7 +633,7 @@ func nodeToMap(n ast.Node, v any, store map[string]any) (map[string]any, error)
633633
p.Value: v,
634634
}
635635
case *ast.MemberNode:
636-
kk, err := eval.EvalAny(p.String(), store)
636+
kk, err := expr.EvalAny(p.String(), store)
637637
if err != nil {
638638
return nil, err
639639
}

‎operator.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/k1LoW/donegroup"
2323
"github.com/k1LoW/maskedio"
2424
"github.com/k1LoW/runn/internal/deprecation"
25-
"github.com/k1LoW/runn/internal/eval"
25+
"github.com/k1LoW/runn/internal/expr"
2626
"github.com/k1LoW/runn/internal/exprtrace"
2727
"github.com/k1LoW/runn/internal/kv"
2828
"github.com/k1LoW/runn/internal/store"
@@ -1096,7 +1096,7 @@ func (op *operator) runLoop(ctx context.Context) error {
10961096
if op.loop.Until != "" {
10971097
sm := op.store.ToMap()
10981098
sm[store.StepKeyOutcome] = string(outcome)
1099-
tf, err := eval.EvalWithTrace(op.loop.Until, sm)
1099+
tf, err := expr.EvalWithTrace(op.loop.Until, sm)
11001100
if err != nil {
11011101
return fmt.Errorf("loop failed on %s: %w", op.bookPathOrID(), err)
11021102
}
@@ -1318,7 +1318,7 @@ func (op *operator) expandBeforeRecord(in any, s *step) (any, error) {
13181318
if !s.deferred {
13191319
sm[store.RootKeyPrevious] = op.store.Latest()
13201320
}
1321-
return eval.EvalExpand(in, sm)
1321+
return expr.EvalExpand(in, sm)
13221322
}
13231323

13241324
// expandCondBeforeRecord - expand condition before the runner records the result.
@@ -1328,7 +1328,7 @@ func (op *operator) expandCondBeforeRecord(ifCond string, s *step) (bool, error)
13281328
if !s.deferred {
13291329
sm[store.RootKeyPrevious] = op.store.Latest()
13301330
}
1331-
return eval.EvalCond(ifCond, sm)
1331+
return expr.EvalCond(ifCond, sm)
13321332
}
13331333

13341334
// Debugln print to out when debug = true.

‎test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/k1LoW/runn/internal/eval"
7+
"github.com/k1LoW/runn/internal/expr"
88
"github.com/k1LoW/runn/internal/exprtrace"
99
"github.com/k1LoW/runn/internal/store"
1010
)
@@ -57,7 +57,7 @@ func (rnr *testRunner) Run(ctx context.Context, s *step, first bool) error {
5757

5858
func (rnr *testRunner) run(_ context.Context, cond string, sm exprtrace.EvalEnv, s *step, first bool) error {
5959
o := s.parent
60-
tf, err := eval.EvalWithTrace(cond, sm)
60+
tf, err := expr.EvalWithTrace(cond, sm)
6161
if err != nil {
6262
return err
6363
}

0 commit comments

Comments
 (0)