Merge pull request #357 from polystat/moreTestsTmp

More tests
polystat · Aug 1, 2022 · f5588b2 · f5588b2 · 0pdd · Aug 1, 2022
2 parents 69f79b9 + 131bf8c
commit f5588b2
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 15 deletions.
diff --git a/transpiler/src/main/eo/preface/fakeclasses.eo b/transpiler/src/main/eo/preface/fakeclasses.eo
@@ -40,9 +40,14 @@
             obj.as-float
           if.
             dst.eq pyComplexClass
-            seq
-              stdout "converting to complex\n"
-              pycomplex (obj.as-float) (pyfloat 0.0)
+            if.
+              obj.x__class__.eq pyComplexClass
+              seq
+                stdout "convertingc complex to complex\n"
+                pycomplex (obj.xreal) (obj.ximag)
+              seq
+                stdout "converting int or float to complex\n"
+                pycomplex (obj.as-float) (pyfloat 0.0)
             seq
               stdout "Oblom\n"
               (pystring "Oblom")

diff --git a/transpiler/src/main/eo/preface/pycomplex.eo b/transpiler/src/main/eo/preface/pycomplex.eo
@@ -34,13 +34,16 @@
         pycomplex (pyfloat 0.0) (pyfloat 0.0)
         p.fst.pow (p.snd)
 
-  [x] > div
+  [x] > float-div
     fakeclasses.convert (pycomplex xreal ximag) x > p
     seq > @
       if.
         (fakeclasses.has-type x (fakeclasses.pyComplexClass))
-        return (pycomplex (pyfloat 0.0) (pyfloat 0.0))
-        p.fst.div (p.snd)
+        []
+          p.fst.mul (pycomplex (x.xreal) (x.ximag.neg)) > num
+          ((x.xreal.mul (x.xreal)).add (x.ximag.mul (x.ximag))) > denom
+          return (pycomplex ((num.xreal.float-div denom).result) ((num.ximag.float-div denom).result)) > @
+        p.fst.float-div (p.snd)
 
   [x] > add
     fakeclasses.convert (pycomplex xreal ximag) x > p

diff --git a/transpiler/src/main/eo/preface/pyfloat.eo b/transpiler/src/main/eo/preface/pyfloat.eo
@@ -68,13 +68,13 @@
         pyfloat (value.pow (x.value))
         p.fst.pow (p.snd)
 
-  [x] > div
+  [x] > float-div
     fakeclasses.convert (pyfloat value) x > p
     seq > @
       if.
         (fakeclasses.has-type x (fakeclasses.pyFloatClass))
         return (pyfloat (value.div (x.value)))
-        p.fst.div (p.snd)
+        p.fst.float-div (p.snd)
 
   [x] > add
     fakeclasses.convert (pyfloat value) x > p
@@ -100,6 +100,9 @@
         pyfloat (value.minus (x.value))
         p.fst.sub (p.snd)
 
+  [] > neg
+    pyfloat (value.neg) > @
+
   [] > as-float
     pyfloat value > @
 

diff --git a/transpiler/src/main/eo/preface/pyint.eo b/transpiler/src/main/eo/preface/pyint.eo
@@ -134,7 +134,7 @@
             stdout "division by zero\n"
             (goto (xZeroDivisionError.apply.@)).result
           (return (pyfloat (value.as-float.div (x.value.as-float))))
-        p.fst.div (p.snd)
+        p.fst.float-div (p.snd)
 
   [x] > mod
     fakeclasses.convert (pyint value) x > p

diff --git a/transpiler/src/main/eo/preface/xAssertionError.eo b/transpiler/src/main/eo/preface/xAssertionError.eo
@@ -0,0 +1,13 @@
++package preface
++alias pyint preface.pyint
++alias return preface.return
++alias cage org.eolang.cage
+
+[] > xAssertionError
+  pyint 14 > x__id__
+  [] > apply
+    [stackUp] > @
+      cage result > pResult
+      [] > result
+        xAssertionError > x__class__
+      stackUp.forward (return pResult) > @
diff --git a/transpiler/src/main/eo/preface/xValueError.eo b/transpiler/src/main/eo/preface/xValueError.eo
@@ -0,0 +1,13 @@
++package preface
++alias pyint preface.pyint
++alias return preface.return
++alias cage org.eolang.cage
+
+[] > xValueError
+  pyint 15 > x__id__
+  [] > apply
+    [stackUp] > @
+      cage result > pResult
+      [] > result
+        xValueError > x__class__
+      stackUp.forward (return pResult) > @
diff --git a/...piler/src/main/scala/org/polystat/py2eo/transpiler/PrintLinearizedMutableEOWithCage.scala b/...piler/src/main/scala/org/polystat/py2eo/transpiler/PrintLinearizedMutableEOWithCage.scala
@@ -44,6 +44,8 @@ object PrintLinearizedMutableEOWithCage {
     "+alias xStopIteration preface.xStopIteration",
     "+alias xTypeError preface.xTypeError",
     "+alias xZeroDivisionError preface.xZeroDivisionError",
+    "+alias xAssertionError preface.xAssertionError",
+    "+alias xValueError preface.xValueError",
     "+alias xrange preface.xrange",
     //    "+alias sprintf org.eolang.txt.sprintf",
     "+junit",
@@ -346,6 +348,8 @@ object PrintLinearizedMutableEOWithCage {
       "xint > dummy-xint",
       "xStopIteration > dummy-stop-iteration",
       "xZeroDivisionError > dummy-xZeroDivisionError",
+      "xAssertionError > dummy-xAssertionError",
+      "xValueError > dummy-xValueError",
       "xTypeError > dummy-xTypeError",
       "xiter > dummy-xiter",
       "xrange > dummy-xrange",

diff --git a/transpiler/src/main/scala/org/polystat/py2eo/transpiler/StatementPasses.scala b/transpiler/src/main/scala/org/polystat/py2eo/transpiler/StatementPasses.scala
@@ -611,6 +611,23 @@ object StatementPasses {
     case _ => (s, ns)
   }
 
+  def simplifyAssert(s : Statement.T, ns : NamesU) : (Statement.T, NamesU) = s match {
+    case Assert(what, param, ann) => (
+      IfSimple(
+        Unop(Unops.LNot, what, ann.pos),
+        Raise(
+          Some(CallIndex(true, Ident("AssertionError", ann.pos), param.toList.map((None, _)), ann.pos)),
+          None,
+          ann.pos
+        ),
+        Pass(ann.pos),
+        ann.pos
+      ),
+      ns
+    )
+    case _ => (s, ns)
+  }
+
   def simplifyFor(s : Statement.T, ns : NamesU) : (Statement.T, NamesU) = s match {
     case For(what, in, body, eelse, false, ann) =>
       val (List(it, inn), ns1) = ns(List("it", "inn"))

diff --git a/transpiler/src/main/scala/org/polystat/py2eo/transpiler/Transpile.scala b/transpiler/src/main/scala/org/polystat/py2eo/transpiler/Transpile.scala
@@ -52,7 +52,9 @@ object Transpile {
         debugPrinter(y._1, "afterSimplifyFor")
 
         try {
-          val rmExcepts = StatementPasses.procStatement(StatementPasses.simplifyExcepts)(y._1, y._2)
+          val rmAssert = StatementPasses.procStatement(StatementPasses.simplifyAssert)(y._1, y._2)
+          debugPrinter(rmAssert._1, "afterRmAssert")
+          val rmExcepts = StatementPasses.procStatement(StatementPasses.simplifyExcepts)(rmAssert._1, rmAssert._2)
           debugPrinter(rmExcepts._1, "afterRmExcepts")
           val simIf = StatementPasses.procStatement(StatementPasses.simplifyIf)(rmExcepts._1, rmExcepts._2)
           debugPrinter(simIf._1, "simplifyIf")

diff --git a/...ystat/py2eo/transpiler/simple-tests/expressions/arithmetic-conversions/conversion-12.yaml b/...ystat/py2eo/transpiler/simple-tests/expressions/arithmetic-conversions/conversion-12.yaml
@@ -1,4 +1,4 @@
-enabled: False
+enabled: True
 python: |
   def test():
     x = 5.15

diff --git a/...ystat/py2eo/transpiler/simple-tests/expressions/arithmetic-conversions/conversion-18.yaml b/...ystat/py2eo/transpiler/simple-tests/expressions/arithmetic-conversions/conversion-18.yaml
@@ -1,4 +1,4 @@
-enabled: False
+enabled: True
 python: |
   def test():
     x = 5

diff --git a/...polystat/py2eo/transpiler/simple-tests/simple-statements/break/while_try_except_else.yaml b/...polystat/py2eo/transpiler/simple-tests/simple-statements/break/while_try_except_else.yaml
@@ -1,4 +1,4 @@
-enabled: False
+enabled: True
 python: |
   def while_try_except_else():
     arr = []
@@ -12,5 +12,5 @@ python: |
         res = True
         arr.append(1)
         break
-    
+
     return res and arr == [1]
diff --git a/...at/py2eo/transpiler/simple-tests/simple-statements/continue/while_try_except_finally.yaml b/...at/py2eo/transpiler/simple-tests/simple-statements/continue/while_try_except_finally.yaml
@@ -1,4 +1,4 @@
-enabled: False
+enabled: True
 python: |
   def continue1():
     i = 0