add CONJ and OR

src/gpsl/grammar/GpslLexer.g4

@@ -13,6 +13,7 @@ MUL: '*' ;
 DIV: '/' ;
 CONJ: '&&' ;
 AND: '&' ;
+OR: '||' ;
 EQ: '=' ;
 EQEQ: '==' ;
 NE: '!=' ;

src/gpsl/grammar/GpslParser.g4

@@ -30,7 +30,7 @@ permission: DOLLER LPAREN ( IDENT LBRACKET ( IDENT COMMA? )* RBRACKET COMMA? )*
 
 expr: assign ;
 assign: equality (EQ assign)? ;
-equality: relational (EQEQ relational | NE relational | CONJ)* ;
+equality: relational (EQEQ relational | NE relational | OR relational | CONJ relational)* ;
 relational: add (LE add | LT add | BE add | BT add)* ;
 add: mul (ADD mul | SUB mul | SUB_ASSIGNMENT mul | ADD_ASSIGNMENT mul)* ;
 mul: unary (MUL unary | DIV unary | DIV_ASSIGNMENT unary | MUL_ASSIGNMENT unary)* ;

src/gpsl/node.rs

@@ -9,10 +9,12 @@ pub enum NodeKind {
     SUB,
     MUL,
     DIV,
-    EQ, // ==
-    NE, // !=
-    LT, // <
-    LE, // <=
+    CONJ, // &&
+    OR,   // ||
+    EQ,   // ==
+    NE,   // !=
+    LT,   // <
+    LE,   // <=
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

src/gpsl/parser.rs

@@ -426,6 +426,10 @@ impl Parser {
                 node = Node::new_node(NodeKind::EQ, node, self.relational()?);
             } else if self.tokenizer.consume(String::from("!=")) {
                 node = Node::new_node(NodeKind::NE, node, self.relational()?);
+            } else if self.tokenizer.consume(String::from("&&")) {
+                node = Node::new_node(NodeKind::CONJ, node, self.relational()?);
+            } else if self.tokenizer.consume(String::from("||")) {
+                node = Node::new_node(NodeKind::OR, node, self.relational()?);
             } else {
                 return Ok(node);
             }

src/gpsl/tokenizer.rs

@@ -132,6 +132,7 @@ impl Tokenizer {
             String::from(")"),
             String::from("["),
             String::from("]"),
+            String::from("||"),
             String::from("=="),
             String::from("!="),
             String::from(">="),

src/gpsl/vm/gpsl.rs

@@ -465,6 +465,24 @@ impl GPSL {
                                 },
                                 _ => Err("Cannot subtract non-number.".to_string()),
                             },
+                            NodeKind::CONJ => {
+                                if lhs.extract_number() == Some(1)
+                                    && rhs.extract_number() == Some(1)
+                                {
+                                    Ok(Some(Variable::Number { value: 1 }))
+                                } else {
+                                    Ok(Some(Variable::Number { value: 0 }))
+                                }
+                            }
+                            NodeKind::OR => {
+                                if lhs.extract_number() == Some(1)
+                                    || rhs.extract_number() == Some(1)
+                                {
+                                    Ok(Some(Variable::Number { value: 1 }))
+                                } else {
+                                    Ok(Some(Variable::Number { value: 0 }))
+                                }
+                            }
                             NodeKind::EQ => {
                                 if lhs == rhs {
                                     Ok(Some(Variable::Number { value: 1 }))