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

C#: Simplify object initialization

Browse Source
This commit is contained in:
Tamas Vajk
2020-10-02 11:17:12 +02:00
parent b793af571e
commit 504f56adeb
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
csharp/extractor/Semmle.Extraction.CIL.Driver/ExtractorOptions.cs
View File

@@ -121,8 +121,10 @@ namespace Semmle.Extraction.CIL.Driver
filesAnalyzed.Add(assemblyPath);
try
{
var info = new AssemblyInfo(assemblyPath);
info.extract = extractAll;
var info = new AssemblyInfo(assemblyPath)
{
extract = extractAll
};
if (!assembliesRead.ContainsKey(info.name))
assembliesRead.Add(info.name, info);
}

10
csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs
View File

@@ -30,10 +30,12 @@ namespace Semmle.Extraction.CIL.Entities
cx.assembly = this;
var def = cx.mdReader.GetAssemblyDefinition();
assemblyName = new AssemblyName();
assemblyName.Name = cx.mdReader.GetString(def.Name);
assemblyName.Version = def.Version;
assemblyName.CultureInfo = new CultureInfo(cx.mdReader.GetString(def.Culture));
assemblyName = new AssemblyName
{
Name = cx.mdReader.GetString(def.Name),
Version = def.Version,
CultureInfo = new CultureInfo(cx.mdReader.GetString(def.Culture))
};
if (!def.PublicKey.IsNil)
assemblyName.SetPublicKey(cx.mdReader.GetBlobBytes(def.PublicKey));

6
csharp/extractor/Semmle.Extraction.CIL/Factories.cs
View File

@@ -72,8 +72,10 @@ namespace Semmle.Extraction.CIL
if (e is null)
{
e = new PrimitiveType(this, code);
e.Label = cx.GetNewLabel();
e = new PrimitiveType(this, code)
{
Label = cx.GetNewLabel()
};
cx.DefineLabel(e, cx.TrapWriter.Writer, cx.Extractor);
primitiveTypes[(int)code] = e;
}