Skip to content

Commit 5dd6623

Browse files
CodaFiCodaFi
committed
Merge pull request #9 from CodaFi/stm-develop
[WIP] STM
2 parents a1ac04c + 79cbdb2 commit 5dd6623

27 files changed

+1188
-1001
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "Carthage/Checkouts/Swiftx"]
2-
path = Carthage/Checkouts/Swiftx
3-
url = https://github.com/typelift/Swiftx.git
1+
[submodule "Carthage/Checkouts/Swiftz"]
2+
path = Carthage/Checkouts/Swiftz
3+
url = https://github.com/typelift/Swiftz.git

‎Cartfile.private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "typelift/Swiftx" ~> 0.1.3
1+
github "typelift/Swiftz"

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "typelift/Swiftx" "v0.1.3"
1+
github "typelift/Swiftz" "v0.2.0"

‎Carthage/Checkouts/Swiftx‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Carthage/Checkouts/Swiftz‎

Submodule Swiftz added at 9a1425b

‎Concurrent-iOS.xcodeproj/project.pbxproj‎

Lines changed: 75 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88

99
/* Begin PBXBuildFile section */
1010
84152B7D1A818C9E006387D5 /* SVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152B7C1A818C9E006387D5 /* SVar.swift */; };
11+
84152C0A1A819F0B006387D5 /* STM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C021A819F0B006387D5 /* STM.swift */; };
12+
84152C0B1A819F0B006387D5 /* TBQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C031A819F0B006387D5 /* TBQueue.swift */; };
13+
84152C0C1A819F0B006387D5 /* TChan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C041A819F0B006387D5 /* TChan.swift */; };
14+
84152C0D1A819F0B006387D5 /* TMVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C051A819F0B006387D5 /* TMVar.swift */; };
15+
84152C0E1A819F0B006387D5 /* TQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C061A819F0B006387D5 /* TQueue.swift */; };
16+
84152C0F1A819F0B006387D5 /* Transactions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C071A819F0B006387D5 /* Transactions.swift */; };
17+
84152C101A819F0B006387D5 /* TSem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C081A819F0B006387D5 /* TSem.swift */; };
18+
84152C111A819F0B006387D5 /* TVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152C091A819F0B006387D5 /* TVar.swift */; };
1119
8434F9FF19E9CE5F008D9909 /* ConcurrentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434F9FC19E9CE5F008D9909 /* ConcurrentTests.swift */; };
1220
8434FA0119E9CE5F008D9909 /* PiCalculus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434F9FE19E9CE5F008D9909 /* PiCalculus.swift */; };
1321
8434FA2219E9CE92008D9909 /* Concurrent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8434FA0719E9CE73008D9909 /* Concurrent.framework */; };
@@ -22,10 +30,10 @@
2230
8434FA4019E9CE9F008D9909 /* IVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434FA2C19E9CE9F008D9909 /* IVar.swift */; };
2331
8434FA4119E9CE9F008D9909 /* MVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434FA2D19E9CE9F008D9909 /* MVar.swift */; };
2432
8434FA4219E9CE9F008D9909 /* QSem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434FA2E19E9CE9F008D9909 /* QSem.swift */; };
25-
847520551A7EBA3F00975C8B /* Swiftx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 847520501A7EBA3200975C8B /* Swiftx.framework */; };
2633
8475205C1A7EC55F00975C8B /* Exception.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8475205B1A7EC55F00975C8B /* Exception.swift */; };
27-
8475205D1A7EDD2D00975C8B /* Swiftx.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 847520501A7EBA3200975C8B /* Swiftx.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2834
849AA3AE1A0984FD00472F08 /* Concurrent.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8434FA0719E9CE73008D9909 /* Concurrent.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
35+
84FE01E41A87EF3D006D3EEA /* Swiftz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FE01DF1A87EF03006D3EEA /* Swiftz.framework */; };
36+
84FE01EC1A881FF2006D3EEA /* STMSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FE01EA1A881FED006D3EEA /* STMSpec.swift */; };
2937
/* End PBXBuildFile section */
3038

3139
/* Begin PBXContainerItemProxy section */
@@ -36,26 +44,26 @@
3644
remoteGlobalIDString = 8434FA0619E9CE73008D9909;
3745
remoteInfo = Concurrent;
3846
};
39-
8475204F1A7EBA3200975C8B /* PBXContainerItemProxy */ = {
47+
84FE01DE1A87EF03006D3EEA /* PBXContainerItemProxy */ = {
4048
isa = PBXContainerItemProxy;
41-
containerPortal = 8475204A1A7EBA3200975C8B /* Swiftx-iOS.xcodeproj */;
49+
containerPortal = 84FE01D91A87EF03006D3EEA /* Swiftz-iOS.xcodeproj */;
4250
proxyType = 2;
43-
remoteGlobalIDString = 84A88D101A70BE0D003D53CF;
44-
remoteInfo = Swiftx;
51+
remoteGlobalIDString = 84A88D981A70C280003D53CF;
52+
remoteInfo = Swiftz;
4553
};
46-
847520511A7EBA3200975C8B /* PBXContainerItemProxy */ = {
54+
84FE01E01A87EF03006D3EEA /* PBXContainerItemProxy */ = {
4755
isa = PBXContainerItemProxy;
48-
containerPortal = 8475204A1A7EBA3200975C8B /* Swiftx-iOS.xcodeproj */;
56+
containerPortal = 84FE01D91A87EF03006D3EEA /* Swiftz-iOS.xcodeproj */;
4957
proxyType = 2;
50-
remoteGlobalIDString = 84A88CBA1A70BD82003D53CF;
51-
remoteInfo = "Swiftx-iOSTests";
58+
remoteGlobalIDString = 84A88D5C1A70C23D003D53CF;
59+
remoteInfo = "Swiftz-iOSTests";
5260
};
53-
847520531A7EBA3A00975C8B /* PBXContainerItemProxy */ = {
61+
84FE01E21A87EF3A006D3EEA /* PBXContainerItemProxy */ = {
5462
isa = PBXContainerItemProxy;
55-
containerPortal = 8475204A1A7EBA3200975C8B /* Swiftx-iOS.xcodeproj */;
63+
containerPortal = 84FE01D91A87EF03006D3EEA /* Swiftz-iOS.xcodeproj */;
5664
proxyType = 1;
57-
remoteGlobalIDString = 84A88D0F1A70BE0D003D53CF;
58-
remoteInfo = Swiftx;
65+
remoteGlobalIDString = 84A88D971A70C280003D53CF;
66+
remoteInfo = Swiftz;
5967
};
6068
/* End PBXContainerItemProxy section */
6169

@@ -66,7 +74,6 @@
6674
dstPath = "";
6775
dstSubfolderSpec = 10;
6876
files = (
69-
8475205D1A7EDD2D00975C8B /* Swiftx.framework in CopyFiles */,
7077
849AA3AE1A0984FD00472F08 /* Concurrent.framework in CopyFiles */,
7178
);
7279
runOnlyForDeploymentPostprocessing = 0;
@@ -75,6 +82,14 @@
7582

7683
/* Begin PBXFileReference section */
7784
84152B7C1A818C9E006387D5 /* SVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SVar.swift; sourceTree = "<group>"; };
85+
84152C021A819F0B006387D5 /* STM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = STM.swift; sourceTree = "<group>"; };
86+
84152C031A819F0B006387D5 /* TBQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TBQueue.swift; sourceTree = "<group>"; };
87+
84152C041A819F0B006387D5 /* TChan.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TChan.swift; sourceTree = "<group>"; };
88+
84152C051A819F0B006387D5 /* TMVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TMVar.swift; sourceTree = "<group>"; };
89+
84152C061A819F0B006387D5 /* TQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TQueue.swift; sourceTree = "<group>"; };
90+
84152C071A819F0B006387D5 /* Transactions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Transactions.swift; sourceTree = "<group>"; };
91+
84152C081A819F0B006387D5 /* TSem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TSem.swift; sourceTree = "<group>"; };
92+
84152C091A819F0B006387D5 /* TVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TVar.swift; sourceTree = "<group>"; };
7893
8434F9EA19E9CE41008D9909 /* Concurrent-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Concurrent-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
7994
8434F9FC19E9CE5F008D9909 /* ConcurrentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConcurrentTests.swift; sourceTree = "<group>"; };
8095
8434F9FD19E9CE5F008D9909 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -92,8 +107,9 @@
92107
8434FA2C19E9CE9F008D9909 /* IVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IVar.swift; sourceTree = "<group>"; };
93108
8434FA2D19E9CE9F008D9909 /* MVar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MVar.swift; sourceTree = "<group>"; };
94109
8434FA2E19E9CE9F008D9909 /* QSem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QSem.swift; sourceTree = "<group>"; };
95-
8475204A1A7EBA3200975C8B /* Swiftx-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Swiftx-iOS.xcodeproj"; path = "Carthage/Checkouts/Swiftx/Swiftx-iOS.xcodeproj"; sourceTree = "<group>"; };
96110
8475205B1A7EC55F00975C8B /* Exception.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Exception.swift; sourceTree = "<group>"; };
111+
84FE01D91A87EF03006D3EEA /* Swiftz-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Swiftz-iOS.xcodeproj"; path = "Carthage/Checkouts/Swiftz/Swiftz-iOS.xcodeproj"; sourceTree = "<group>"; };
112+
84FE01EA1A881FED006D3EEA /* STMSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = STMSpec.swift; sourceTree = "<group>"; };
97113
/* End PBXFileReference section */
98114

99115
/* Begin PBXFrameworksBuildPhase section */
@@ -109,17 +125,32 @@
109125
isa = PBXFrameworksBuildPhase;
110126
buildActionMask = 2147483647;
111127
files = (
112-
847520551A7EBA3F00975C8B /* Swiftx.framework in Frameworks */,
128+
84FE01E41A87EF3D006D3EEA /* Swiftz.framework in Frameworks */,
113129
);
114130
runOnlyForDeploymentPostprocessing = 0;
115131
};
116132
/* End PBXFrameworksBuildPhase section */
117133

118134
/* Begin PBXGroup section */
135+
84152C131A819F0E006387D5 /* STM */ = {
136+
isa = PBXGroup;
137+
children = (
138+
84152C021A819F0B006387D5 /* STM.swift */,
139+
84152C031A819F0B006387D5 /* TBQueue.swift */,
140+
84152C041A819F0B006387D5 /* TChan.swift */,
141+
84152C051A819F0B006387D5 /* TMVar.swift */,
142+
84152C061A819F0B006387D5 /* TQueue.swift */,
143+
84152C071A819F0B006387D5 /* Transactions.swift */,
144+
84152C081A819F0B006387D5 /* TSem.swift */,
145+
84152C091A819F0B006387D5 /* TVar.swift */,
146+
);
147+
name = STM;
148+
sourceTree = "<group>";
149+
};
119150
8434F9D519E9CE41008D9909 = {
120151
isa = PBXGroup;
121152
children = (
122-
8475204A1A7EBA3200975C8B /* Swiftx-iOS.xcodeproj */,
153+
84FE01D91A87EF03006D3EEA /* Swiftz-iOS.xcodeproj */,
123154
8434FA0819E9CE73008D9909 /* Concurrent */,
124155
8434F9FB19E9CE5F008D9909 /* ConcurrentTests */,
125156
8434F9E019E9CE41008D9909 /* Products */,
@@ -139,6 +170,7 @@
139170
isa = PBXGroup;
140171
children = (
141172
8434F9FC19E9CE5F008D9909 /* ConcurrentTests.swift */,
173+
84FE01EA1A881FED006D3EEA /* STMSpec.swift */,
142174
8434F9FE19E9CE5F008D9909 /* PiCalculus.swift */,
143175
8434F9FD19E9CE5F008D9909 /* Info.plist */,
144176
);
@@ -158,6 +190,7 @@
158190
8434FA2D19E9CE9F008D9909 /* MVar.swift */,
159191
84152B7C1A818C9E006387D5 /* SVar.swift */,
160192
8434FA2E19E9CE9F008D9909 /* QSem.swift */,
193+
84152C131A819F0E006387D5 /* STM */,
161194
8434FA0919E9CE73008D9909 /* Supporting Files */,
162195
);
163196
path = Concurrent;
@@ -174,11 +207,11 @@
174207
name = "Supporting Files";
175208
sourceTree = "<group>";
176209
};
177-
8475204B1A7EBA3200975C8B /* Products */ = {
210+
84FE01DA1A87EF03006D3EEA /* Products */ = {
178211
isa = PBXGroup;
179212
children = (
180-
847520501A7EBA3200975C8B /* Swiftx.framework */,
181-
847520521A7EBA3200975C8B /* Swiftx-iOSTests.xctest */,
213+
84FE01DF1A87EF03006D3EEA /* Swiftz.framework */,
214+
84FE01E11A87EF03006D3EEA /* Swiftz-iOSTests.xctest */,
182215
);
183216
name = Products;
184217
sourceTree = "<group>";
@@ -230,7 +263,7 @@
230263
buildRules = (
231264
);
232265
dependencies = (
233-
847520541A7EBA3A00975C8B /* PBXTargetDependency */,
266+
84FE01E31A87EF3A006D3EEA /* PBXTargetDependency */,
234267
);
235268
name = Concurrent;
236269
productName = Concurrent;
@@ -266,8 +299,8 @@
266299
projectDirPath = "";
267300
projectReferences = (
268301
{
269-
ProductGroup = 8475204B1A7EBA3200975C8B /* Products */;
270-
ProjectRef = 8475204A1A7EBA3200975C8B /* Swiftx-iOS.xcodeproj */;
302+
ProductGroup = 84FE01DA1A87EF03006D3EEA /* Products */;
303+
ProjectRef = 84FE01D91A87EF03006D3EEA /* Swiftz-iOS.xcodeproj */;
271304
},
272305
);
273306
projectRoot = "";
@@ -279,18 +312,18 @@
279312
/* End PBXProject section */
280313

281314
/* Begin PBXReferenceProxy section */
282-
847520501A7EBA3200975C8B /* Swiftx.framework */ = {
315+
84FE01DF1A87EF03006D3EEA /* Swiftz.framework */ = {
283316
isa = PBXReferenceProxy;
284317
fileType = wrapper.framework;
285-
path = Swiftx.framework;
286-
remoteRef = 8475204F1A7EBA3200975C8B /* PBXContainerItemProxy */;
318+
path = Swiftz.framework;
319+
remoteRef = 84FE01DE1A87EF03006D3EEA /* PBXContainerItemProxy */;
287320
sourceTree = BUILT_PRODUCTS_DIR;
288321
};
289-
847520521A7EBA3200975C8B /* Swiftx-iOSTests.xctest */ = {
322+
84FE01E11A87EF03006D3EEA /* Swiftz-iOSTests.xctest */ = {
290323
isa = PBXReferenceProxy;
291324
fileType = wrapper.cfbundle;
292-
path = "Swiftx-iOSTests.xctest";
293-
remoteRef = 847520511A7EBA3200975C8B /* PBXContainerItemProxy */;
325+
path = "Swiftz-iOSTests.xctest";
326+
remoteRef = 84FE01E01A87EF03006D3EEA /* PBXContainerItemProxy */;
294327
sourceTree = BUILT_PRODUCTS_DIR;
295328
};
296329
/* End PBXReferenceProxy section */
@@ -319,6 +352,7 @@
319352
files = (
320353
8434FA0119E9CE5F008D9909 /* PiCalculus.swift in Sources */,
321354
8434F9FF19E9CE5F008D9909 /* ConcurrentTests.swift in Sources */,
355+
84FE01EC1A881FF2006D3EEA /* STMSpec.swift in Sources */,
322356
);
323357
runOnlyForDeploymentPostprocessing = 0;
324358
};
@@ -330,12 +364,20 @@
330364
8434FA3F19E9CE9F008D9909 /* IChan.swift in Sources */,
331365
8434FA3A19E9CE9F008D9909 /* CONCRealWorld.m in Sources */,
332366
8475205C1A7EC55F00975C8B /* Exception.swift in Sources */,
367+
84152C0E1A819F0B006387D5 /* TQueue.swift in Sources */,
333368
8434FA4119E9CE9F008D9909 /* MVar.swift in Sources */,
369+
84152C101A819F0B006387D5 /* TSem.swift in Sources */,
370+
84152C0F1A819F0B006387D5 /* Transactions.swift in Sources */,
371+
84152C0C1A819F0B006387D5 /* TChan.swift in Sources */,
372+
84152C0D1A819F0B006387D5 /* TMVar.swift in Sources */,
334373
8434FA3D19E9CE9F008D9909 /* Concurrent.swift in Sources */,
335374
8434FA3E19E9CE9F008D9909 /* Future.swift in Sources */,
336375
8434FA4019E9CE9F008D9909 /* IVar.swift in Sources */,
376+
84152C0A1A819F0B006387D5 /* STM.swift in Sources */,
377+
84152C111A819F0B006387D5 /* TVar.swift in Sources */,
337378
8434FA3819E9CE9F008D9909 /* Chan.swift in Sources */,
338379
84152B7D1A818C9E006387D5 /* SVar.swift in Sources */,
380+
84152C0B1A819F0B006387D5 /* TBQueue.swift in Sources */,
339381
);
340382
runOnlyForDeploymentPostprocessing = 0;
341383
};
@@ -347,10 +389,10 @@
347389
target = 8434FA0619E9CE73008D9909 /* Concurrent */;
348390
targetProxy = 8434FA2019E9CE8F008D9909 /* PBXContainerItemProxy */;
349391
};
350-
847520541A7EBA3A00975C8B /* PBXTargetDependency */ = {
392+
84FE01E31A87EF3A006D3EEA /* PBXTargetDependency */ = {
351393
isa = PBXTargetDependency;
352-
name = Swiftx;
353-
targetProxy = 847520531A7EBA3A00975C8B /* PBXContainerItemProxy */;
394+
name = Swiftz;
395+
targetProxy = 84FE01E21A87EF3A006D3EEA /* PBXContainerItemProxy */;
354396
};
355397
/* End PBXTargetDependency section */
356398

0 commit comments

Comments
 (0)