hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle 'case null, default:'

Browse Source
This commit is contained in:
Chris Smowton
2023-10-31 14:53:49 +00:00
parent 9a450b09be
commit 54a89d6fef
12 changed files with 131 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/ql/test/library-tests/pattern-switch/cfg/Test.java
View File

@@ -52,6 +52,24 @@ public class Test {
default -> { }
}
switch((String)thing) {
case "Const1":
System.out.println("It's Const1!");
case "Const2":
System.out.println("It's Const1 or Const2!");
break;
case String s when s.length() <= 6:
System.out.println("It's <= 6 chars long, and neither Const1 nor Const2");
case "Const3":
System.out.println("It's (<= 6 chars long, and neither Const1 nor Const2), or Const3");
break;
case "Const30":
System.out.println("It's Const30");
break;
case null, default:
System.out.println("It's null, or something else");
}
}
}

4
java/ql/test/library-tests/printAst/A.java
View File

@@ -88,6 +88,10 @@ class A {
case String s when s.length() == 5 -> "it's 5 letters long";
default -> "It's something else";
};
var nullDefaultTest = switch(thing) {
case String s -> "It's a string";
case null, default -> "It's something else";
};
}
}
catch (RuntimeException rte) {

68
java/ql/test/library-tests/printAst/PrintAst.expected
View File

@@ -246,36 +246,48 @@ A.java:
# 88| 1: [LocalVariableDeclExpr] s
# 89| 3: [DefaultCase] default
# 89| -1: [StringLiteral] "It's something else"
# 93| 0: [CatchClause] catch (...)
# 91| 8: [LocalVariableDeclStmt] var ...;
# 91| 1: [LocalVariableDeclExpr] nullDefaultTest
# 91| 0: [SwitchExpr] switch (...)
# 91| -1: [VarAccess] thing
# 92| 0: [PatternCase] case T t ...
# 92| -1: [StringLiteral] "It's a string"
#-----| 0: (Single Local Variable Declaration)
# 92| 0: [TypeAccess] String
# 92| 1: [LocalVariableDeclExpr] s
# 93| 1: [NullDefaultCase] case null, default
# 93| -1: [StringLiteral] "It's something else"
# 93| 0: [NullLiteral] null
# 97| 0: [CatchClause] catch (...)
#-----| 0: (Single Local Variable Declaration)
# 93| 0: [TypeAccess] RuntimeException
# 93| 1: [LocalVariableDeclExpr] rte
# 93| 1: [BlockStmt] { ... }
# 94| 0: [ReturnStmt] return ...
# 98| 10: [Class] E
# 102| 3: [FieldDeclaration] E A;
# 97| 0: [TypeAccess] RuntimeException
# 97| 1: [LocalVariableDeclExpr] rte
# 97| 1: [BlockStmt] { ... }
# 98| 0: [ReturnStmt] return ...
# 102| 10: [Class] E
# 106| 3: [FieldDeclaration] E A;
#-----| -3: (Javadoc)
# 99| 1: [Javadoc] /** Javadoc for enum constant */
# 100| 0: [JavadocText] Javadoc for enum constant
# 102| -1: [TypeAccess] E
# 102| 0: [ClassInstanceExpr] new E(...)
# 102| -3: [TypeAccess] E
# 103| 4: [FieldDeclaration] E B;
# 103| 1: [Javadoc] /** Javadoc for enum constant */
# 104| 0: [JavadocText] Javadoc for enum constant
# 106| -1: [TypeAccess] E
# 106| 0: [ClassInstanceExpr] new E(...)
# 106| -3: [TypeAccess] E
# 107| 4: [FieldDeclaration] E B;
#-----| -3: (Javadoc)
# 99| 1: [Javadoc] /** Javadoc for enum constant */
# 100| 0: [JavadocText] Javadoc for enum constant
# 103| -1: [TypeAccess] E
# 103| 0: [ClassInstanceExpr] new E(...)
# 103| -3: [TypeAccess] E
# 104| 5: [FieldDeclaration] E C;
# 103| 1: [Javadoc] /** Javadoc for enum constant */
# 104| 0: [JavadocText] Javadoc for enum constant
# 107| -1: [TypeAccess] E
# 107| 0: [ClassInstanceExpr] new E(...)
# 107| -3: [TypeAccess] E
# 108| 5: [FieldDeclaration] E C;
#-----| -3: (Javadoc)
# 99| 1: [Javadoc] /** Javadoc for enum constant */
# 100| 0: [JavadocText] Javadoc for enum constant
# 104| -1: [TypeAccess] E
# 104| 0: [ClassInstanceExpr] new E(...)
# 104| -3: [TypeAccess] E
# 110| 11: [FieldDeclaration] int i, ...;
# 103| 1: [Javadoc] /** Javadoc for enum constant */
# 104| 0: [JavadocText] Javadoc for enum constant
# 108| -1: [TypeAccess] E
# 108| 0: [ClassInstanceExpr] new E(...)
# 108| -3: [TypeAccess] E
# 114| 11: [FieldDeclaration] int i, ...;
#-----| -3: (Javadoc)
# 107| 1: [Javadoc] /** Javadoc for fields */
# 108| 0: [JavadocText] Javadoc for fields
# 110| -1: [TypeAccess] int
# 111| 1: [Javadoc] /** Javadoc for fields */
# 112| 0: [JavadocText] Javadoc for fields
# 114| -1: [TypeAccess] int