Merge branch 'develop'

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lex.l b/src/lex.l
index 85bf522..aec662b 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -89,8 +89,13 @@ char *Parse_closeStringBuffer() {
 <INITIAL>"=>" return (TO);
 <INITIAL>"~" return (CNCT);
 <INITIAL>"-" return (SUB);
+<INITIAL>"&&" return(AND);
+<INITIAL>"and" return(AND);
+<INITIAL>"||" return(OR);
+<INITIAL>"or" return(OR);
+<INITIAL>"!" return(NOT);
+<INITIAL>"not" return(NOT);
 <INITIAL>"|" return(PIPE);
-<INITIAL>"&" return(AMP);
 <INITIAL>"=" return(LD);
 <INITIAL>"==" return(EQUAL);
 <INITIAL>"!=" return(NE);