Helper static method Predicate::evaluate

libwccl/ops/intersects.h

@@ -29,10 +29,7 @@ protected:
 	virtual BaseRetValPtr apply_internal(const FunExecContext& context) const {
 		boost::shared_ptr<T> set1 = this->set1_expr_->apply(context);
 		boost::shared_ptr<T> set2 = this->set2_expr_->apply(context);
-		if(set1->is_subset_of(*set2)) {
-			return Predicate::True(context);
-		}
-		return Predicate::False(context);
+		return Predicate::evaluate(set1->intersects(*set2), context);
 	}
 
 };

libwccl/ops/isinside.h

@@ -42,10 +42,7 @@ protected:
 	 */
 	virtual BaseRetValPtr apply_internal(const FunExecContext& context) const {
 		const boost::shared_ptr<const Position>& pos = pos_expr_->apply(context);
-		if(pos->is_inside(context.sentence_context())) {
-			return Predicate::True(context);
-		}
-		return Predicate::False(context);
+		return Predicate::evaluate(pos->is_inside(context.sentence_context()), context);
 	}
 };
 

libwccl/ops/isoutside.h

@@ -42,10 +42,7 @@ protected:
 	 */
 	virtual BaseRetValPtr apply_internal(const FunExecContext& context) const {
 		const boost::shared_ptr<const Position>& pos = pos_expr_->apply(context);
-		if(pos->is_outside(context.sentence_context())) {
-			return Predicate::True(context);
-		}
-		return Predicate::False(context);
+		return Predicate::evaluate(pos->is_outside(context.sentence_context()), context);
 	}
 };
 

libwccl/ops/issubsetof.h

@@ -32,11 +32,10 @@ protected:
 	 */
 	virtual BaseRetValPtr apply_internal(const FunExecContext& context) const {
 		boost::shared_ptr<T> possible_subset = this->set1_expr_->apply(context);
-		if(!possible_subset->empty()) {
+		if(!possible_subset->empty())
+		{
 			boost::shared_ptr<T> set_compared_to = this->set2_expr_->apply(context);
-			if(possible_subset->is_subset_of(*set_compared_to)) {
-				return Predicate::True(context);
-			}
+			return Predicate::evaluate(possible_subset->is_subset_of(*set_compared_to), context);
 		}
 		return Predicate::False(context);
 	}

libwccl/ops/predicate.cpp

@@ -14,4 +14,9 @@ Predicate::RetValPtr Predicate::False(const FunExecContext& context)
 	return false_constant.apply(context);
 }
 
+Predicate::RetValPtr Predicate::evaluate(bool condition, const FunExecContext &context)
+{
+	return condition ? True(context) : False(context);
+}
+
 } /* end ns Wccl */

libwccl/ops/predicate.h

@@ -21,6 +21,10 @@ public:
 	 * Helper function returing False, to use by predicates when returning value
 	 */
 	static RetValPtr False(const FunExecContext& context);
+	/**
+	 * Helper function returing True or False depending on condition
+	 */
+	static RetValPtr evaluate(bool condition, const FunExecContext& context);
 };
 
 } /* end ns Wccl */