Do not allow boolean operators for integers.

Fixes #2496

2 files changed, 3 insertions, 0 deletions

diff --git a/Token.h b/Token.h
index 43a5b90b..7c7b1c7f 100644
--- a/Token.h
+++ b/Token.h
@@ -366,6 +366,7 @@ public:
 	}
 
 	static bool isBitOp(Value op) { return (BitOr <= op && op <= SHR) || op == BitNot; }
+	static bool isBooleanOp(Value op) { return (Or <= op && op <= And) || op == Not; }
 	static bool isUnaryOp(Value op) { return (Not <= op && op <= Delete) || op == Add || op == Sub || op == After; }
 	static bool isCountOp(Value op) { return op == Inc || op == Dec; }
 	static bool isShiftOp(Value op) { return (SHL <= op) && (op <= SHR); }
diff --git a/Types.cpp b/Types.cpp
index 744362fb..3abb0b05 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -311,6 +311,8 @@ TypePointer IntegerType::binaryOperatorResult(Token::Value _operator, TypePointe
 	// All integer types can be compared
 	if (Token::isCompareOp(_operator))
 		return commonType;
+	if (Token::isBooleanOp(_operator))
+		return TypePointer();
 	// Nothing else can be done with addresses
 	if (commonType->isAddress())
 		return TypePointer();