From b7cd60e4cfbe4033a003da7c9baac3f02d0da948 Mon Sep 17 00:00:00 2001 From: Samuele Lorefice Date: Thu, 23 Jan 2025 16:23:09 +0100 Subject: [PATCH] General cleanup of the generator code --- CodeGenerator/Program.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CodeGenerator/Program.cs b/CodeGenerator/Program.cs index 7de912b..8462ced 100644 --- a/CodeGenerator/Program.cs +++ b/CodeGenerator/Program.cs @@ -16,15 +16,14 @@ namespace CodeGenerator { using CThisRefExp = CodeThisReferenceExpression; using CFieldRefExp = CodeFieldReferenceExpression; - public class Program { - public static BlendFile blendfile; - private static StringBuilder sb = new(); + public static class Program { + private static BlendFile blendfile; + private static readonly StringBuilder sb = new(); private const string OutPath = @"GeneratedOutput\"; private const string Namespace = "BlendFile"; - private static readonly string[] AdaptedTypes = new[] { "uchar" }; private static HashSet customTypes; - public static void Log(string message) { + private static void Log(string message) { sb.AppendLine(message); Console.WriteLine(message); } @@ -36,8 +35,7 @@ namespace CodeGenerator { Log("Generating C# code..."); Log("Pass 1: Generating types"); - CodeNamespace rootNs; - CodeNamespace ns = GenerateTypes(out rootNs); + CodeNamespace ns = GenerateTypes(out var rootNs); Log("Pass 2: Writing out code"); OutputCodeFiles(ns); @@ -369,7 +367,7 @@ namespace CodeGenerator { return cmf; } - public static CodeExpression GenerateArrayInitExpression(CodeTypeReference type, IEnumerable dimensions) { + private static CodeExpression GenerateArrayInitExpression(CodeTypeReference type, IEnumerable dimensions) { var dimValues = dimensions as int[] ?? dimensions.ToArray(); string dims = string.Concat(dimValues.Take(dimValues.Count() - 1).Select(d => $"{d},")); dims += dimValues.Last(); @@ -377,8 +375,9 @@ namespace CodeGenerator { } private static CodeTypeConstructor GenerateStaticConstructor(CodeTypeDeclaration ctd) { - CodeTypeConstructor ctc = new CodeTypeConstructor(); - ctc.Attributes = MemberAttributes.Static; + CodeTypeConstructor ctc = new CodeTypeConstructor { + Attributes = MemberAttributes.Static + }; ctc.Statements.AddRange(ctd.Members .OfType() .Where(f => f.Type.ArrayRank > 0) @@ -409,8 +408,9 @@ namespace CodeGenerator { .OfType() .Select(f => { - var cpde = new CParamDeclExp(f.Type, f.Name); - cpde.Direction = FieldDirection.In; + var cpde = new CParamDeclExp(f.Type, f.Name) { + Direction = FieldDirection.In + }; return cpde; }).ToArray());