diff --git a/include/sqlgen/transpilation/Condition.hpp b/include/sqlgen/transpilation/Condition.hpp index 69f5e7b..2984115 100644 --- a/include/sqlgen/transpilation/Condition.hpp +++ b/include/sqlgen/transpilation/Condition.hpp @@ -12,17 +12,17 @@ struct Condition { }; template -auto operator&&(const Condition& _lhs, const Condition& _rhs) { +auto operator&&(const Condition& _cond1, const Condition& _cond2) { return Condition>{ - .condition = conditions::And{.lhs = _lhs.condition, - .rhs = _rhs.condition}}; + .condition = conditions::And{.cond1 = _cond1.condition, + .cond2 = _cond2.condition}}; } template -auto operator||(const Condition& _lhs, const Condition& _rhs) { +auto operator||(const Condition& _cond1, const Condition& _cond2) { return Condition>{ - .condition = - conditions::Or{.lhs = _lhs.condition, .rhs = _rhs.condition}}; + .condition = conditions::Or{.cond1 = _cond1.condition, + .cond2 = _cond2.condition}}; } } // namespace sqlgen::transpilation diff --git a/include/sqlgen/transpilation/conditions.hpp b/include/sqlgen/transpilation/conditions.hpp index 9992d8c..c6c202e 100644 --- a/include/sqlgen/transpilation/conditions.hpp +++ b/include/sqlgen/transpilation/conditions.hpp @@ -5,8 +5,8 @@ namespace sqlgen::transpilation::conditions { template struct And { - CondType1 lhs; - CondType2 rhs; + CondType1 cond1; + CondType2 cond2; }; template @@ -47,8 +47,8 @@ struct LesserThan { template struct Or { - CondType1 lhs; - CondType2 rhs; + CondType1 cond1; + CondType2 cond2; }; } // namespace sqlgen::transpilation::conditions diff --git a/include/sqlgen/transpilation/to_condition.hpp b/include/sqlgen/transpilation/to_condition.hpp index 88c2096..06bad2a 100644 --- a/include/sqlgen/transpilation/to_condition.hpp +++ b/include/sqlgen/transpilation/to_condition.hpp @@ -29,9 +29,9 @@ struct ToCondition> { return dynamic::Condition{ .val = dynamic::Condition::And{ .cond1 = Ref::make( - ToCondition>{}(_cond.lhs)), + ToCondition>{}(_cond.cond1)), .cond2 = Ref::make( - ToCondition>{}(_cond.rhs)), + ToCondition>{}(_cond.cond2)), }}; } }; @@ -43,9 +43,9 @@ struct ToCondition> { return dynamic::Condition{ .val = dynamic::Condition::Or{ .cond1 = Ref::make( - ToCondition>{}(_cond.lhs)), + ToCondition>{}(_cond.cond1)), .cond2 = Ref::make( - ToCondition>{}(_cond.rhs)), + ToCondition>{}(_cond.cond2)), }}; } };