Merge pull request #7390 from hvitved/ruby/deprecate-pattern-classes

Ruby: Deprecate `Pattern` classes

ruby/ql/test/library-tests/ast/Ast.expected

@@ -559,7 +559,7 @@ calls/calls.rb:
 #  315|       getArgument: [IntegerLiteral] 0
 #  315|     getAnOperand/getRightOperand: [IntegerLiteral] 10
 #  316|   getStmt: [AssignExpr] ... = ...
-#  316|     getLeftOperand: [TuplePattern] (..., ...)
+#  316|     getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #  316|       getElement: [MethodCall] call to foo
 #  316|         getReceiver: [Self, SelfVariableAccess] self
 #  316|       getElement: [MethodCall] call to bar
@@ -574,7 +574,7 @@ calls/calls.rb:
 #  316|       getElement: [IntegerLiteral] 3
 #  316|       getElement: [IntegerLiteral] 4
 #  317|   getStmt: [AssignExpr] ... = ...
-#  317|     getLeftOperand: [TuplePattern] (..., ...)
+#  317|     getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #  317|       getElement: [LocalVariableAccess] a
 #  317|       getElement: [ElementReference] ...[...]
 #  317|         getReceiver: [MethodCall] call to foo
@@ -654,7 +654,7 @@ calls/calls.rb:
 #  336|       getArgument: [LocalVariableAccess] b
 #  336|       getArgument: [ForwardedArguments] ...
 #  340|   getStmt: [ForExpr] for ... in ...
-#  340|     getPattern: [TuplePattern] (..., ...)
+#  340|     getPattern: [DestructuredLhsExpr] (..., ...)
 #  340|       getElement: [LocalVariableAccess] x
 #  340|       getElement: [LocalVariableAccess] y
 #  340|       getElement: [LocalVariableAccess] z
@@ -1845,7 +1845,7 @@ control/loops.rb:
 #   18|         getAnOperand/getLeftOperand: [LocalVariableAccess] foo
 #   18|         getAnOperand/getRightOperand: [LocalVariableAccess] n
 #   22|   getStmt: [ForExpr] for ... in ...
-#   22|     getPattern: [TuplePattern] (..., ...)
+#   22|     getPattern: [DestructuredLhsExpr] (..., ...)
 #   22|       getElement: [LocalVariableAccess] key
 #   22|       getElement: [LocalVariableAccess] value
 #   22|     getValue: [HashLiteral] {...}
@@ -1863,7 +1863,7 @@ control/loops.rb:
 #   24|         getAnOperand/getLeftOperand: [LocalVariableAccess] foo
 #   24|         getAnOperand/getRightOperand: [LocalVariableAccess] value
 #   28|   getStmt: [ForExpr] for ... in ...
-#   28|     getPattern: [TuplePattern] (..., ...)
+#   28|     getPattern: [DestructuredLhsExpr] (..., ...)
 #   28|       getElement: [LocalVariableAccess] key
 #   28|       getElement: [LocalVariableAccess] value
 #   28|     getValue: [HashLiteral] {...}
@@ -2367,7 +2367,7 @@ params/params.rb:
 #   14|         getAnOperand/getLeftOperand/getReceiver: [LocalVariableAccess] foo
 #   14|         getAnOperand/getArgument/getRightOperand: [LocalVariableAccess] bar
 #   17|   getStmt: [Method] destructured_method_param
-#   17|     getParameter: [TuplePatternParameter] (..., ...)
+#   17|     getParameter: [DestructuredParameter] (..., ...)
 #   17|       getElement: [LocalVariableAccess] a
 #   17|       getElement: [LocalVariableAccess] b
 #   17|       getElement: [LocalVariableAccess] c
@@ -2377,7 +2377,7 @@ params/params.rb:
 #   22|   getStmt: [MethodCall] call to each
 #   22|     getReceiver: [LocalVariableAccess] array
 #   22|     getBlock: [BraceBlock] { ... }
-#   22|       getParameter: [TuplePatternParameter] (..., ...)
+#   22|       getParameter: [DestructuredParameter] (..., ...)
 #   22|         getElement: [LocalVariableAccess] a
 #   22|         getElement: [LocalVariableAccess] b
 #   22|       getStmt: [MethodCall] call to puts
@@ -2388,10 +2388,10 @@ params/params.rb:
 #   25|   getStmt: [AssignExpr] ... = ...
 #   25|     getAnOperand/getLeftOperand: [LocalVariableAccess] sum_four_values
 #   25|     getAnOperand/getRightOperand: [Lambda] -> { ... }
-#   25|       getParameter: [TuplePatternParameter] (..., ...)
+#   25|       getParameter: [DestructuredParameter] (..., ...)
 #   25|         getElement: [LocalVariableAccess] first
 #   25|         getElement: [LocalVariableAccess] second
-#   25|       getParameter: [TuplePatternParameter] (..., ...)
+#   25|       getParameter: [DestructuredParameter] (..., ...)
 #   25|         getElement: [LocalVariableAccess] third
 #   25|         getElement: [LocalVariableAccess] fourth
 #   26|       getStmt: [AddExpr] ... + ...

ruby/ql/test/library-tests/ast/AstDesugar.expected

@@ -245,7 +245,7 @@ calls/calls.rb:
 #  340|             getAnOperand/getRightOperand: [MethodCall] call to []
 #  340|               getArgument: [IntegerLiteral] 2
 #  340|               getReceiver: [LocalVariableAccess] __synth__0__1
-#  340|         getLeftOperand: [TuplePattern] (..., ...)
+#  340|         getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #  341|       getStmt: [MethodCall] call to foo
 #  341|         getReceiver: [Self, SelfVariableAccess] self
 #  341|         getArgument: [LocalVariableAccess] x
@@ -477,7 +477,7 @@ control/loops.rb:
 #   22|             getAnOperand/getRightOperand: [MethodCall] call to []
 #   22|               getArgument: [IntegerLiteral] 1
 #   22|               getReceiver: [LocalVariableAccess] __synth__0__1
-#   22|         getLeftOperand: [TuplePattern] (..., ...)
+#   22|         getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #   23|       getStmt: [AssignAddExpr] ... += ...
 #   23|         getDesugared: [AssignExpr] ... = ...
 #   23|           getAnOperand/getLeftOperand: [LocalVariableAccess] sum
@@ -518,7 +518,7 @@ control/loops.rb:
 #   28|             getAnOperand/getRightOperand: [MethodCall] call to []
 #   28|               getArgument: [IntegerLiteral] 1
 #   28|               getReceiver: [LocalVariableAccess] __synth__0__1
-#   28|         getLeftOperand: [TuplePattern] (..., ...)
+#   28|         getAnOperand/getLeftOperand: [DestructuredLhsExpr] (..., ...)
 #   29|       getStmt: [AssignAddExpr] ... += ...
 #   29|         getDesugared: [AssignExpr] ... = ...
 #   29|           getAnOperand/getLeftOperand: [LocalVariableAccess] sum

ruby/ql/test/library-tests/ast/control/Loop.ql

@@ -13,13 +13,13 @@ query predicate conditionalLoops(
   cond = l.getCondition()
 }
 
-query predicate forExprs(ForExpr f, Pattern p, StmtSequence body, int i, Stmt bodyChild) {
+query predicate forExprs(ForExpr f, LhsExpr p, StmtSequence body, int i, Stmt bodyChild) {
   p = f.getPattern() and
   body = f.getBody() and
   bodyChild = body.getStmt(i)
 }
 
-query predicate forExprsTuplePatterns(ForExpr f, TuplePattern tp, int i, Pattern cp) {
+query predicate forExprsTuplePatterns(ForExpr f, DestructuredLhsExpr tp, int i, Expr cp) {
   tp = f.getPattern() and
   cp = tp.getElement(i)
 }

ruby/ql/test/library-tests/ast/params/params.expected

@@ -73,7 +73,7 @@ paramsInMethods
 | params.rb:4:1:5:3 | identifier_method_params | 0 | params.rb:4:30:4:32 | foo | SimpleParameter |
 | params.rb:4:1:5:3 | identifier_method_params | 1 | params.rb:4:35:4:37 | bar | SimpleParameter |
 | params.rb:4:1:5:3 | identifier_method_params | 2 | params.rb:4:40:4:42 | baz | SimpleParameter |
-| params.rb:17:1:18:3 | destructured_method_param | 0 | params.rb:17:31:17:39 | (..., ...) | TuplePatternParameter |
+| params.rb:17:1:18:3 | destructured_method_param | 0 | params.rb:17:31:17:39 | (..., ...) | DestructuredParameter |
 | params.rb:30:1:31:3 | method_with_splat | 0 | params.rb:30:23:30:28 | wibble | SimpleParameter |
 | params.rb:30:1:31:3 | method_with_splat | 1 | params.rb:30:31:30:36 | *splat | SplatParameter |
 | params.rb:30:1:31:3 | method_with_splat | 2 | params.rb:30:39:30:52 | **double_splat | HashSplatParameter |
@@ -90,7 +90,7 @@ paramsInMethods
 paramsInBlocks
 | params.rb:9:11:11:3 | do ... end | 0 | params.rb:9:15:9:17 | key | SimpleParameter |
 | params.rb:9:11:11:3 | do ... end | 1 | params.rb:9:20:9:24 | value | SimpleParameter |
-| params.rb:22:12:22:32 | { ... } | 0 | params.rb:22:15:22:20 | (..., ...) | TuplePatternParameter |
+| params.rb:22:12:22:32 | { ... } | 0 | params.rb:22:15:22:20 | (..., ...) | DestructuredParameter |
 | params.rb:34:12:35:3 | do ... end | 0 | params.rb:34:16:34:18 | val | SimpleParameter |
 | params.rb:34:12:35:3 | do ... end | 1 | params.rb:34:21:34:26 | *splat | SplatParameter |
 | params.rb:34:12:35:3 | do ... end | 2 | params.rb:34:29:34:42 | **double_splat | HashSplatParameter |
@@ -103,8 +103,8 @@ paramsInBlocks
 paramsInLambdas
 | params.rb:14:7:14:33 | -> { ... } | 0 | params.rb:14:11:14:13 | foo | SimpleParameter |
 | params.rb:14:7:14:33 | -> { ... } | 1 | params.rb:14:16:14:18 | bar | SimpleParameter |
-| params.rb:25:19:27:1 | -> { ... } | 0 | params.rb:25:23:25:37 | (..., ...) | TuplePatternParameter |
-| params.rb:25:19:27:1 | -> { ... } | 1 | params.rb:25:40:25:54 | (..., ...) | TuplePatternParameter |
+| params.rb:25:19:27:1 | -> { ... } | 0 | params.rb:25:23:25:37 | (..., ...) | DestructuredParameter |
+| params.rb:25:19:27:1 | -> { ... } | 1 | params.rb:25:40:25:54 | (..., ...) | DestructuredParameter |
 | params.rb:38:22:38:47 | -> { ... } | 0 | params.rb:38:26:38:26 | x | SimpleParameter |
 | params.rb:38:22:38:47 | -> { ... } | 1 | params.rb:38:29:38:33 | *blah | SplatParameter |
 | params.rb:38:22:38:47 | -> { ... } | 2 | params.rb:38:36:38:43 | **wibble | HashSplatParameter |
@@ -122,10 +122,10 @@ params
 | params.rb:9:20:9:24 | value | 1 | SimpleParameter |
 | params.rb:14:11:14:13 | foo | 0 | SimpleParameter |
 | params.rb:14:16:14:18 | bar | 1 | SimpleParameter |
-| params.rb:17:31:17:39 | (..., ...) | 0 | TuplePatternParameter |
-| params.rb:22:15:22:20 | (..., ...) | 0 | TuplePatternParameter |
-| params.rb:25:23:25:37 | (..., ...) | 0 | TuplePatternParameter |
-| params.rb:25:40:25:54 | (..., ...) | 1 | TuplePatternParameter |
+| params.rb:17:31:17:39 | (..., ...) | 0 | DestructuredParameter |
+| params.rb:22:15:22:20 | (..., ...) | 0 | DestructuredParameter |
+| params.rb:25:23:25:37 | (..., ...) | 0 | DestructuredParameter |
+| params.rb:25:40:25:54 | (..., ...) | 1 | DestructuredParameter |
 | params.rb:30:23:30:28 | wibble | 0 | SimpleParameter |
 | params.rb:30:31:30:36 | *splat | 1 | SplatParameter |
 | params.rb:30:39:30:52 | **double_splat | 2 | HashSplatParameter |

ruby/ql/test/library-tests/ast/params/params.ql

@@ -6,7 +6,7 @@ query predicate idParams(NamedParameter np, string name) { name = np.getName() }
 
 query predicate blockParams(BlockParameter bp, string name) { name = bp.getName() }
 
-query predicate patternParams(TuplePatternParameter tpp, Pattern child, int childIndex) {
+query predicate patternParams(DestructuredParameter tpp, AstNode child, int childIndex) {
   tpp.getElement(childIndex) = child
 }
 

ruby/ql/test/library-tests/controlflow/graph/Cfg.expected

@@ -1941,12 +1941,12 @@ cfg.rb:
 #   62| call to []
 #-----|  -> * ...
 
-#   62| ...
-#-----|  -> ...
-
 #   62| 1
 #-----|  -> call to []
 
+#   62| ...
+#-----|  -> ...
+
 #   62| __synth__0
 #-----|  -> 1
 
@@ -3626,12 +3626,12 @@ desugar.rb:
 #   22| call to []
 #-----|  -> ... = ...
 
-#   22| ...
-#-----|  -> ...
-
 #   22| -1
 #-----|  -> call to []
 
+#   22| ...
+#-----|  -> ...
+
 #   22| __synth__0
 #-----|  -> -1
 
@@ -3706,12 +3706,12 @@ desugar.rb:
 #   26| call to []
 #-----|  -> * ...
 
-#   26| ...
-#-----|  -> ...
-
 #   26| 1
 #-----|  -> call to []
 
+#   26| ...
+#-----|  -> ...
+
 #   26| __synth__0
 #-----|  -> 1
 

ruby/ql/test/library-tests/variables/parameter.expected

@@ -23,6 +23,11 @@ parameterVariable
 | parameters.rb:49:12:49:16 | (..., ...) | parameters.rb:49:13:49:13 | a |
 | parameters.rb:49:12:49:16 | (..., ...) | parameters.rb:49:15:49:15 | b |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y |
+| parameters.rb:59:19:59:27 | (..., ...) | parameters.rb:59:20:59:20 | a |
+| parameters.rb:59:19:59:27 | (..., ...) | parameters.rb:59:23:59:23 | b |
+| parameters.rb:59:19:59:27 | (..., ...) | parameters.rb:59:25:59:25 | c |
+| parameters.rb:59:22:59:26 | (..., ...) | parameters.rb:59:23:59:23 | b |
+| parameters.rb:59:22:59:26 | (..., ...) | parameters.rb:59:25:59:25 | c |
 | scopes.rb:2:14:2:14 | x | scopes.rb:2:14:2:14 | x |
 | scopes.rb:9:14:9:14 | x | scopes.rb:9:14:9:14 | x |
 | ssa.rb:1:7:1:7 | b | ssa.rb:1:7:1:7 | b |

ruby/ql/test/library-tests/variables/parameters.rb

@@ -56,3 +56,7 @@ x = 10
    puts y
 end
 
+def tuples_nested((a,(b,c)))
+  puts "#{a} #{b} #{c}"
+end
+

ruby/ql/test/library-tests/variables/ssa.expected

@@ -29,7 +29,7 @@ definition
 | nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self |
 | nested_scopes.rb:31:11:31:16 | ... = ... | nested_scopes.rb:31:11:31:11 | a |
 | nested_scopes.rb:40:1:40:18 | ... = ... | nested_scopes.rb:40:1:40:1 | d |
-| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:58:1 | self |
+| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self |
 | parameters.rb:1:14:1:14 | x | parameters.rb:1:14:1:14 | x |
 | parameters.rb:2:4:2:8 | ... = ... | parameters.rb:1:18:1:18 | y |
 | parameters.rb:7:1:13:3 | self (order_pizza) | parameters.rb:7:1:13:3 | self |
@@ -63,11 +63,15 @@ definition
 | parameters.rb:49:13:49:13 | a | parameters.rb:49:13:49:13 | a |
 | parameters.rb:49:15:49:15 | b | parameters.rb:49:15:49:15 | b |
 | parameters.rb:53:1:53:6 | ... = ... | parameters.rb:53:1:53:1 | x |
-| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:58:1 | self |
+| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:62:1 | self |
 | parameters.rb:54:9:57:3 | <captured> | parameters.rb:53:1:53:1 | x |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y |
 | parameters.rb:54:19:54:23 | ... = ... | parameters.rb:53:1:53:1 | x |
 | parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x |
+| parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self |
+| parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a |
+| parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b |
+| parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c |
 | scopes.rb:1:1:1:15 | self (scopes.rb) | scopes.rb:1:1:49:4 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self |
 | scopes.rb:4:4:4:8 | ... = ... | scopes.rb:4:4:4:4 | a |
@@ -180,8 +184,8 @@ read
 | nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
 | nested_scopes.rb:31:11:31:16 | ... = ... | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:32:16:32:16 | a |
 | nested_scopes.rb:40:1:40:18 | ... = ... | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:41:1:41:1 | d |
-| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:3:4:3:9 | self |
-| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:4:4:4:9 | self |
+| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:3:4:3:9 | self |
+| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:4:4:4:9 | self |
 | parameters.rb:1:14:1:14 | x | parameters.rb:1:14:1:14 | x | parameters.rb:3:9:3:9 | x |
 | parameters.rb:2:4:2:8 | ... = ... | parameters.rb:1:18:1:18 | y | parameters.rb:4:9:4:9 | y |
 | parameters.rb:7:1:13:3 | self (order_pizza) | parameters.rb:7:1:13:3 | self | parameters.rb:9:5:9:33 | self |
@@ -215,10 +219,14 @@ read
 | parameters.rb:49:1:51:3 | self (tuples) | parameters.rb:49:1:51:3 | self | parameters.rb:50:3:50:18 | self |
 | parameters.rb:49:13:49:13 | a | parameters.rb:49:13:49:13 | a | parameters.rb:50:11:50:11 | a |
 | parameters.rb:49:15:49:15 | b | parameters.rb:49:15:49:15 | b | parameters.rb:50:16:50:16 | b |
-| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:55:4:55:9 | self |
-| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:56:4:56:9 | self |
+| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:55:4:55:9 | self |
+| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:56:4:56:9 | self |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y | parameters.rb:56:9:56:9 | y |
 | parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
+| parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self | parameters.rb:60:3:60:23 | self |
+| parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
+| parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
+| parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c | parameters.rb:60:21:60:21 | c |
 | scopes.rb:1:1:1:15 | self (scopes.rb) | scopes.rb:1:1:49:4 | self | scopes.rb:8:1:8:6 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:3:4:3:9 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:3:9:3:9 | self |
@@ -339,7 +347,7 @@ firstRead
 | nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
 | nested_scopes.rb:31:11:31:16 | ... = ... | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:32:16:32:16 | a |
 | nested_scopes.rb:40:1:40:18 | ... = ... | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:41:1:41:1 | d |
-| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:3:4:3:9 | self |
+| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:3:4:3:9 | self |
 | parameters.rb:1:14:1:14 | x | parameters.rb:1:14:1:14 | x | parameters.rb:3:9:3:9 | x |
 | parameters.rb:2:4:2:8 | ... = ... | parameters.rb:1:18:1:18 | y | parameters.rb:4:9:4:9 | y |
 | parameters.rb:7:1:13:3 | self (order_pizza) | parameters.rb:7:1:13:3 | self | parameters.rb:9:5:9:33 | self |
@@ -371,9 +379,13 @@ firstRead
 | parameters.rb:49:1:51:3 | self (tuples) | parameters.rb:49:1:51:3 | self | parameters.rb:50:3:50:18 | self |
 | parameters.rb:49:13:49:13 | a | parameters.rb:49:13:49:13 | a | parameters.rb:50:11:50:11 | a |
 | parameters.rb:49:15:49:15 | b | parameters.rb:49:15:49:15 | b | parameters.rb:50:16:50:16 | b |
-| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:55:4:55:9 | self |
+| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:55:4:55:9 | self |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y | parameters.rb:56:9:56:9 | y |
 | parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
+| parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self | parameters.rb:60:3:60:23 | self |
+| parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
+| parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
+| parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c | parameters.rb:60:21:60:21 | c |
 | scopes.rb:1:1:1:15 | self (scopes.rb) | scopes.rb:1:1:49:4 | self | scopes.rb:8:1:8:6 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:3:4:3:9 | self |
 | scopes.rb:4:4:4:8 | ... = ... | scopes.rb:4:4:4:4 | a | scopes.rb:5:9:5:9 | a |
@@ -464,7 +476,7 @@ lastRead
 | nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:32:11:32:16 | self |
 | nested_scopes.rb:31:11:31:16 | ... = ... | nested_scopes.rb:31:11:31:11 | a | nested_scopes.rb:32:16:32:16 | a |
 | nested_scopes.rb:40:1:40:18 | ... = ... | nested_scopes.rb:40:1:40:1 | d | nested_scopes.rb:41:1:41:1 | d |
-| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:4:4:4:9 | self |
+| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:4:4:4:9 | self |
 | parameters.rb:1:14:1:14 | x | parameters.rb:1:14:1:14 | x | parameters.rb:3:9:3:9 | x |
 | parameters.rb:2:4:2:8 | ... = ... | parameters.rb:1:18:1:18 | y | parameters.rb:4:9:4:9 | y |
 | parameters.rb:7:1:13:3 | self (order_pizza) | parameters.rb:7:1:13:3 | self | parameters.rb:9:5:9:33 | self |
@@ -496,9 +508,13 @@ lastRead
 | parameters.rb:49:1:51:3 | self (tuples) | parameters.rb:49:1:51:3 | self | parameters.rb:50:3:50:18 | self |
 | parameters.rb:49:13:49:13 | a | parameters.rb:49:13:49:13 | a | parameters.rb:50:11:50:11 | a |
 | parameters.rb:49:15:49:15 | b | parameters.rb:49:15:49:15 | b | parameters.rb:50:16:50:16 | b |
-| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:56:4:56:9 | self |
+| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:56:4:56:9 | self |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y | parameters.rb:56:9:56:9 | y |
 | parameters.rb:55:4:55:9 | phi | parameters.rb:53:1:53:1 | x | parameters.rb:55:9:55:9 | x |
+| parameters.rb:59:1:61:3 | self (tuples_nested) | parameters.rb:59:1:61:3 | self | parameters.rb:60:3:60:23 | self |
+| parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:60:11:60:11 | a |
+| parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:60:16:60:16 | b |
+| parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c | parameters.rb:60:21:60:21 | c |
 | scopes.rb:1:1:1:15 | self (scopes.rb) | scopes.rb:1:1:49:4 | self | scopes.rb:8:1:8:6 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:5:4:5:9 | self |
 | scopes.rb:4:4:4:8 | ... = ... | scopes.rb:4:4:4:4 | a | scopes.rb:5:9:5:9 | a |
@@ -568,11 +584,11 @@ adjacentReads
 | nested_scopes.rb:13:11:13:15 | ... = ... | nested_scopes.rb:13:11:13:11 | a | nested_scopes.rb:14:16:14:16 | a | nested_scopes.rb:15:11:15:11 | a |
 | nested_scopes.rb:27:7:29:9 | self (show) | nested_scopes.rb:27:7:29:9 | self | nested_scopes.rb:28:11:28:16 | self | nested_scopes.rb:28:16:28:16 | self |
 | nested_scopes.rb:30:16:30:19 | self (class << ...) | nested_scopes.rb:30:7:33:9 | self | nested_scopes.rb:30:16:30:19 | self | nested_scopes.rb:32:11:32:16 | self |
-| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:3:4:3:9 | self | parameters.rb:4:4:4:9 | self |
+| parameters.rb:1:9:5:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:3:4:3:9 | self | parameters.rb:4:4:4:9 | self |
 | parameters.rb:7:26:7:31 | pizzas | parameters.rb:7:26:7:31 | pizzas | parameters.rb:8:6:8:11 | pizzas | parameters.rb:11:14:11:19 | pizzas |
 | parameters.rb:25:1:28:3 | self (opt_param) | parameters.rb:25:1:28:3 | self | parameters.rb:26:3:26:11 | self | parameters.rb:27:3:27:11 | self |
 | parameters.rb:25:15:25:18 | name | parameters.rb:25:15:25:18 | name | parameters.rb:25:40:25:43 | name | parameters.rb:26:8:26:11 | name |
-| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:58:1 | self | parameters.rb:55:4:55:9 | self | parameters.rb:56:4:56:9 | self |
+| parameters.rb:54:9:57:3 | <captured> | parameters.rb:1:1:62:1 | self | parameters.rb:55:4:55:9 | self | parameters.rb:56:4:56:9 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:3:4:3:9 | self | scopes.rb:3:9:3:9 | self |
 | scopes.rb:2:9:6:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:3:9:3:9 | self | scopes.rb:5:4:5:9 | self |
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:1:1:49:4 | self | scopes.rb:10:4:10:9 | self | scopes.rb:12:4:12:9 | self |

ruby/ql/test/library-tests/variables/varaccess.expected

@@ -73,9 +73,9 @@ variableAccess
 | parameters.rb:1:14:1:14 | x | parameters.rb:1:14:1:14 | x | parameters.rb:1:9:5:3 | do ... end |
 | parameters.rb:1:18:1:18 | y | parameters.rb:1:18:1:18 | y | parameters.rb:1:9:5:3 | do ... end |
 | parameters.rb:2:4:2:4 | y | parameters.rb:1:18:1:18 | y | parameters.rb:1:9:5:3 | do ... end |
-| parameters.rb:3:4:3:9 | self | parameters.rb:1:1:58:1 | self | parameters.rb:1:1:58:1 | parameters.rb |
+| parameters.rb:3:4:3:9 | self | parameters.rb:1:1:62:1 | self | parameters.rb:1:1:62:1 | parameters.rb |
 | parameters.rb:3:9:3:9 | x | parameters.rb:1:14:1:14 | x | parameters.rb:1:9:5:3 | do ... end |
-| parameters.rb:4:4:4:9 | self | parameters.rb:1:1:58:1 | self | parameters.rb:1:1:58:1 | parameters.rb |
+| parameters.rb:4:4:4:9 | self | parameters.rb:1:1:62:1 | self | parameters.rb:1:1:62:1 | parameters.rb |
 | parameters.rb:4:9:4:9 | y | parameters.rb:1:18:1:18 | y | parameters.rb:1:9:5:3 | do ... end |
 | parameters.rb:7:17:7:22 | client | parameters.rb:7:17:7:22 | client | parameters.rb:7:1:13:3 | order_pizza |
 | parameters.rb:7:26:7:31 | pizzas | parameters.rb:7:26:7:31 | pizzas | parameters.rb:7:1:13:3 | order_pizza |
@@ -108,7 +108,7 @@ variableAccess
 | parameters.rb:31:11:31:15 | first | parameters.rb:30:15:30:19 | first | parameters.rb:30:1:32:3 | key_param |
 | parameters.rb:31:20:31:25 | middle | parameters.rb:30:24:30:29 | middle | parameters.rb:30:1:32:3 | key_param |
 | parameters.rb:31:30:31:33 | last | parameters.rb:30:36:30:39 | last | parameters.rb:30:1:32:3 | key_param |
-| parameters.rb:34:1:34:1 | b | parameters.rb:34:1:34:1 | b | parameters.rb:1:1:58:1 | parameters.rb |
+| parameters.rb:34:1:34:1 | b | parameters.rb:34:1:34:1 | b | parameters.rb:1:1:62:1 | parameters.rb |
 | parameters.rb:35:11:35:11 | a | parameters.rb:35:11:35:11 | a | parameters.rb:35:1:38:3 | multi |
 | parameters.rb:35:16:35:16 | b | parameters.rb:35:16:35:16 | b | parameters.rb:35:1:38:3 | multi |
 | parameters.rb:37:3:37:18 | self | parameters.rb:35:1:38:3 | self | parameters.rb:35:1:38:3 | multi |
@@ -127,13 +127,20 @@ variableAccess
 | parameters.rb:50:3:50:18 | self | parameters.rb:49:1:51:3 | self | parameters.rb:49:1:51:3 | tuples |
 | parameters.rb:50:11:50:11 | a | parameters.rb:49:13:49:13 | a | parameters.rb:49:1:51:3 | tuples |
 | parameters.rb:50:16:50:16 | b | parameters.rb:49:15:49:15 | b | parameters.rb:49:1:51:3 | tuples |
-| parameters.rb:53:1:53:1 | x | parameters.rb:53:1:53:1 | x | parameters.rb:1:1:58:1 | parameters.rb |
+| parameters.rb:53:1:53:1 | x | parameters.rb:53:1:53:1 | x | parameters.rb:1:1:62:1 | parameters.rb |
 | parameters.rb:54:14:54:14 | y | parameters.rb:54:14:54:14 | y | parameters.rb:54:9:57:3 | do ... end |
-| parameters.rb:54:19:54:19 | x | parameters.rb:53:1:53:1 | x | parameters.rb:1:1:58:1 | parameters.rb |
-| parameters.rb:55:4:55:9 | self | parameters.rb:1:1:58:1 | self | parameters.rb:1:1:58:1 | parameters.rb |
-| parameters.rb:55:9:55:9 | x | parameters.rb:53:1:53:1 | x | parameters.rb:1:1:58:1 | parameters.rb |
-| parameters.rb:56:4:56:9 | self | parameters.rb:1:1:58:1 | self | parameters.rb:1:1:58:1 | parameters.rb |
+| parameters.rb:54:19:54:19 | x | parameters.rb:53:1:53:1 | x | parameters.rb:1:1:62:1 | parameters.rb |
+| parameters.rb:55:4:55:9 | self | parameters.rb:1:1:62:1 | self | parameters.rb:1:1:62:1 | parameters.rb |
+| parameters.rb:55:9:55:9 | x | parameters.rb:53:1:53:1 | x | parameters.rb:1:1:62:1 | parameters.rb |
+| parameters.rb:56:4:56:9 | self | parameters.rb:1:1:62:1 | self | parameters.rb:1:1:62:1 | parameters.rb |
 | parameters.rb:56:9:56:9 | y | parameters.rb:54:14:54:14 | y | parameters.rb:54:9:57:3 | do ... end |
+| parameters.rb:59:20:59:20 | a | parameters.rb:59:20:59:20 | a | parameters.rb:59:1:61:3 | tuples_nested |
+| parameters.rb:59:23:59:23 | b | parameters.rb:59:23:59:23 | b | parameters.rb:59:1:61:3 | tuples_nested |
+| parameters.rb:59:25:59:25 | c | parameters.rb:59:25:59:25 | c | parameters.rb:59:1:61:3 | tuples_nested |
+| parameters.rb:60:3:60:23 | self | parameters.rb:59:1:61:3 | self | parameters.rb:59:1:61:3 | tuples_nested |
+| parameters.rb:60:11:60:11 | a | parameters.rb:59:20:59:20 | a | parameters.rb:59:1:61:3 | tuples_nested |
+| parameters.rb:60:16:60:16 | b | parameters.rb:59:23:59:23 | b | parameters.rb:59:1:61:3 | tuples_nested |
+| parameters.rb:60:21:60:21 | c | parameters.rb:59:25:59:25 | c | parameters.rb:59:1:61:3 | tuples_nested |
 | scopes.rb:2:14:2:14 | x | scopes.rb:2:14:2:14 | x | scopes.rb:2:9:6:3 | do ... end |
 | scopes.rb:3:4:3:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
 | scopes.rb:3:9:3:9 | self | scopes.rb:1:1:49:4 | self | scopes.rb:1:1:49:4 | scopes.rb |
@@ -354,6 +361,9 @@ implicitWrite
 | parameters.rb:49:13:49:13 | a |
 | parameters.rb:49:15:49:15 | b |
 | parameters.rb:54:14:54:14 | y |
+| parameters.rb:59:20:59:20 | a |
+| parameters.rb:59:23:59:23 | b |
+| parameters.rb:59:25:59:25 | c |
 | scopes.rb:2:14:2:14 | x |
 | scopes.rb:9:14:9:14 | x |
 | ssa.rb:1:7:1:7 | b |
@@ -452,6 +462,10 @@ readAccess
 | parameters.rb:55:9:55:9 | x |
 | parameters.rb:56:4:56:9 | self |
 | parameters.rb:56:9:56:9 | y |
+| parameters.rb:60:3:60:23 | self |
+| parameters.rb:60:11:60:11 | a |
+| parameters.rb:60:16:60:16 | b |
+| parameters.rb:60:21:60:21 | c |
 | scopes.rb:3:4:3:9 | self |
 | scopes.rb:3:9:3:9 | self |
 | scopes.rb:5:4:5:9 | self |

ruby/ql/test/library-tests/variables/variable.expected

@@ -56,7 +56,7 @@
 | nested_scopes.rb:30:7:33:9 | self |
 | nested_scopes.rb:31:11:31:11 | a |
 | nested_scopes.rb:40:1:40:1 | d |
-| parameters.rb:1:1:58:1 | self |
+| parameters.rb:1:1:62:1 | self |
 | parameters.rb:1:14:1:14 | x |
 | parameters.rb:1:18:1:18 | y |
 | parameters.rb:7:1:13:3 | self |
@@ -89,6 +89,10 @@
 | parameters.rb:49:15:49:15 | b |
 | parameters.rb:53:1:53:1 | x |
 | parameters.rb:54:14:54:14 | y |
+| parameters.rb:59:1:61:3 | self |
+| parameters.rb:59:20:59:20 | a |
+| parameters.rb:59:23:59:23 | b |
+| parameters.rb:59:25:59:25 | c |
 | scopes.rb:1:1:1:15 | self |
 | scopes.rb:1:1:49:4 | self |
 | scopes.rb:2:14:2:14 | x |

ruby/ql/test/library-tests/variables/varscopes.expected

@@ -32,7 +32,7 @@
 | nested_scopes.rb:22:9:24:11 | show_a2 |
 | nested_scopes.rb:27:7:29:9 | show |
 | nested_scopes.rb:30:7:33:9 | class << ... |
-| parameters.rb:1:1:58:1 | parameters.rb |
+| parameters.rb:1:1:62:1 | parameters.rb |
 | parameters.rb:1:9:5:3 | do ... end |
 | parameters.rb:7:1:13:3 | order_pizza |
 | parameters.rb:15:1:19:3 | print_map |
@@ -45,6 +45,7 @@
 | parameters.rb:45:1:47:3 | dup_underscore |
 | parameters.rb:49:1:51:3 | tuples |
 | parameters.rb:54:9:57:3 | do ... end |
+| parameters.rb:59:1:61:3 | tuples_nested |
 | scopes.rb:1:1:1:15 | a |
 | scopes.rb:1:1:49:4 | scopes.rb |
 | scopes.rb:2:9:6:3 | do ... end |