From a68765a0c2d86d9b6b44ae062ee32917a48dfa8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Fri, 9 Jun 2023 19:16:11 +0300 Subject: [PATCH] d --- .../UserInterfaceState.xcuserstate | Bin 30794 -> 31475 bytes shared/gen | 2 +- shared/javaScript.js | 5 +++-- shared/swift.swift | 6 ++++-- shared/typeScript.ts | 6 ++++-- будущее | 6 +++++- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate b/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate index 2b538177d825fe83be8768c557e7cb15592529b0..3d30794edeeda8b698436be90614fe69dd589b18 100644 GIT binary patch delta 14761 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 KciXx4@c#p&P2H9N delta 14294 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 diff --git a/shared/gen b/shared/gen index b63f016..2552ac8 100755 --- a/shared/gen +++ b/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 diff --git a/shared/javaScript.js b/shared/javaScript.js index e7acc21..d8395cb 100644 --- a/shared/javaScript.js +++ b/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; } diff --git a/shared/swift.swift b/shared/swift.swift index 4973e36..e096631 100644 --- a/shared/swift.swift +++ b/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 } diff --git a/shared/typeScript.ts b/shared/typeScript.ts index 5ff9050..1740ddd 100644 --- a/shared/typeScript.ts +++ b/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 } diff --git a/будущее b/будущее index 0b32b11..23fd79b 100644 --- a/будущее +++ b/будущее @@ -1,6 +1,10 @@ +09.06: 19:00- + +* заменить for на forEach в TS НАДО: -* конвертировать for loop +* ввести функцию заполнения массива индексами +* конвертировать forEach * конвертить Math.floor * перейти на один файл swift * генерить memoryItemPositions.swift