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

C#: Refactor and use new language features.

Browse Source
This commit is contained in:
Michael Nebel
2022-01-31 09:24:31 +01:00
parent f1d5d3af9d
commit 7cbeffc8a7
1 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Patterns/PropertyPattern.cs
View File

@@ -23,17 +23,7 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
}
}
private class AccessStep
{
public readonly string Identifier;
public readonly Microsoft.CodeAnalysis.Location Location;
public AccessStep(string identifier, Microsoft.CodeAnalysis.Location location)
{
Identifier = identifier;
Location = location;
}
}
private record AccessStep(string Identifier, Microsoft.CodeAnalysis.Location Location);
private class AccessStepPack
{
@@ -47,37 +37,25 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
return this;
}
public AccessStepPack(string identifier, Microsoft.CodeAnalysis.Location location)
{
public AccessStepPack(string identifier, Microsoft.CodeAnalysis.Location location) =>
Last = new AccessStep(identifier, location);
}
}
private static AccessStepPack GetAccessStepPack(ExpressionSyntax syntax)
{
switch (syntax)
private static AccessStepPack GetAccessStepPack(ExpressionSyntax syntax) =>
syntax switch
{
case MemberAccessExpressionSyntax memberAccess:
return GetAccessStepPack(memberAccess.Expression).Add(memberAccess.Name.Identifier.ValueText, memberAccess.Name.Identifier.GetLocation());
case IdentifierNameSyntax identifier:
return new AccessStepPack(identifier.Identifier.Text, identifier.GetLocation());
default:
throw new InternalError(syntax, "Unexpected expression syntax in property patterns.");
}
}
private static AccessStepPack GetAccessStepPack(BaseExpressionColonSyntax syntax)
{
switch (syntax)
{
case NameColonSyntax ncs:
return new AccessStepPack(ncs.Name.ToString(), ncs.Name.GetLocation());
case ExpressionColonSyntax ecs:
return GetAccessStepPack(ecs.Expression);
default:
throw new InternalError(syntax, "Unsupported expression colon in property pattern.");
MemberAccessExpressionSyntax memberAccess => GetAccessStepPack(memberAccess.Expression).Add(memberAccess.Name.Identifier.ValueText, memberAccess.Name.Identifier.GetLocation()),
IdentifierNameSyntax identifier => new AccessStepPack(identifier.Identifier.Text, identifier.GetLocation()),
_ => throw new InternalError(syntax, "Unexpected expression syntax in property patterns."),
};
private static AccessStepPack GetAccessStepPack(BaseExpressionColonSyntax syntax) =>
syntax switch
{
NameColonSyntax ncs => new AccessStepPack(ncs.Name.ToString(), ncs.Name.GetLocation()),
ExpressionColonSyntax ecs => GetAccessStepPack(ecs.Expression),
_ => throw new InternalError(syntax, "Unsupported expression colon in property pattern."),
};
}
private static Expression CreateSyntheticExp(Context cx, Microsoft.CodeAnalysis.Location location, IExpressionParentEntity parent, int child) =>
new Expression(new ExpressionInfo(cx, null, cx.CreateLocation(location), ExprKind.PROPERTY_PATTERN, parent, child, false, null));