Merge pull request #372 from polystat/moreTestsTmp

support with. Closes #332

transpiler/src/main/scala/org/polystat/py2eo/transpiler/StatementPasses.scala

@@ -649,6 +649,112 @@ object StatementPasses {
     case _ => (s, ns)
   }
 
+  def simplifyWith(s : Statement.T, ns : NamesU) : (Statement.T, NamesU) = s match {
+    case With(List((cms, target)), body, isAsync, ann) =>
+      assert(!isAsync)
+      val (List(manager, value, hit_except), ns1) =
+        ns(List("manager", "value", "hit_except"))
+      val managerId = Ident(manager, ann.pos)
+      val enter = Field(managerId, "__enter__", ann.pos)
+      val exit = Field(managerId, "__exit__", ann.pos)
+      val code = Suite(
+        List(
+          Assign(List(Ident(manager, ann.pos), cms), ann.pos),
+          Assign(List(
+              Ident(value, ann.pos),
+              CallIndex(
+                true,
+                enter,
+                List(),
+                ann.pos
+              )
+            ),
+            ann.pos
+          ),
+          Assign(List(
+              Ident(hit_except, ann.pos),
+              BoolLiteral(false, ann.pos)
+            ),
+            ann.pos
+          ),
+          Try(
+            target match {
+              case Some(v) =>
+                Suite(List(
+                    Assign(List(v, Ident(value, ann.pos)), ann.pos),
+                    body
+                  ),
+                  ann.pos
+                )
+              case None => body
+            },
+            List(
+              (
+                None,
+                Suite(
+                  List(
+                    Assign(List(
+                        Ident(hit_except, ann.pos),
+                        BoolLiteral(true, ann.pos)
+                      ),
+                      ann.pos
+                    ),
+                    IfSimple(
+                      Unop(
+                        Unops.LNot,
+                        CallIndex(
+                          true,
+                          exit,
+                          List(
+                            (None, Field(Ident("current-exception", ann.pos), "__class__", ann.pos)),
+                            (None, Ident("current-exception", ann.pos)),
+                            (None, NoneLiteral(ann.pos))
+                          ),
+                          ann.pos
+                        ),
+                        ann.pos
+                      ),
+                      Raise(None, None, ann.pos),
+                      Pass(ann.pos),
+                      ann.pos
+                    )
+                  ),
+                  ann.pos
+                )
+              )
+            ),
+            None,
+            Some(
+              IfSimple(
+                Unop(Unops.LNot, Ident(hit_except, ann.pos), ann.pos),
+                Assign(
+                  List(
+                    CallIndex(
+                      true,
+                      exit,
+                      List(
+                        (None, NoneLiteral(ann.pos)),
+                        (None, NoneLiteral(ann.pos)),
+                        (None, NoneLiteral(ann.pos))
+                      ),
+                      ann.pos
+                    )
+                  ),
+                  ann.pos
+                ),
+                Pass(ann.pos),
+                ann.pos
+              )
+            ),
+            ann.pos
+          )
+        ),
+        ann.pos
+      )
+      (code, ns1)
+    case _ => (s, ns)
+  }
+
   def simplifyAssert(s : Statement.T, ns : NamesU) : (Statement.T, NamesU) = s match {
     case Assert(what, param, ann) => (
       IfSimple(

transpiler/src/main/scala/org/polystat/py2eo/transpiler/Transpile.scala

@@ -52,7 +52,9 @@ object Transpile {
         debugPrinter(y._1, "afterSimplifyFor")
 
         try {
-          val rmAssert = StatementPasses.procStatement(StatementPasses.simplifyAssert)(y._1, y._2)
+          val rmWith = StatementPasses.procStatement(StatementPasses.simplifyWith)(y._1, y._2)
+          debugPrinter(rmWith._1, "afterRmWith")
+          val rmAssert = StatementPasses.procStatement(StatementPasses.simplifyAssert)(rmWith._1, rmWith._2)
           debugPrinter(rmAssert._1, "afterRmAssert")
           val preRmExcepts = StatementPasses.procStatement(StatementPasses.preSimplifyExcepts)(rmAssert._1, rmAssert._2)
           debugPrinter(preRmExcepts._1, "afterRmExcepts")

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/compound-statements/with/with-1.yaml

@@ -1,4 +1,4 @@
-enabled: False
+enabled: True
 python: |
   # no exception happens in this test
   def t1():

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/library/list/list-3.yaml

@@ -1,4 +1,4 @@
-enabled: False
+enabled: True
 python: |
   def test():
-    return len(list("Hello World!!!")) == 14
+    return len(list("Hello World!!!")) == 14