Merge pull request #389 from polystat/fixDjangoAndTodo

Fix django and todo

Author: dours

parser/pom.xml

@@ -52,6 +52,18 @@ SOFTWARE.
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest_2.13</artifactId>
+      <version>3.2.10</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

parser/src/test/scala/org/polystat/py2eo/parser/MapStatementsTest.scala

@@ -0,0 +1,28 @@
+package org.polystat.py2eo.parser
+
+import org.junit.Assert.fail
+import org.junit.Test
+import org.polystat.py2eo.parser.Expression.Ident
+import org.polystat.py2eo.parser.Statement.{Assign, Suite}
+
+class MapStatementsTest {
+
+  @Test def simpleAssign(): Unit = {
+    Parse("a = b") match {
+      case Some(Suite(List(Suite(List(
+          Assign(List(Ident("a", _), Ident("b", _)), _)
+        ), _)), _)) => ()
+      case _ => fail()
+    }
+  }
+
+  @Test def longAssign(): Unit = {
+    Parse("a = b = c") match {
+      case Some(Suite(List(Suite(List(
+          Assign(List(Ident("a", _), Ident("b", _), Ident("c", _)), _)
+        ), _)), _)) => ()
+      case _ : Any => fail()
+    }
+  }
+
+}

transpiler/src/main/eo/preface/pyint.eo

@@ -108,10 +108,14 @@
 
   [x] > mul
     xfakeclasses.convert (pyint value) x > p
+    memory 0 > tmp
     seq > @
       if.
         (xfakeclasses.has-type x (xfakeclasses.pyIntClass))
-        pyint (value.times (x.value))
+        seq
+          tmp.write (value.times (x.value))
+          tmp
+          pyint (tmp)
         p.fst.mul (p.snd)
 
   [x] > div
@@ -226,7 +230,7 @@
     pyfloat (value.as-float) > @
 
   [] > force
-    value.write val > @
+    value > @
 
   [] > xto-int
     [] > ap

transpiler/src/main/eo/preface/pystring.eo

@@ -64,7 +64,7 @@
             123
 
   [] > to-my-array
-    (goto ((xmyArray.ap (*)).@)).result > a
+    (goto ((xmyArray.ap (pybool TRUE) (*)).@)).result > a
     memory 0 > index
     seq > @
       (index.lt (value.length)).while

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

@@ -21,6 +21,7 @@
   fakeclass 10 > pyListClass
   fakeclass 13 > pyStringClass
   fakeclass 17 > xpyTypeClass
+  fakeclass 18 > pyTupleClass
 
   [typ1 typ2] > gt
     seq > @

transpiler/src/main/eo/preface/xfilter.eo

@@ -1,11 +1,12 @@
 +package preface
 +alias return preface.return
 +alias xmyArray preface.xmyArray
++alias pybool preface.pybool
 
 [] > xfilter
   [f l] > ap
     [stackUp] > @
-      (goto ((xmyArray.ap (*)).@)).result > ans
+      (goto ((xmyArray.ap (pybool TRUE) (*)).@)).result > ans
       memory 0 > i
       seq > @
         (i.lt (l.value.length)).while

transpiler/src/main/eo/preface/xmap.eo

@@ -1,11 +1,12 @@
 +package preface
 +alias return preface.return
 +alias xmyArray preface.xmyArray
++alias pybool preface.pybool
 
 [] > xmap
   [f l] > ap
     [stackUp] > @
-      (goto ((xmyArray.ap (*)).@)).result > ans
+      (goto ((xmyArray.ap (pybool TRUE) (*)).@)).result > ans
       memory 0 > i
       seq > @
         (i.lt (l.value.length)).while

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

@@ -12,16 +12,16 @@
 +alias xAssertionError preface.xAssertionError
 
 [] > xmyArray
-  [initValue] > ap
+  [is-list initValue] > ap
     [stackUp] > @
       cage result > pResult
       [] > result
         cage initValue > value
-        xfakeclasses.pyListClass > x__class__
+        is-list.if (xfakeclasses.pyListClass) (xfakeclasses.pyTupleClass) > x__class__
         [] > to-my-array
           pResult > @
         [x] > with-value
-          (goto ((xmyArray.ap x).@)).result > @
+          (goto ((xmyArray.ap is-list x).@)).result > @
         [] > xlength
           [self] > ap
             [stackUp] > @
@@ -52,7 +52,7 @@
           [self what] > ap
             [stackUp] > @
               memory FALSE > removed
-              (goto ((xmyArray.ap (*)).@)).result > accum
+              (goto ((xmyArray.ap is-list (*)).@)).result > accum
               memory 0 > i
               seq > @
                 (i.lt (self.value.length)).while
@@ -77,7 +77,7 @@
           memory TRUE > acc
           memory 0 > pos
           if. > res
-            ((x.x__class__.eq (xfakeclasses.pyListClass)).value.and (value.length.eq (x.value.length)))
+            ((x.x__class__.eq (is-list.if (xfakeclasses.pyListClass) (xfakeclasses.pyTupleClass))).value.and (value.length.eq (x.value.length)))
             seq
               (acc.and (pos.lt (value.length))).while
                 [unused]

transpiler/src/main/eo/preface/xmyMap.eo

@@ -127,7 +127,7 @@
         [] > xkeys
           [self] > ap
             [stackUp] > @
-              (goto ((xmyArray.ap (*)).@)).result > accum
+              (goto ((xmyArray.ap (pybool TRUE) (*)).@)).result > accum
               memory 0 > i
               seq > @
                 (i.lt (value.length)).while
@@ -143,7 +143,7 @@
         [] > xkeys-internal
           [] > ap
             [stackUp] > @
-              (goto ((xmyArray.ap (*)).@)).result > accum
+              (goto ((xmyArray.ap (pybool TRUE) (*)).@)).result > accum
               memory 0 > i
               seq > @
                 (i.lt (value.length)).while

transpiler/src/main/eo/preface/xtuple.eo

@@ -0,0 +1,6 @@
++package preface
++alias xfakeclasses preface.xfakeclasses
+
+[] > xtuple
+  xfakeclasses.pyTupleClass > @
+