Remove duplications of locatable and element in the DB scheme

tamasvajk · igfoo · commit 22af7f0e890f · 2022-05-10T19:51:27.000+01:00
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -1019,9 +1019,12 @@ javadocText(
 @callable = @method | @constructor;
 
 /** A program element that has a name. */
-@element = @file | @package | @primitive | @class | @interface | @method | @constructor | @modifier | @param | @exception | @field |
-           @annotation | @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
-           @kt_property;
+@element = @package | @modifier | @annotation |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @class | @interface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
 
 @modifiable = @member_modifiable| @param | @localvar ;
 
@@ -1030,10 +1033,8 @@ javadocText(
 @member = @method | @constructor | @field | @reftype ;
 
 /** A program element that has a location. */
-@locatable = @file | @class | @interface | @fielddecl | @field | @constructor | @method | @param | @exception
-             | @boundedtype | @typebound | @array | @primitive
-             | @import | @stmt | @expr | @whenbranch | @localvar | @javadoc | @javadocTag | @javadocText
-             | @xmllocatable | @ktcomment | @kt_type_alias | @kt_property;
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
 
 @top = @element | @locatable | @folder;
 
