Desugar compound assignments

2026-05-04 13:15:21 +02:00 · 2021-06-04 10:39:06 +02:00
parent da9adfbab4
commit 6678ac0347
15 changed files with 688 additions and 104 deletions
--- a/ql/test/library-tests/ast/AstDesugar.expected
+++ b/ql/test/library-tests/ast/AstDesugar.expected
@@ -31,6 +31,82 @@ calls/calls.rb:
 #  315|         getAnOperand/getRightOperand: [IntegerLiteral] 10
 #  315|       getArgument: [IntegerLiteral] 0
 #  315|     getStmt: [LocalVariableAccess] __synth__0
+#  316| [AssignExpr] ... = ...
+#  316|   getDesugared: [StmtSequence] ...
+#  316|     getStmt: [AssignExpr] ... = ...
+#  316|       getAnOperand/getLeftOperand: [MethodCall] call to foo
+#  316|       getDesugared: [StmtSequence] ...
+#  316|         getStmt: [SetterMethodCall] call to foo=
+#  316|           getReceiver: [Self] self
+#  316|           getArgument: [AssignExpr] ... = ...
+#  316|             getAnOperand/getRightOperand: [MethodCall] call to []
+#  316|               getArgument: [IntegerLiteral] 0
+#  316|               getReceiver: [LocalVariableAccess] __synth__0
+#  316|             getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
+#  316|         getStmt: [LocalVariableAccess] __synth__0
+#  316|     getStmt: [AssignExpr] ... = ...
+#  316|       getDesugared: [StmtSequence] ...
+#  316|         getStmt: [SetterMethodCall] call to bar=
+#  316|           getReceiver: [Self] self
+#  316|           getArgument: [AssignExpr] ... = ...
+#  316|             getAnOperand/getRightOperand: [MethodCall] call to []
+#  316|               getArgument: [RangeLiteral] _ .. _
+#  316|                 getBegin: [IntegerLiteral] 1
+#  316|                 getEnd: [IntegerLiteral] -2
+#  316|               getReceiver: [LocalVariableAccess] __synth__0
+#  316|             getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
+#  316|         getStmt: [LocalVariableAccess] __synth__0
+#  316|       getAnOperand/getLeftOperand: [MethodCall] call to bar
+#  316|     getStmt: [AssignExpr] ... = ...
+#  316|       getDesugared: [StmtSequence] ...
+#  316|         getStmt: [SetterMethodCall] call to []=
+#  316|           getReceiver: [MethodCall] call to foo
+#  316|             getReceiver: [Self] self
+#  316|           getArgument: [AssignExpr] ... = ...
+#  316|             getAnOperand/getRightOperand: [MethodCall] call to []
+#  316|               getArgument: [IntegerLiteral] -1
+#  316|               getReceiver: [LocalVariableAccess] __synth__0
+#  316|             getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
+#  316|           getArgument: [IntegerLiteral] 4
+#  316|         getStmt: [LocalVariableAccess] __synth__0
+#  316|       getAnOperand/getLeftOperand: [ElementReference] ...[...]
+#  316|     getStmt: [AssignExpr] ... = ...
+#  316|       getAnOperand/getRightOperand: [SplatExpr] * ...
+#  316|         getAnOperand/getOperand: [ArrayLiteral] [...]
+#  316|           getElement: [IntegerLiteral] 1
+#  316|           getElement: [IntegerLiteral] 2
+#  316|           getElement: [IntegerLiteral] 3
+#  316|           getElement: [IntegerLiteral] 4
+#  316|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
+#  317| [AssignExpr] ... = ...
+#  317|   getDesugared: [StmtSequence] ...
+#  317|     getStmt: [AssignExpr] ... = ...
+#  317|       getAnOperand/getLeftOperand: [LocalVariableAccess] a
+#  317|       getAnOperand/getRightOperand: [MethodCall] call to []
+#  317|         getArgument: [IntegerLiteral] 0
+#  317|         getReceiver: [LocalVariableAccess] __synth__0
+#  317|     getStmt: [AssignExpr] ... = ...
+#  317|       getDesugared: [StmtSequence] ...
+#  317|         getStmt: [SetterMethodCall] call to []=
+#  317|           getReceiver: [MethodCall] call to foo
+#  317|             getReceiver: [Self] self
+#  317|           getArgument: [AssignExpr] ... = ...
+#  317|             getAnOperand/getRightOperand: [MethodCall] call to []
+#  317|               getArgument: [RangeLiteral] _ .. _
+#  317|                 getBegin: [IntegerLiteral] 1
+#  317|                 getEnd: [IntegerLiteral] -1
+#  317|               getReceiver: [LocalVariableAccess] __synth__0
+#  317|             getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
+#  317|           getArgument: [IntegerLiteral] 5
+#  317|         getStmt: [LocalVariableAccess] __synth__0
+#  317|       getAnOperand/getLeftOperand: [ElementReference] ...[...]
+#  317|     getStmt: [AssignExpr] ... = ...
+#  317|       getAnOperand/getRightOperand: [SplatExpr] * ...
+#  317|         getAnOperand/getOperand: [ArrayLiteral] [...]
+#  317|           getElement: [IntegerLiteral] 1
+#  317|           getElement: [IntegerLiteral] 2
+#  317|           getElement: [IntegerLiteral] 3
+#  317|       getAnOperand/getLeftOperand: [LocalVariableAccess] __synth__0
 #  318| [AssignAddExpr] ... += ...
 #  318|   getDesugared: [StmtSequence] ...
 #  318|     getStmt: [AssignExpr] ... = ...
--- a/ql/test/library-tests/ast/calls/arguments.expected
+++ b/ql/test/library-tests/ast/calls/arguments.expected
@@ -4,6 +4,8 @@ blockArguments
 splatExpr
 | calls.rb:270:5:270:8 | * ... | calls.rb:270:6:270:8 | call to bar |
 | calls.rb:271:5:271:11 | * ... | calls.rb:271:6:271:11 | call to bar |
+| calls.rb:316:31:316:42 | * ... | calls.rb:316:31:316:42 | [...] |
+| calls.rb:317:14:317:22 | * ... | calls.rb:317:14:317:22 | [...] |
 hashSplatExpr
 | calls.rb:274:5:274:9 | ** ... | calls.rb:274:7:274:9 | call to bar |
 | calls.rb:275:5:275:12 | ** ... | calls.rb:275:7:275:12 | call to bar |
--- a/ql/test/library-tests/ast/calls/calls.expected
+++ b/ql/test/library-tests/ast/calls/calls.expected
@@ -35,8 +35,19 @@ callsWithArguments
 | calls.rb:315:1:315:6 | ...[...] | [] | 0 | calls.rb:315:5:315:5 | 0 |
 | calls.rb:315:1:315:6 | call to []= | []= | 0 | calls.rb:315:5:315:5 | 0 |
 | calls.rb:315:1:315:6 | call to []= | []= | 1 | calls.rb:315:1:315:6 | ... = ... |
+| calls.rb:316:1:316:8 | call to [] | [] | 0 | calls.rb:316:1:316:8 | 0 |
+| calls.rb:316:1:316:8 | call to foo= | foo= | 0 | calls.rb:316:1:316:8 | ... = ... |
+| calls.rb:316:12:316:19 | call to [] | [] | 0 | calls.rb:316:12:316:19 | _ .. _ |
+| calls.rb:316:12:316:19 | call to bar= | bar= | 0 | calls.rb:316:12:316:19 | ... = ... |
 | calls.rb:316:22:316:27 | ...[...] | [] | 0 | calls.rb:316:26:316:26 | 4 |
+| calls.rb:316:22:316:27 | call to [] | [] | 0 | calls.rb:316:22:316:27 | -1 |
+| calls.rb:316:22:316:27 | call to []= | []= | 0 | calls.rb:316:26:316:26 | 4 |
+| calls.rb:316:22:316:27 | call to []= | []= | 1 | calls.rb:316:22:316:27 | ... = ... |
+| calls.rb:317:1:317:1 | call to [] | [] | 0 | calls.rb:317:1:317:1 | 0 |
 | calls.rb:317:5:317:10 | ...[...] | [] | 0 | calls.rb:317:9:317:9 | 5 |
+| calls.rb:317:5:317:10 | call to [] | [] | 0 | calls.rb:317:5:317:10 | _ .. _ |
+| calls.rb:317:5:317:10 | call to []= | []= | 0 | calls.rb:317:9:317:9 | 5 |
+| calls.rb:317:5:317:10 | call to []= | []= | 1 | calls.rb:317:5:317:10 | ... = ... |
 | calls.rb:318:1:318:10 | call to count= | count= | 1 | calls.rb:318:12:318:13 | __synth__1 |
 | calls.rb:319:1:319:6 | ...[...] | [] | 0 | calls.rb:319:5:319:5 | 0 |
 | calls.rb:319:1:319:6 | call to [] | [] | 0 | calls.rb:319:5:319:5 | __synth__1 |
@@ -225,12 +236,21 @@ callsWithReceiver
 | calls.rb:315:1:315:3 | call to foo | calls.rb:315:1:315:3 | self |
 | calls.rb:315:1:315:6 | ...[...] | calls.rb:315:1:315:3 | call to foo |
 | calls.rb:315:1:315:6 | call to []= | calls.rb:315:1:315:3 | call to foo |
+| calls.rb:316:1:316:8 | call to [] | calls.rb:316:1:316:8 | __synth__0 |
 | calls.rb:316:1:316:8 | call to foo | calls.rb:316:1:316:4 | self |
+| calls.rb:316:1:316:8 | call to foo= | calls.rb:316:1:316:4 | self |
+| calls.rb:316:12:316:19 | call to [] | calls.rb:316:12:316:19 | __synth__0 |
 | calls.rb:316:12:316:19 | call to bar | calls.rb:316:12:316:15 | self |
+| calls.rb:316:12:316:19 | call to bar= | calls.rb:316:12:316:15 | self |
 | calls.rb:316:22:316:24 | call to foo | calls.rb:316:22:316:24 | self |
 | calls.rb:316:22:316:27 | ...[...] | calls.rb:316:22:316:24 | call to foo |
+| calls.rb:316:22:316:27 | call to [] | calls.rb:316:22:316:27 | __synth__0 |
+| calls.rb:316:22:316:27 | call to []= | calls.rb:316:22:316:24 | call to foo |
+| calls.rb:317:1:317:1 | call to [] | calls.rb:317:1:317:1 | __synth__0 |
 | calls.rb:317:5:317:7 | call to foo | calls.rb:317:5:317:7 | self |
 | calls.rb:317:5:317:10 | ...[...] | calls.rb:317:5:317:7 | call to foo |
+| calls.rb:317:5:317:10 | call to [] | calls.rb:317:5:317:10 | __synth__0 |
+| calls.rb:317:5:317:10 | call to []= | calls.rb:317:5:317:7 | call to foo |
 | calls.rb:318:1:318:10 | call to count | calls.rb:318:1:318:4 | __synth__0 |
 | calls.rb:318:1:318:10 | call to count | calls.rb:318:1:318:4 | self |
 | calls.rb:318:1:318:10 | call to count= | calls.rb:318:1:318:4 | __synth__0 |
@@ -287,6 +307,10 @@ superCallsWithBlock
 setterCalls
 | calls.rb:314:1:314:8 | call to foo= |
 | calls.rb:315:1:315:6 | call to []= |
+| calls.rb:316:1:316:8 | call to foo= |
+| calls.rb:316:12:316:19 | call to bar= |
+| calls.rb:316:22:316:27 | call to []= |
+| calls.rb:317:5:317:10 | call to []= |
 | calls.rb:318:1:318:10 | call to count= |
 | calls.rb:319:1:319:6 | call to []= |
 | calls.rb:320:1:320:32 | call to []= |
--- a/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -870,7 +870,7 @@ cfg.rb:
 #-----|  -> ... ? ... : ...

 #   61| ... = ...
-#-----|  -> x
+#-----|  -> __synth__0

 #   61| C
 #-----|  -> "constant"
@@ -878,27 +878,87 @@ cfg.rb:
 #   61| "constant"
 #-----|  -> ... = ...

-#   62| ... = ...
+#   62| ...
 #-----|  -> pattern

-#   62| (..., ...)
-#-----|  -> 1
+#   62| ...
+#-----|  -> ...

 #   62| x
+#-----|  -> __synth__0
+
+#   62| ... = ...
+#-----|  -> __synth__0
+
+#   62| call to []
+#-----|  -> ... = ...
+
+#   62| 0
+#-----|  -> call to []
+
+#   62| __synth__0
+#-----|  -> 0
+
+#   62| call to []
+#-----|  -> * ...
+
+#   62| 1
+#-----|  -> call to []
+
+#   62| __synth__0
+#-----|  -> 1
+
+#   62| ... = ...
 #-----|  -> y

-#   62| (..., ...)
-#-----|  -> (..., ...)
+#   62| * ...
+#-----|  -> ... = ...
+
+#   62| __synth__0
+#-----|  -> __synth__0

 #   62| y
+#-----|  -> __synth__0
+
+#   62| ... = ...
 #-----|  -> z

+#   62| call to []
+#-----|  -> ... = ...
+
+#   62| 0
+#-----|  -> call to []
+
+#   62| __synth__0
+#-----|  -> 0
+
 #   62| z
-#-----|  -> (..., ...)
+#-----|  -> __synth__0
+
+#   62| ... = ...
+#-----|  -> ...
+
+#   62| call to []
+#-----|  -> ... = ...
+
+#   62| 1
+#-----|  -> call to []
+
+#   62| __synth__0
+#-----|  -> 1

 #   62| [...]
+#-----|  -> * ...
+
+#   62| ... = ...
+#-----|  -> x
+
+#   62| * ...
 #-----|  -> ... = ...

+#   62| __synth__0
+#-----|  -> 1
+
 #   62| 1
 #-----|  -> 2

@@ -1514,8 +1574,8 @@ cfg.rb:
 #-----|  -> ... rescue ...

 #  136| ... / ...
-#-----|  -> init
 #-----| raise -> self
+#-----|  -> __synth__0

 #  136| 1
 #-----|  -> 0
@@ -1527,7 +1587,7 @@ cfg.rb:
 #-----|  -> ... / ...

 #  136| call to puts
-#-----|  -> init
+#-----|  -> __synth__0

 #  136| self
 #-----|  -> "div by zero"
@@ -1535,26 +1595,62 @@ cfg.rb:
 #  136| "div by zero"
 #-----|  -> call to puts

-#  138| ... = ...
+#  138| ...
 #-----|  -> M

-#  138| (..., ...)
-#-----|  -> 1
-
 #  138| init
+#-----|  -> __synth__0
+
+#  138| ... = ...
 #-----|  -> last

+#  138| call to []
+#-----|  -> ... = ...
+
+#  138| _ .. _
+#-----|  -> call to []
+
+#  138| __synth__0
+#-----|  -> 0
+
+#  138| 0
+#-----|  -> -2
+
+#  138| -2
+#-----|  -> _ .. _
+
 #  138| last
-#-----|  -> (..., ...)
+#-----|  -> __synth__0
+
+#  138| ... = ...
+#-----|  -> ...
+
+#  138| call to []
+#-----|  -> ... = ...
+
+#  138| -1
+#-----|  -> call to []
+
+#  138| __synth__0
+#-----|  -> -1

 #  138| 1
 #-----|  -> 2

+#  138| ... = ...
+#-----|  -> init
+
+#  138| * ...
+#-----|  -> ... = ...
+
+#  138| __synth__0
+#-----|  -> 1
+
 #  138| 2
 #-----|  -> 3

 #  138| 3
-#-----|  -> ... = ...
+#-----|  -> * ...

 #  140| M
 #-----|  -> Constant
@@ -2370,7 +2466,7 @@ desugar.rb:
 #-----|  -> ... + ...

 #   21| enter m6
-#-----|  -> x
+#-----|  -> __synth__0

 #   21| m6
 #-----|  -> m7
@@ -2380,30 +2476,87 @@ desugar.rb:
 #   21| exit m6 (normal)
 #-----|  -> exit m6

-#   22| ... = ...
+#   22| x
+#-----|  -> __synth__0
+
+#   22| ...
 #-----|  -> exit m6 (normal)

-#   22| (..., ...)
-#-----|  -> 1
-
-#   22| x
+#   22| ... = ...
 #-----|  -> y

+#   22| call to []
+#-----|  -> ... = ...
+
+#   22| 0
+#-----|  -> call to []
+
+#   22| ...
+#-----|  -> ...
+
+#   22| __synth__0
+#-----|  -> 0
+
 #   22| y
+#-----|  -> __synth__0
+
+#   22| ... = ...
 #-----|  -> self

-#   22| call to bar
-#-----|  -> (..., ...)
+#   22| call to []
+#-----|  -> ... = ...
+
+#   22| _ .. _
+#-----|  -> call to []
+
+#   22| __synth__0
+#-----|  -> 1
+
+#   22| 1
+#-----|  -> -2
+
+#   22| -2
+#-----|  -> _ .. _

 #   22| call to z
-#-----|  -> call to bar
+#-----|  -> __synth__0

 #   22| self
 #-----|  -> call to z

-#   22| [...]
+#   22| call to []
 #-----|  -> ... = ...

+#   22| -1
+#-----|  -> call to []
+
+#   22| __synth__0
+#-----|  -> -1
+
+#   22| call to bar=
+#-----|  -> __synth__0
+
+#   22| __synth__0
+#-----|  -> ...
+
+#   22| ... = ...
+#-----|  -> call to bar=
+
+#   22| __synth__0
+#-----|  -> __synth__0
+
+#   22| [...]
+#-----|  -> * ...
+
+#   22| ... = ...
+#-----|  -> x
+
+#   22| * ...
+#-----|  -> ... = ...
+
+#   22| __synth__0
+#-----|  -> 1
+
 #   22| 1
 #-----|  -> 2

@@ -2417,7 +2570,7 @@ desugar.rb:
 #-----|  -> [...]

 #   25| enter m7
-#-----|  -> x
+#-----|  -> __synth__0

 #   25| m7
 #-----|  -> @x
@@ -2427,27 +2580,87 @@ desugar.rb:
 #   25| exit m7 (normal)
 #-----|  -> exit m7

-#   26| ... = ...
+#   26| x
+#-----|  -> __synth__0
+
+#   26| ...
 #-----|  -> exit m7 (normal)

-#   26| (..., ...)
+#   26| ... = ...
+#-----|  -> __synth__0
+
+#   26| call to []
+#-----|  -> ... = ...
+
+#   26| 0
+#-----|  -> call to []
+
+#   26| ...
+#-----|  -> ...
+
+#   26| __synth__0
+#-----|  -> 0
+
+#   26| call to []
+#-----|  -> * ...
+
+#   26| 1
+#-----|  -> call to []
+
+#   26| __synth__0
 #-----|  -> 1

-#   26| x
+#   26| ... = ...
 #-----|  -> y

-#   26| (..., ...)
-#-----|  -> (..., ...)
+#   26| * ...
+#-----|  -> ... = ...
+
+#   26| __synth__0
+#-----|  -> __synth__0

 #   26| y
+#-----|  -> __synth__0
+
+#   26| ... = ...
 #-----|  -> z

+#   26| call to []
+#-----|  -> ... = ...
+
+#   26| 0
+#-----|  -> call to []
+
+#   26| __synth__0
+#-----|  -> 0
+
 #   26| z
-#-----|  -> (..., ...)
+#-----|  -> __synth__0
+
+#   26| ... = ...
+#-----|  -> ...
+
+#   26| call to []
+#-----|  -> ... = ...
+
+#   26| 1
+#-----|  -> call to []
+
+#   26| __synth__0
+#-----|  -> 1

 #   26| [...]
+#-----|  -> * ...
+
+#   26| ... = ...
+#-----|  -> x
+
+#   26| * ...
 #-----|  -> ... = ...

+#   26| __synth__0
+#-----|  -> 1
+
 #   26| 1
 #-----|  -> 2

--- a/ql/test/library-tests/variables/ssa.expected
+++ b/ql/test/library-tests/variables/ssa.expected
@@ -43,10 +43,12 @@ definition
 | scopes.rb:7:1:7:5 | ... = ... | scopes.rb:7:1:7:1 | a |
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:7:1:7:1 | a |
 | scopes.rb:11:4:11:9 | ... = ... | scopes.rb:7:1:7:1 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:7:1:7:1 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:7:13:7 | b |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:11:13:11 | c |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:14:13:14 | d |
+| scopes.rb:13:4:13:4 | ... = ... | scopes.rb:7:1:7:1 | a |
+| scopes.rb:13:7:13:7 | ... = ... | scopes.rb:13:7:13:7 | b |
+| scopes.rb:13:10:13:15 | ... = ... | scopes.rb:13:10:13:15 | __synth__0 |
+| scopes.rb:13:11:13:11 | ... = ... | scopes.rb:13:11:13:11 | c |
+| scopes.rb:13:14:13:14 | ... = ... | scopes.rb:13:14:13:14 | d |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x |
 | scopes.rb:42:2:42:9 | ... = ... | scopes.rb:42:2:42:4 | var |
 | scopes.rb:46:5:46:13 | ... = ... | scopes.rb:46:5:46:8 | var2 |
@@ -128,10 +130,15 @@ read
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:7:1:7:1 | a | scopes.rb:10:9:10:9 | a |
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:7:1:7:1 | a | scopes.rb:11:4:11:4 | a |
 | scopes.rb:11:4:11:9 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:12:9:12:9 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:11:13:11 | c | scopes.rb:16:9:16:9 | c |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:14:13:14 | d | scopes.rb:17:9:17:9 | d |
+| scopes.rb:13:4:13:4 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
+| scopes.rb:13:7:13:7 | ... = ... | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
+| scopes.rb:13:10:13:15 | ... = ... | scopes.rb:13:10:13:15 | __synth__0 | scopes.rb:13:11:13:11 | __synth__0 |
+| scopes.rb:13:10:13:15 | ... = ... | scopes.rb:13:10:13:15 | __synth__0 | scopes.rb:13:14:13:14 | __synth__0 |
+| scopes.rb:13:11:13:11 | ... = ... | scopes.rb:13:11:13:11 | c | scopes.rb:16:9:16:9 | c |
+| scopes.rb:13:14:13:14 | ... = ... | scopes.rb:13:14:13:14 | d | scopes.rb:17:9:17:9 | d |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:4:13:4 | __synth__0 |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:7:13:7 | __synth__0 |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:10:13:15 | __synth__0 |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:28:8:28:8 | x |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:31:10:31:10 | x |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:34:7:34:7 | x |
@@ -209,10 +216,12 @@ firstRead
 | scopes.rb:7:1:7:5 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:8:6:8:6 | a |
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:7:1:7:1 | a | scopes.rb:10:9:10:9 | a |
 | scopes.rb:11:4:11:9 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:12:9:12:9 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:11:13:11 | c | scopes.rb:16:9:16:9 | c |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:14:13:14 | d | scopes.rb:17:9:17:9 | d |
+| scopes.rb:13:4:13:4 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
+| scopes.rb:13:7:13:7 | ... = ... | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
+| scopes.rb:13:10:13:15 | ... = ... | scopes.rb:13:10:13:15 | __synth__0 | scopes.rb:13:11:13:11 | __synth__0 |
+| scopes.rb:13:11:13:11 | ... = ... | scopes.rb:13:11:13:11 | c | scopes.rb:16:9:16:9 | c |
+| scopes.rb:13:14:13:14 | ... = ... | scopes.rb:13:14:13:14 | d | scopes.rb:17:9:17:9 | d |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:4:13:4 | __synth__0 |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:28:8:28:8 | x |
 | scopes.rb:42:2:42:9 | ... = ... | scopes.rb:42:2:42:4 | var | scopes.rb:44:5:44:7 | var |
 | scopes.rb:46:5:46:13 | ... = ... | scopes.rb:46:5:46:8 | var2 | scopes.rb:47:5:47:8 | var2 |
@@ -280,10 +289,12 @@ lastRead
 | scopes.rb:7:1:7:5 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:8:6:8:6 | a |
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:7:1:7:1 | a | scopes.rb:11:4:11:4 | a |
 | scopes.rb:11:4:11:9 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:12:9:12:9 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:11:13:11 | c | scopes.rb:16:9:16:9 | c |
-| scopes.rb:13:4:13:32 | ... = ... | scopes.rb:13:14:13:14 | d | scopes.rb:17:9:17:9 | d |
+| scopes.rb:13:4:13:4 | ... = ... | scopes.rb:7:1:7:1 | a | scopes.rb:14:9:14:9 | a |
+| scopes.rb:13:7:13:7 | ... = ... | scopes.rb:13:7:13:7 | b | scopes.rb:15:9:15:9 | b |
+| scopes.rb:13:10:13:15 | ... = ... | scopes.rb:13:10:13:15 | __synth__0 | scopes.rb:13:14:13:14 | __synth__0 |
+| scopes.rb:13:11:13:11 | ... = ... | scopes.rb:13:11:13:11 | c | scopes.rb:16:9:16:9 | c |
+| scopes.rb:13:14:13:14 | ... = ... | scopes.rb:13:14:13:14 | d | scopes.rb:17:9:17:9 | d |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:10:13:15 | __synth__0 |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:37:5:37:5 | x |
 | scopes.rb:42:2:42:9 | ... = ... | scopes.rb:42:2:42:4 | var | scopes.rb:44:5:44:7 | var |
 | scopes.rb:46:5:46:13 | ... = ... | scopes.rb:46:5:46:8 | var2 | scopes.rb:47:5:47:8 | var2 |
@@ -317,6 +328,9 @@ adjacentReads
 | 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: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 |
 | scopes.rb:9:9:18:3 | <captured> | scopes.rb:7:1:7:1 | a | scopes.rb:10:9:10:9 | a | scopes.rb:11:4:11:4 | a |
+| scopes.rb:13:10:13:15 | ... = ... | scopes.rb:13:10:13:15 | __synth__0 | scopes.rb:13:11:13:11 | __synth__0 | scopes.rb:13:14:13:14 | __synth__0 |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:4:13:4 | __synth__0 | scopes.rb:13:7:13:7 | __synth__0 |
+| scopes.rb:13:19:13:32 | ... = ... | scopes.rb:13:4:13:32 | __synth__0 | scopes.rb:13:7:13:7 | __synth__0 | scopes.rb:13:10:13:15 | __synth__0 |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:28:8:28:8 | x | scopes.rb:31:10:31:10 | x |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:31:10:31:10 | x | scopes.rb:34:7:34:7 | x |
 | scopes.rb:27:1:27:5 | ... = ... | scopes.rb:27:1:27:1 | x | scopes.rb:34:7:34:7 | x | scopes.rb:34:14:34:14 | x |
--- a/ql/test/library-tests/variables/varaccess.expected
+++ b/ql/test/library-tests/variables/varaccess.expected
@@ -215,10 +215,16 @@ explicitWrite
 | scopes.rb:7:1:7:1 | a | scopes.rb:7:1:7:5 | ... = ... |
 | scopes.rb:11:4:11:4 | a | scopes.rb:11:4:11:9 | ... += ... |
 | scopes.rb:11:4:11:4 | a | scopes.rb:11:4:11:9 | ... = ... |
+| scopes.rb:13:4:13:4 | a | scopes.rb:13:4:13:4 | ... = ... |
 | scopes.rb:13:4:13:4 | a | scopes.rb:13:4:13:32 | ... = ... |
 | scopes.rb:13:7:13:7 | b | scopes.rb:13:4:13:32 | ... = ... |
+| scopes.rb:13:7:13:7 | b | scopes.rb:13:7:13:7 | ... = ... |
+| scopes.rb:13:10:13:15 | __synth__0 | scopes.rb:13:10:13:15 | ... = ... |
 | scopes.rb:13:11:13:11 | c | scopes.rb:13:4:13:32 | ... = ... |
+| scopes.rb:13:11:13:11 | c | scopes.rb:13:11:13:11 | ... = ... |
 | scopes.rb:13:14:13:14 | d | scopes.rb:13:4:13:32 | ... = ... |
+| scopes.rb:13:14:13:14 | d | scopes.rb:13:14:13:14 | ... = ... |
+| scopes.rb:13:19:13:32 | __synth__0 | scopes.rb:13:19:13:32 | ... = ... |
 | scopes.rb:21:1:21:7 | $global | scopes.rb:21:1:21:12 | ... = ... |
 | scopes.rb:24:1:24:6 | script | scopes.rb:24:1:24:11 | ... = ... |
 | scopes.rb:27:1:27:1 | x | scopes.rb:27:1:27:5 | ... = ... |
@@ -334,6 +340,11 @@ readAccess
 | scopes.rb:10:9:10:9 | a |
 | scopes.rb:11:4:11:4 | a |
 | scopes.rb:12:9:12:9 | a |
+| scopes.rb:13:4:13:4 | __synth__0 |
+| scopes.rb:13:7:13:7 | __synth__0 |
+| scopes.rb:13:10:13:15 | __synth__0 |
+| scopes.rb:13:11:13:11 | __synth__0 |
+| scopes.rb:13:14:13:14 | __synth__0 |
 | scopes.rb:14:9:14:9 | a |
 | scopes.rb:15:9:15:9 | b |
 | scopes.rb:16:9:16:9 | c |
--- a/ql/test/library-tests/variables/variable.expected
+++ b/ql/test/library-tests/variables/variable.expected
@@ -54,7 +54,9 @@
 | scopes.rb:4:4:4:4 | a |
 | scopes.rb:7:1:7:1 | a |
 | scopes.rb:9:14:9:14 | x |
+| scopes.rb:13:4:13:32 | __synth__0 |
 | scopes.rb:13:7:13:7 | b |
+| scopes.rb:13:10:13:15 | __synth__0 |
 | scopes.rb:13:11:13:11 | c |
 | scopes.rb:13:14:13:14 | d |
 | scopes.rb:24:1:24:6 | script |