Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Author: DougGregor

CMakeLists.txt

@@ -69,7 +69,7 @@ set(SWIFT_ENABLE_GOLD_LINKER FALSE CACHE BOOL
     "Enable using the gold linker when available")
 
 set(_SWIFT_KNOWN_INSTALL_COMPONENTS
-    "compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;sourcekit-xpc-service;sourcekit-inproc")
+    "compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc")
 
 # Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
 set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_KNOWN_INSTALL_COMPONENTS}" CACHE STRING
@@ -125,6 +125,9 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     "Whether to enable CrashReporter integration"
     FALSE)
 
+set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
+    "The name of the toolchain to pass to 'xcrun'")
+
 set(SWIFT_DARWIN_ICU_INCLUDE_PATH "" CACHE STRING
     "Path to the directory where the ICU headers are located")
 
@@ -644,6 +647,10 @@ if(SWIFT_INCLUDE_DOCS)
   add_subdirectory(docs)
 endif()
 
+swift_install_in_component(license
+  FILES "LICENSE.txt"
+  DESTINATION "share/swift")
+
 # Add a documentation target so that documentation shows up in the
 # Xcode project.
 if(XCODE)

bindings/xml/comment-xml-schema.rng

@@ -767,6 +767,9 @@
 
   <define name="CodeListing">
     <element name="CodeListing">
+      <attribute name="language">
+        <data type="string" />
+      </attribute>
       <zeroOrMore>
         <ref name="zCodeLineNumbered"/>
       </zeroOrMore>

docs/ABI.rst

@@ -1176,12 +1176,12 @@ for the first time. The first argument type will mangle in long form,
 ``CC3zim4zang4zung``, and in doing so, ``zim`` will acquire substitution ``S_``,
 ``zim.zang`` will acquire substitution ``S0_``, and ``zim.zang.zung`` will
 acquire ``S1_``. The second argument is the same as the first and will mangle
-using its substitution, ``CS1_``. The
+using its substitution, ``S1_``. The
 third argument type will mangle using the substitution for ``zim``,
 ``CS_7zippity``. (It also acquires substitution ``S2_`` which would be used
 if it mangled again.) The result type will mangle using the substitution for
 ``zim.zang``, ``CS0_3zoo`` (and acquire substitution ``S3_``). The full
-function type thus mangles as ``fTCC3zim4zang4zungCS1_CS_7zippity_CS0_3zoo``.
+function type thus mangles as ``fTCC3zim4zang4zungS1_CS_7zippity_CS0_3zoo``.
 
 ::
 

docs/Generics.rst

@@ -594,7 +594,7 @@ lets us describe an iteration of values of some given value type::
     func next() -> Element
   }
 
-Now, we want to express the notion of an enumerable collection, which provides a
+Now, we want to express the notion of an enumerable collection, which provides
 iteration, which we do by adding requirements into the protocol::
 
   protocol EnumerableCollection : Collection {

docs/Pattern Matching.rst

@@ -354,7 +354,7 @@ imperative language — in contrast to, say, a functional language where
 you're in an expression and you need to produce a value — there's a
 colorable argument that non-exhaustive matches should be okay.  I
 dislike this, however, and propose that it should be an error to
-make an non-exhaustive switch; people who want non-exhaustive matches
+make a non-exhaustive switch; people who want non-exhaustive matches
 can explicitly put in default cases.
 Exhaustiveness actually isn't that difficult to check, at least over
 ADTs.  It's also really the behavior that I would expect from the
@@ -689,13 +689,13 @@ interpreted according to what is found:
   value must match the named type (according to the rules below for
   'is' patterns).  It is okay for this to be trivially true.
 
-  In addition, there must be an non-empty arguments clause, and each
+  In addition, there must be a non-empty arguments clause, and each
   element in the clause must have an identifier.  For each element,
   the identifier must correspond to a known property of the named
   type, and the value of that property must satisfy the element
   pattern.
 
-- If the name resolves to a enum element, then the dynamic type
+- If the name resolves to an enum element, then the dynamic type
   of the matched value must match the enum type as discussed above,
   and the value must be of the specified element.  There must be
   an arguments clause if and only if the element has a value type.

docs/SIL.rst

@@ -4058,7 +4058,7 @@ select_value
   // %r1, %r2, %r3, etc. must have type $T
   // %n has type $T
 
-Selects one of the "case" or "default" operands based on the case of an
+Selects one of the "case" or "default" operands based on the case of a
 value. This is equivalent to a trivial `switch_value`_ branch sequence::
 
   entry:

docs/Testing.rst

@@ -355,7 +355,7 @@ CPU=i386_or_x86_64`` to ``REQUIRES: CPU=x86_64``.
 ``swift_test_mode_optimize[_unchecked|none]_<CPUNAME>`` to specify a test mode
 plus cpu configuration.
 
-``optimized_stdlib_<CPUNAME>``` to specify a optimized stdlib plus cpu
+``optimized_stdlib_<CPUNAME>``` to specify an optimized stdlib plus cpu
 configuration.
 
 Feature ``REQUIRES: executable_test``

docs/archive/LangRef.html

@@ -762,7 +762,7 @@ <h4 id="attribute-infix">Infix Attributes</h4>
   <p>FIXME: Implement these restrictions.</p>
 
   <!-- _____________________________________________________________________ -->
-  <h4 id="attribute-resilence">Resilience Attribute</h4>
+  <h4 id="attribute-resilience">Resilience Attribute</h4>
 
   <pre class="grammar">
     attribute-resilience ::= 'resilient'

docs/doxygen.cfg.in

@@ -1063,7 +1063,7 @@ PERL_PATH              =
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# generate an inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
 # or super classes. Setting the tag to NO turns the diagrams off. Note that 
 # this option is superseded by the HAVE_DOT option below. This is only a 
 # fallback. It is recommended to install and use dot, since it yields more 

docs/proposals/Accessors.rst

@@ -704,7 +704,7 @@ that was technically copied beforehand.  For example::
   var oldArray : [Int] = []
 
   // This function copies array before modifying it, but because that
-  // copy is of an value undergoing modification, the copy will use
+  // copy is of a value undergoing modification, the copy will use
   // the same buffer and therefore observe updates to the element.
   func foo(inout element: Int) {
     oldArray = array