Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

spelling: canonicalize

Browse source 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref 2022-10-23 16:01:22 -04:00
parent b79dfafefb
commit 34966a93ef
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Expr.cc
View file

@ -452,7 +452,7 @@ void Expr::AddTag(ODesc* d) const
d->AddSP(expr_name(Tag())); d->AddSP(expr_name(Tag()));
} }
void Expr::Canonicize() { } void Expr::Canonicalize() { }
void Expr::SetType(TypePtr t) void Expr::SetType(TypePtr t)
{ {
@ -1670,7 +1670,7 @@ AddExpr::AddExpr(ExprPtr arg_op1, ExprPtr arg_op2)
} }
} }
void AddExpr::Canonicize() void AddExpr::Canonicalize()
{ {
if ( expr_greater(op2.get(), op1.get()) || if ( expr_greater(op2.get(), op1.get()) ||
(op1->GetType()->Tag() == TYPE_INTERVAL && op2->GetType()->Tag() == TYPE_TIME) || (op1->GetType()->Tag() == TYPE_INTERVAL && op2->GetType()->Tag() == TYPE_TIME) ||
@ -1902,7 +1902,7 @@ TimesExpr::TimesExpr(ExprPtr arg_op1, ExprPtr arg_op2)
if ( IsError() ) if ( IsError() )
return; return;
Canonicize(); Canonicalize();
TypeTag bt1 = op1->GetType()->Tag(); TypeTag bt1 = op1->GetType()->Tag();
@ -1929,7 +1929,7 @@ TimesExpr::TimesExpr(ExprPtr arg_op1, ExprPtr arg_op2)
CheckScalarAggOp(); CheckScalarAggOp();
} }
void TimesExpr::Canonicize() void TimesExpr::Canonicalize()
{ {
if ( expr_greater(op2.get(), op1.get()) || op2->GetType()->Tag() == TYPE_INTERVAL || if ( expr_greater(op2.get(), op1.get()) || op2->GetType()->Tag() == TYPE_INTERVAL ||
(op2->IsConst() && ! is_vector(op2->ExprVal()) && ! op1->IsConst()) ) (op2->IsConst() && ! is_vector(op2->ExprVal()) && ! op1->IsConst()) )
@ -2247,7 +2247,7 @@ EqExpr::EqExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2)
if ( IsError() ) if ( IsError() )
return; return;
Canonicize(); Canonicalize();
const auto& t1 = op1->GetType(); const auto& t1 = op1->GetType();
const auto& t2 = op2->GetType(); const auto& t2 = op2->GetType();
@ -2317,7 +2317,7 @@ EqExpr::EqExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2)
CheckScalarAggOp(); CheckScalarAggOp();
} }
void EqExpr::Canonicize() void EqExpr::Canonicalize()
{ {
if ( op2->GetType()->Tag() == TYPE_PATTERN ) if ( op2->GetType()->Tag() == TYPE_PATTERN )
SwapOps(); SwapOps();
@ -2362,7 +2362,7 @@ RelExpr::RelExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2)
if ( IsError() ) if ( IsError() )
return; return;
Canonicize(); Canonicalize();
const auto& t1 = op1->GetType(); const auto& t1 = op1->GetType();
const auto& t2 = op2->GetType(); const auto& t2 = op2->GetType();
@ -2399,7 +2399,7 @@ RelExpr::RelExpr(ExprTag arg_tag, ExprPtr arg_op1, ExprPtr arg_op2)
CheckScalarAggOp(); CheckScalarAggOp();
} }
void RelExpr::Canonicize() void RelExpr::Canonicalize()
{ {
if ( tag == EXPR_GT ) if ( tag == EXPR_GT )
{ {

10
src/Expr.h
View file

@ -426,7 +426,7 @@ protected:
void AddTag(ODesc* d) const; void AddTag(ODesc* d) const;
// Puts the expression in canonical form. // Puts the expression in canonical form.
virtual void Canonicize(); virtual void Canonicalize();
void SetType(TypePtr t); void SetType(TypePtr t);
@ -747,7 +747,7 @@ class AddExpr final : public BinaryExpr
{ {
public: public:
AddExpr(ExprPtr op1, ExprPtr op2); AddExpr(ExprPtr op1, ExprPtr op2);
void Canonicize() override; void Canonicalize() override;
// Optimization-related: // Optimization-related:
ExprPtr Duplicate() override; ExprPtr Duplicate() override;
@ -809,7 +809,7 @@ class TimesExpr final : public BinaryExpr
{ {
public: public:
TimesExpr(ExprPtr op1, ExprPtr op2); TimesExpr(ExprPtr op1, ExprPtr op2);
void Canonicize() override; void Canonicalize() override;
// Optimization-related: // Optimization-related:
ExprPtr Duplicate() override; ExprPtr Duplicate() override;
@ -874,7 +874,7 @@ class EqExpr final : public BinaryExpr
{ {
public: public:
EqExpr(ExprTag tag, ExprPtr op1, ExprPtr op2); EqExpr(ExprTag tag, ExprPtr op1, ExprPtr op2);
void Canonicize() override; void Canonicalize() override;
// Optimization-related: // Optimization-related:
ExprPtr Duplicate() override; ExprPtr Duplicate() override;
@ -890,7 +890,7 @@ class RelExpr final : public BinaryExpr
{ {
public: public:
RelExpr(ExprTag tag, ExprPtr op1, ExprPtr op2); RelExpr(ExprTag tag, ExprPtr op1, ExprPtr op2);
void Canonicize() override; void Canonicalize() override;
// Optimization-related: // Optimization-related:
ExprPtr Duplicate() override; ExprPtr Duplicate() override;