Expose that case guard test controls its case body

Author: smowton

java/ql/test/library-tests/guards12/PrintAst.expected

@@ -38,19 +38,23 @@ Test.java:
 #   12|             0: [StringLiteral] "d"
 #   13|           3: [DefaultCase] default
 #   13|             -1: [BlockStmt] { ... }
-#   15|         2: [SwitchStmt] switch (...)
-#   15|           -1: [VarAccess] s
-#   16|           0: [PatternCase] case T t ...
-#   16|             -3: [EQExpr] ... == ...
-#   16|               0: [MethodCall] length(...)
-#   16|                 -1: [VarAccess] s
-#   16|               1: [IntegerLiteral] 4
-#   16|             -1: [BlockStmt] { ... }
-#-----|             0: (Single Local Variable Declaration)
-#   16|               0: [TypeAccess] String
-#   16|               1: [LocalVariableDeclExpr] s2
-#   17|           1: [ConstCase] case ...
+#   15|         2: [LocalVariableDeclStmt] var ...;
+#   15|           0: [TypeAccess] int
+#   15|           1: [LocalVariableDeclExpr] len
+#   15|             0: [MethodCall] length(...)
+#   15|               -1: [VarAccess] s
+#   16|         3: [SwitchStmt] switch (...)
+#   16|           -1: [VarAccess] s
+#   17|           0: [PatternCase] case T t ...
+#   17|             -3: [EQExpr] ... == ...
+#   17|               0: [VarAccess] len
+#   17|               1: [IntegerLiteral] 4
 #   17|             -1: [BlockStmt] { ... }
-#   17|             0: [StringLiteral] "e"
-#   18|           2: [DefaultCase] default
+#-----|             0: (Single Local Variable Declaration)
+#   17|               0: [TypeAccess] String
+#   17|               1: [LocalVariableDeclExpr] s2
+#   18|           1: [ConstCase] case ...
 #   18|             -1: [BlockStmt] { ... }
+#   18|             0: [StringLiteral] "e"
+#   19|           2: [DefaultCase] default
+#   19|             -1: [BlockStmt] { ... }

java/ql/test/library-tests/guards12/Test.java

@@ -12,8 +12,9 @@ void foo(String s) {
       case "d" -> { }
       default -> { }
     }
+    int len = s.length();
     switch (s) {
-      case String s2 when s.length() == 4 -> { }
+      case String s2 when len == 4 -> { }
       case "e" -> { }
       default -> { }
     }

java/ql/test/library-tests/guards12/guard.expected

@@ -6,5 +6,6 @@
 | Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | true | Test.java:11:7:11:17 | case ... |
 | Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | false | Test.java:13:7:13:16 | default |
 | Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | true | Test.java:12:7:12:17 | case ... |
-| Test.java:17:7:17:17 | case ... | Test.java:15:13:15:13 | s | Test.java:17:12:17:14 | "e" | true | false | Test.java:18:7:18:16 | default |
-| Test.java:17:7:17:17 | case ... | Test.java:15:13:15:13 | s | Test.java:17:12:17:14 | "e" | true | true | Test.java:17:7:17:17 | case ... |
+| Test.java:17:27:17:34 | ... == ... | Test.java:17:27:17:29 | len | Test.java:17:34:17:34 | 4 | true | true | Test.java:17:39:17:41 | { ... } |
+| Test.java:18:7:18:17 | case ... | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | true | false | Test.java:19:7:19:16 | default |
+| Test.java:18:7:18:17 | case ... | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | true | true | Test.java:18:7:18:17 | case ... |