hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 09:13:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Change dbscheme from nullability_member to nullability_parent

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
View File

@@ -117,7 +117,7 @@ namespace Semmle.Extraction.CSharp.Entities
int i = 0; int i = 0;
foreach (var s in symbol.NullableParameters) foreach (var s in symbol.NullableParameters)
{ {
trapFile.nullability_member(this, i, Create(Context, s)); trapFile.nullability_parent(Create(Context, s), i, this);
i++; i++;
} }
} }

4
csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs
View File

@@ -386,9 +386,9 @@ namespace Semmle.Extraction.CSharp
trapFile.WriteTuple("nullability", nullability, annotation); 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) internal static void numlines(this TextWriter trapFile, IEntity label, LineCounts lineCounts)

10
csharp/ql/src/semmle/code/csharp/AnnotatedType.qll
View File

@@ -70,11 +70,11 @@ private module Annotations {
language[monotonicAggregates] language[monotonicAggregates]
private string getMemberString() { private string getMemberString() {
if nullability_member(nullability, _, _) if nullability_parent(_, _, nullability)
then then
result = "<" + result = "<" +
concat(int i, Nullability child | concat(int i, Nullability child |
nullability_member(nullability, i, getNullability(child)) nullability_parent(getNullability(child), i, nullability)
| |
child.toString(), "," order by i child.toString(), "," order by i
) + ">" ) + ">"
@@ -169,8 +169,8 @@ private module Annotations {
*/ */
bindingset[i] bindingset[i]
Nullability getChildNullability(Nullability n, int i) { Nullability getChildNullability(Nullability n, int i) {
if nullability_member(getNullability(n), i, _) if nullability_parent(_, i, getNullability(n))
then nullability_member(getNullability(n), i, getNullability(result)) then nullability_parent(getNullability(result), i, getNullability(n))
else result = n else result = n
} }
@@ -190,7 +190,7 @@ private module Annotations {
* and all type arguments are oblivious. * and all type arguments are oblivious.
*/ */
class NoNullability extends ObliviousNullability { class NoNullability extends ObliviousNullability {
NoNullability() { not nullability_member(nullability, _, _) } NoNullability() { not nullability_parent(_, _, nullability) }
} }
/** A type with annotated nullablity, `?`. */ /** A type with annotated nullablity, `?`. */

4
csharp/ql/src/semmlecode.csharp.dbscheme
View File

@@ -480,8 +480,8 @@ case @nullability.kind of
| 2 = @annotated | 2 = @annotated
; ;
#keyset[nullability, index] #keyset[parent, index]
nullability_member(int nullability: @nullability ref, int index: int ref, int child: @nullability ref) 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) type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref)

18266
csharp/ql/src/semmlecode.csharp.dbscheme.stats
View File

File diff suppressed because it is too large Load Diff