diff --git a/iOS/app/MMMemory.xcodeproj/project.pbxproj b/iOS/app/MMMemory.xcodeproj/project.pbxproj index a1fce3b..48ce22b 100644 --- a/iOS/app/MMMemory.xcodeproj/project.pbxproj +++ b/iOS/app/MMMemory.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 1F083A14C69F20A6BA92A63E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F16A7DD61EF6CD4FB4E3DE25 /* AppDelegate.swift */; }; 3D03666F3BC2B1F2CBB49530 /* Main.SectionSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5F2B2E3A26F03F6825608E /* Main.SectionSelection.swift */; }; + 4AC2B8BF716272D446F9E7E0 /* uts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 721855DB1A329E65128E36B5 /* uts.swift */; }; 79FB208C9DADDA6179E588C3 /* Main.SectionGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AC22F19366076CF4168BFBD /* Main.SectionGrid.swift */; }; 89086E3972F560A9A1A76CE4 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C71EDBDFFDBC96F6E8E7762 /* Model.swift */; }; B19B3998FA2BA651ACB1E53C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1742EFC5A1E818780679340 /* Assets.xcassets */; }; @@ -23,6 +24,7 @@ 0DF762100A8EDF105B6E136D /* Main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.swift; sourceTree = ""; }; 4E32B0495E4BCEA4EE0508D4 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 6D5F2B2E3A26F03F6825608E /* Main.SectionSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.SectionSelection.swift; sourceTree = ""; }; + 721855DB1A329E65128E36B5 /* uts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = uts.swift; sourceTree = ""; }; 9AC22F19366076CF4168BFBD /* Main.SectionGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.SectionGrid.swift; sourceTree = ""; }; 9C71EDBDFFDBC96F6E8E7762 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = ""; }; 9D774FEE86833E8A0A74387C /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -55,6 +57,7 @@ 6D5F2B2E3A26F03F6825608E /* Main.SectionSelection.swift */, 0DF762100A8EDF105B6E136D /* Main.swift */, 9C71EDBDFFDBC96F6E8E7762 /* Model.swift */, + 721855DB1A329E65128E36B5 /* uts.swift */, ); name = src; path = ../src; @@ -147,6 +150,7 @@ DB1010B8A246D47BEC6B3FA6 /* Main.swift in Sources */, 89086E3972F560A9A1A76CE4 /* Model.swift in Sources */, BE2994BF2FFF272E62883953 /* swift.swift in Sources */, + 4AC2B8BF716272D446F9E7E0 /* uts.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; 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 81b2ee2..91c14fb 100644 Binary files a/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate and b/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/iOS/src/uts.swift b/iOS/src/uts.swift new file mode 100644 index 0000000..7907bc3 --- /dev/null +++ b/iOS/src/uts.swift @@ -0,0 +1,3 @@ +func utsIndexArray(_ count: Float) -> [Int] { + [Int](0.. protocol function protocolReplace(line) { if (line.includes("protocol")) { isProtocol = true; @@ -63,6 +64,7 @@ function protocolReplace(line) { return result; } +// a: Number -> var a: Float { get } function protocolReplaceVariable(line) { let parts = line.split(": "); if (parts.length == 2) { @@ -75,9 +77,7 @@ function protocolReplaceVariable(line) { return line; } -// func memoryItemPositions(c: Context) -> Position[] { -// var pos: Position[] = [] - +// Type[] -> [Type] function typeArrayReplace(line) { let parts = line.split(" "); for (var i in parts) { diff --git a/будущее b/будущее index c01e445..b2170b7 100644 --- a/будущее +++ b/будущее @@ -2,11 +2,12 @@ * заменить for на forEach в TS * ввести функцию заполнения массива индексами: utsIndexArray +* ввести utsFloor +* ввести utsIndexArray в Swift НАДО: -* ввести utsFloor +* ввести utsFloor в Swift * конвертировать forEach -* конвертить Math.floor * перейти на один файл swift * генерить memoryItemPositions.swift * ввести общую библиотеку?