C#: Change dbscheme from nullability_member to nullability_parent

calumgrant · calumgrant · commit 7c21ebb52628 · 2019-11-12T13:40:58.000Z
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
@@ -117,7 +117,7 @@ public override void Populate(TextWriter trapFile)
             int i = 0;
             foreach (var s in symbol.NullableParameters)
             {
-                trapFile.nullability_member(this, i, Create(Context, s));
+                trapFile.nullability_parent(Create(Context, s), i, this);
                 i++;
             }
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs b/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs
@@ -386,9 +386,9 @@ internal static void nullability(this TextWriter trapFile, NullabilityEntity nul
             trapFile.WriteTuple("nullability", nullability, annotation);
         }
 
-        internal static void nullability_member(this TextWriter trapFile, NullabilityEntity nullability, int index, NullabilityEntity child)
+        internal static void nullability_parent(this TextWriter trapFile, NullabilityEntity nullability, int index, NullabilityEntity parent)
         {
-            trapFile.WriteTuple("nullability_member", nullability, index, child);
+            trapFile.WriteTuple("nullability_parent", nullability, index, parent);
         }
 
         internal static void numlines(this TextWriter trapFile, IEntity label, LineCounts lineCounts)
diff --git a/csharp/ql/src/semmle/code/csharp/AnnotatedType.qll b/csharp/ql/src/semmle/code/csharp/AnnotatedType.qll
@@ -70,11 +70,11 @@ private module Annotations {
 
     language[monotonicAggregates]
     private string getMemberString() {
-      if nullability_member(nullability, _, _)
+      if nullability_parent(_, _, nullability)
       then
         result = "<" +
             concat(int i, Nullability child |
-              nullability_member(nullability, i, getNullability(child))
+              nullability_parent(getNullability(child), i, nullability)
             |
               child.toString(), "," order by i
             ) + ">"
@@ -169,8 +169,8 @@ private module Annotations {
    */
   bindingset[i]
   Nullability getChildNullability(Nullability n, int i) {
-    if nullability_member(getNullability(n), i, _)
-    then nullability_member(getNullability(n), i, getNullability(result))
+    if nullability_parent(_, i, getNullability(n))
+    then nullability_parent(getNullability(result), i, getNullability(n))
     else result = n
   }
 
@@ -190,7 +190,7 @@ private module Annotations {
    * and all type arguments are oblivious.
    */
   class NoNullability extends ObliviousNullability {
-    NoNullability() { not nullability_member(nullability, _, _) }
+    NoNullability() { not nullability_parent(_, _, nullability) }
   }
 
   /** A type with annotated nullablity, `?`. */
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme b/csharp/ql/src/semmlecode.csharp.dbscheme
@@ -480,8 +480,8 @@ case @nullability.kind of
 | 2 = @annotated
 ;
 
-#keyset[nullability, index]
-nullability_member(int nullability: @nullability ref, int index: int ref, int child: @nullability ref)
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
 
 type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref)
 
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme.stats b/csharp/ql/src/semmlecode.csharp.dbscheme.stats

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public override void Populate(TextWriter trapFile)`
`117`	`117`	`int i = 0;`
`118`	`118`	`foreach (var s in symbol.NullableParameters)`
`119`	`119`	`{`
`120`		`- trapFile.nullability_member(this, i, Create(Context, s));`
	`120`	`+ trapFile.nullability_parent(Create(Context, s), i, this);`
`121`	`121`	`i++;`
`122`	`122`	`}`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,9 +386,9 @@ internal static void nullability(this TextWriter trapFile, NullabilityEntity nul`
`386`	`386`	`trapFile.WriteTuple("nullability", nullability, annotation);`
`387`	`387`	`}`
`388`	`388`
`389`		`- internal static void nullability_member(this TextWriter trapFile, NullabilityEntity nullability, int index, NullabilityEntity child)`
	`389`	`+ internal static void nullability_parent(this TextWriter trapFile, NullabilityEntity nullability, int index, NullabilityEntity parent)`
`390`	`390`	`{`
`391`		`- trapFile.WriteTuple("nullability_member", nullability, index, child);`
	`391`	`+ trapFile.WriteTuple("nullability_parent", nullability, index, parent);`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`internal static void numlines(this TextWriter trapFile, IEntity label, LineCounts lineCounts)`
Original file line number	Diff line number	Diff line change
`@@ -480,8 +480,8 @@ case @nullability.kind of`
`480`	`480`	`\| 2 = @annotated`
`481`	`481`	`;`
`482`	`482`
`483`		`-#keyset[nullability, index]`
`484`		`-nullability_member(int nullability: @nullability ref, int index: int ref, int child: @nullability ref)`
	`483`	`+#keyset[parent, index]`
	`484`	`+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)`
`485`	`485`
`486`	`486`	`type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref)`
`487`	`487`