X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbooleanevaluator.cpp;h=58a6fcf1a682b53aa0c6ef54627a9f7729f7eecd;hb=8b133e26e29abbe79886c47d57637eb18ea9cb24;hp=ecb38fb0d07657e4ed9a1a3e574289e08bccee5b;hpb=02097e6a1ddbffbc2217005c3c2ebba528f5248f;p=builder.git

diff --git a/source/booleanevaluator.cpp b/source/booleanevaluator.cpp
index ecb38fb..58a6fcf 100644
--- a/source/booleanevaluator.cpp
+++ b/source/booleanevaluator.cpp
@@ -1,20 +1,25 @@
 #include <stdexcept>
+#include <msp/strings/format.h>
 #include "booleanevaluator.h"
 
 using namespace std;
+using namespace Msp;
 
-/* I'd rather have overloads with different slots, but that creates an
-ambiguity because slots have template constructors. */
-BooleanEvaluator::BooleanEvaluator(const Slot &s, bool allow_compare):
-	slot(s),
-	ops(allow_compare ? "&|!=^" : "&|!")
+BooleanEvaluator::BooleanEvaluator(const ValueFunction &f):
+	func([&f](const string &value, const string *){ return f(value); }),
+	ops("&|!")
+{ }
+
+BooleanEvaluator::BooleanEvaluator(const CompareFunction &f):
+	func(f),
+	ops("&|!=^")
 { }
 
 bool BooleanEvaluator::evaluate(const string &str)
 {
 	string buf;
 	last_was_op = true;
-	for(string::const_iterator i=str.begin();; ++i)
+	for(auto i=str.begin();; ++i)
 	{
 		if(i!=str.end() && (isalnum(*i) || (!buf.empty() && (*i=='_' || *i=='-'))))
 			buf += *i;
@@ -31,7 +36,7 @@ bool BooleanEvaluator::evaluate(const string &str)
 					op_stack.pop_back();
 					string var = var_stack.back();
 					var_stack.pop_back();
-					bool value = (slot(var, &buf) == (op=='='));
+					bool value = (func(var, &buf) == (op=='='));
 					value_stack.push_back(value);
 				}
 				else
@@ -48,7 +53,7 @@ bool BooleanEvaluator::evaluate(const string &str)
 			else if(ops.find(*i)!=string::npos)
 				push_op(*i);
 			else
-				throw runtime_error("syntax error at "+string(1, *i));
+				throw runtime_error(format("syntax error at %c", *i));
 		}
 	}
 
@@ -64,7 +69,7 @@ bool BooleanEvaluator::evaluate(const string &str)
 void BooleanEvaluator::push_op(char op)
 {
 	if(last_was_op!=is_unary(op))
-		throw runtime_error("syntax error at "+string(1, op));
+		throw runtime_error(format("syntax error at %c", op));
 	// TODO Disallow mixing of ! and =/^
 	if(is_logic(op) && !var_stack.empty())
 		value_stack.push_back(pop_value());
@@ -81,7 +86,7 @@ bool BooleanEvaluator::pop_value()
 	{
 		string var = var_stack.back();
 		var_stack.pop_back();
-		return slot(var, 0);
+		return func(var, 0);
 	}
 	else if(!value_stack.empty())
 	{