[gardening] Use American English.

Author: practicalswift

benchmark/scripts/compare_perf_tests.py

@@ -250,7 +250,7 @@ def table(title, results, is_strong=False, is_open=False):
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <style>
         body {{ font-family: -apple-system, sans-serif; font-size: 14px; }}
-        table {{ border-spacing: 2px; border-color: grey; border-spacing: 0;
+        table {{ border-spacing: 2px; border-color: gray; border-spacing: 0;
                 border-collapse: collapse; }}
         table tr {{ background-color: #fff; border-top: 1px solid #c6cbd1; }}
         table th, table td {{ padding: 6px 13px; border: 1px solid #dfe2e5; }}

include/swift/AST/Expr.h

@@ -4858,7 +4858,7 @@ class KeyPathExpr : public Expr {
   }
 };
 
-/// Represents the unusual behaviour of a . in a \ keypath expression, such as
+/// Represents the unusual behavior of a . in a \ keypath expression, such as
 /// \.[0] and \Foo.?.
 class KeyPathDotExpr : public Expr {
   SourceLoc DotLoc;

include/swift/Parse/Parser.h

@@ -1144,7 +1144,7 @@ class Parser {
                                               bool isExprBasic);
   ParserResult<Expr> parseExprPostfixSuffix(ParserResult<Expr> inner,
                                             bool isExprBasic,
-                                            bool periodHasKeyPathBehaviour,
+                                            bool periodHasKeyPathBehavior,
                                             bool &hasBindOptional);
   ParserResult<Expr> parseExprPostfix(Diag<> ID, bool isExprBasic);
   ParserResult<Expr> parseExprUnary(Diag<> ID, bool isExprBasic);

lib/Parse/ParseExpr.cpp

@@ -552,9 +552,9 @@ ParserResult<Expr> Parser::parseExprKeyPath() {
     bool unusedHasBindOptional = false;
 
     // Inside a keypath's path, the period always behaves normally: the key path
-    // behaviour is only the separation between type and path.
+    // behavior is only the separation between type and path.
     pathResult = parseExprPostfixSuffix(inner, /*isExprBasic=*/true,
-                                        /*periodHasKeyPathBehaviour=*/false,
+                                        /*periodHasKeyPathBehavior=*/false,
                                         unusedHasBindOptional);
     if (pathResult.isParseError() || pathResult.hasCodeCompletion())
       return pathResult;
@@ -1062,7 +1062,7 @@ static bool canParseTypeOf(Parser &P) {
 
 ParserResult<Expr>
 Parser::parseExprPostfixSuffix(ParserResult<Expr> Result, bool isExprBasic,
-                               bool periodHasKeyPathBehaviour,
+                               bool periodHasKeyPathBehavior,
                                bool &hasBindOptional) {
   hasBindOptional = false;
 
@@ -1078,7 +1078,7 @@ Parser::parseExprPostfixSuffix(ParserResult<Expr> Result, bool isExprBasic,
       // A key path is special, because it allows .[, unlike anywhere else. The
       // period itself should be left in the token stream. (.? and .! end up
       // being operators, and so aren't handled here.)
-      if (periodHasKeyPathBehaviour && peekToken().is(tok::l_square)) {
+      if (periodHasKeyPathBehavior && peekToken().is(tok::l_square)) {
         break;
       }
 
@@ -1259,7 +1259,7 @@ Parser::parseExprPostfixSuffix(ParserResult<Expr> Result, bool isExprBasic,
     if (Tok.is(tok::oper_postfix)) {
       // KeyPaths are more restricted in what can go after a ., and so we treat
       // them specially.
-      if (periodHasKeyPathBehaviour && startsWithSymbol(Tok, '.'))
+      if (periodHasKeyPathBehavior && startsWithSymbol(Tok, '.'))
         break;
 
       Expr *oper = parseExprOperator();
@@ -1738,7 +1738,7 @@ ParserResult<Expr> Parser::parseExprPostfix(Diag<> ID, bool isExprBasic) {
 
   bool hasBindOptional = false;
   Result = parseExprPostfixSuffix(Result, isExprBasic,
-                                  /*periodHasKeyPathBehaviour=*/InSwiftKeyPath,
+                                  /*periodHasKeyPathBehavior=*/InSwiftKeyPath,
                                   hasBindOptional);
   if (Result.isParseError() || Result.hasCodeCompletion())
     return Result;

test/stdlib/TestDecimal.swift

@@ -420,7 +420,7 @@ class TestDecimal : TestDecimalSuper {
         expectEqual(0, result._isNegative, "0 * -1")
     }
 
-    func test_Normalise() {
+    func test_Normalize() {
         var one = Decimal(1)
         var ten = Decimal(-10)
         expectEqual(.noError, NSDecimalNormalize(&one, &ten, .plain))
@@ -598,7 +598,7 @@ DecimalTests.test("test_Misc") { TestDecimal().test_Misc() }
 DecimalTests.test("test_MultiplicationOverflow") { TestDecimal().test_MultiplicationOverflow() }
 DecimalTests.test("test_NaNInput") { TestDecimal().test_NaNInput() }
 DecimalTests.test("test_NegativeAndZeroMultiplication") { TestDecimal().test_NegativeAndZeroMultiplication() }
-DecimalTests.test("test_Normalise") { TestDecimal().test_Normalise() }
+DecimalTests.test("test_Normalize") { TestDecimal().test_Normalize() }
 DecimalTests.test("test_NSDecimal") { TestDecimal().test_NSDecimal() }
 DecimalTests.test("test_RepeatingDivision") { TestDecimal().test_RepeatingDivision() }
 DecimalTests.test("test_Round") { TestDecimal().test_Round() }

tools/SourceKit/docs/Protocol.md

@@ -637,7 +637,7 @@ To gather documentation, SourceKit must be given either the name of a module (ke
                                         // these must include the path to that file.
     [opt] <key.cancel_on_subsequent_request>: (int64) // Whether this request should be canceled if a
                                         // new cursor-info request is made that uses the same AST.
-                                        // This behaviour is a workaround for not having first-class
+                                        // This behavior is a workaround for not having first-class
                                         // cancelation. For backwards compatibility, the default is 1.
 }
 ```