Skip to content

Commit caaee26

Browse files
authored
Merge pull request github#10880 from jsoref/spelling-ql
Spelling ql
2 parents fd8f8cb + 7055b13 commit caaee26

File tree

15 files changed

+26
-26
lines changed

15 files changed

+26
-26
lines changed

ql/extractor/src/extractor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ struct Visitor<'a> {
216216
schema: &'a NodeTypeMap,
217217
/// A stack for gathering information from child nodes. Whenever a node is
218218
/// entered the parent's [Label], child counter, and an empty list is pushed.
219-
/// All children append their data to the the list. When the visitor leaves a
219+
/// All children append their data to the list. When the visitor leaves a
220220
/// node the list containing the child data is popped from the stack and
221221
/// matched against the dbscheme for the node. If the expectations are met
222222
/// the corresponding row definitions are added to the trap_output.

ql/node-types/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub enum FieldTypeInfo {
4343
},
4444

4545
/// The field can be one of several tokens, so the db type will be an `int`
46-
/// with a `case @foo.kind` for each possiblity.
46+
/// with a `case @foo.kind` for each possibility.
4747
ReservedWordInt(BTreeMap<String, (usize, String)>),
4848
}
4949

ql/ql/src/codeql_ql/ast/Ast.qll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ class Class extends TClass, TypeDeclaration, ModuleDeclaration {
853853
override string getName() { result = cls.getName().getValue() }
854854

855855
/**
856-
* Gets the charateristic predicate for this class.
856+
* Gets the characteristic predicate for this class.
857857
*/
858858
CharPred getCharPred() { toQL(result) = cls.getChild(_).(QL::ClassMember).getChild(_) }
859859

@@ -1009,7 +1009,7 @@ class NewTypeBranch extends TNewTypeBranch, Predicate, TypeDeclaration {
10091009
class Call extends TCall, Expr, Formula {
10101010
/** Gets the `i`th argument of this call. */
10111011
Expr getArgument(int i) {
1012-
none() // overridden in sublcasses.
1012+
none() // overridden in subclasses.
10131013
}
10141014

10151015
/** Gets an argument of this call, if any. */
@@ -2507,10 +2507,10 @@ module YAML {
25072507
deprecated class YAMLNode = YamlNode;
25082508

25092509
/** A YAML comment. */
2510-
class YamlComment extends TYamlCommemt, YamlNode {
2510+
class YamlComment extends TYamlComment, YamlNode {
25112511
Yaml::Comment yamlcomment;
25122512

2513-
YamlComment() { this = TYamlCommemt(yamlcomment) }
2513+
YamlComment() { this = TYamlComment(yamlcomment) }
25142514

25152515
override string getAPrimaryQlClass() { result = "YamlComment" }
25162516
}

ql/ql/src/codeql_ql/ast/internal/AstNodes.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ newtype TAstNode =
6060
TPredicateExpr(QL::PredicateExpr pe) or
6161
TAnnotation(QL::Annotation annot) or
6262
TAnnotationArg(QL::AnnotArg arg) or
63-
TYamlCommemt(Yaml::Comment yc) or
63+
TYamlComment(Yaml::Comment yc) or
6464
TYamlEntry(Yaml::Entry ye) or
6565
TYamlKey(Yaml::Key yk) or
6666
TYamlListitem(Yaml::Listitem yli) or
@@ -86,7 +86,7 @@ class TCall = TPredicateCall or TMemberCall or TNoneCall or TAnyCall;
8686

8787
class TTypeRef = TImport or TModuleExpr or TType;
8888

89-
class TYamlNode = TYamlCommemt or TYamlEntry or TYamlKey or TYamlListitem or TYamlValue;
89+
class TYamlNode = TYamlComment or TYamlEntry or TYamlKey or TYamlListitem or TYamlValue;
9090

9191
class TSignatureExpr = TPredicateExpr or TType or TModuleExpr;
9292

@@ -125,7 +125,7 @@ private QL::AstNode toQLExpr(AST::AstNode n) {
125125
}
126126

127127
Yaml::AstNode toGenerateYaml(AST::AstNode n) {
128-
n = TYamlCommemt(result) or
128+
n = TYamlComment(result) or
129129
n = TYamlEntry(result) or
130130
n = TYamlKey(result) or
131131
n = TYamlListitem(result) or

ql/ql/src/codeql_ql/ast/internal/Builtins.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ predicate isBuiltinMember(string qual, string ret, string name, string args) {
6161
}
6262

6363
module BuiltinsConsistency {
64-
query predicate noBuildinParse(string sig) {
64+
query predicate noBuiltinParse(string sig) {
6565
isBuiltinMember(sig) and
6666
not exists(sig.regexpCapture("(\\w+) (\\w+)\\.(\\w+)\\(([\\w, ]*)\\)", _))
6767
}
6868

69-
query predicate noBuildinClasslessParse(string sig) {
69+
query predicate noBuiltinClasslessParse(string sig) {
7070
isBuiltinClassless(sig) and
7171
not exists(sig.regexpCapture("(\\w+) (\\w+)\\(([\\w, ]*)\\)", _))
7272
}

ql/ql/src/codeql_ql/ast/internal/Module.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private module Cached {
271271

272272
pragma[noinline]
273273
private predicate resolveModuleRefHelper(TypeRef me, ContainerOrModule enclosing, string name) {
274-
// The scope is all enclosing modules, the immidiatly containing folder, not the parent folders.
274+
// The scope is all enclosing modules, the immediately containing folder, not the parent folders.
275275
enclosing = getEnclosingModuleNoFolderStep*(getStartModule(me)) and
276276
name = [me.(ModuleExpr).getName(), me.(TypeExpr).getClassName()] and
277277
not exists(me.(ModuleExpr).getQualifier()) and
@@ -313,7 +313,7 @@ private predicate definesModule(
313313
m = TModule(any(Module mod | public = getPublicBool(mod)))
314314
)
315315
or
316-
// signature module in a paramertized module
316+
// signature module in a parameterized module
317317
exists(Module mod, SignatureExpr sig, TypeRef ty, int i |
318318
mod = container.asModule() and
319319
mod.hasParameter(i, name, sig) and

ql/ql/src/codeql_ql/ast/internal/Predicate.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private module Cached {
157157
)
158158
}
159159

160-
private predicate resolveBuildinPredicateCall(PredicateCall call, BuiltinClassless pred) {
160+
private predicate resolveBuiltinPredicateCall(PredicateCall call, BuiltinClassless pred) {
161161
call.getNumberOfArguments() = pred.getArity() and
162162
call.getPredicateName() = pred.getName()
163163
}
@@ -167,7 +167,7 @@ private module Cached {
167167
resolvePredicateCall(c, p)
168168
or
169169
not resolvePredicateCall(c, _) and
170-
resolveBuildinPredicateCall(c, p)
170+
resolveBuiltinPredicateCall(c, p)
171171
or
172172
resolveMemberCall(c, p)
173173
or

ql/ql/src/codeql_ql/dataflow/DataFlow.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class AstNodeNode extends Node, MkAstNodeNode {
7272
}
7373

7474
/**
75-
* Gets the data-flow node correspoinding to the given AST node.
75+
* Gets the data-flow node corresponding to the given AST node.
7676
*/
7777
pragma[inline]
7878
Node astNode(AstNode node) { result = MkAstNodeNode(node) }

ql/ql/src/codeql_ql/style/DeadCodeQuery.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private AstNode alive() {
7575
or
7676
result instanceof TopLevel // toplevel is always alive.
7777
or
78-
// recurisve cases
78+
// recursive cases
7979
result = aliveStep(alive())
8080
}
8181

@@ -243,13 +243,13 @@ private AstNode queryable() {
243243
or
244244
result instanceof TopLevel // toplevel is always alive.
245245
or
246-
// recurisve cases
246+
// recursive cases
247247
result = aliveStep(queryable())
248248
}
249249

250250
/**
251251
* Gets an AstNode that does not affect any query result.
252-
* Is interresting as an quick-eval target to investigate dead code.
252+
* Is interesting as an quick-eval target to investigate dead code.
253253
* (It is intentional that this predicate is a result of this predicate).
254254
*/
255255
AstNode unQueryable(string msg) {

ql/ql/src/queries/bugs/InconsistentDeprecation.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @problem.severity warning
66
* @id ql/inconsistent-deprecation
77
* @tags correctness
8-
* maintanability
8+
* maintainability
99
* @precision very-high
1010
*/
1111

0 commit comments

Comments
 (0)