Slight refactoring of codegen structure (#460)

* Moved instructions

* More

* Fix

src/Draco.Compiler/Internal/Codegen/CilCodegen.cs

@@ -7,6 +7,7 @@
 using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using Draco.Compiler.Internal.OptimizingIr;
+using Draco.Compiler.Internal.OptimizingIr.Instructions;
 using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 using Constant = Draco.Compiler.Internal.OptimizingIr.Model.Constant;
@@ -145,7 +146,7 @@ IEnumerable<IOperand> RemainingOperands()
 
         switch (instruction)
         {
-        case OptimizingIr.Model.SequencePoint sp:
+        case OptimizingIr.Instructions.SequencePoint sp:
         {
             this.PdbCodegen?.AddSequencePoint(this.InstructionEncoder, sp);
             break;
@@ -357,28 +358,15 @@ IEnumerable<IOperand> RemainingOperands()
         }
         case CallInstruction call:
         {
-            // Arguments
+            // Optional receiver and arguments
             foreach (var arg in RemainingOperands()) this.EncodePush(arg);
             // Call
-            this.InstructionEncoder.OpCode(ILOpCode.Call);
+            this.InstructionEncoder.OpCode(call.Procedure.IsVirtual ? ILOpCode.Callvirt : ILOpCode.Call);
             this.EncodeToken(call.Procedure);
             // Store result
             this.StoreRegister(call.Target);
             break;
         }
-        case MemberCallInstruction mcall:
-        {
-            // Receiver
-            this.EncodePush(NextOperand());
-            // Arguments
-            foreach (var arg in RemainingOperands()) this.EncodePush(arg);
-            // Call
-            this.InstructionEncoder.OpCode(mcall.Procedure.IsVirtual ? ILOpCode.Callvirt : ILOpCode.Call);
-            this.EncodeToken(mcall.Procedure);
-            // Store result
-            this.StoreRegister(mcall.Target);
-            break;
-        }
         case NewObjectInstruction newObj:
         {
             // Arguments

src/Draco.Compiler/Internal/Codegen/PdbCodegen.cs

@@ -105,7 +105,7 @@ public void EndScope(int ilOffset)
             Length: ilOffset - start.StartOffset));
     }
 
-    public void AddSequencePoint(InstructionEncoder encoder, OptimizingIr.Model.SequencePoint sequencePoint)
+    public void AddSequencePoint(InstructionEncoder encoder, OptimizingIr.Instructions.SequencePoint sequencePoint)
     {
         var sp = MakeSequencePoint(encoder, sequencePoint.Range);
         this.sequencePoints.Add(sp);

src/Draco.Compiler/Internal/OptimizingIr/FunctionBodyCodegen.cs

@@ -4,6 +4,7 @@
 using Draco.Compiler.Api;
 using Draco.Compiler.Internal.Binding;
 using Draco.Compiler.Internal.BoundTree;
+using Draco.Compiler.Internal.OptimizingIr.Instructions;
 using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 using Draco.Compiler.Internal.Symbols.Generic;
@@ -290,14 +291,7 @@ public override IOperand VisitCallExpression(BoundCallExpression node)
         else
         {
             var callResult = this.DefineRegister(node.TypeRequired);
-            if (receiver is null)
-            {
-                this.Write(Call(callResult, proc, args));
-            }
-            else
-            {
-                this.Write(MemberCall(callResult, proc, receiver, args));
-            }
+            this.Write(Call(callResult, proc, receiver, args));
             return callResult;
         }
     }

src/Draco.Compiler/Internal/OptimizingIr/InstructionFactory.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Draco.Compiler.Api.Syntax;
+using Draco.Compiler.Internal.OptimizingIr.Instructions;
 using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
@@ -28,10 +29,10 @@ public static LoadFieldInstruction LoadField(Register target, IOperand receiver,
     public static JumpInstruction Jump(BasicBlock target) => new(target);
     public static BranchInstruction Branch(IOperand condition, BasicBlock then, BasicBlock @else) =>
         new(condition, then, @else);
-    public static CallInstruction Call(Register target, FunctionSymbol proc, IEnumerable<IOperand> args) =>
-        new(target, proc, args);
-    public static MemberCallInstruction MemberCall(Register target, FunctionSymbol proc, IOperand receiver, IEnumerable<IOperand> args) =>
+    public static CallInstruction Call(Register target, FunctionSymbol proc, IOperand? receiver, IEnumerable<IOperand> args) =>
         new(target, proc, receiver, args);
+    public static CallInstruction Call(Register target, FunctionSymbol proc, IEnumerable<IOperand> args) =>
+        Call(target, proc, null, args);
     public static NewObjectInstruction NewObject(Register target, FunctionSymbol ctor, IEnumerable<IOperand> args) =>
         new(target, ctor, args);
     public static NewDelegateInstruction NewDelegate(Register target, IOperand? receiver, FunctionSymbol function, FunctionSymbol delegateCtor) =>

src/Draco.Compiler/Internal/OptimizingIr/Model/AddressOfInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/AddressOfInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Loads the address of some local/global/argument.

src/Draco.Compiler/Internal/OptimizingIr/Model/ArithmeticInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/ArithmeticInstruction.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Represents some kind of binary arithmetic instruction.

src/Draco.Compiler/Internal/OptimizingIr/Model/ArithmeticOp.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/ArithmeticOp.cs

@@ -1,4 +1,4 @@
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// The different arithmetic operations supported.

src/Draco.Compiler/Internal/OptimizingIr/Model/ArrayLengthInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/ArrayLengthInstruction.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// An array length query.

src/Draco.Compiler/Internal/OptimizingIr/Model/BoxInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/BoxInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Valuetype element boxing.

src/Draco.Compiler/Internal/OptimizingIr/Model/BranchInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/BranchInstruction.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A conditional jump.

src/Draco.Compiler/Internal/OptimizingIr/Instructions/CallInstruction.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Linq;
+using Draco.Compiler.Internal.OptimizingIr.Model;
+using Draco.Compiler.Internal.Symbols;
+
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
+
+/// <summary>
+/// A procedure call.
+/// </summary>
+internal sealed class CallInstruction(
+    Register target,
+    FunctionSymbol procedure,
+    IOperand? receiver,
+    IEnumerable<IOperand> arguments) : InstructionBase, IValueInstruction
+{
+    public override string InstructionKeyword => "call";
+
+    public Register Target { get; set; } = target;
+
+    /// <summary>
+    /// The called procedure.
+    /// </summary>
+    public FunctionSymbol Procedure { get; set; } = procedure;
+
+    /// <summary>
+    /// The receiver the method is called on.
+    /// </summary>
+    public IOperand? Receiver { get; set; } = receiver;
+
+    /// <summary>
+    /// The arguments that are passed to the procedure.
+    /// </summary>
+    public IList<IOperand> Arguments { get; set; } = arguments.ToList();
+
+    public override IEnumerable<Symbol> StaticOperands => [this.Procedure];
+    public override IEnumerable<IOperand> Operands => this.Receiver is null
+        ? this.Arguments
+        : this.Arguments.Prepend(this.Receiver);
+
+    public override string ToString()
+    {
+        var target = this.Target.ToOperandString();
+        var receiver = this.Receiver is null
+            ? string.Empty
+            : $"{this.Receiver.ToOperandString()}.";
+        var args = string.Join(", ", this.Arguments.Select(a => a.ToOperandString()));
+        return $"{target} := {this.InstructionKeyword} {receiver}[{this.Procedure.FullName}]({args})";
+    }
+
+    public override CallInstruction Clone() => new(this.Target, this.Procedure, this.Receiver, this.Arguments);
+}

src/Draco.Compiler/Internal/OptimizingIr/Model/EndScope.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/EndScope.cs

@@ -1,4 +1,4 @@
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A pseudo-instruction for representing the end of a local scope.

src/Draco.Compiler/Internal/OptimizingIr/Model/IInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/IInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Read-only interface of an instruction.

src/Draco.Compiler/Internal/OptimizingIr/Model/IValueInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/IValueInstruction.cs

@@ -1,4 +1,6 @@
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+using Draco.Compiler.Internal.OptimizingIr.Model;
+
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// An instruction that produces a result in a register.

src/Draco.Compiler/Internal/OptimizingIr/Model/InstructionBase.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/InstructionBase.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A mutable base class for <see cref="IInstruction"/> implementations.

src/Draco.Compiler/Internal/OptimizingIr/Model/JumpInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/JumpInstruction.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// An unconditional jump.

src/Draco.Compiler/Internal/OptimizingIr/Model/LoadElementInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/LoadElementInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// An array element access.

src/Draco.Compiler/Internal/OptimizingIr/Model/LoadFieldInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/LoadFieldInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A field access.

src/Draco.Compiler/Internal/OptimizingIr/Model/LoadInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/LoadInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Loads a value from a local/global/argument.

src/Draco.Compiler/Internal/OptimizingIr/Model/NewArrayInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/NewArrayInstruction.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// An array instantiation.

src/Draco.Compiler/Internal/OptimizingIr/Model/NewDelegateInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/NewDelegateInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A delegate instantiation.

src/Draco.Compiler/Internal/OptimizingIr/Model/NewObjectInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/NewObjectInstruction.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// An object instantiation.

src/Draco.Compiler/Internal/OptimizingIr/Model/NopInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/NopInstruction.cs

@@ -1,4 +1,4 @@
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Represents no operation.

src/Draco.Compiler/Internal/OptimizingIr/Model/RetInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/RetInstruction.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Returns from the current procedure.

src/Draco.Compiler/Internal/OptimizingIr/Model/SequencePoint.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/SequencePoint.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using Draco.Compiler.Api.Syntax;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A pseudo-instruction for representing sequence points.

src/Draco.Compiler/Internal/OptimizingIr/Model/StartScope.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/StartScope.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// A pseudo-instruction for representing the start of a local scope.

src/Draco.Compiler/Internal/OptimizingIr/Model/StoreElementInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/StoreElementInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Stores a value in an array element.

src/Draco.Compiler/Internal/OptimizingIr/Model/StoreFieldInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/StoreFieldInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Stores a value in a field.

src/Draco.Compiler/Internal/OptimizingIr/Model/StoreInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/StoreInstruction.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Stores a value in a local/global/argument.

src/Draco.Compiler/Internal/OptimizingIr/Model/TreeInstruction.cs → src/Draco.Compiler/Internal/OptimizingIr/Instructions/TreeInstruction.cs

@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using Draco.Compiler.Internal.OptimizingIr.Model;
 using Draco.Compiler.Internal.Symbols;
 
-namespace Draco.Compiler.Internal.OptimizingIr.Model;
+namespace Draco.Compiler.Internal.OptimizingIr.Instructions;
 
 /// <summary>
 /// Represents a tree-ified instruction, that's only part of the stackification process.

src/Draco.Compiler/Internal/OptimizingIr/Model/BasicBlock.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Draco.Compiler.Internal.OptimizingIr.Instructions;
 using Draco.Compiler.Internal.Symbols;
 
 namespace Draco.Compiler.Internal.OptimizingIr.Model;