Resolve build issues with generated code

Z-Seven · Oct 5, 2016 · d35baaa · d35baaa
1 parent 7bbdacd
commit d35baaa
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/R.swift/Generators/ImageGenerator.swift b/R.swift/Generators/ImageGenerator.swift
@@ -40,7 +40,7 @@ struct ImageGenerator: ExternalOnlyStructGenerator {
           isStatic: true,
           name: SwiftIdentifier(name: name),
           typeDefinition: .inferred(Type.ImageResource),
-          value: "Rswift.ImageResource(bundle: _R.hostingBundle, name: \"\(name)\")"
+          value: "Rswift.ImageResource(bundle: R.hostingBundle, name: \"\(name)\")"
         )
       }
 

diff --git a/R.swift/Generators/NibGenerator.swift b/R.swift/Generators/NibGenerator.swift
@@ -120,7 +120,7 @@ struct NibGenerator: StructGenerator {
       isStatic: false,
       name: "bundle",
       typeDefinition: .inferred(Type._Bundle),
-      value: "_R.hostingBundle"
+      value: "R.hostingBundle"
     )
 
     let nameVar = Let(

diff --git a/R.swift/Generators/ResourceFileGenerator.swift b/R.swift/Generators/ResourceFileGenerator.swift
@@ -46,7 +46,7 @@ struct ResourceFileGenerator: ExternalOnlyStructGenerator {
           isStatic: true,
           name: SwiftIdentifier(name: $0.fullname),
           typeDefinition: .inferred(Type.FileResource),
-          value: "Rswift.FileResource(bundle: _R.hostingBundle, name: \"\($0.filename)\", pathExtension: \"\($0.pathExtension)\")"
+          value: "Rswift.FileResource(bundle: R.hostingBundle, name: \"\($0.filename)\", pathExtension: \"\($0.pathExtension)\")"
         )
     }
   }

diff --git a/R.swift/Generators/StoryboardGenerator.swift b/R.swift/Generators/StoryboardGenerator.swift
@@ -92,7 +92,7 @@ struct StoryboardGenerator: StructGenerator {
     var functions: [Function] = []
     var properties: [Let] = [
       Let(comments: [], accessModifier: externalAccessLevel, isStatic: false, name: "name", typeDefinition: .inferred(Type._String), value: "\"\(storyboard.name)\""),
-      Let(comments: [], accessModifier: externalAccessLevel, isStatic: false, name: "bundle", typeDefinition: .inferred(Type._Bundle), value: "_R.hostingBundle")
+      Let(comments: [], accessModifier: externalAccessLevel, isStatic: false, name: "bundle", typeDefinition: .inferred(Type._Bundle), value: "R.hostingBundle")
     ]
 
     // Initial view controller

diff --git a/R.swift/Generators/StringsGenerator.swift b/R.swift/Generators/StringsGenerator.swift
@@ -173,7 +173,7 @@ struct StringsGenerator: ExternalOnlyStructGenerator {
       isStatic: true,
       name: SwiftIdentifier(name: values.key),
       typeDefinition: .inferred(Type.StringResource),
-      value: "Rswift.StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", bundle: _R.hostingBundle, locales: [\(locales)], comment: nil)"
+      value: "Rswift.StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", bundle: R.hostingBundle, locales: [\(locales)], comment: nil)"
     )
   }
 
@@ -223,7 +223,7 @@ struct StringsGenerator: ExternalOnlyStructGenerator {
       parameters: params,
       doesThrow: false,
       returnType: Type._String,
-      body: "return String(format: \(values.localizedString), locale: _R.applicationLocale, \(args))"
+      body: "return String(format: \(values.localizedString), locale: R.applicationLocale, \(args))"
     )
   }
 
@@ -252,10 +252,10 @@ private struct StringValues {
     let escapedKey = key.escapedStringLiteral
 
     if tableName == "Localizable" {
-      return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, comment: \"\")"
+      return "NSLocalizedString(\"\(escapedKey)\", bundle: R.hostingBundle, comment: \"\")"
     }
     else {
-      return "NSLocalizedString(\"\(escapedKey)\", tableName: \"\(tableName)\", bundle: _R.hostingBundle, comment: \"\")"
+      return "NSLocalizedString(\"\(escapedKey)\", tableName: \"\(tableName)\", bundle: R.hostingBundle, comment: \"\")"
     }
   }
 

diff --git a/R.swift/Generators/ValidatedStructGenerator.swift b/R.swift/Generators/ValidatedStructGenerator.swift
@@ -29,15 +29,15 @@ class ValidatedStructGenerator: StructGenerator {
 
     let validationStruct = Struct(
       comments: [],
-      accessModifier: .Private,
+      accessModifier: .FilePrivate,
       type: Type(module: .host, name: "intern"),
       implements: [TypePrinter(type: Type.Validatable)],
       typealiasses: [],
       properties: [],
       functions: [
         Function(
           comments: [],
-          accessModifier: .Private,
+          accessModifier: .FilePrivate,
           isStatic: true,
           name: "validate",
           generics: nil,

diff --git a/R.swift/SwiftTypes/Struct.swift b/R.swift/SwiftTypes/Struct.swift
@@ -65,10 +65,10 @@ struct Struct: UsedTypesProvider, SwiftCodeConverible {
       .joined(separator: "\n\n")
 
 
-    // Private `init`, so that struct can't be initialized
-    let privateInit = "private init() {}"
+    // File private `init`, so that struct can't be initialized from the outside world
+    let fileprivateInit = "fileprivate init() {}"
 
-    let bodyComponents = [typealiasString, varsString, functionsString, structsString, privateInit].filter { $0 != "" }
+    let bodyComponents = [typealiasString, varsString, functionsString, structsString, fileprivateInit].filter { $0 != "" }
     let bodyString = bodyComponents.joined(separator: "\n\n").indentWithString(IndentationString)
 
     return "\(commentsString)\(accessModifierString)struct \(type)\(implementsString) {\n\(bodyString)\n}"

diff --git a/ResourceApp/ResourceApp.xcodeproj/project.pbxproj b/ResourceApp/ResourceApp.xcodeproj/project.pbxproj
@@ -174,7 +174,7 @@
 		DEF559AB1CA48892009B8C51 /* ResourceAppTests-tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ResourceAppTests-tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DEF559AD1CA48892009B8C51 /* ResourceAppTests_tvOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourceAppTests_tvOS.swift; sourceTree = "<group>"; };
 		DEF559AF1CA48892009B8C51 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		DEF559B61CA48DC2009B8C51 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = "<group>"; };
+		DEF559B61CA48DC2009B8C51 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = R.generated.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		DEF559B81CA4932F009B8C51 /* Rswift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Rswift.framework; path = "../R.swift.Library/build/Debug-appletvos/Rswift.framework"; sourceTree = "<group>"; };
 		E20983231D585E78005ACBAA /* SegueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SegueTests.swift; sourceTree = "<group>"; };
 		E20983251D585F8C005ACBAA /* Xib with ViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Xib with ViewController.xib"; sourceTree = "<group>"; };