Merge branch 'master' into epec-kernel

1 files changed, 11 insertions, 7 deletions

diff --git a/src/expr.cc b/src/expr.cc
index 4355400..2e069f0 100644
--- a/src/expr.cc
+++ b/src/expr.cc
@@ -69,7 +69,7 @@ public:
 		expr.recursioncount++; 
 	}
 	~FuncRecursionGuard() { expr.recursioncount--; }
-	bool recursion_detected() const { return (expr.recursioncount > 100); }
+	bool recursion_detected() const { return (expr.recursioncount > 1000); }
 private:
 	const Expression &expr;
 };
@@ -172,23 +172,27 @@ std::string Expression::toString() const
 
 	if (this->type == "*" || this->type == "/" || this->type == "%" || this->type == "+" ||
 			this->type == "-" || this->type == "<" || this->type == "<=" || this->type == "==" || 
-			this->type == "!=" || this->type == ">=" || this->type == ">") {
+			this->type == "!=" || this->type == ">=" || this->type == ">" ||
+			this->type == "&&" || this->type == "||") {
 		stream << "(" << *this->children[0] << " " << this->type << " " << *this->children[1] << ")";
 	}
 	else if (this->type == "?:") {
-		stream << "(" << *this->children[0] << " ? " << this->type << " : " << *this->children[1] << ")";
+		stream << "(" << *this->children[0] << " ? " << *this->children[1] << " : " << *this->children[2] << ")";
 	}
 	else if (this->type == "[]") {
-		stream << "(" << *this->children[0] << "[" << *this->children[1] << "])";
+		stream << *this->children[0] << "[" << *this->children[1] << "]";
 	}
 	else if (this->type == "I") {
-		stream << "(-" << *this->children[0] << ")";
+		stream << "-" << *this->children[0];
+	}
+	else if (this->type == "!") {
+		stream << "!" << *this->children[0];
 	}
 	else if (this->type == "C") {
 		stream << this->const_value;
 	}
 	else if (this->type == "R") {
-		stream << "[" << *this->children[0] << " : " << *this->children[1] << " : " << this->children[2] << "]";
+		stream << "[" << *this->children[0] << " : " << *this->children[1] << " : " << *this->children[2] << "]";
 	}
 	else if (this->type == "V") {
 		stream << "[";
@@ -202,7 +206,7 @@ std::string Expression::toString() const
 		stream << this->var_name;
 	}
 	else if (this->type == "N") {
-		stream << "(" << *this->children[0] << "." << this->var_name << ")";
+		stream << *this->children[0] << "." << this->var_name;
 	}
 	else if (this->type == "F") {
 		stream << this->call_funcname << "(";