binary operators cannot be only chars (+, -, *, /) also strings (>=, …

…<=, ...)
aig-upf · Mar 16, 2018 · 3352efd · 3352efd
1 parent 7b5bd65
commit 3352efd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/parser/Expression.cpp b/parser/Expression.cpp
@@ -48,7 +48,7 @@ Expression * createExpression( Filereader & f, TokenStruct< std::string > & ts,
 			Expression * right = createExpression( f, ts, d );
 			f.next();
 			f.assert_token( ")" );
-			return new CompositeExpression( s[0], left, right );
+			return new CompositeExpression( s, left, right );
 		}
 		else {
 			f.c -= s.size();

diff --git a/parser/Expression.h b/parser/Expression.h
@@ -30,11 +30,11 @@ class CompositeExpression : public Expression {
 
 public:
 
-	char op;
+	std::string op;
 	Expression * left;
 	Expression * right;
 
-	CompositeExpression( char c, Expression * l, Expression * r ) : op( c ), left( l ), right( r ) {}
+	CompositeExpression( const std::string& c, Expression * l, Expression * r ) : op( c ), left( l ), right( r ) {}
 
 	~CompositeExpression() {
 		delete left;
@@ -57,12 +57,12 @@ class CompositeExpression : public Expression {
 
 	double compute( double x, double y ) {
 		double res = 0;
-		switch( op ) {
-		case '+': res = x + y; break;
-		case '-': res = x - y; break;
-		case '*': res = x * y; break;
-		case '/': res = ( y == 0 ? 0 : x / y ); break;
-		}
+
+		if ( op == "+" ) res = x + y;
+		else if ( op == "-" ) res = x - y;
+		else if ( op == "*" ) res = x * y;
+		else if ( op == "/" ) res = ( y == 0 ? 0 : x / y );
+
 		return res;
 	}