Skip to content

made evaluate method exported #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewChubatiuk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

made evaluate method exported #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bexpr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ func (eval *Evaluator) Evaluate(datum interface{}) (bool, error) {
opts = append(opts, WithUnknownValue(*eval.unknownVal))
}

return evaluate(eval.ast, datum, opts...)
return Evaluate(eval.ast, datum, opts...)
}
14 changes: 7 additions & 7 deletions evaluate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ func evaluateCollectionExpression(expression *grammar.CollectionExpression, datu
}
}

result, err := evaluate(expression.Inner, datum, innerOpt...)
result, err := Evaluate(expression.Inner, datum, innerOpt...)
if err != nil {
return false, err
}
Expand All @@ -453,31 +453,31 @@ func evaluateCollectionExpression(expression *grammar.CollectionExpression, datu
}
}

func evaluate(ast grammar.Expression, datum interface{}, opt ...Option) (bool, error) {
func Evaluate(ast grammar.Expression, datum interface{}, opt ...Option) (bool, error) {
switch node := ast.(type) {
case *grammar.UnaryExpression:
switch node.Operator {
case grammar.UnaryOpNot:
result, err := evaluate(node.Operand, datum, opt...)
result, err := Evaluate(node.Operand, datum, opt...)
return !result, err
}
case *grammar.BinaryExpression:
switch node.Operator {
case grammar.BinaryOpAnd:
result, err := evaluate(node.Left, datum, opt...)
result, err := Evaluate(node.Left, datum, opt...)
if err != nil || !result {
return result, err
}

return evaluate(node.Right, datum, opt...)
return Evaluate(node.Right, datum, opt...)

case grammar.BinaryOpOr:
result, err := evaluate(node.Left, datum, opt...)
result, err := Evaluate(node.Left, datum, opt...)
if err != nil || result {
return result, err
}

return evaluate(node.Right, datum, opt...)
return Evaluate(node.Right, datum, opt...)
}
case *grammar.MatchExpression:
return evaluateMatchExpression(node, datum, opt...)
Expand Down