Swift: rename Synth conversion functions

Author: redsun82

swift/codegen/templates/ql_class.mustache

@@ -29,7 +29,7 @@ class {{name}}Base extends Synth::T{{name}}{{#bases}}, {{.}}{{/bases}} {
   {{#type_is_class}}
   {{type}} getImmediate{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
     {{^ipa}}
-    result = Synth::fromRaw{{type}}(Synth::toRaw{{name}}(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
+    result = Synth::convert{{type}}FromRaw(Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
     {{/ipa}}
     {{#ipa}}
     none()
@@ -44,7 +44,7 @@ class {{name}}Base extends Synth::T{{name}}{{#bases}}, {{.}}{{/bases}} {
   {{^type_is_class}}
   {{type}} {{getter}}({{#is_repeated}}int index{{/is_repeated}}) {
     {{^ipa}}
-    {{^is_predicate}}result = {{/is_predicate}}Synth::toRaw{{name}}(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
+    {{^is_predicate}}result = {{/is_predicate}}Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_repeated}}index{{/is_repeated}})
     {{/ipa}}
     {{#ipa}}
     none()

swift/codegen/templates/ql_ipa_types.mustache

@@ -17,7 +17,7 @@ cached module Synth {
   {{/non_final_classes}}
 
   {{#final_classes}}
-  cached T{{name}} fromRaw{{name}}(Raw::Element e) {
+  cached T{{name}} convert{{name}}FromRaw(Raw::Element e) {
     {{^is_fresh_ipa}}
     result = T{{name}}(e)
     {{/is_fresh_ipa}}
@@ -28,18 +28,18 @@ cached module Synth {
   {{/final_classes}}
 
   {{#non_final_classes}}
-  cached T{{name}} fromRaw{{name}}(Raw::Element e) {
+  cached T{{name}} convert{{name}}FromRaw(Raw::Element e) {
     {{#derived}}
     {{^first}}
     or
     {{/first}}
-    result = fromRaw{{name}}(e)
+    result = convert{{name}}FromRaw(e)
     {{/derived}}
   }
   {{/non_final_classes}}
 
   {{#final_classes}}
-  cached Raw::Element toRaw{{name}}(T{{name}} e) {
+  cached Raw::Element convert{{name}}ToRaw(T{{name}} e) {
     {{^is_fresh_ipa}}
     e = T{{name}}(result)
     {{/is_fresh_ipa}}
@@ -50,12 +50,12 @@ cached module Synth {
   {{/final_classes}}
 
   {{#non_final_classes}}
-  cached Raw::Element toRaw{{name}}(T{{name}} e) {
+  cached Raw::Element convert{{name}}ToRaw(T{{name}} e) {
     {{#derived}}
     {{^first}}
     or
     {{/first}}
-    result = toRaw{{name}}(e)
+    result = convert{{name}}ToRaw(e)
     {{/derived}}
   }
   {{/non_final_classes}}

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

@@ -202,7 +202,7 @@ private module JoinBlockPredecessors {
   private predicate idOfDbAstNode(Raw::AstNode x, int y) = equivalenceRelation(id/2)(x, y)
 
   // TODO does not work if fresh ipa entities (`ipa: on:`) turn out to be first of the block
-  private predicate idOf(AstNode x, int y) { idOfDbAstNode(Synth::toRawAstNode(x), y) }
+  private predicate idOf(AstNode x, int y) { idOfDbAstNode(Synth::convertAstNodeToRaw(x), y) }
 
   private AstNode projectToAst(ControlFlowElement n) {
     result = n.asAstNode()

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

@@ -7,7 +7,10 @@ import codeql.swift.elements.decl.ParamDecl
 
 class CallableBase extends Synth::TCallable, Element {
   ParamDecl getImmediateParam(int index) {
-    result = Synth::fromRawParamDecl(Synth::toRawCallable(this).(Raw::Callable).getParam(index))
+    result =
+      Synth::convertParamDeclFromRaw(Synth::convertCallableToRaw(this)
+            .(Raw::Callable)
+            .getParam(index))
   }
 
   final ParamDecl getParam(int index) { result = getImmediateParam(index).resolve() }
@@ -17,7 +20,8 @@ class CallableBase extends Synth::TCallable, Element {
   final int getNumberOfParams() { result = count(getAParam()) }
 
   BraceStmt getImmediateBody() {
-    result = Synth::fromRawBraceStmt(Synth::toRawCallable(this).(Raw::Callable).getBody())
+    result =
+      Synth::convertBraceStmtFromRaw(Synth::convertCallableToRaw(this).(Raw::Callable).getBody())
   }
 
   final BraceStmt getBody() { result = getImmediateBody().resolve() }

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

@@ -6,5 +6,5 @@ import codeql.swift.elements.Locatable
 class CommentBase extends Synth::TComment, Locatable {
   override string getAPrimaryQlClass() { result = "Comment" }
 
-  string getText() { result = Synth::toRawComment(this).(Raw::Comment).getText() }
+  string getText() { result = Synth::convertCommentToRaw(this).(Raw::Comment).getText() }
 }

swift/ql/lib/codeql/swift/generated/Element.qll

@@ -17,5 +17,5 @@ class ElementBase extends Synth::TElement {
     result = getResolveStep().resolve()
   }
 
-  predicate isUnknown() { Synth::toRawElement(this).isUnknown() }
+  predicate isUnknown() { Synth::convertElementToRaw(this).isUnknown() }
 }

swift/ql/lib/codeql/swift/generated/File.qll

@@ -4,5 +4,5 @@ private import codeql.swift.generated.Raw
 import codeql.swift.elements.Element
 
 class FileBase extends Synth::TFile, Element {
-  string getName() { result = Synth::toRawFile(this).(Raw::File).getName() }
+  string getName() { result = Synth::convertFileToRaw(this).(Raw::File).getName() }
 }

swift/ql/lib/codeql/swift/generated/Locatable.qll

@@ -6,7 +6,10 @@ import codeql.swift.elements.Location
 
 class LocatableBase extends Synth::TLocatable, Element {
   Location getImmediateLocation() {
-    result = Synth::fromRawLocation(Synth::toRawLocatable(this).(Raw::Locatable).getLocation())
+    result =
+      Synth::convertLocationFromRaw(Synth::convertLocatableToRaw(this)
+            .(Raw::Locatable)
+            .getLocation())
   }
 
   final Location getLocation() { result = getImmediateLocation().resolve() }

swift/ql/lib/codeql/swift/generated/Location.qll

@@ -6,16 +6,18 @@ import codeql.swift.elements.File
 
 class LocationBase extends Synth::TLocation, Element {
   File getImmediateFile() {
-    result = Synth::fromRawFile(Synth::toRawLocation(this).(Raw::Location).getFile())
+    result = Synth::convertFileFromRaw(Synth::convertLocationToRaw(this).(Raw::Location).getFile())
   }
 
   final File getFile() { result = getImmediateFile().resolve() }
 
-  int getStartLine() { result = Synth::toRawLocation(this).(Raw::Location).getStartLine() }
+  int getStartLine() { result = Synth::convertLocationToRaw(this).(Raw::Location).getStartLine() }
 
-  int getStartColumn() { result = Synth::toRawLocation(this).(Raw::Location).getStartColumn() }
+  int getStartColumn() {
+    result = Synth::convertLocationToRaw(this).(Raw::Location).getStartColumn()
+  }
 
-  int getEndLine() { result = Synth::toRawLocation(this).(Raw::Location).getEndLine() }
+  int getEndLine() { result = Synth::convertLocationToRaw(this).(Raw::Location).getEndLine() }
 
-  int getEndColumn() { result = Synth::toRawLocation(this).(Raw::Location).getEndColumn() }
+  int getEndColumn() { result = Synth::convertLocationToRaw(this).(Raw::Location).getEndColumn() }
 }