component_tags -> struct_tags

github · Oct 8, 2024 · 288e0ec · 288e0ec
1 parent c1a1edf
commit 288e0ec
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/...adbf125835fb83a510465b2f29a24/go.dbscheme → ...5e5e892dfb16b55ed4bd76ea662be/go.dbscheme b/...adbf125835fb83a510465b2f29a24/go.dbscheme → ...5e5e892dfb16b55ed4bd76ea662be/go.dbscheme
diff --git a/...dbf125835fb83a510465b2f29a24/old.dbscheme → ...e5e892dfb16b55ed4bd76ea662be/old.dbscheme b/...dbf125835fb83a510465b2f29a24/old.dbscheme → ...e5e892dfb16b55ed4bd76ea662be/old.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);

diff --git a/...835fb83a510465b2f29a24/upgrade.properties → ...dfb16b55ed4bd76ea662be/upgrade.properties b/...835fb83a510465b2f29a24/upgrade.properties → ...dfb16b55ed4bd76ea662be/upgrade.properties
@@ -1,5 +1,5 @@
 description: Remove component-tags and interface-method-id tables
 compatibility: full
 
-component_tags.rel: delete
+struct_tags.rel: delete
 interface_private_method_ids.rel: delete
diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
@@ -1150,8 +1150,8 @@ var ComponentTypesTable = NewTable("component_types",
 	EntityColumn(TypeType, "tp"),
 ).KeySet("parent", "index")
 
-// ComponentTagsTable is the table associating struct types with their component types' tags
-var ComponentTagsTable = NewTable("component_tags",
+// StructTagsTable is the table associating struct types with their component types' tags
+var StructTagsTable = NewTable("struct_tags",
 	EntityColumn(StructType, "parent"),
 	IntColumn("index"),
 	StringColumn("tag"),

diff --git a/go/extractor/extractor.go b/go/extractor/extractor.go
@@ -1625,7 +1625,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 				}
 				extractComponentType(tw, lbl, i, name, field.Type())
 				if tp.Tag(i) != "" {
-					dbscheme.ComponentTagsTable.Emit(tw, lbl, i, tp.Tag(i))
+					dbscheme.StructTagsTable.Emit(tw, lbl, i, tp.Tag(i))
 				}
 			}
 		case *types.Pointer:

diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);

diff --git a/go/ql/lib/go.dbscheme.stats b/go/ql/lib/go.dbscheme.stats
@@ -13979,7 +13979,7 @@
             </dependencies>
         </relation>
         <relation>
-            <name>component_tags</name>
+            <name>struct_tags</name>
             <cardinality>41038845</cardinality>
             <columnsizes>
                 <e>

diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
@@ -467,9 +467,9 @@ class StructType extends @structtype, CompositeType {
   predicate hasOwnFieldWithTag(int i, string name, Type tp, boolean isEmbedded, string tag) {
     this.hasOwnField(i, name, tp, isEmbedded) and
     (
-      component_tags(this, i, tag)
+      struct_tags(this, i, tag)
       or
-      not component_tags(this, i, _) and tag = ""
+      not struct_tags(this, i, _) and tag = ""
     )
   }
 
@@ -594,9 +594,9 @@ class StructType extends @structtype, CompositeType {
         concat(int i, string name, Type tp, string tagToPrint |
           component_types(this, i, name, tp) and
           (
-            tagToPrint = " `" + any(string tag | component_tags(this, i, tag)) + "`"
+            tagToPrint = " `" + any(string tag | struct_tags(this, i, tag)) + "`"
             or
-            tagToPrint = "" and not component_tags(this, i, _)
+            tagToPrint = "" and not struct_tags(this, i, _)
           )
         |
           name + " " + tp.pp() + tagToPrint, "; " order by i

diff --git a/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme b/go/ql/lib/upgrades/a58b81b1b4c4cccc8ca11731c1db86622f33af57/go.dbscheme
@@ -208,7 +208,7 @@ underlying_type(unique int named: @namedtype ref, int tp: @type ref);
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
 
 #keyset[parent, index]
-component_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
+struct_tags(int parent: @structtype ref, int index: int ref, string tag: string ref);
 
 #keyset[interface, index]
 interface_private_method_ids(int interface: @interfacetype ref, int index: int ref, string id: string ref);