Skip to content

Commit

Permalink
tidy and extend syntax sugar for floor function
Browse files Browse the repository at this point in the history
  • Loading branch information
@joe-hauns
joe-hauns committed Dec 10, 2024
1 parent 87a4330 commit 0b78e07
Showing 1 changed file with 40 additions and 56 deletions.
96 changes: 40 additions & 56 deletions Test/SyntaxSugar.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,8 @@
#define __CONSTANT_TYPE_INT IntegerConstantType
#define __CONSTANT_TYPE_REAL RealConstantType
#define __CONSTANT_TYPE_RAT RationalConstantType
#if defined(__clang__)
# define __ALLOW_UNUSED(...) \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wunused\"") \
__VA_ARGS__ \
_Pragma("GCC diagnostic pop") \

#elif defined(__GNUC__) || defined(__GNUG__)

# define __ALLOW_UNUSED(...) \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wunused-but-set-variable\"") \
__VA_ARGS__ \
_Pragma("GCC diagnostic pop") \

#else
# define __ALLOW_UNUSED(...) __VA_ARGS__
#endif



#define __ARGS_DECL(Type, arity) __ARGS_DECL_ ## arity(Type)
#define __ARGS_DECL_1(Type) Type arg0_
#define __ARGS_DECL_2(Type) Type arg0_ , Type arg1_
Expand Down Expand Up @@ -103,31 +86,31 @@
#define DECL_FUN_DEF(d, t) auto d = PredSugar(env.signature->getFnDef(t.sugaredExpr().term()->functor()));
#define DECL_PRED_DEF(d, t) auto d = PredSugar(env.signature->getBoolDef(((Literal*)t)->functor()));

#define DECL_DEFAULT_VARS \
__ALLOW_UNUSED( \
DECL_VAR(x, 0) \
DECL_VAR(y, 1) \
DECL_VAR(z, 2) \
) \
#define DECL_DEFAULT_VARS \
__ALLOW_UNUSED( \
DECL_VAR(x, 0) \
DECL_VAR(y, 1) \
DECL_VAR(z, 2) \
) \

// Sort variables are just variables
// numbers chosen to make a clash with term variables unlikely
// Only these vars should be used when creating polymorphic sorts
// if more are required this macro should be modified.
#define DECL_DEFAULT_SORT_VARS \
__ALLOW_UNUSED( \
DECL_SORT_VAR(alpha, 101) \
DECL_SORT_VAR(beta, 102) \
DECL_SORT_VAR(gamma, 103) \
#define DECL_DEFAULT_SORT_VARS \
__ALLOW_UNUSED( \
DECL_SORT_VAR(alpha, 101) \
DECL_SORT_VAR(beta, 102) \
DECL_SORT_VAR(gamma, 103) \
)

#define DECL_COMBINATORS \
__ALLOW_UNUSED( \
DECL_I_COMB(I) \
DECL_K_COMB(K) \
DECL_B_COMB(B) \
DECL_C_COMB(C) \
DECL_S_COMB(S) \
#define DECL_COMBINATORS \
__ALLOW_UNUSED( \
DECL_I_COMB(I) \
DECL_K_COMB(K) \
DECL_B_COMB(B) \
DECL_C_COMB(C) \
DECL_S_COMB(S) \
)


Expand Down Expand Up @@ -182,15 +165,17 @@
*
* For examples see UnitTesting/tSyntaxSugar.cpp.
*/
#define NUMBER_SUGAR(Sort) \
__ALLOW_UNUSED( \
using NumTraits = Sort##Traits; \
syntaxSugarGlobals().setNumTraits(NumTraits{}); \
auto add = FuncSugar(NumTraits::addF()); \
auto mul = FuncSugar(NumTraits::mulF()); \
auto minus = FuncSugar(NumTraits::minusF()); \
auto Sort = SortSugar(NumTraits::sort()); \
) \
#define NUMBER_SUGAR(Sort) \
__ALLOW_UNUSED( \
using NumTraits = Sort##Traits; \
syntaxSugarGlobals().setNumTraits(NumTraits{}); \
auto add = FuncSugar(NumTraits::addF()); \
auto mul = FuncSugar(NumTraits::mulF()); \
auto minus = FuncSugar(NumTraits::minusF()); \
auto floor = FuncSugar(NumTraits::floorF()); \
auto ceil = [&](auto t) { return minus(floor(minus(t))); }; \
auto Sort = SortSugar(NumTraits::sort()); \
) \

#define DECL_TERM_ALGEBRA(...) createTermAlgebra(__VA_ARGS__);

Expand Down Expand Up @@ -372,7 +357,7 @@ class TermSugar : public ExpressionSugar
}

TermSugar(TermList trm, SortSugar sort)
: ExpressionSugar(trm)
: TermSugar(trm)
{
ASS(_sugaredExpr.isVar());
_srt = sort.sugaredExpr();
Expand Down Expand Up @@ -458,20 +443,20 @@ inline TermSugar operator-(TermSugar lhs, TermSugar rhs) { return lhs + -rhs; }
inline TermSugar operator*(TermSugar lhs, TermSugar rhs) { return syntaxSugarGlobals().mul(lhs, rhs); }
inline TermSugar operator/(TermSugar lhs, TermSugar rhs) { return syntaxSugarGlobals().div(lhs, rhs); }

#define __IMPL_NUMBER_BIN_FUN(op, result_t) \
inline result_t op(int lhs, TermSugar rhs) { return op(TermSugar(lhs), rhs); } \
inline result_t op(TermSugar lhs, int rhs) { return op(lhs, TermSugar(rhs)); } \
#define __IMPL_NUMBER_BIN_FUN(op, result_t) \
inline result_t op(int lhs, TermSugar rhs) { return op(TermSugar(lhs), rhs); } \
inline result_t op(TermSugar lhs, int rhs) { return op(lhs, TermSugar(rhs)); } \

__IMPL_NUMBER_BIN_FUN(operator+, TermSugar)
__IMPL_NUMBER_BIN_FUN(operator*, TermSugar)
__IMPL_NUMBER_BIN_FUN(operator/, TermSugar)

#define __BIN_FUNC_QUOTIENT_REMAINDER(X) \
#define __BIN_FUNC_QUOTIENT_REMAINDER(X) \
inline TermSugar quotient##X(TermSugar lhs, TermSugar rhs){ return syntaxSugarGlobals(). quotient##X(lhs, rhs); } \
inline TermSugar remainder##X(TermSugar lhs, TermSugar rhs){ return syntaxSugarGlobals().remainder##X(lhs, rhs); } \
\
__IMPL_NUMBER_BIN_FUN( quotient##X, TermSugar) \
__IMPL_NUMBER_BIN_FUN(remainder##X, TermSugar) \
\
__IMPL_NUMBER_BIN_FUN( quotient##X, TermSugar) \
__IMPL_NUMBER_BIN_FUN(remainder##X, TermSugar) \

__BIN_FUNC_QUOTIENT_REMAINDER(E)
__BIN_FUNC_QUOTIENT_REMAINDER(T)
Expand All @@ -492,8 +477,7 @@ inline Lit operator==(TermSugar lhs, SortedTermSugar rhs)

inline Lit operator==(TermSugar lhs, TermSugar rhs)
{
SortId sort;
ALWAYS(SortHelper::tryGetResultSort(lhs, sort) || SortHelper::tryGetResultSort(rhs, sort));
SortId sort = lhs.sort().isNonEmpty() ? lhs.sort() : rhs.sort();
return Literal::createEquality(true, lhs, rhs, sort);
}

Expand Down

0 comments on commit 0b78e07

Please sign in to comment.