VariableInfo: checked increment; get rid of an unused field

Author: ForNeVeR

Cesium.CodeGen/Contexts/AssemblyContext.cs

@@ -5,6 +5,7 @@
 using Cesium.CodeGen.Contexts.Meta;
 using Cesium.CodeGen.Contexts.Utilities;
 using Cesium.CodeGen.Extensions;
+using Cesium.CodeGen.Ir.Declarations;
 using Cesium.CodeGen.Ir.Emitting;
 using Cesium.CodeGen.Ir.Lowering;
 using Cesium.CodeGen.Ir.Types;
@@ -220,17 +221,17 @@ public TypeReference StandardDelegateType(TypeReference returnType, IEnumerable<
         return null;
     }
 
-    internal void AddAssemblyLevelField(string name, Ir.Declarations.StorageClass storageClass, IType type)
+    internal void AddAssemblyLevelField(string name, StorageClass storageClass, IType type)
     {
         if (_globalFields.TryGetValue(name, out var globalField))
         {
-            if (globalField.StorageClass != Ir.Declarations.StorageClass.Extern && storageClass != Ir.Declarations.StorageClass.Extern)
+            if (globalField.StorageClass != StorageClass.Extern && storageClass != StorageClass.Extern)
                 throw new CompilationException($"Cannot add a duplicate global field named \"{name}\".");
 
             return;
         }
 
-        _globalFields.Add(name, new (name, storageClass, type, null));
+        _globalFields.Add(name, new (storageClass, type, null));
     }
 
     public FieldDefinition? ResolveAssemblyLevelField(string name, TranslationUnitContext context)

Cesium.CodeGen/Contexts/BlockScope.cs

@@ -48,7 +48,7 @@ public void AddVariable(StorageClass storageClass, string identifier, IType vari
         switch (storageClass)
         {
             case StorageClass.Auto:
-                _variables.Add(identifier, new(identifier, storageClass, variable, constant));
+                _variables.Add(identifier, new(storageClass, variable, constant));
                 break;
             case StorageClass.Static:
                 ((IDeclarationScope) Parent).AddVariable(storageClass, identifier, variable, constant);

Cesium.CodeGen/Contexts/FunctionScope.cs

@@ -28,7 +28,7 @@ public void DeclareFunction(string identifier, FunctionInfo functionInfo)
     public VariableInfo? GetGlobalField(string identifier) => AssemblyContext.GetGlobalField(identifier);
     public void AddVariable(StorageClass storageClass, string identifier, IType variableType, IExpression? constant)
     {
-        _variables.Add(identifier, new(identifier, storageClass, variableType, constant));
+        _variables.Add(identifier, new(storageClass, variableType, constant));
         if (storageClass == StorageClass.Static)
         {
             Context.AddTranslationUnitLevelField(storageClass, identifier, variableType);

Cesium.CodeGen/Contexts/GlobalConstructorScope.cs

@@ -1,4 +1,3 @@
-using Cesium.Ast;
 using Cesium.CodeGen.Contexts.Meta;
 using Cesium.CodeGen.Ir;
 using Cesium.CodeGen.Ir.BlockItems;
@@ -33,13 +32,13 @@ public void AddVariable(StorageClass storageClass, string identifier, IType vari
     {
         if (constant is not null)
         {
-            _variables.Add(identifier, new(identifier, storageClass, variableType, constant));
+            _variables.Add(identifier, new(storageClass, variableType, constant));
             return;
         }
 
         if (storageClass == StorageClass.Static)
         {
-            _variables.Add(identifier, new(identifier, storageClass, variableType, constant));
+            _variables.Add(identifier, new(storageClass, variableType, constant));
         }
 
         Context.AddTranslationUnitLevelField(storageClass, identifier, variableType);

Cesium.CodeGen/Contexts/VariableInfo.cs

@@ -4,8 +4,8 @@
 
 namespace Cesium.CodeGen.Contexts;
 
-internal record VariableInfo(string Identifier, StorageClass StorageClass, IType Type, IExpression? Constant)
+internal record VariableInfo(StorageClass StorageClass, IType Type, IExpression? Constant)
 {
     static int CurrentIndex = 0;
-    public int Index { get; } = CurrentIndex++;
+    public int Index { get; } = checked(CurrentIndex++);
 }