Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Sema/TypeChecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ DeclName TypeChecker::getObjectLiteralConstructorName(ObjectLiteralExpr *expr) {
switch (expr->getLiteralKind()) {
case ObjectLiteralExpr::colorLiteral: {
return DeclName(Context, Context.Id_init,
{ Context.getIdentifier("colorLiteralRed"),
{ Context.getIdentifier("_colorLiteralRed"),
Context.getIdentifier("green"),
Context.getIdentifier("blue"),
Context.getIdentifier("alpha") });
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/AppKit/AppKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extension NSApplication {

extension NSColor : _ExpressibleByColorLiteral {
@nonobjc
public required convenience init(colorLiteralRed red: Float, green: Float,
public required convenience init(_colorLiteralRed red: Float, green: Float,
blue: Float, alpha: Float) {
self.init(srgbRed: CGFloat(red), green: CGFloat(green),
blue: CGFloat(blue), alpha: CGFloat(alpha))
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/CoreGraphics/CoreGraphics.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public protocol _CGColorInitTrampoline {
}

extension _CGColorInitTrampoline {
public init(colorLiteralRed red: Float, green: Float, blue: Float,
public init(_colorLiteralRed red: Float, green: Float, blue: Float,
alpha: Float) {
self.init(red: CGFloat(red), green: CGFloat(green), blue: CGFloat(blue),
alpha: CGFloat(alpha))
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/UIKit/UIKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ extension UIView : _DefaultCustomPlaygroundQuickLookable {
#endif

extension UIColor : _ExpressibleByColorLiteral {
@nonobjc public required convenience init(colorLiteralRed red: Float,
@nonobjc public required convenience init(_colorLiteralRed red: Float,
green: Float,
blue: Float, alpha: Float) {
self.init(red: CGFloat(red), green: CGFloat(green),
Expand Down
13 changes: 12 additions & 1 deletion stdlib/public/core/CompilerProtocols.swift
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,18 @@ public protocol _ExpressibleByColorLiteral {
///
/// Do not call this initializer directly. Instead, initialize a variable or
/// constant using a color literal.
init(colorLiteralRed red: Float, green: Float, blue: Float, alpha: Float)
init(_colorLiteralRed red: Float, green: Float, blue: Float, alpha: Float)
}

extension _ExpressibleByColorLiteral {
@available(swift, deprecated: 3.2, obsoleted: 4.0,
message: "This initializer is only meant to be used by color literals")
public init(
colorLiteralRed red: Float, green: Float, blue: Float, alpha: Float
) {
self.init(
_colorLiteralRed: red, green: green, blue: blue, alpha: alpha)
}
}

/// A type that can be initialized using an image literal (e.g.
Expand Down
2 changes: 1 addition & 1 deletion test/IDE/complete_literal.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func giveMeAString() -> Int {
// LITERAL5-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended/TypeRelation[Invalid]: append({#contentsOf: Sequence#})[#Void#]{{; name=.+$}}

struct MyColor: _ExpressibleByColorLiteral {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) { red = colorLiteralRed }
init(_colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) { red = colorLiteralRed }
var red: Float
}
public typealias _ColorLiteralType = MyColor
Expand Down
2 changes: 1 addition & 1 deletion test/IDE/complete_value_literals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func testTuple2() {
// TUPLE_2: Literal[Tuple]/None/TypeRelation[Identical]: ({#(values)#})[#(MyInt1, MyString1, MyDouble1)#];

struct MyColor1: _ExpressibleByColorLiteral {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
init(_colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
}
func testColor0() {
let x: Int = #^COLOR_0^#
Expand Down
2 changes: 1 addition & 1 deletion test/IDE/structure_object_literals.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %swift-ide-test -structure -source-filename %s | %FileCheck %s

struct S: _ExpressibleByColorLiteral {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
init(_colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
}

// CHECK: <gvar>let <name>y</name>: S = <object-literal-expression>#<name>colorLiteral</name>(<arg><name>red</name>: 1</arg>, <arg><name>green</name>: 0</arg>, <arg><name>blue</name>: 0</arg>, <arg><name>alpha</name>: 1</arg>)</object-literal-expression></gvar>
Expand Down
2 changes: 1 addition & 1 deletion test/Sema/object_literals_ios.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// REQUIRES: OS=ios

struct S: _ExpressibleByColorLiteral {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
init(_colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
}

let y: S = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1)
Expand Down
2 changes: 1 addition & 1 deletion test/Sema/object_literals_osx.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// REQUIRES: OS=macosx

struct S: _ExpressibleByColorLiteral {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
init(_colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
}

let y: S = #colorLiteral(red: 1, green: 0, blue: 0, alpha: 1)
Expand Down