Rename db types relating to local classes

smowton · smowton · commit 29b9231f4929 · 2021-09-02T14:51:51.000+01:00
These now all refer to types or classes-or-interfaces.
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -440,10 +440,10 @@ isAnonymClass(
   int parent: @classinstancexpr ref
 );
 
-#keyset[classid] #keyset[parent]
-isLocalClass(
-  int classid: @classorinterface ref,
-  int parent: @localclassdeclstmt ref
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
 );
 
 isDefConstr(
@@ -526,7 +526,7 @@ case @stmt.kind of
 | 15 = @labeledstmt
 | 16 = @assertstmt
 | 17 = @localvariabledeclstmt
-| 18 = @localclassdeclstmt
+| 18 = @localtypedeclstmt
 | 19 = @constructorinvocationstmt
 | 20 = @superconstructorinvocationstmt
 | 21 = @case
diff --git a/java/ql/lib/config/semmlecode.dbscheme.stats b/java/ql/lib/config/semmlecode.dbscheme.stats
@@ -16910,7 +16910,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isLocalClass</name>
+<name>isLocalClassOrInterface</name>
 <cardinality>349</cardinality>
 <columnsizes>
 <e>
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
@@ -787,9 +787,9 @@ class LocalVariableDeclStmt extends Stmt, @localvariabledeclstmt {
 }
 
 /** A statement that declares a local class or interface. */
-class LocalTypeDeclStmt extends Stmt, @localclassdeclstmt {
+class LocalTypeDeclStmt extends Stmt, @localtypedeclstmt {
   /** Gets the local type declared by this statement. */
-  LocalClassOrInterface getLocalType() { isLocalClass(result, this) }
+  LocalClassOrInterface getLocalType() { isLocalClassOrInterface(result, this) }
 
   /**
    * DEPRECATED: Renamed `getLocalType` to reflect the fact that
diff --git a/java/ql/lib/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll
@@ -722,7 +722,7 @@ class LocalClassOrInterface extends NestedType, ClassOrInterface {
   LocalClassOrInterface() { this.isLocal() }
 
   /** Gets the statement that declares this local class. */
-  LocalTypeDeclStmt getLocalTypeDeclStmt() { isLocalClass(this, result) }
+  LocalTypeDeclStmt getLocalTypeDeclStmt() { isLocalClassOrInterface(this, result) }
 
   /**
    * DEPRECATED: renamed `getLocalTypeDeclStmt` to reflect the fact that
@@ -864,7 +864,7 @@ class Interface extends ClassOrInterface, @interface {
 /** A class or interface. */
 class ClassOrInterface extends RefType, @classorinterface {
   /** Holds if this class or interface is local. */
-  predicate isLocal() { isLocalClass(this, _) }
+  predicate isLocal() { isLocalClassOrInterface(this, _) }
 
   /** Holds if this class or interface is package protected, that is, neither public nor private nor protected. */
   predicate isPackageProtected() {
diff --git a/java/upgrades/b4e689c90426b017ad550e30a439cab2763ff424/semmlecode.dbscheme b/java/upgrades/b4e689c90426b017ad550e30a439cab2763ff424/semmlecode.dbscheme
@@ -440,10 +440,10 @@ isAnonymClass(
   int parent: @classinstancexpr ref
 );
 
-#keyset[classid] #keyset[parent]
-isLocalClass(
-  int classid: @classorinterface ref,
-  int parent: @localclassdeclstmt ref
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
 );
 
 isDefConstr(
@@ -526,7 +526,7 @@ case @stmt.kind of
 | 15 = @labeledstmt
 | 16 = @assertstmt
 | 17 = @localvariabledeclstmt
-| 18 = @localclassdeclstmt
+| 18 = @localtypedeclstmt
 | 19 = @constructorinvocationstmt
 | 20 = @superconstructorinvocationstmt
 | 21 = @case
diff --git a/java/upgrades/b4e689c90426b017ad550e30a439cab2763ff424/upgrade.properties b/java/upgrades/b4e689c90426b017ad550e30a439cab2763ff424/upgrade.properties
@@ -1,2 +1,4 @@
 description: Java 16: allow local interfaces
 compatibility: backwards
+isLocalClassOrInterface.rel: reorder isLocalClass.rel(int id, int parent) id parent
+isLocalClass.rel: delete
