handle elif, closes #43

qlasskit/ast2ast.py

@@ -277,6 +277,9 @@ def visit_If(self, node):
 
             if target_0id[0:2] == "__" and target_0id not in self.env:
                 orelse_inner = ast.Name(id=target_0id[2:])
+            elif target_0id[0 : len("_iftarg")] == "_iftarg":
+                if_l.append(b)
+                continue
             else:
                 orelse_inner = ast.Name(id=target_0id)
 

qlasskit/ast2logic/t_statement.py

@@ -26,7 +26,7 @@ def translate_statement(  # noqa: C901
 ) -> Tuple[List[Tuple[str, Boolean]], Env]:
     """Parse a statement"""
     # match stmt:
-    if isinstance(stmt, ast.If):
+    if isinstance(stmt, ast.If):  # This is handled by ast2ast
         # Translate test expression, body & orelse statements
         # test = translate_expression(stmt.test, env)
 

qlasskit/qlassfun.py

@@ -291,7 +291,9 @@ def from_function(
         original_f = eval(fun_ast.body[0].name) if isinstance(f, str) else f
 
         def _do_translate(fun_ast, original_f):
+            # print(ast.dump(fun_ast, indent=4))
             fun = ast2ast(fun_ast.body[0])
+            # print(ast.dump(fun, indent=4))
             fun_name, args, fun_ret, exps = translate_ast(fun, types, defs)
 
             exps = bool_optimizer.apply(exps)

test/qlassf/test_ifthenelse.py

@@ -60,6 +60,19 @@ def test_if(self):
         qf = qlassf(f, compiler=self.compiler, to_compile=COMPILATION_ENABLED)
         compute_and_compare_results(self, qf)
 
+    def test_elif(self):
+        f = (
+            "def test(a: Qint2, b: bool) -> bool:\n"
+            + "\td = False\n"
+            + "\tif a == 0:\n"
+            + "\t\td = not b\n"
+            + "\telif a == 1:\n"
+            + "\t\td = b\n"
+            + "\treturn d"
+        )
+        qf = qlassf(f, compiler=self.compiler, to_compile=COMPILATION_ENABLED)
+        compute_and_compare_results(self, qf)
+
     def test_if_for(self):
         f = (
             "def test(a: bool, b: bool) -> bool:\n"

test/qlassf/test_list.py

@@ -118,7 +118,7 @@ def test_list_access_with_var_on_tuple2(self):
         qf = qlassf(f, to_compile=COMPILATION_ENABLED, compiler=self.compiler)
         compute_and_compare_results(self, qf)
 
-    # TODO: handle this case
+    # TODO: handle this case (won't fix right now #42)
     # def test_list_of_tuple_of_tuple(self):
     #     f = (
     #         "def oracle(io_list: Parameter[List[Tuple[Tuple[bool, bool], bool]]],"