C#: Change dbscheme from nullability_member to nullability_parent

This commit is contained in:
Calum Grant
2019-11-11 19:24:48 +00:00
parent 41b441614b
commit 7c21ebb526
5 changed files with 8928 additions and 9358 deletions

View File

@@ -117,7 +117,7 @@ namespace Semmle.Extraction.CSharp.Entities
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++;
}
}

View File

@@ -386,9 +386,9 @@ namespace Semmle.Extraction.CSharp
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)

View File

@@ -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, `?`. */

View File

@@ -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)

File diff suppressed because it is too large Load Diff