Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions eval/eval/logic_step.cc
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,10 @@ class LogicalOpStep : public ExpressionStepBase {
public:
// Constructs FunctionStep that uses overloads specified.
LogicalOpStep(OpType op_type, size_t count, int64_t expr_id)
: ExpressionStepBase(expr_id), op_type_(op_type), count_(count) {
shortcircuit_ = (op_type_ == OpType::kOr);
}
: ExpressionStepBase(expr_id),
shortcircuit_(op_type == OpType::kOr),
op_type_(op_type),
count_(count) {}

absl::Status Evaluate(ExecutionFrame* frame) const override;

Expand Down Expand Up @@ -247,9 +248,9 @@ class LogicalOpStep : public ExpressionStepBase {
}
}

bool shortcircuit_;
const OpType op_type_;
size_t count_;
bool shortcircuit_;
};

absl::Status LogicalOpStep::Evaluate(ExecutionFrame* frame) const {
Expand Down
Loading