Skip to content

Commit ace92d0

Browse files
redsun82redsun82
committed
Swift: rename Db to Raw 
1 parent 9347030 commit ace92d0

File tree

296 files changed

+1347
-1332
lines changed

Some content is hidden

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

296 files changed

+1347
-1332
lines changed

‎swift/codegen/generators/qlgen.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.Class]):
8282

8383
def _to_db_type(x: str) -> str:
8484
if x[0].isupper():
85-
return "Db::" + x
85+
return "Raw::" + x
8686
return x
8787

8888

@@ -225,7 +225,7 @@ def generate(opts, renderer):
225225

226226
inheritance_graph = {name: cls.bases for name, cls in data.classes.items()}
227227
db_classes = [classes[name] for name in toposort_flatten(inheritance_graph) if not classes[name].ipa]
228-
renderer.render(ql.DbClasses(db_classes), out / "Db.qll")
228+
renderer.render(ql.DbClasses(db_classes), out / "Raw.qll")
229229

230230
classes_by_dir_and_name = sorted(classes.values(), key=lambda cls: (cls.dir, cls.name))
231231
for c in classes_by_dir_and_name:

‎swift/codegen/templates/ql_class.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// generated by {{generator}}
22
private import codeql.swift.generated.Synth
3-
private import codeql.swift.generated.Db
3+
private import codeql.swift.generated.Raw
44
{{#imports}}
55
import {{.}}
66
{{/imports}}
@@ -29,7 +29,7 @@ class {{name}}Base extends Synth::T{{name}}{{#bases}}, {{.}}{{/bases}} {
2929
{{#type_is_class}}
3030
{{type}} getImmediate{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
3131
{{^ipa}}
32-
result = Synth::convert{{type}}FromDb(Synth::convert{{name}}ToDb(this){{^root}}.(Db::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
32+
result = Synth::convert{{type}}FromDb(Synth::convert{{name}}ToDb(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
3333
{{/ipa}}
3434
{{#ipa}}
3535
none()
@@ -44,7 +44,7 @@ class {{name}}Base extends Synth::T{{name}}{{#bases}}, {{.}}{{/bases}} {
4444
{{^type_is_class}}
4545
{{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
4646
{{^ipa}}
47-
{{^is_predicate}}result = {{/is_predicate}}Synth::convert{{name}}ToDb(this){{^root}}.(Db::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
47+
{{^is_predicate}}result = {{/is_predicate}}Synth::convert{{name}}ToDb(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
4848
{{/ipa}}
4949
{{#ipa}}
5050
none()

‎swift/codegen/templates/ql_db.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Db {
1+
module Raw {
22
{{#classes}}
33
class {{name}} extends {{db_id}}{{#bases}}, {{.}}{{/bases}} {
44
{{#root}}string toString() { none() }{{/root}}

‎swift/codegen/templates/ql_ipa_constructor_stub.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// generated by {{generator}}, remove this comment if you wish to edit this file
2-
private import codeql.swift.generated.Db
2+
private import codeql.swift.generated.Raw
33

44
predicate construct{{cls.name}}({{#cls.params}}{{^first}}, {{/first}}{{type}} {{param}}{{/cls.params}}) { none() }

‎swift/codegen/templates/ql_ipa_types.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
private import codeql.swift.generated.SynthConstructors
2-
private import codeql.swift.generated.Db
2+
private import codeql.swift.generated.Raw
33

44
cached module Synth {
55
cached newtype T{{root}} =
@@ -11,7 +11,7 @@ cached module Synth {
1111
T{{name}}({{#params}}{{^first}}, {{/first}}{{type}} {{param}}{{/params}}){{#has_params}} { construct{{name}}({{#params}}{{^first}}, {{/first}}{{param}}{{/params}}) }{{/has_params}}
1212
{{/is_ipa}}
1313
{{#is_db}}
14-
T{{name}}(Db::{{name}} id){{#has_subtracted_ipa_types}} { {{#subtracted_ipa_types}}{{^first}} and {{/first}}not construct{{name}}(id){{/subtracted_ipa_types}} }{{/has_subtracted_ipa_types}}
14+
T{{name}}(Raw::{{name}} id){{#has_subtracted_ipa_types}} { {{#subtracted_ipa_types}}{{^first}} and {{/first}}not construct{{name}}(id){{/subtracted_ipa_types}} }{{/has_subtracted_ipa_types}}
1515
{{/is_db}}
1616
{{/final_classes}}
1717

@@ -22,7 +22,7 @@ cached module Synth {
2222
{{/non_final_classes}}
2323

2424
{{#final_classes}}
25-
cached T{{name}} convert{{name}}FromDb(Db::Element e) {
25+
cached T{{name}} convert{{name}}FromDb(Raw::Element e) {
2626
{{^is_fresh_ipa}}
2727
result = T{{name}}(e)
2828
{{/is_fresh_ipa}}
@@ -33,7 +33,7 @@ cached module Synth {
3333
{{/final_classes}}
3434

3535
{{#non_final_classes}}
36-
cached T{{name}} convert{{name}}FromDb(Db::Element e) {
36+
cached T{{name}} convert{{name}}FromDb(Raw::Element e) {
3737
{{#derived}}
3838
{{^first}}
3939
or
@@ -44,7 +44,7 @@ cached module Synth {
4444
{{/non_final_classes}}
4545

4646
{{#final_classes}}
47-
cached Db::Element convert{{name}}ToDb(T{{name}} e) {
47+
cached Raw::Element convert{{name}}ToDb(T{{name}} e) {
4848
{{^is_fresh_ipa}}
4949
e = T{{name}}(result)
5050
{{/is_fresh_ipa}}
@@ -55,7 +55,7 @@ cached module Synth {
5555
{{/final_classes}}
5656

5757
{{#non_final_classes}}
58-
cached Db::Element convert{{name}}ToDb(T{{name}} e) {
58+
cached Raw::Element convert{{name}}ToDb(T{{name}} e) {
5959
{{#derived}}
6060
{{^first}}
6161
or

‎swift/codegen/test/test_qlgen.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def _filter_generated_classes(ret, output_test_files=False):
101101
str(f): ret[ql_test_output_path() / f]
102102
for f in test_files
103103
}
104-
base_files -= {pathlib.Path(f"{name}.qll") for name in ("Db", "Synth", "SynthConstructors")}
104+
base_files -= {pathlib.Path(f"{name}.qll") for name in ("Raw", "Synth", "SynthConstructors")}
105105
assert stub_files == base_files
106106
return {
107107
str(f): (ret[stub_path() / f], ret[ql_output_path() / f])
@@ -131,8 +131,8 @@ def test_empty(generate):
131131
children_file(): ql.GetParentImplementation(),
132132
ql_output_path() / "Synth.qll": ql.Synth.Types(schema.root_class_name),
133133
ql_output_path() / "SynthConstructors.qll": ql.ImportList(),
134-
ql_output_path() / "Db.qll": ql.DbClasses(),
135-
ql_output_path() / "Db.qll": ql.DbClasses(),
134+
ql_output_path() / "Raw.qll": ql.DbClasses(),
135+
ql_output_path() / "Raw.qll": ql.DbClasses(),
136136
}
137137

138138

‎swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ private import internal.ControlFlowGraphImpl
66
private import internal.ControlFlowElements
77
private import CfgNodes
88
private import SuccessorTypes
9-
private import codeql.swift.generated.Db
9+
private import codeql.swift.generated.Raw
1010
private import codeql.swift.generated.Synth
1111

1212
/**
@@ -197,9 +197,9 @@ class ExitBasicBlock extends BasicBlock {
197197
}
198198

199199
private module JoinBlockPredecessors {
200-
private predicate id(Db::AstNode x, Db::AstNode y) { x = y }
200+
private predicate id(Raw::AstNode x, Raw::AstNode y) { x = y }
201201

202-
private predicate idOfDbAstNode(Db::AstNode x, int y) = equivalenceRelation(id/2)(x, y)
202+
private predicate idOfDbAstNode(Raw::AstNode x, int y) = equivalenceRelation(id/2)(x, y)
203203

204204
// TODO does not work if fresh ipa entities (`ipa: on:`) turn out to be first of the block
205205
private predicate idOf(AstNode x, int y) { idOfDbAstNode(Synth::convertAstNodeToDb(x), y) }

‎swift/ql/lib/codeql/swift/generated/AstNode.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// generated by codegen/codegen.py
22
private import codeql.swift.generated.Synth
3-
private import codeql.swift.generated.Db
3+
private import codeql.swift.generated.Raw
44
import codeql.swift.elements.Locatable
55

66
class AstNodeBase extends Synth::TAstNode, Locatable { }

‎swift/ql/lib/codeql/swift/generated/Callable.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// generated by codegen/codegen.py
22
private import codeql.swift.generated.Synth
3-
private import codeql.swift.generated.Db
3+
private import codeql.swift.generated.Raw
44
import codeql.swift.elements.stmt.BraceStmt
55
import codeql.swift.elements.Element
66
import codeql.swift.elements.decl.ParamDecl
77

88
class CallableBase extends Synth::TCallable, Element {
99
ParamDecl getImmediateParam(int index) {
1010
result =
11-
Synth::convertParamDeclFromDb(Synth::convertCallableToDb(this).(Db::Callable).getParam(index))
11+
Synth::convertParamDeclFromDb(Synth::convertCallableToDb(this).(Raw::Callable).getParam(index))
1212
}
1313

1414
final ParamDecl getParam(int index) { result = getImmediateParam(index).resolve() }
@@ -19,7 +19,7 @@ class CallableBase extends Synth::TCallable, Element {
1919

2020
BraceStmt getImmediateBody() {
2121
result =
22-
Synth::convertBraceStmtFromDb(Synth::convertCallableToDb(this).(Db::Callable).getBody())
22+
Synth::convertBraceStmtFromDb(Synth::convertCallableToDb(this).(Raw::Callable).getBody())
2323
}
2424

2525
final BraceStmt getBody() { result = getImmediateBody().resolve() }

‎swift/ql/lib/codeql/swift/generated/Comment.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// generated by codegen/codegen.py
22
private import codeql.swift.generated.Synth
3-
private import codeql.swift.generated.Db
3+
private import codeql.swift.generated.Raw
44
import codeql.swift.elements.Locatable
55

66
class CommentBase extends Synth::TComment, Locatable {
77
override string getAPrimaryQlClass() { result = "Comment" }
88

9-
string getText() { result = Synth::convertCommentToDb(this).(Db::Comment).getText() }
9+
string getText() { result = Synth::convertCommentToDb(this).(Raw::Comment).getText() }
1010
}

0 commit comments

Comments
 (0)