patrick/WoofWare.PawPrint
1
0
Fork 0
mirror of https://github.com/Smaug123/WoofWare.PawPrint synced 2025-10-12 00:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up return flow (#12)

Browse Source
This commit is contained in:
Patrick Stevens
2025-05-23 14:04:13 +01:00
committed by GitHub
parent 109b3a70fc
commit a933df4424
7 changed files with 104 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WoofWare.PawPrint.Test/Roslyn.fs
View File

@@ -13,7 +13,7 @@ module Roslyn =
let compile (sources : string list) : byte[] =
// Create a syntax tree per source snippet.
let parseOptions =
CSharpParseOptions.Default.WithLanguageVersion (LanguageVersion.Preview)
CSharpParseOptions.Default.WithLanguageVersion LanguageVersion.Preview
let syntaxTrees : SyntaxTree[] =
sources
@@ -25,14 +25,13 @@ module Roslyn =
// Reference every assembly found in the runtime directory – crude but
// guarantees we can resolve System.* et al.
let runtimeDir =
System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory ()
let runtimeDir = Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory ()
let metadataReferences : MetadataReference[] =
Directory.GetFiles (runtimeDir, "*.dll")
|> Array.map (fun path -> MetadataReference.CreateFromFile path :> MetadataReference)
let compilationOptions = CSharpCompilationOptions (OutputKind.ConsoleApplication)
let compilationOptions = CSharpCompilationOptions OutputKind.ConsoleApplication
let compilation =
CSharpCompilation.Create (
@@ -44,7 +43,7 @@ module Roslyn =
use peStream = new MemoryStream ()
let emitResult = compilation.Emit (peStream)
let emitResult = compilation.Emit peStream
if emitResult.Success then
peStream.ToArray ()

77
WoofWare.PawPrint.Test/TestCases.fs
View File

@@ -12,6 +12,22 @@ open WoofWare.PawPrint.Test
module TestCases =
let assy = typeof<RunResult>.Assembly
let unimplemented =
[
{
FileName = "BasicException.cs"
ExpectedReturnCode = 10
}
{
FileName = "WriteLine.cs"
ExpectedReturnCode = 10
}
{
FileName = "BasicLock.cs"
ExpectedReturnCode = 10
}
]
let cases : TestCase list =
[
{
@@ -25,7 +41,7 @@ module TestCases =
]
[<TestCaseSource(nameof cases)>]
let ``Can run a no-op`` (case : TestCase) : unit =
let ``Can evaluate C# files`` (case : TestCase) : unit =
let source = Assembly.getEmbeddedResourceAsString case.FileName assy
let image = Roslyn.compile [ source ]
let messages, loggerFactory = LoggerFactory.makeTest ()
@@ -35,15 +51,54 @@ module TestCases =
use peImage = new MemoryStream (image)
let terminalState, terminatingThread =
Program.run loggerFactory peImage dotnetRuntimes []
try
let terminalState, terminatingThread =
Program.run loggerFactory peImage dotnetRuntimes []
let exitCode =
match terminalState.ThreadState.[terminatingThread].MethodState.EvaluationStack.Values with
| [] -> failwith "expected program to return a value, but it returned void"
| head :: _ ->
match head with
| EvalStackValue.Int32 i -> i
| ret -> failwith "expected program to return an int, but it returned %O{ret}"
let exitCode =
match terminalState.ThreadState.[terminatingThread].MethodState.EvaluationStack.Values with
| [] -> failwith "expected program to return a value, but it returned void"
| head :: _ ->
match head with
| EvalStackValue.Int32 i -> i
| ret -> failwith $"expected program to return an int, but it returned %O{ret}"
exitCode |> shouldEqual case.ExpectedReturnCode
exitCode |> shouldEqual case.ExpectedReturnCode
with _ ->
for message in messages () do
System.Console.Error.WriteLine $"{message}"
reraise ()
[<TestCaseSource(nameof unimplemented)>]
[<Explicit "not yet implemented">]
let ``Can evaluate C# files (unimplemented)`` (case : TestCase) : unit =
let source = Assembly.getEmbeddedResourceAsString case.FileName assy
let image = Roslyn.compile [ source ]
let messages, loggerFactory = LoggerFactory.makeTest ()
let dotnetRuntimes =
DotnetRuntime.SelectForDll assy.Location |> ImmutableArray.CreateRange
use peImage = new MemoryStream (image)
try
let terminalState, terminatingThread =
Program.run loggerFactory peImage dotnetRuntimes []
let exitCode =
match terminalState.ThreadState.[terminatingThread].MethodState.EvaluationStack.Values with
| [] -> failwith "expected program to return a value, but it returned void"
| head :: _ ->
match head with
| EvalStackValue.Int32 i -> i
| ret -> failwith $"expected program to return an int, but it returned %O{ret}"
exitCode |> shouldEqual case.ExpectedReturnCode
with _ ->
for message in messages () do
System.Console.Error.WriteLine $"{message}"
reraise ()

3
WoofWare.PawPrint.Test/WoofWare.PawPrint.Test.fsproj
View File

@@ -19,8 +19,9 @@
<Compile Include="TestBasicLock.fs" />
<EmbeddedResource Include="sources\BasicLock.cs" />
<EmbeddedResource Include="sources\NoOp.cs" />
<EmbeddedResource Include="sources\HelloWorld.cs" />
<EmbeddedResource Include="sources\BasicException.cs" />
<EmbeddedResource Include="sources\TriangleNumber.cs" />
<EmbeddedResource Include="sources\WriteLine.cs" />
</ItemGroup>
<ItemGroup>

1
WoofWare.PawPrint.Test/sources/HelloWorld.cs → WoofWare.PawPrint.Test/sources/BasicException.cs
View File

@@ -6,7 +6,6 @@ namespace HelloWorldApp
{
static int ReallyMain(string[] args)
{
Console.WriteLine("Hello, world!");
return 0;
}

13
WoofWare.PawPrint.Test/sources/WriteLine.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
namespace HelloWorldApp
{
class Program
{
static int Main(string[] args)
{
Console.WriteLine("Hello, world!");
return 0;
}
}
}