summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/type/qatomicmathematicianlocators.cpp')
-rw-r--r--src/xmlpatterns/type/qatomicmathematicianlocators.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
index 59446f9..9177b33 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp
@@ -47,12 +47,13 @@ using namespace QPatternist;
#define implMathVisit(ownerClass, visitor, mather, validOps) \
AtomicTypeVisitorResult::Ptr \
-ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \
+ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \
const SourceLocationReflection *const r) const \
{ \
Q_UNUSED(r) \
/* Note the extra paranteses around validOps. */ \
- if(((validOps) & AtomicMathematician::Operator(op)) == op) \
+ const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \
+ if (((validOps) & op) == op) \
return AtomicTypeVisitorResult::Ptr(new mather()); \
else \
return AtomicTypeVisitorResult::Ptr(); \
@@ -60,11 +61,12 @@ ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op,
#define implReportingMathVisit(ownerClass, visitor, mather, validOps) \
AtomicTypeVisitorResult::Ptr \
-ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \
+ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \
const SourceLocationReflection *const r) const \
{ \
+ const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \
/* Note the extra paranteses around validOps. */ \
- if(((validOps) & AtomicMathematician::Operator(op)) == op) \
+ if (((validOps) & op) == op) \
return AtomicTypeVisitorResult::Ptr(new mather(r)); \
else \
return AtomicTypeVisitorResult::Ptr(); \
@@ -72,11 +74,12 @@ ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op,
#define implRevReportingMathVisit(ownerClass, visitor, mather, validOps) \
AtomicTypeVisitorResult::Ptr \
-ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \
+ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \
const SourceLocationReflection *const r) const \
{ \
+ const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \
/* Note the extra paranteses around validOps. */ \
- if(((validOps) & AtomicMathematician::Operator(op)) == op) \
+ if (((validOps) & op) == op) \
return AtomicTypeVisitorResult::Ptr(new OperandSwitcherMathematician( \
AtomicMathematician::Ptr(new mather(r)))); \
else \