Skip to content

Commit 4622a66

Browse files
committed
Merge pull request #52 from kostiakoval/move-toTOML-methods
move TOML printing to toTOML methods.
2 parents 84e5989 + 695c626 commit 4622a66

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

Sources/PackageDescription/Package.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ public final class Package {
3838
public class func Package(url url: String, _ version: Version) -> Dependency {
3939
return Dependency(url, version...version)
4040
}
41+
42+
/// Print a representation of the dependency as TOML.
43+
public func toTOML() -> String {
44+
return "[\"\(url)\", \"\(versionRange.startIndex)\", \"\(versionRange.endIndex)\"],"
45+
}
46+
4147
}
4248

4349
/// The name of the package, if specified.
@@ -74,7 +80,7 @@ public final class Package {
7480
}
7581
result += "dependencies = ["
7682
for dependency in dependencies {
77-
result += "[\"\(dependency.url)\", \"\(dependency.versionRange.startIndex)\", \"\(dependency.versionRange.endIndex)\"],"
83+
result += dependency.toTOML()
7884
}
7985
result += "]\n"
8086
for target in targets {

Sources/PackageDescription/Target.swift

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ public final class Target {
1414
public enum Dependency {
1515
/// A dependency on a target in the same project.
1616
case Target(name: String)
17+
18+
/// Print a representation of the target dependency as TOML.
19+
public func toTOML() -> String {
20+
switch self {
21+
case .Target(let name):
22+
return "\"\(name)\","
23+
}
24+
}
1725
}
1826

1927
/// The name of the target.
@@ -35,10 +43,7 @@ public final class Target {
3543
result += "name = \"\(name)\"\n"
3644
result += "dependencies = ["
3745
for dependency in dependencies {
38-
switch dependency {
39-
case .Target(let name):
40-
result += "\"\(name)\","
41-
}
46+
result += dependency.toTOML()
4247
}
4348
result += "]\n"
4449
return result

0 commit comments

Comments
 (0)