Swift: Fix.

Author: geoffw0

swift/ql/test/library-tests/dataflow/taint/LocalTaint.expected

@@ -123,3 +123,17 @@
 | string.swift:39:13:39:19 | ... .+(_:_:) ... | string.swift:39:13:39:29 | ... .+(_:_:) ... |
 | string.swift:39:19:39:19 | tainted | string.swift:39:13:39:19 | ... .+(_:_:) ... |
 | string.swift:39:29:39:29 | < | string.swift:39:13:39:29 | ... .+(_:_:) ... |
+| url.swift:14:29:14:29 | clean | url.swift:14:17:14:34 | call to init(string:) |
+| url.swift:15:31:15:31 | tainted | url.swift:15:19:15:38 | call to init(string:) |
+| url.swift:20:24:20:24 | clean | url.swift:20:12:20:46 | call to init(string:relativeTo:) |
+| url.swift:20:43:20:43 | nil | url.swift:20:12:20:46 | call to init(string:relativeTo:) |
+| url.swift:21:24:21:24 | tainted | url.swift:21:12:21:48 | call to init(string:relativeTo:) |
+| url.swift:21:45:21:45 | nil | url.swift:21:12:21:48 | call to init(string:relativeTo:) |
+| url.swift:22:24:22:24 | clean | url.swift:22:12:22:51 | call to init(string:relativeTo:) |
+| url.swift:22:43:22:43 | urlClean | url.swift:22:12:22:51 | call to init(string:relativeTo:) |
+| url.swift:23:24:23:24 | clean | url.swift:23:12:23:53 | call to init(string:relativeTo:) |
+| url.swift:23:43:23:43 | urlTainted | url.swift:23:12:23:53 | call to init(string:relativeTo:) |
+| url.swift:25:25:25:25 | clean | url.swift:25:13:25:30 | call to init(string:) |
+| url.swift:29:25:29:25 | tainted | url.swift:29:13:29:32 | call to init(string:) |
+| url.swift:34:26:34:26 | clean | url.swift:34:14:34:31 | call to init(string:) |
+| url.swift:38:28:38:28 | tainted | url.swift:38:16:38:35 | call to init(string:) |

swift/ql/test/library-tests/dataflow/taint/Taint.expected

@@ -12,6 +12,10 @@ edges
 | try.swift:9:17:9:24 | call to source() :  | try.swift:9:13:9:24 | try ... |
 | try.swift:15:17:15:24 | call to source() :  | try.swift:15:12:15:24 | try! ... |
 | try.swift:18:18:18:25 | call to source() :  | try.swift:18:12:18:27 | ...! |
+| url.swift:13:16:13:23 | call to source() :  | url.swift:18:12:18:12 | urlTainted |
+| url.swift:13:16:13:23 | call to source() :  | url.swift:21:12:21:49 | ...! |
+| url.swift:13:16:13:23 | call to source() :  | url.swift:23:12:23:54 | ...! |
+| url.swift:13:16:13:23 | call to source() :  | url.swift:39:12:39:12 | ...! |
 nodes
 | string.swift:5:11:5:18 | call to source() :  | semmle.label | call to source() :  |
 | string.swift:7:13:7:13 | "..." | semmle.label | "..." |
@@ -31,6 +35,11 @@ nodes
 | try.swift:15:17:15:24 | call to source() :  | semmle.label | call to source() :  |
 | try.swift:18:12:18:27 | ...! | semmle.label | ...! |
 | try.swift:18:18:18:25 | call to source() :  | semmle.label | call to source() :  |
+| url.swift:13:16:13:23 | call to source() :  | semmle.label | call to source() :  |
+| url.swift:18:12:18:12 | urlTainted | semmle.label | urlTainted |
+| url.swift:21:12:21:49 | ...! | semmle.label | ...! |
+| url.swift:23:12:23:54 | ...! | semmle.label | ...! |
+| url.swift:39:12:39:12 | ...! | semmle.label | ...! |
 subpaths
 #select
 | string.swift:7:13:7:13 | "..." | string.swift:5:11:5:18 | call to source() :  | string.swift:7:13:7:13 | "..." | result |
@@ -46,3 +55,7 @@ subpaths
 | try.swift:9:13:9:24 | try ... | try.swift:9:17:9:24 | call to source() :  | try.swift:9:13:9:24 | try ... | result |
 | try.swift:15:12:15:24 | try! ... | try.swift:15:17:15:24 | call to source() :  | try.swift:15:12:15:24 | try! ... | result |
 | try.swift:18:12:18:27 | ...! | try.swift:18:18:18:25 | call to source() :  | try.swift:18:12:18:27 | ...! | result |
+| url.swift:18:12:18:12 | urlTainted | url.swift:13:16:13:23 | call to source() :  | url.swift:18:12:18:12 | urlTainted | result |
+| url.swift:21:12:21:49 | ...! | url.swift:13:16:13:23 | call to source() :  | url.swift:21:12:21:49 | ...! | result |
+| url.swift:23:12:23:54 | ...! | url.swift:13:16:13:23 | call to source() :  | url.swift:23:12:23:54 | ...! | result |
+| url.swift:39:12:39:12 | ...! | url.swift:13:16:13:23 | call to source() :  | url.swift:39:12:39:12 | ...! | result |

swift/ql/test/library-tests/dataflow/taint/TaintInline.expected

@@ -1,4 +0,0 @@
-| url.swift:18:24:19:1 | // $ tainted=13\n | Missing result:tainted=13 |
-| url.swift:21:52:22:1 | // $ tainted=13\n | Missing result:tainted=13 |
-| url.swift:23:57:24:1 | // $ tainted=13\n | Missing result:tainted=13 |
-| url.swift:39:25:40:1 | // $ tainted=13\n | Missing result:tainted=13 |

swift/ql/test/library-tests/dataflow/taint/url.swift

@@ -1,5 +1,5 @@
 
-class URL
+struct URL
 {
 	init?(string: String) {}
 	init?(string: String, relativeTo: URL?) {}