hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-29 18:55:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Follow line directives when getting element location

Browse Source
This commit is contained in:
Tamas Vajk
2021-01-22 14:51:32 +01:00
parent 967765342e
commit a1d227dbbb
21 changed files with 139 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/LineDirective.cs
View File

@@ -27,7 +27,13 @@ namespace Semmle.Extraction.CSharp.Entities
if (trivia.Line.IsKind(SyntaxKind.NumericLiteralToken))
{
var value = (int)trivia.Line.Value;
trapFile.directive_line_values(this, value, trivia.File.ValueText);
trapFile.directive_line_value(this, value);
if (!string.IsNullOrWhiteSpace(trivia.File.ValueText))
{
var file = Extraction.Entities.File.Create(cx, trivia.File.ValueText);
trapFile.directive_line_file(this, file);
}
}
}
}

3
csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PragmaChecksumDirective.cs
View File

@@ -12,7 +12,8 @@ namespace Semmle.Extraction.CSharp.Entities
protected override void PopulatePreprocessor(TextWriter trapFile)
{
trapFile.pragma_checksums(this, trivia.File.ToString(), trivia.Guid.ToString(), trivia.Bytes.ToString());
var file = Extraction.Entities.File.Create(cx, trivia.File.ValueText);
trapFile.pragma_checksums(this, file, trivia.Guid.ToString(), trivia.Bytes.ToString());
}
}
}

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

@@ -624,7 +624,7 @@ namespace Semmle.Extraction.CSharp
trapFile.WriteTuple("pragma_warning_error_codes", pragma, errorCode, child);
}
internal static void pragma_checksums(this TextWriter trapFile, PragmaChecksumDirective pragma, string file, string guid, string bytes)
internal static void pragma_checksums(this TextWriter trapFile, PragmaChecksumDirective pragma, Extraction.Entities.File file, string guid, string bytes)
{
trapFile.WriteTuple("pragma_checksums", pragma, file, guid, bytes);
}
@@ -659,9 +659,14 @@ namespace Semmle.Extraction.CSharp
trapFile.WriteTuple("directive_lines", directive, kind);
}
internal static void directive_line_values(this TextWriter trapFile, LineDirective directive, int line, string file)
internal static void directive_line_value(this TextWriter trapFile, LineDirective directive, int line)
{
trapFile.WriteTuple("directive_line_values", directive, line, file);
trapFile.WriteTuple("directive_line_value", directive, line);
}
internal static void directive_line_file(this TextWriter trapFile, LineDirective directive, Extraction.Entities.File file)
{
trapFile.WriteTuple("directive_line_file", directive, file);
}
internal static void directive_regions(this TextWriter trapFile, RegionDirective directive, string name)