Use enum's for namespacing instead of struct's. Fixes #7

SwiftGen · Jan 15, 2017 · b35d425 · b35d425
1 parent 40cc780
commit b35d425
Show file tree

Hide file tree

Showing 27 changed files with 48 additions and 48 deletions.
diff --git a/Tests/Expected/Fonts/default-context-customname.swift b/Tests/Expected/Fonts/default-context-customname.swift
@@ -29,7 +29,7 @@ extension Font {
   }
 }
 
-struct CustomFamily {
+enum CustomFamily {
   enum SFNSDisplay: String, FontConvertible {
     case Black = ".SFNSDisplay-Black"
     case Bold = ".SFNSDisplay-Bold"

diff --git a/Tests/Expected/Fonts/default-context-defaults.swift b/Tests/Expected/Fonts/default-context-defaults.swift
@@ -29,7 +29,7 @@ extension Font {
   }
 }
 
-struct FontFamily {
+enum FontFamily {
   enum SFNSDisplay: String, FontConvertible {
     case Black = ".SFNSDisplay-Black"
     case Bold = ".SFNSDisplay-Bold"

diff --git a/Tests/Expected/Fonts/swift3-context-customname.swift b/Tests/Expected/Fonts/swift3-context-customname.swift
@@ -29,7 +29,7 @@ extension Font {
   }
 }
 
-struct CustomFamily {
+enum CustomFamily {
   enum SFNSDisplay: String, FontConvertible {
     case black = ".SFNSDisplay-Black"
     case bold = ".SFNSDisplay-Bold"

diff --git a/Tests/Expected/Fonts/swift3-context-defaults.swift b/Tests/Expected/Fonts/swift3-context-defaults.swift
@@ -29,7 +29,7 @@ extension Font {
   }
 }
 
-struct FontFamily {
+enum FontFamily {
   enum SFNSDisplay: String, FontConvertible {
     case black = ".SFNSDisplay-Black"
     case bold = ".SFNSDisplay-Bold"

diff --git a/Tests/Expected/Storyboards-iOS/default-context-all.swift b/Tests/Expected/Storyboards-iOS/default-context-all.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case Test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/default-context-customname.swift b/Tests/Expected/Storyboards-iOS/default-context-customname.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case Test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/lowercase-context-all.swift b/Tests/Expected/Storyboards-iOS/lowercase-context-all.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case Test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/lowercase-context-customname.swift b/Tests/Expected/Storyboards-iOS/lowercase-context-customname.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case Test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/swift3-context-all.swift b/Tests/Expected/Storyboards-iOS/swift3-context-all.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/swift3-context-customname.swift b/Tests/Expected/Storyboards-iOS/swift3-context-customname.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/uppercase-context-all.swift b/Tests/Expected/Storyboards-iOS/uppercase-context-all.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case Test = "test"
   }

diff --git a/Tests/Expected/Storyboards-iOS/uppercase-context-customname.swift b/Tests/Expected/Storyboards-iOS/uppercase-context-customname.swift
@@ -44,7 +44,7 @@ extension UIViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -169,7 +169,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum AdditionalImport: String, StoryboardSegueType {
     case Test = "test"
   }

diff --git a/Tests/Expected/Storyboards-macOS/default-context-all.swift b/Tests/Expected/Storyboards-macOS/default-context-all.swift
@@ -49,7 +49,7 @@ extension NSViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -157,7 +157,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum Message: String, StoryboardSegueType {
     case Custom = "Custom"
     case Embed = "Embed"

diff --git a/Tests/Expected/Storyboards-macOS/default-context-customname.swift b/Tests/Expected/Storyboards-macOS/default-context-customname.swift
@@ -49,7 +49,7 @@ extension NSViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -157,7 +157,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum Message: String, StoryboardSegueType {
     case Custom = "Custom"
     case Embed = "Embed"

diff --git a/Tests/Expected/Storyboards-macOS/lowercase-context-all.swift b/Tests/Expected/Storyboards-macOS/lowercase-context-all.swift
@@ -49,7 +49,7 @@ extension NSViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -157,7 +157,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum Message: String, StoryboardSegueType {
     case Custom = "Custom"
     case Embed = "Embed"

diff --git a/Tests/Expected/Storyboards-macOS/lowercase-context-customname.swift b/Tests/Expected/Storyboards-macOS/lowercase-context-customname.swift
@@ -49,7 +49,7 @@ extension NSViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -157,7 +157,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum Message: String, StoryboardSegueType {
     case Custom = "Custom"
     case Embed = "Embed"

diff --git a/Tests/Expected/Storyboards-macOS/swift3-context-all.swift b/Tests/Expected/Storyboards-macOS/swift3-context-all.swift
@@ -49,7 +49,7 @@ extension NSViewController {
   }
 }
 
-struct StoryboardScene {
+enum StoryboardScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -157,7 +157,7 @@ struct StoryboardScene {
   }
 }
 
-struct StoryboardSegue {
+enum StoryboardSegue {
   enum Message: String, StoryboardSegueType {
     case custom = "Custom"
     case embed = "Embed"

diff --git a/Tests/Expected/Storyboards-macOS/swift3-context-customname.swift b/Tests/Expected/Storyboards-macOS/swift3-context-customname.swift
@@ -49,7 +49,7 @@ extension NSViewController {
   }
 }
 
-struct XCTStoryboardsScene {
+enum XCTStoryboardsScene {
   enum AdditionalImport: String, StoryboardSceneType {
     static let storyboardName = "AdditionalImport"
 
@@ -157,7 +157,7 @@ struct XCTStoryboardsScene {
   }
 }
 
-struct XCTStoryboardsSegue {
+enum XCTStoryboardsSegue {
   enum Message: String, StoryboardSegueType {
     case custom = "Custom"
     case embed = "Embed"

diff --git a/templates/fonts-default.stencil b/templates/fonts-default.stencil
@@ -30,7 +30,7 @@ extension Font {
   }
 }
 
-struct {{enumName}} {
+enum {{enumName}} {
   {% for family in families %}
   enum {{family.name|swiftIdentifier|snakeToCamelCaseNoPrefix}}: String, FontConvertible {
     {% for font in family.fonts %}

diff --git a/templates/fonts-swift3.stencil b/templates/fonts-swift3.stencil
@@ -30,7 +30,7 @@ extension Font {
   }
 }
 
-struct {{enumName}} {
+enum {{enumName}} {
   {% for family in families %}
   enum {{family.name|swiftIdentifier|snakeToCamelCaseNoPrefix}}: String, FontConvertible {
     {% for font in family.fonts %}

diff --git a/templates/storyboards-default.stencil b/templates/storyboards-default.stencil
@@ -47,7 +47,7 @@ extension UIViewController {
 
 {# This is where the generation begins, this code depends on what you have in your Storyboards #}
 {% if storyboards %}
-struct {{sceneEnumName}} {
+enum {{sceneEnumName}} {
   {% for storyboard in storyboards %}
   {% set storyboardName %}{{storyboard.name|swiftIdentifier}}{% endset %}
   {% if storyboard.scenes %}
@@ -110,7 +110,7 @@ struct {{sceneEnumName}} {
   {% endfor %}
 }
 
-struct {{segueEnumName}} {
+enum {{segueEnumName}} {
   {% for storyboard in storyboards %}{% if storyboard.segues %}
   enum {{storyboard.name|swiftIdentifier}}: String, StoryboardSegueType {
     {% for segue in storyboard.segues %}

diff --git a/templates/storyboards-lowercase.stencil b/templates/storyboards-lowercase.stencil
@@ -47,7 +47,7 @@ extension UIViewController {
 
 {# This is where the generation begins, this code depends on what you have in your Storyboards #}
 {% if storyboards %}
-struct {{sceneEnumName}} {
+enum {{sceneEnumName}} {
   {% for storyboard in storyboards %}
   {% set storyboardName %}{{storyboard.name|swiftIdentifier}}{% endset %}
   {% if storyboard.scenes %}
@@ -110,7 +110,7 @@ struct {{sceneEnumName}} {
   {% endfor %}
 }
 
-struct {{segueEnumName}} {
+enum {{segueEnumName}} {
   {% for storyboard in storyboards %}{% if storyboard.segues %}
   enum {{storyboard.name|swiftIdentifier}}: String, StoryboardSegueType {
     {% for segue in storyboard.segues %}

diff --git a/templates/storyboards-osx-default.stencil b/templates/storyboards-osx-default.stencil
@@ -54,7 +54,7 @@ extension NSViewController {
 
 {# This is where the generation begins, this code depends on what you have in your Storyboards #}
 {% if storyboards %}
-struct {{sceneEnumName}} {
+enum {{sceneEnumName}} {
   {% for storyboard in storyboards %}
   {% set storyboardName %}{{storyboard.name|swiftIdentifier}}{% endset %}
   {% if storyboard.scenes %}
@@ -91,7 +91,7 @@ struct {{sceneEnumName}} {
   {% endfor %}
 }
 
-struct {{segueEnumName}} {
+enum {{segueEnumName}} {
   {% for storyboard in storyboards %}{% if storyboard.segues %}
   enum {{storyboard.name|swiftIdentifier}}: String, StoryboardSegueType {
     {% for segue in storyboard.segues %}

diff --git a/templates/storyboards-osx-lowercase.stencil b/templates/storyboards-osx-lowercase.stencil
@@ -54,7 +54,7 @@ extension NSViewController {
 
 {# This is where the generation begins, this code depends on what you have in your Storyboards #}
 {% if storyboards %}
-struct {{sceneEnumName}} {
+enum {{sceneEnumName}} {
   {% for storyboard in storyboards %}
   {% set storyboardName %}{{storyboard.name|swiftIdentifier}}{% endset %}
   {% if storyboard.scenes %}
@@ -91,7 +91,7 @@ struct {{sceneEnumName}} {
   {% endfor %}
 }
 
-struct {{segueEnumName}} {
+enum {{segueEnumName}} {
   {% for storyboard in storyboards %}{% if storyboard.segues %}
   enum {{storyboard.name|swiftIdentifier}}: String, StoryboardSegueType {
     {% for segue in storyboard.segues %}

diff --git a/templates/storyboards-osx-swift3.stencil b/templates/storyboards-osx-swift3.stencil
@@ -54,7 +54,7 @@ extension NSViewController {
 
 {# This is where the generation begins, this code depends on what you have in your Storyboards #}
 {% if storyboards %}
-struct {{sceneEnumName}} {
+enum {{sceneEnumName}} {
   {% for storyboard in storyboards %}
   {% set storyboardName %}{{storyboard.name|swiftIdentifier}}{% endset %}
   {% if storyboard.scenes %}
@@ -91,7 +91,7 @@ struct {{sceneEnumName}} {
   {% endfor %}
 }
 
-struct {{segueEnumName}} {
+enum {{segueEnumName}} {
   {% for storyboard in storyboards %}{% if storyboard.segues %}
   enum {{storyboard.name|swiftIdentifier}}: String, StoryboardSegueType {
     {% for segue in storyboard.segues %}