From 8f4c08af86e6da68d61d219a1646e3eaff617512 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Thu, 9 Jul 2015 13:13:22 +0200
Subject: [PATCH] Added missing conditionals in keywords.txt. Fixes #966

---
 build/shared/lib/keywords.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt
index 16d6d1918..b9898c0bd 100644
--- a/build/shared/lib/keywords.txt
+++ b/build/shared/lib/keywords.txt
@@ -222,6 +222,8 @@ export	KEYWORD3		RESERVED_WORD
 =		assign
 &		BitwiseAnd
 |		BitwiseAnd
+^		BitwiseAnd
+~		BitwiseXorNot
 ,
 //		Comments
 ?:
@@ -230,14 +232,14 @@ export	KEYWORD3		RESERVED_WORD
 /		Arithmetic
 /*		Comments
 .		dot
-==
-<		greaterthan
-<=		greaterthanorequalto
+==		If
+<		If
+<=		If
 ++		Increment
-!=		inequality
+!=		If
 <<		Bitshift
-<		lessthan
-<=		lessthanorequalto
+>		If
+>=		If
 &&		Boolean
 !		Boolean
 ||		Boolean