refactor: Lua.CodeAnalysis.Compilation

src/Lua/CodeAnalysis/Compilation/Declarements.cs

@@ -3,29 +3,29 @@ using System.Runtime.CompilerServices;
 
 namespace Lua.CodeAnalysis.Compilation;
 
-unsafe struct TextReader(char* Ptr, int Length)
+unsafe struct TextReader(char* ptr, int length)
 {
     public int Position;
 
     public (char, bool) Read()
     {
-        if (Position >= Length) return ('\0', false);
-        return (Ptr[Position++], true);
+        if (Position >= length) return ('\0', false);
+        return (ptr[Position++], true);
     }
 
     public bool TryRead(out char c)
     {
-        if (Position >= Length)
+        if (Position >= length)
         {
             c = '\0';
             return false;
         }
 
-        c = Ptr[Position++];
+        c = ptr[Position++];
         return true;
     }
 
-    public char Current => Ptr[Position];
+    public char Current => ptr[Position];
 }
 
 internal unsafe struct AssignmentTarget(ref AssignmentTarget previous, ExprDesc exprDesc)
@@ -50,11 +50,11 @@ internal class Block : IPoolNode<Block>
     Block() { }
     ref Block? IPoolNode<Block>.NextNode => ref Previous;
 
-    static LinkedPool<Block> pool;
+    static LinkedPool<Block> Pool;
 
     public static Block Get(Block? previous, int firstLabel, int firstGoto, int activeVariableCount, bool hasUpValue, bool isLoop)
     {
-        if (!pool.TryPop(out var block))
+        if (!Pool.TryPop(out var block))
         {
             block = new Block();
         }
@@ -73,7 +73,7 @@ internal class Block : IPoolNode<Block>
     public void Release()
     {
         Previous = null;
-        pool.TryPush(this);
+        Pool.TryPush(this);
     }
 }
 

src/Lua/CodeAnalysis/Compilation/Dump.cs

@@ -84,23 +84,23 @@ internal unsafe struct Header
 internal unsafe ref struct DumpState(IBufferWriter<byte> writer, bool reversedEndian)
 {
     public readonly IBufferWriter<byte> Writer = writer;
-    Span<byte> UnWritten;
+    Span<byte> unWritten;
 
     void Write(ReadOnlySpan<byte> span)
     {
         var toWrite = span;
-        var remaining = UnWritten.Length;
+        var remaining = unWritten.Length;
         if (span.Length > remaining)
         {
-            span[..remaining].CopyTo(UnWritten);
+            span[..remaining].CopyTo(unWritten);
             Writer.Advance(remaining);
             toWrite = span[remaining..];
-            UnWritten = Writer.GetSpan(toWrite.Length);
+            unWritten = Writer.GetSpan(toWrite.Length);
         }
 
-        toWrite.CopyTo(UnWritten);
+        toWrite.CopyTo(unWritten);
         Writer.Advance(toWrite.Length);
-        UnWritten = UnWritten[toWrite.Length..];
+        unWritten = unWritten[toWrite.Length..];
     }
 
     public bool IsReversedEndian => reversedEndian;
@@ -113,9 +113,9 @@ internal unsafe ref struct DumpState(IBufferWriter<byte> writer, bool reversedEn
 
     public void Dump(Prototype prototype)
     {
-        if (UnWritten.Length == 0)
+        if (unWritten.Length == 0)
         {
-            UnWritten = Writer.GetSpan(Header.Size + 32);
+            unWritten = Writer.GetSpan(Header.Size + 32);
         }
 
         DumpHeader();
@@ -230,7 +230,7 @@ internal unsafe ref struct DumpState(IBufferWriter<byte> writer, bool reversedEn
                     WriteDouble(c.UnsafeReadDouble());
                     break;
                 case LuaValueType.String:
-                    WriteString(c.UnsafeRead<string>()!);
+                    WriteString(c.UnsafeRead<string>());
                     break;
             }
         }

src/Lua/CodeAnalysis/Compilation/Function.cs

@@ -117,7 +117,7 @@ internal class Function : IPoolNode<Function>
 
     public ExprDesc CloseFunction()
     {
-        var e = P.Function!.Previous!.ExpressionToNextRegister(MakeExpression(Kind.Relocatable, Previous!.EncodeABx(OpCode.Closure, 0, Previous!.Proto.PrototypeList.Length - 1)));
+        var e = P.Function.Previous!.ExpressionToNextRegister(MakeExpression(Kind.Relocatable, Previous!.EncodeABx(OpCode.Closure, 0, Previous!.Proto.PrototypeList.Length - 1)));
         P.Function.ReturnNone();
         P.Function.LeaveBlock();
         Assert(P.Function.Block == null);
@@ -238,7 +238,7 @@ internal class Function : IPoolNode<Function>
 
     public void CheckRepeatedLabel(string name)
     {
-        foreach (var l in P.ActiveLabels.AsSpan().Slice(Block!.FirstLabel))
+        foreach (var l in P.ActiveLabels.AsSpan().Slice(Block.FirstLabel))
         {
             if (l.Name == name)
             {
@@ -250,7 +250,7 @@ internal class Function : IPoolNode<Function>
 
     public void FindGotos(int label)
     {
-        for (var i = Block!.FirstGoto; i < P.PendingGotos.Length;)
+        for (var i = Block.FirstGoto; i < P.PendingGotos.Length;)
         {
             var l = P.ActiveLabels[label];
             if (P.PendingGotos[i].Name == l.Name)

src/Lua/CodeAnalysis/Compilation/Parser.cs

@@ -360,17 +360,17 @@ internal class Parser : IPoolNode<Parser>, IDisposable
                 return OprPow;
             case TkConcat:
                 return OprConcat;
-            case TkNE:
+            case TkNe:
                 return OprNE;
             case TkEq:
                 return OprEq;
             case '<':
                 return OprLT;
-            case TkLE:
+            case TkLe:
                 return OprLE;
             case '>':
                 return OprGT;
-            case TkGE:
+            case TkGe:
                 return OprGE;
             case TkAnd:
                 return OprAnd;
@@ -440,7 +440,7 @@ internal class Parser : IPoolNode<Parser>, IDisposable
             case TkElse:
             case TkElseif:
             case TkEnd:
-            case TkEOS:
+            case TkEos:
                 return true;
             case TkUntil:
                 return withUntil;
@@ -966,7 +966,7 @@ internal class Parser : IPoolNode<Parser>, IDisposable
         Function.OpenMainFunction();
         Next();
         StatementList();
-        Scanner.Check(TkEOS);
+        Scanner.Check(TkEos);
         Function = Function.CloseMainFunction();
     }
 
@@ -977,7 +977,7 @@ internal class Parser : IPoolNode<Parser>, IDisposable
             R = r,
             LineNumber = 1,
             LastLine = 1,
-            LookAheadToken = new() { T = TkEOS },
+            LookAheadToken = new() { T = TkEos },
             L = l,
             Buffer = new(),
             Source = name

src/Lua/CodeAnalysis/Compilation/PrototypeBuilder.cs

@@ -32,7 +32,7 @@ internal class PrototypeBuilder : IPoolNode<PrototypeBuilder>
         Source = source;
     }
 
-    static LinkedPool<PrototypeBuilder> pool;
+    static LinkedPool<PrototypeBuilder> Pool;
 
 
     PrototypeBuilder? nextNode;
@@ -40,7 +40,7 @@ internal class PrototypeBuilder : IPoolNode<PrototypeBuilder>
 
     internal static PrototypeBuilder Get(string source)
     {
-        if (!pool.TryPop(out var f))
+        if (!Pool.TryPop(out var f))
         {
             f = new PrototypeBuilder(source);
         }
@@ -57,7 +57,7 @@ internal class PrototypeBuilder : IPoolNode<PrototypeBuilder>
         LineInfoList.Clear();
         LocalVariablesList.Clear();
         UpValuesList.Clear();
-        pool.TryPush(this);
+        Pool.TryPush(this);
     }
 
 

src/Lua/CodeAnalysis/Compilation/Scanner.cs

@@ -23,14 +23,6 @@ internal struct Scanner
     public int T => Token.T;
 
 
-    static string ChunkID(string source)
-    {
-        var shortSourceBuffer = (stackalloc char[59]);
-        var len = LuaDebug.WriteShortSource(source, shortSourceBuffer);
-        return shortSourceBuffer[..len].ToString();
-    }
-
-
     public const int FirstReserved = ushort.MaxValue + 257;
     public const int EndOfStream = -1;
 
@@ -62,12 +54,12 @@ internal struct Scanner
     public const int TkConcat = TkWhile + 1;
     public const int TkDots = TkConcat + 1;
     public const int TkEq = TkDots + 1;
-    public const int TkGE = TkEq + 1;
-    public const int TkLE = TkGE + 1;
-    public const int TkNE = TkLE + 1;
-    public const int TkDoubleColon = TkNE + 1;
-    public const int TkEOS = TkDoubleColon + 1;
-    public const int TkNumber = TkEOS + 1;
+    public const int TkGe = TkEq + 1;
+    public const int TkLe = TkGe + 1;
+    public const int TkNe = TkLe + 1;
+    public const int TkDoubleColon = TkNe + 1;
+    public const int TkEos = TkDoubleColon + 1;
+    public const int TkNumber = TkEos + 1;
     public const int TkName = TkNumber + 1;
     public const int TkString = TkName + 1;
 
@@ -90,9 +82,9 @@ internal struct Scanner
     public void SyntaxError(string message) => ScanError(message, Token.T);
     public void ErrorExpected(char t) => SyntaxError(TokenToString(t) + " expected");
     public void NumberError() => ScanError("malformed number", TkNumber);
-    public static bool IsNewLine(int c) => c == '\n' || c == '\r';
+    public static bool IsNewLine(int c) => c is '\n' or '\r';
 
-    public static bool IsDecimal(int c) => '0' <= c && c <= '9';
+    public static bool IsDecimal(int c) => c is >= '0' and <= '9';
 
 
     public static string TokenToString(Token t) => t.T switch
@@ -100,7 +92,7 @@ internal struct Scanner
         TkName or TkString => t.S,
         TkNumber => $"{t.N}",
         < FirstReserved => $"{(char)t.T}", // TODO check for printable rune
-        < TkEOS => $"'{tokens[t.T - FirstReserved]}'",
+        < TkEos => $"'{tokens[t.T - FirstReserved]}'",
         _ => tokens[t.T - FirstReserved]
     };
 
@@ -109,7 +101,7 @@ internal struct Scanner
         TkName or TkString => Token.S,
         TkNumber => $"{Token.N}",
         < FirstReserved => $"{(char)t}", // TODO check for printable rune
-        < TkEOS => $"'{tokens[t - FirstReserved]}'",
+        < TkEos => $"'{tokens[t - FirstReserved]}'",
         _ => tokens[t - FirstReserved]
     };
 
@@ -123,9 +115,10 @@ internal struct Scanner
 
     public void ScanError(string message, int token)
     {
-        var buff = ChunkID(Source);
-        if (token != 0) message = $"{buff}:{LineNumber}: {message} near {TokenToString(token)}";
-        else message = $"{buff}:{LineNumber}: {message}";
+        var shortSourceBuffer = (stackalloc char[59]);
+        var len = LuaDebug.WriteShortSource(Source, shortSourceBuffer);
+        var buff = shortSourceBuffer[..len].ToString();
+        message = token != 0 ? $"{buff}:{LineNumber}: {message} near {TokenToString(token)}" : $"{buff}:{LineNumber}: {message}";
         throw new LuaScanException(message);
     }
 
@@ -177,7 +170,7 @@ internal struct Scanner
     public int SkipSeparator()
     {
         var (i, c) = (0, Current);
-        Assert(c == '[' || c == ']');
+        Assert(c is '[' or ']');
         for (SaveAndAdvance(); Current == '='; i++) SaveAndAdvance();
         if (Current == c) return i;
         return -i - 1;
@@ -197,14 +190,7 @@ internal struct Scanner
             switch (Current)
             {
                 case EndOfStream:
-                    if (comment)
-                    {
-                        ScanError("unfinished long comment", TkEOS);
-                    }
-                    else
-                    {
-                        ScanError("unfinished long string", TkEOS);
-                    }
+                    ScanError(comment ? "unfinished long comment" : "unfinished long string", TkEos);
 
                     break;
                 case ']':
@@ -488,7 +474,7 @@ internal struct Scanner
             switch (Current)
             {
                 case EndOfStream:
-                    ScanError("unfinished string", TkEOS);
+                    ScanError("unfinished string", TkEos);
                     break;
                 case '\n' or '\r':
                     ScanError("unfinished string", TkString);
@@ -660,7 +646,7 @@ internal struct Scanner
                     }
 
                     Advance();
-                    return new() { T = TkLE };
+                    return new() { T = TkLe };
                 case '>':
                     Advance();
                     if (Current != '=')
@@ -669,7 +655,7 @@ internal struct Scanner
                     }
 
                     Advance();
-                    return new() { T = TkGE };
+                    return new() { T = TkGe };
                 case '~':
                     Advance();
                     if (Current != '=')
@@ -678,7 +664,7 @@ internal struct Scanner
                     }
 
                     Advance();
-                    return new() { T = TkNE };
+                    return new() { T = TkNe };
                 case ':':
                     Advance();
                     if (Current != ':')
@@ -692,7 +678,7 @@ internal struct Scanner
                 case '\'':
                     return ReadString();
                 case EndOfStream:
-                    return new() { T = TkEOS };
+                    return new() { T = TkEos };
                 case '.':
                     SaveAndAdvance();
                     if (CheckNext("."))
@@ -745,10 +731,10 @@ internal struct Scanner
     public void Next()
     {
         LastLine = LineNumber;
-        if (LookAheadToken.T != TkEOS)
+        if (LookAheadToken.T != TkEos)
         {
             Token = LookAheadToken;
-            LookAheadToken.T = TkEOS;
+            LookAheadToken.T = TkEos;
         }
         else
         {
@@ -759,7 +745,7 @@ internal struct Scanner
 
     public int LookAhead()
     {
-        Assert(LookAheadToken.T == TkEOS);
+        Assert(LookAheadToken.T == TkEos);
         LookAheadToken = Scan();
         return LookAheadToken.T;
     }
@@ -801,11 +787,11 @@ internal struct Scanner
         }
     }
 
-    static bool IsWhiteSpace(int c) => c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' || c == '\v';
+    static bool IsWhiteSpace(int c) => c is ' ' or '\t' or '\n' or '\r' or '\f' or '\v';
     static bool IsDigit(int c) => c is >= '0' and <= '9';
 
     static bool IsLetter(int c)
     {
-        return c < ushort.MaxValue && c is '_' or >= 'a' and <= 'z' or >= 'A' and <= 'Z';
+        return c is < ushort.MaxValue and ('_' or >= 'a' and <= 'z' or >= 'A' and <= 'Z');
     }
 }

src/Lua/CodeAnalysis/Compilation/Token.cs

@@ -12,6 +12,6 @@ internal struct Token
 
     public static implicit operator Token(int token)
     {
-        return new Token { T = token };
+        return new() { T = token };
     }
 }