From 7c70f3df93268db612749ac6084483abe6a2a73e Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Wed, 6 Nov 2019 21:20:37 +0300
Subject: [PATCH] parser: & and | type check

---
 vlib/compiler/parser.v | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/vlib/compiler/parser.v b/vlib/compiler/parser.v
index d187072115..e7bc06e0f4 100644
--- a/vlib/compiler/parser.v
+++ b/vlib/compiler/parser.v
@@ -1469,7 +1469,6 @@ fn (p mut Parser) bool_expression() string {
 		p.check_types(p.bterm(), typ)
 		if typ != 'bool' {
 			p.error('logical operators `&&` and `||` require booleans')
-			
 		}	
 	}
 	if typ == '' {
@@ -2363,12 +2362,12 @@ fn (p mut Parser) indot_expr() string {
 		}
 		// `typ` is element's type
 		if is_map {
-			p.cgen.set_placeholder(ph, '_IN_MAP( (')
+			p.cgen.set_placeholder(ph, '(_IN_MAP( (')
 		}
 		else {
-			p.cgen.set_placeholder(ph, '_IN($typ, (')
+			p.cgen.set_placeholder(ph, '(_IN($typ, (')
 		}
-		p.gen(')')
+		p.gen('))')
 		return 'bool'
 	}
 	return typ
@@ -2474,7 +2473,12 @@ fn (p mut Parser) expression() string {
 		if is_str && tok_op != .plus {
 			p.error('strings only support `+` operator')
 		}	
-		p.check_types(p.term(), typ)
+		expr_type := p.term()
+		if (tok_op in [.pipe, .amp]) && !(is_integer_type(expr_type) &&
+			is_integer_type(typ)) {
+			p.error('operators `&` and `|` are defined only on integer types')
+		}	
+		p.check_types(expr_type, typ)
 		if (is_str || is_ustr) && tok_op == .plus && !p.is_js {
 			p.gen(')')
 		}