Skip to content

Commit cbc0dac

Browse files
authored
Merge pull request github#10823 from jsoref/spelling-swift
Spelling swift
2 parents 332bc35 + 480f1e2 commit cbc0dac

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

swift/codegen/generators/qlgen.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,18 +230,18 @@ def _partition(l, pred):
230230
return map(list, _partition_iter(l, pred))
231231

232232

233-
def _is_in_qltest_collapsed_hierachy(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
234-
return "qltest_collapse_hierarchy" in cls.pragmas or _is_under_qltest_collapsed_hierachy(cls, lookup)
233+
def _is_in_qltest_collapsed_hierarchy(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
234+
return "qltest_collapse_hierarchy" in cls.pragmas or _is_under_qltest_collapsed_hierarchy(cls, lookup)
235235

236236

237-
def _is_under_qltest_collapsed_hierachy(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
237+
def _is_under_qltest_collapsed_hierarchy(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
238238
return "qltest_uncollapse_hierarchy" not in cls.pragmas and any(
239-
_is_in_qltest_collapsed_hierachy(lookup[b], lookup) for b in cls.bases)
239+
_is_in_qltest_collapsed_hierarchy(lookup[b], lookup) for b in cls.bases)
240240

241241

242242
def _should_skip_qltest(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
243243
return "qltest_skip" in cls.pragmas or not (
244-
cls.final or "qltest_collapse_hierarchy" in cls.pragmas) or _is_under_qltest_collapsed_hierachy(
244+
cls.final or "qltest_collapse_hierarchy" in cls.pragmas) or _is_under_qltest_collapsed_hierarchy(
245245
cls, lookup)
246246

247247

swift/extractor/infra/SwiftDispatcher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ class SwiftDispatcher {
308308

309309
static FilePath getFilePath(llvm::StringRef path) {
310310
// TODO: this needs more testing
311-
// TODO: check canonicaliztion of names on a case insensitive filesystems
311+
// TODO: check canonicalization of names on a case insensitive filesystems
312312
// TODO: make symlink resolution conditional on CODEQL_PRESERVE_SYMLINKS=true
313313
llvm::SmallString<PATH_MAX> realPath;
314314
if (std::error_code ec = llvm::sys::fs::real_path(path, realPath)) {

swift/ql/lib/codeql/swift/controlflow/internal/Completion.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private predicate isBooleanConstant(ControlFlowElement n, boolean value) {
9494
mustHaveBooleanCompletion(n) and
9595
value = n.asAstNode().(BooleanLiteralExpr).getValue()
9696
or
97-
// Boolean consants hidden inside conversions are also
97+
// Boolean constants hidden inside conversions are also
9898
// constants that resolve to the same value.
9999
exists(ControlFlowElement parent |
100100
parent.asAstNode() = n.asAstNode().getResolveStep() and

swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ module Exprs {
10741074

10751075
/**
10761076
* The control-flow for assignments where the left-hand side has
1077-
* direct-to-implmentation-access semantics.
1077+
* direct-to-implementation-access semantics.
10781078
*/
10791079
class PropertyAssignExpr extends AssignExprTree {
10801080
AccessorDecl accessorDecl;

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowDispatch.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ newtype TDataFlowCall =
7171
TNormalCall(ApplyExprCfgNode call) or
7272
TPropertyGetterCall(PropertyGetterCfgNode getter) or
7373
TPropertySetterCall(PropertySetterCfgNode setter) or
74-
TPropertyObserverCall(PropertyObserverCfgNode obserer) or
74+
TPropertyObserverCall(PropertyObserverCfgNode observer) or
7575
TSummaryCall(FlowSummaryImpl::Public::SummarizedCallable c, Node receiver) {
7676
FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
7777
}
@@ -191,7 +191,7 @@ class PropertyObserverCall extends DataFlowCall, TPropertyObserverCall {
191191
result = observer.getBase()
192192
or
193193
// TODO: This is correct for `willSet` (which takes a `newValue` parameter),
194-
// but for `didSet` (which takes an `oldValue` paramter) we need an rvalue
194+
// but for `didSet` (which takes an `oldValue` parameter) we need an rvalue
195195
// for `getBase()`.
196196
i = 0 and
197197
result = observer.getSource()

swift/tools/tracing-config.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function RegisterExtractorPack(id)
1212
return nil
1313
end
1414

15-
-- removes upsupported CLI arg including the following how_many args
15+
-- removes unsupported CLI arg including the following how_many args
1616
function strip_unsupported_arg(args, arg, how_many)
1717
local index = indexOf(args, arg)
1818
if index then

0 commit comments

Comments
 (0)