Skip to content

Commit 6d1095f

Browse files
author
Dave Abrahams
committedJul 12, 2014
Protocol names end in "Type," "ible," or "able"
Mechanically add "Type" to the end of any protocol names that don't end in "Type," "ible," or "able." Also, drop "Type" from the end of any associated type names, except for those of the *LiteralConvertible protocols. There are obvious improvements to make in some of these names, which can be handled with separate commits. Fixes <rdar://problem/17165920> Protocols `Integer` etc should get uglier names. Swift SVN r19883
1 parent dff53de commit 6d1095f

File tree

201 files changed

+1658
-1582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+1658
-1582
lines changed
 

‎docs/LangRef.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@ <h4 id="protocol-member-typealias">'typealias' protocol elements (associated typ
625625

626626
<pre class="example">
627627
protocol Sequence {
628-
typename GeneratorType : Generator
629-
func generate() -> GeneratorType
628+
typename Generator : GeneratorType
629+
func generate() -> Generator
630630
}
631631
</pre>
632632

‎include/swift/AST/DiagnosticsParse.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ ERROR(expected_lbrace_after_for,stmt_parsing,none,
734734
ERROR(expected_foreach_in,stmt_parsing,none,
735735
"expected 'in' after for-each pattern", ())
736736
ERROR(expected_foreach_container,stmt_parsing,none,
737-
"expected Sequence expression for for-each loop", ())
737+
"expected SequenceType expression for for-each loop", ())
738738
ERROR(expected_foreach_lbrace,stmt_parsing,none,
739739
"expected '{' to start the body of for-each loop", ())
740740

0 commit comments

Comments
 (0)