d

shared/gen

@@ -2,6 +2,6 @@
 
 SCRIPT_DIR=$(cd "$(dirname "$0")" ; pwd -P)
 
-tsc $SCRIPT_DIR/typeScript.ts --outfile $SCRIPT_DIR/javaScript.js
+tsc $SCRIPT_DIR/typeScript.ts --lib es6 --outfile $SCRIPT_DIR/javaScript.js
 $SCRIPT_DIR/../toSwift $SCRIPT_DIR/typeScript.ts $SCRIPT_DIR/swift.swift
 

shared/javaScript.js

@@ -9,12 +9,13 @@ function memorySpace() {
 }
 function memoryItemPositions(c) {
     var pos = [];
-    for (var i = 0; i < c.itemsCount; i++) {
+    var ids = Array.from(Array(c.itemsCount).keys());
+    ids.forEach(function (i) {
         var row = Math.floor(i / 4);
         var x = memoryGap() + (i - row * 4) * memoryGap();
         var y = memoryGap() + row * memoryGap();
         // @ts-ignore
         pos.push(memoryCreatePosition(x, y));
-    }
+    });
     return pos;
 }

shared/swift.swift

@@ -21,12 +21,14 @@ func memorySpace() -> Float {
 
 func memoryItemPositions(c: Context) -> [Position] {
   var pos: [Position] = []
-  for (var i = 0; i < c.itemsCount; i++) {
+
+  let ids = Array.from(Array(c.itemsCount).keys());
+  ids.forEach(i => {
     let row = Math.floor(i / 4)
     let x = memoryGap() + (i - row * 4) * memoryGap()
     let y = memoryGap() + row * memoryGap()
     // @ts-ignore
     pos.push(memoryCreatePosition(x, y))
-  }
+  })
   return pos
 }

shared/typeScript.ts

@@ -21,12 +21,14 @@ function memorySpace(): number {
 
 function memoryItemPositions(c: Context): Position[] {
   var pos: Position[] = []
-  for (var i = 0; i < c.itemsCount; i++) {
+
+  let ids = Array.from(Array(c.itemsCount).keys());
+  ids.forEach(i => {
     let row = Math.floor(i / 4)
     let x = memoryGap() + (i - row * 4) * memoryGap()
     let y = memoryGap() + row * memoryGap()
     // @ts-ignore
     pos.push(memoryCreatePosition(x, y))
-  }
+  })
   return pos
 }