Add logical OR and AND

Author: jmdewart

oqpy/base.py

@@ -165,6 +165,16 @@ def __bool__(self) -> bool:
         )
 
 
+def logical_and(first: AstConvertible, second: AstConvertible) -> OQPyBinaryExpression:
+    """Logical AND."""
+    return OQPyBinaryExpression(ast.BinaryOperator["&&"], first, second)
+
+
+def logical_or(first: AstConvertible, second: AstConvertible) -> OQPyBinaryExpression:
+    """Logical OR."""
+    return OQPyBinaryExpression(ast.BinaryOperator["||"], first, second)
+
+
 def expr_matches(a: Any, b: Any) -> bool:
     """Check equality of the given objects.
 

tests/test_directives.py

@@ -24,7 +24,7 @@
 
 import oqpy
 from oqpy import *
-from oqpy.base import expr_matches
+from oqpy.base import expr_matches, logical_and, logical_or
 from oqpy.quantum_types import PhysicalQubits
 from oqpy.timing import OQDurationLiteral
 
@@ -270,6 +270,9 @@ def test_binary_expressions():
     i = IntVar(5, "i")
     j = IntVar(2, "j")
     k = IntVar(0, "k")
+    b1 = BoolVar(False, "b1")
+    b2 = BoolVar(True, "b2")
+    b3 = BoolVar(False, "b3")
     prog.set(i, 2 * (i + j))
     prog.set(j, 2 % (2 - i) % 2)
     prog.set(j, 1 + oqpy.pi)
@@ -291,13 +294,19 @@ def test_binary_expressions():
     prog.set(k, 1 << j)
     prog.set(k, i << j)
     prog.set(k, ~k)
+    prog.set(b1, logical_or(b2, b3))
+    prog.set(b1, logical_and(b2, True))
+    prog.set(b1, logical_or(False, b3))
 
     expected = textwrap.dedent(
         """
         OPENQASM 3.0;
         int[32] i = 5;
         int[32] j = 2;
         int[32] k = 0;
+        bool b1 = false;
+        bool b2 = true;
+        bool b3 = false;
         i = 2 * (i + j);
         j = 2 % (2 - i) % 2;
         j = 1 + pi;
@@ -319,6 +328,9 @@ def test_binary_expressions():
         k = 1 << j;
         k = i << j;
         k = ~k;
+        b1 = b2 || b3;
+        b1 = b2 && true;
+        b1 = false || b3;
         """
     ).strip()