Merge pull request #14 from chrisjbreisch/feature/error-handling

interface cleanup

Trs80.Level1Basic.CommandModels/ITrs80DataModel.cs

@@ -0,0 +1,8 @@
+using Trs80.Level1Basic.HostMachine;
+
+namespace Trs80.Level1Basic.CommandModels;
+
+public interface ITrs80DataModel
+{
+    HostFont OriginalHostFont { get; set; }
+}

Trs80.Level1Basic.CommandModels/Trs80DataModel.cs

@@ -2,11 +2,6 @@
 
 namespace Trs80.Level1Basic.CommandModels;
 
-public interface ITrs80DataModel
-{
-    HostFont OriginalHostFont { get; set; }
-}
-
 public class Trs80DataModel : ITrs80DataModel
 {
     public HostFont OriginalHostFont { get; set; } = new();

Trs80.Level1Basic.Common/AppSettings.cs

@@ -1,12 +1,6 @@
 
 namespace Trs80.Level1Basic.Common;
 
-public interface IAppSettings
-{
-    string FontName { get; set; }
-    short FontSize { get; set; }
-}
-
 public sealed class AppSettings : IAppSettings
 {
     public string FontName { get; set; }

Trs80.Level1Basic.Common/IAppSettings.cs

@@ -0,0 +1,7 @@
+namespace Trs80.Level1Basic.Common;
+
+public interface IAppSettings
+{
+    string FontName { get; set; }
+    short FontSize { get; set; }
+}

Trs80.Level1Basic.HostMachine/FontInfo.cs

@@ -0,0 +1,16 @@
+using System.Runtime.InteropServices;
+
+namespace Trs80.Level1Basic.HostMachine;
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+public struct FontInfo
+{
+    public int cbSize;
+    public int FontIndex;
+    public short FontWidth;
+    public short FontSize;
+    public int FontFamily;
+    public int FontWeight;
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+    public string FontName;
+}

Trs80.Level1Basic.HostMachine/Host.cs

@@ -10,30 +10,6 @@
 
 namespace Trs80.Level1Basic.HostMachine;
 
-[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-public struct FontInfo
-{
-    public int cbSize;
-    public int FontIndex;
-    public short FontWidth;
-    public short FontSize;
-    public int FontFamily;
-    public int FontWeight;
-    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-    public string FontName;
-}
-
-[StructLayout(LayoutKind.Sequential)]
-public struct Rect
-{
-    public int Left;        // x position of upper-left corner
-    public int Top;         // y position of upper-left corner
-    public int Right;       // x position of lower-right corner
-    public int Bottom;      // y position of lower-right corner
-}
-
-
-
 public class Host : IHost, IDisposable 
 {
     // https://www.pinvoke.net/default.aspx/user32/FindWindow.html

Trs80.Level1Basic.HostMachine/Rect.cs

@@ -0,0 +1,12 @@
+using System.Runtime.InteropServices;
+
+namespace Trs80.Level1Basic.HostMachine;
+
+[StructLayout(LayoutKind.Sequential)]
+public struct Rect
+{
+    public int Left;        // x position of upper-left corner
+    public int Top;         // y position of upper-left corner
+    public int Right;       // x position of lower-right corner
+    public int Bottom;      // y position of lower-right corner
+}

Trs80.Level1Basic.VirtualMachine/Interpreter/Interpreter.cs

@@ -650,7 +650,8 @@ private void ExecuteGosub(IStatement jumpToStatement, IStatement resumeStatement
 
     public Void VisitPrintStatement(Print statement)
     {
-        if (statement.AtPosition != null) PrintAt(statement.AtPosition);
+        if (statement.AtPosition != null) 
+            PrintAt(statement.AtPosition);
 
         if (statement.Expressions is { Count: > 0 })
             foreach (Expression expression in statement.Expressions)
@@ -661,6 +662,7 @@ public Void VisitPrintStatement(Print statement)
         _trs80.WriteLine();
         _machine.CursorX = 0;
         _machine.CursorY++;
+
         return null!;
     }
 

Trs80.Level1Basic.VirtualMachine/Machine/Callable.cs

@@ -3,12 +3,6 @@
 
 namespace Trs80.Level1Basic.VirtualMachine.Machine;
 
-public interface ICallable
-{
-    int Arity { get; set; }
-    Func<ITrs80, List<dynamic>, dynamic> Call { get; set; }
-}
-
 public class Callable : ICallable
 {
     public int Arity { get; set; }

Trs80.Level1Basic.VirtualMachine/Machine/ICallable.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Trs80.Level1Basic.VirtualMachine.Machine;
+
+public interface ICallable
+{
+    int Arity { get; set; }
+    Func<ITrs80, List<dynamic>, dynamic> Call { get; set; }
+}

Trs80.Level1Basic.VirtualMachine/Machine/INativeFunctions.cs

@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Trs80.Level1Basic.VirtualMachine.Machine;
+
+public interface INativeFunctions
+{
+    List<Callable> Get(string name);
+}

Trs80.Level1Basic.VirtualMachine/Machine/NativeFunctions.cs

@@ -3,11 +3,6 @@
 
 namespace Trs80.Level1Basic.VirtualMachine.Machine;
 
-public interface INativeFunctions
-{
-    List<Callable> Get(string name);
-}
-
 [SuppressMessage("ReSharper", "UnusedParameter.Local")]
 public class NativeFunctions : INativeFunctions
 {

Trs80.Level1Basic.VirtualMachine/Parser/IParser.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Trs80.Level1Basic.VirtualMachine.Parser.Statements;
+using Trs80.Level1Basic.VirtualMachine.Scanner;
+
+namespace Trs80.Level1Basic.VirtualMachine.Parser;
+
+public interface IParser
+{
+    IStatement Parse(List<Token> tokens);
+}

Trs80.Level1Basic.VirtualMachine/Parser/Parser.cs

@@ -12,11 +12,6 @@
 
 namespace Trs80.Level1Basic.VirtualMachine.Parser;
 
-public interface IParser
-{
-    IStatement Parse(List<Token> tokens);
-}
-
 public class Parser : IParser
 {
     private List<Token> _tokens;

Trs80.Level1Basic.VirtualMachine/Parser/Statements/IListStatementDecorator.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Trs80.Level1Basic.VirtualMachine.Parser.Statements;
+
+public interface IListStatementDecorator : IStatement
+{
+    public Type BaseType();
+    public IStatement UnDecorate();
+
+    IStatement Enclosing { get; set; }
+}

Trs80.Level1Basic.VirtualMachine/Parser/Statements/ListStatementDecorator.cs

@@ -2,14 +2,6 @@
 
 namespace Trs80.Level1Basic.VirtualMachine.Parser.Statements;
 
-public interface IListStatementDecorator : IStatement
-{
-    public Type BaseType();
-    public IStatement UnDecorate();
-
-    IStatement Enclosing { get; set; }
-}
-
 public class ListStatementDecorator : IListStatementDecorator
 {
     private readonly IStatement _statement;

Trs80.Level1Basic.VirtualMachine/Scanner/IScanner.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using Trs80.Level1Basic.Common;
+
+namespace Trs80.Level1Basic.VirtualMachine.Scanner;
+
+public interface IScanner
+{
+    List<Token> ScanTokens(SourceLine source);
+}

Trs80.Level1Basic.VirtualMachine/Scanner/Scanner.cs

@@ -6,11 +6,6 @@
 
 namespace Trs80.Level1Basic.VirtualMachine.Scanner;
 
-public interface IScanner
-{
-    List<Token> ScanTokens(SourceLine source);
-}
-
 public class Scanner : IScanner
 {
     private string _source;

Trs80.Level1Basic.Workflow/IInputStep.cs

@@ -0,0 +1,11 @@
+using Trs80.Level1Basic.Common;
+using WorkflowCore.Interface;
+
+namespace Trs80.Level1Basic.Workflow;
+
+public interface IInputStep : IStepBody
+{
+    bool WritePrompt { get; set; }
+    bool Done { get; set; }
+    SourceLine SourceLine { get; set; }
+}

Trs80.Level1Basic.Workflow/IInterpretStep.cs

@@ -0,0 +1,9 @@
+using Trs80.Level1Basic.VirtualMachine.Parser.Statements;
+using WorkflowCore.Interface;
+
+namespace Trs80.Level1Basic.Workflow;
+
+public interface IInterpretStep : IStepBody
+{
+    Statement Statement { get; set; }
+}

Trs80.Level1Basic.Workflow/IParseStep.cs

@@ -0,0 +1,11 @@
+using Trs80.Level1Basic.VirtualMachine.Parser.Statements;
+using Trs80.Level1Basic.VirtualMachine.Scanner;
+using WorkflowCore.Interface;
+
+namespace Trs80.Level1Basic.Workflow;
+
+public interface IParseStep : IStepBody
+{
+    List<Token> Tokens { get; set; }
+    IStatement Statement { get; set; }
+}

Trs80.Level1Basic.Workflow/IScanStep.cs

@@ -0,0 +1,11 @@
+using Trs80.Level1Basic.Common;
+using Trs80.Level1Basic.VirtualMachine.Scanner;
+using WorkflowCore.Interface;
+
+namespace Trs80.Level1Basic.Workflow;
+
+public interface IScanStep : IStepBody
+{
+    SourceLine SourceLine { get; set; }
+    List<Token> Tokens { get; set; }
+}

Trs80.Level1Basic.Workflow/ISetupConsoleStep.cs

@@ -0,0 +1,7 @@
+using WorkflowCore.Interface;
+
+namespace Trs80.Level1Basic.Workflow;
+
+public interface ISetupConsoleStep : IStepBody
+{
+}

Trs80.Level1Basic.Workflow/IShutdownConsoleStep.cs

@@ -0,0 +1,7 @@
+using WorkflowCore.Interface;
+
+namespace Trs80.Level1Basic.Workflow;
+
+public interface IShutdownConsoleStep : IStepBody
+{
+}

Trs80.Level1Basic.Workflow/InputStep.cs

@@ -6,13 +6,6 @@
 
 namespace Trs80.Level1Basic.Workflow;
 
-public interface IInputStep : IStepBody
-{
-    bool WritePrompt { get; set; }
-    bool Done { get; set; }
-    SourceLine SourceLine { get; set; }
-}
-
 public class InputStep : StepBody, IInputStep
 {
     private readonly ICommand<InputModel> _command;

Trs80.Level1Basic.Workflow/InterpretStep.cs

@@ -6,11 +6,6 @@
 
 namespace Trs80.Level1Basic.Workflow;
 
-public interface IInterpretStep : IStepBody
-{
-    Statement Statement { get; set; }
-}
-
 public class InterpretStep : StepBody, IInterpretStep
 {
     private readonly ICommand<InterpretModel> _command;

Trs80.Level1Basic.Workflow/ParseStep.cs

@@ -8,12 +8,6 @@
 
 namespace Trs80.Level1Basic.Workflow;
 
-public interface IParseStep : IStepBody
-{
-    List<Token> Tokens { get; set; }
-    IStatement Statement { get; set; }
-}
-
 public class ParseStep : StepBody, IParseStep
 {
     private readonly ICommand<ParseModel> _command;

Trs80.Level1Basic.Workflow/ScanStep.cs

@@ -7,12 +7,6 @@
 
 namespace Trs80.Level1Basic.Workflow;
 
-public interface IScanStep : IStepBody
-{
-    SourceLine SourceLine { get; set; }
-    List<Token> Tokens { get; set; }
-}
-
 public class ScanStep : StepBody, IScanStep
 {
     private readonly ICommand<ScanModel> _command;