kornerr/MMMemory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d

Browse Source
This commit is contained in:
Михаил Капелько
2023-06-01 20:05:50 +03:00
parent 79cb34de80
commit 7156a633ff
14 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
iOS/app/MMMemory.xcodeproj/project.pbxproj
View File

@@ -8,11 +8,12 @@
/* Begin PBXBuildFile section */
1F083A14C69F20A6BA92A63E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F16A7DD61EF6CD4FB4E3DE25 /* AppDelegate.swift */; };
248FA3B7A82DA60E6892F821 /* memorySpace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 490862345F009401FB4E1199 /* memorySpace.swift */; };
3D03666F3BC2B1F2CBB49530 /* Main.SectionSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D5F2B2E3A26F03F6825608E /* Main.SectionSelection.swift */; };
3EA747EF132EF00B60CE3BA8 /* memorySide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17E6ABD013AB08F7DF11C069 /* memorySide.swift */; };
79FB208C9DADDA6179E588C3 /* Main.SectionGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AC22F19366076CF4168BFBD /* Main.SectionGrid.swift */; };
7B6D5211C387213AE05C080F /* memoryGap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9994AEAC20F4AB2DA70C9840 /* memoryGap.swift */; };
89086E3972F560A9A1A76CE4 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C71EDBDFFDBC96F6E8E7762 /* Model.swift */; };
A8118182ABE97FA935A1A4F9 /* model.iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3A95F2FA5C43AF82C7A97FC /* model.iOS.swift */; };
B19B3998FA2BA651ACB1E53C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1742EFC5A1E818780679340 /* Assets.xcassets */; };
CAFD870CA84084E45011CC23 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4E32B0495E4BCEA4EE0508D4 /* LaunchScreen.storyboard */; };
D505E64F4CD6EAEB530BF851 /* Main.Section16Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38A1AA6B57483F6B44CDF78 /* Main.Section16Buttons.swift */; };
@@ -23,15 +24,16 @@
/* Begin PBXFileReference section */
0DF762100A8EDF105B6E136D /* Main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.swift; sourceTree = "<group>"; };
17E6ABD013AB08F7DF11C069 /* memorySide.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = memorySide.swift; sourceTree = "<group>"; };
490862345F009401FB4E1199 /* memorySpace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = memorySpace.swift; sourceTree = "<group>"; };
4E32B0495E4BCEA4EE0508D4 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
6D5F2B2E3A26F03F6825608E /* Main.SectionSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.SectionSelection.swift; sourceTree = "<group>"; };
9994AEAC20F4AB2DA70C9840 /* memoryGap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = memoryGap.swift; sourceTree = "<group>"; };
9AC22F19366076CF4168BFBD /* Main.SectionGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.SectionGrid.swift; sourceTree = "<group>"; };
9C71EDBDFFDBC96F6E8E7762 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
9D774FEE86833E8A0A74387C /* App.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
A355A898E25602F45B88CCBA /* Main.Platform.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.Platform.swift; sourceTree = "<group>"; };
A38A1AA6B57483F6B44CDF78 /* Main.Section16Buttons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Main.Section16Buttons.swift; sourceTree = "<group>"; };
C1742EFC5A1E818780679340 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E3A95F2FA5C43AF82C7A97FC /* model.iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = model.iOS.swift; sourceTree = "<group>"; };
F16A7DD61EF6CD4FB4E3DE25 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -39,21 +41,14 @@
44681273C081F5991624384F /* Swift */ = {
isa = PBXGroup;
children = (
9994AEAC20F4AB2DA70C9840 /* memoryGap.swift */,
17E6ABD013AB08F7DF11C069 /* memorySide.swift */,
490862345F009401FB4E1199 /* memorySpace.swift */,
);
name = Swift;
path = ../../shared/Swift;
sourceTree = "<group>";
};
4F93BC5459F4AF4391816D4A /* shared */ = {
isa = PBXGroup;
children = (
E3A95F2FA5C43AF82C7A97FC /* model.iOS.swift */,
);
name = shared;
path = ../../shared;
sourceTree = "<group>";
};
667BC26EA8068A9FA707FC02 /* src */ = {
isa = PBXGroup;
children = (
@@ -82,7 +77,6 @@
CD7F0F0C9CA1BA5EAFD5CA09 = {
isa = PBXGroup;
children = (
4F93BC5459F4AF4391816D4A /* shared */,
667BC26EA8068A9FA707FC02 /* src */,
44681273C081F5991624384F /* Swift */,
AE7B74413EC292E802CC5C70 /* Products */,
@@ -158,8 +152,9 @@
3D03666F3BC2B1F2CBB49530 /* Main.SectionSelection.swift in Sources */,
DB1010B8A246D47BEC6B3FA6 /* Main.swift in Sources */,
89086E3972F560A9A1A76CE4 /* Model.swift in Sources */,
7B6D5211C387213AE05C080F /* memoryGap.swift in Sources */,
3EA747EF132EF00B60CE3BA8 /* memorySide.swift in Sources */,
A8118182ABE97FA935A1A4F9 /* model.iOS.swift in Sources */,
248FA3B7A82DA60E6892F821 /* memorySpace.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

BIN
iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

1
iOS/app/project.yml
View File

@@ -9,7 +9,6 @@ targets:
sources:
- path: "../src"
- path: "../../shared/Swift"
- path: "../../shared/model.iOS.swift"
settings:
base:
INFOPLIST_FILE: Info.plist

4
shared/JavaScript/memoryGap.js Normal file
View File

@@ -0,0 +1,4 @@
// @ts-nocheck
function memoryGap() {
return memorySide() + memorySpace();
}

3
shared/JavaScript/memorySpace.js Normal file
View File

@@ -0,0 +1,3 @@
function memorySpace() {
return 20;
}

5
shared/model.iOS.swift → shared/Swift/memoryGap.swift
View File

@@ -1,7 +1,4 @@
func memorySpace() -> Float {
return 20
}
// @ts-nocheck
func memoryGap() -> Float {
return memorySide() + memorySpace()
}

3
shared/Swift/memorySpace.swift Normal file
View File

@@ -0,0 +1,3 @@
func memorySpace() -> Float {
return 20
}

12
shared/gen
View File

@@ -2,6 +2,14 @@
SCRIPT_DIR=$(cd "$(dirname "$0")" ; pwd -P)
tsc $SCRIPT_DIR/memorySide.ts --outfile $SCRIPT_DIR/JavaScript/memorySide.js
$SCRIPT_DIR/../toSwift $SCRIPT_DIR/memorySide.ts $SCRIPT_DIR/Swift/memorySide.swift
FILES=(
memoryGap
memorySide
memorySpace
)
for file in ${FILES[*]}; do
tsc $SCRIPT_DIR/$file.ts --outfile $SCRIPT_DIR/JavaScript/$file.js
$SCRIPT_DIR/../toSwift $SCRIPT_DIR/$file.ts $SCRIPT_DIR/Swift/$file.swift
done

4
shared/memoryGap.ts Normal file
View File

@@ -0,0 +1,4 @@
// @ts-nocheck
function memoryGap(): number {
return memorySide() + memorySpace()
}

3
shared/memorySpace.ts Normal file
View File

@@ -0,0 +1,3 @@
function memorySpace(): number {
return 20
}

7
shared/model.web.js
View File

@@ -1,7 +0,0 @@
function memorySpace() {
return 20
}
function memoryGap() {
return memorySide() + memorySpace()
}

3
web/memory.html
View File

@@ -5,8 +5,9 @@
</head>
<body>
</body>
<script src="../shared/JavaScript/memoryGap.js"></script>
<script src="../shared/JavaScript/memorySide.js"></script>
<script src="../shared/model.web.js"></script>
<script src="../shared/JavaScript/memorySpace.js"></script>
<script>
function memoryItemPositions(M) {
var pos = []

12
будущее
View File

@@ -1,15 +1,5 @@
01.06: 19.20-
* сообщать Usage
* принимать на вход в toSwift аргументы
* вывести файл построчно
* ввести словарь замен
* сохранять в файл
* конвертить memorySide из TS в Swift
* генерить memorySide.swift
НАДО:
* генерить остальные функции-константы
* использовать сгенеренные js и swift в проектах
* генерить библиотеку на основе иных replacements
* ввести общую библиотеку
* генерить itemPositions

12
прошлое
View File

@@ -1,4 +1,16 @@
01.06: 40
* сообщать Usage
* принимать на вход в toSwift аргументы
* вывести файл построчно
* ввести словарь замен
* сохранять в файл
* конвертить memorySide из TS в Swift
* генерить memorySide.swift
* генерить остальные функции-константы
* использовать сгенеренные js и swift в проектах
31.05: 30
* перевести memorySide на TS