Merge pull request #396 from polystat/fixDjangoAndTodo

support assign-6, assign-7

Author: dours

transpiler/src/main/eo/preface/pyslice.eo

@@ -0,0 +1,6 @@
++package preface
++alias xfakeclasses preface.xfakeclasses
+
+[from to step] > pyslice
+  xfakeclasses.pySliceClass > x__class__
+  0 > force

transpiler/src/main/eo/preface/xfakeclasses.eo

@@ -22,6 +22,7 @@
   fakeclass 13 > pyStringClass
   fakeclass 17 > xpyTypeClass
   fakeclass 18 > pyTupleClass
+  fakeclass 19 > pySliceClass
 
   [typ1 typ2] > gt
     seq > @

transpiler/src/main/eo/preface/xmyArray.eo

@@ -9,13 +9,14 @@
 +alias xfakeclasses preface.xfakeclasses
 +alias stdout org.eolang.io.stdout
 +alias sprintf org.eolang.txt.sprintf
-+alias xAssertionError preface.xAssertionError
 
 [] > xmyArray
   [is-list initValue] > ap
     [stackUp] > @
       cage result > pResult
       [] > result
+        0 > @
+        0 > force
         cage initValue > value
         is-list.if (xfakeclasses.pyListClass) (xfakeclasses.pyTupleClass) > x__class__
         [] > to-my-array
@@ -134,10 +135,57 @@
         [] > xsetAtIndex
           [self key val] > ap
             [stackUp] > @
+              (goto ((xmyArray.ap is-list *).@)).result > acc
+              memory 0 > i
+              val.iter 0 > it
               seq > @
-                stdout "xsetAtIndex not supported for array\n"
-                stackUp.forward (goto (xAssertionError.ap.@))
-                0
+                if.
+                  (key.x__class__.eq (xfakeclasses.pySliceClass))
+                  seq
+                    while.
+                      (i.lt (key.from))
+                      [unused]
+                        seq > @
+                          stdout (sprintf "i = %d\n" i)
+                          (goto ((acc.xappend.ap acc (value.get i)).@)).result
+                          i.write (i.plus 1)
+                          0
+                    stdout (sprintf "from = %d, to = %d\n" (key.from) (key.to))
+                    goto
+                      [exitLoop]
+                        while. > @
+                          (TRUE)
+                          [unused]
+                            (goto ((it.x__next__.ap it).@)) > to-append
+                            if. > @
+                              (to-append.x__class__.x__id__.eq (pyint 3))
+                              seq
+                                (goto ((acc.xappend.ap acc (to-append.result)).@)).result
+                                0
+                              exitLoop.forward 0
+                    stdout "after 2nd while\n"
+                    while.
+                      (i.lt (value.length))
+                      [unused]
+                        seq > @
+                          stdout (sprintf "i = %d\n" i)
+                          (goto ((acc.xappend.ap acc (value.get i)).@)).result
+                          i.write (i.plus 1)
+                          0
+                    value.write (acc.value)
+                    stackUp.forward (return 0)
+                    0
+                  seq
+                    while.
+                      (i.lt (value.length))
+                      [unused]
+                        seq > @
+                          (goto ((acc.xappend.ap acc ((key.value.eq i).if val (value.get i))).@)).result
+                          i.write (i.plus 1)
+                          0
+                    value.write (acc.value)
+                    stackUp.forward (return 0)
+                    0
         [] > x__iter__
           [self] > ap
             [stackUp] > @

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

@@ -3,7 +3,7 @@ package org.polystat.py2eo.transpiler
 import org.polystat.py2eo.parser.Expression.{
   Binop, Binops, BoolLiteral, CallIndex, CollectionCons, CollectionKind, Compops, Cond,
   DictCons, Field, FloatLiteral, FreakingComparison, IntLiteral, LazyLAnd,
-  LazyLOr, NoneLiteral, Parameter, SimpleComparison, StringLiteral, T, Unop, Unops,
+  LazyLOr, NoneLiteral, Parameter, SimpleComparison, Slice, StringLiteral, T, Unop, Unops,
   UnsupportedExpr
 }
 import org.polystat.py2eo.parser.{AugOps, Expression, GeneralAnnotation, Statement, VarScope}
@@ -81,6 +81,9 @@ object PrintEO {
           case Left((k, v)) => s" (pair ${e(k)} ${e(v)})"
         }.mkString("")
         (s"((*${elts}))")
+      case Slice(Some(from), Some(to), by0, ann) =>
+        val by = by0.getOrElse(IntLiteral(1, ann.pos))
+        s"(pyslice ${e(from)} ${e(to)} ${e(by)})"
       case NoneLiteral(_) => "(pystring \"None: is there a None literal in the EO language?\")"
       case IntLiteral(value, _) => s"(pyint $value)"
       case FloatLiteral(value, _) => s"(pyfloat $value)"

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

@@ -21,6 +21,7 @@ object PrintLinearizedMutableEOWithCage {
     "+alias stdout org.eolang.io.stdout",
     "+alias sprintf org.eolang.txt.sprintf",
     "+alias cage org.eolang.cage",
+    "+alias pyslice preface.pyslice",
     "+alias pyint preface.pyint",
     "+alias pair preface.pair",
     "+alias pyfloat preface.pyfloat",
@@ -163,9 +164,9 @@ object PrintLinearizedMutableEOWithCage {
       case Assign(List(lhs, rhs), _) if seqOfFields(lhs).isDefined =>
         val collectionCons = rhs match {
           case _ : Await | _ : Star | _ : DoubleStar |
-               _ : CollectionComprehension | _ : DictComprehension | _ : GeneratorComprehension | _ : Slice =>
+               _ : CollectionComprehension | _ : DictComprehension | _ : GeneratorComprehension =>
             throw new GeneratorException("these expressions must be wrapped in a function call " +
-              "because a copy creation is needed and dataization is impossible")
+              "because a copy creation is needed and dataization is impossible: " + rhs)
           case _ : CollectionCons | _ : DictCons => true
           case _ => false
         }
@@ -349,6 +350,7 @@ object PrintLinearizedMutableEOWithCage {
       "cage 0 > xcurrent-exception",
       "cage 0 > xexcinexc",
       "cage FALSE > xcaught",
+      "pyslice 0 0 0 > dummy-pyslice-usage",
       "pyint 0 > dummy-int-usage",
       "pyfloat 0 > dummy-float-usage",
       "pybool TRUE > dummy-bool-usage",

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

@@ -0,0 +1,15 @@
+package org.polystat.py2eo.transpiler
+
+import org.polystat.py2eo.parser.Expression.{CollectionCons, Star, T}
+
+object StarInCollectionConstructor {
+  def apply(e : T) : T = e match {
+    case CollectionCons(kind, l, ann) =>
+      val l1 = l.flatMap({
+        case Star(CollectionCons(kind1, l, _), _) => l
+        case x : Any => List(x)
+      })
+      CollectionCons(kind, l1, ann)
+    case x : Any => x
+  }
+}

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

@@ -52,7 +52,9 @@ object Transpile {
         debugPrinter(y._1, "afterSimplifyFor")
 
         try {
-          val rmWith = GenericStatementPasses.procStatement(SimplifyWith.apply)(y._1, y._2)
+          val starInCollCons = GenericStatementPasses.simpleProcExprInStatement(StarInCollectionConstructor.apply)(y._1, y._2)
+          debugPrinter(starInCollCons._1, "afterStarInCollCons")
+          val rmWith = GenericStatementPasses.procStatement(SimplifyWith.apply)(starInCollCons._1, starInCollCons._2)
           debugPrinter(rmWith._1, "afterRmWith")
           val rmAssert = GenericStatementPasses.procStatement(SimplifyAssert.apply)(rmWith._1, rmWith._2)
           debugPrinter(rmAssert._1, "afterRmAssert")

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/compound-statements/class/inheritance-test.yaml

@@ -1,15 +1,10 @@
-enabled: False
+enabled: True
 python: |
-  def assignTest5():
+  def assignTest6():
     class c:
       f = 1
     a = [10, 11, 12, 13]
     (x, y) = [z, t] = c.f = a[0] = a[1] = 7, 8
     a[2:1] = (7, 8)
-    i, *[j, k], l = (21, 22, 23, 24)
 
-    b1 = (x == 7) and (y == 8) and (z == 7) and (t == 8) and (c.f == (7, 8)) and a == [(7, 8), (7, 8), 7, 8, 12, 13]
-    b2 = (i == 21) and (j == 22) and (k == 23) and (l == 24)
-    return b1 and b2
-
-  assert assignTest5()
+    return (x == 7) and (y == 8) and (z == 7) and (t == 8) and (c.f == (7, 8)) and a == [(7, 8), (7, 8), 7, 8, 12, 13]

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/simple-statements/assign/assign-6.yaml

@@ -0,0 +1,6 @@
+enabled: True
+python: |
+  def assignTest7():
+    i, *[j, k], l = (21, 22, 23, 24)
+
+    return (i == 21) and (j == 22) and (k == 23) and (l == 24)