Clean up namespaces

pine-vm · Oct 15, 2024 · 2c7617c · 2c7617c
1 parent e57fd20
commit 2c7617c
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 29 deletions.
diff --git a/implement/Pine.Core/PineVM/IPineVM.cs b/implement/Pine.Core/PineVM/IPineVM.cs
@@ -0,0 +1,8 @@
+namespace Pine.Core.PineVM;
+
+public interface IPineVM
+{
+    Result<string, PineValue> EvaluateExpression(
+        Expression expression,
+        PineValue environment);
+}
diff --git a/implement/Pine.Core/PineVM/LockingPineVM.cs b/implement/Pine.Core/PineVM/LockingPineVM.cs
@@ -0,0 +1,21 @@
+namespace Pine.Core.PineVM;
+
+public class LockingPineVM : IPineVM
+{
+    private readonly IPineVM pineVM;
+
+    private readonly object pineVMLock = new();
+
+    public LockingPineVM(IPineVM pineVM)
+    {
+        this.pineVM = pineVM;
+    }
+
+    public Result<string, PineValue> EvaluateExpression(Expression expression, PineValue environment)
+    {
+        lock (pineVMLock)
+        {
+            return pineVM.EvaluateExpression(expression, environment);
+        }
+    }
+}
diff --git a/implement/pine/Elm/Platform/CommandLineApp.cs b/implement/pine/Elm/Platform/CommandLineApp.cs
@@ -177,7 +177,7 @@ public static CommandLineAppConfig ConfigFromDeclarationValue(PineValue runRootD
     public static (PineValue, CommandLineAppEventResponse) Init(
         CommandLineAppConfig config,
         CommandLineAppInitEnvironment environment,
-        PineVM.IPineVM pineVM)
+        Core.PineVM.IPineVM pineVM)
     {
         var initRecord =
             new ElmValue.ElmRecord(
@@ -225,7 +225,7 @@ public static (PineValue, CommandLineAppEventResponse)?
         CommandLineAppConfig config,
         ReadOnlyMemory<byte> input,
         PineValue stateBefore,
-        PineVM.IPineVM pineVM)
+        Core.PineVM.IPineVM pineVM)
     {
         var subscriptionsValue =
             ElmTime.ElmInteractive.ElmInteractiveEnvironment.ApplyFunction(

diff --git a/implement/pine/ElmInteractive/ElmInteractive.cs b/implement/pine/ElmInteractive/ElmInteractive.cs
@@ -441,7 +441,7 @@ public static Result<string, PineValue> ParseElmModuleTextToPineValue(
             .ToString()!;
 
         var responseResultStructure =
-            System.Text.Json.JsonSerializer.Deserialize<Result<string, ElmInteractive.PineValueJson>>(
+            System.Text.Json.JsonSerializer.Deserialize<Result<string, PineValueJson>>(
                 responseJson,
                 compilerInterfaceJsonSerializerOptions)!;
 

diff --git a/implement/pine/ElmInteractive/ElmInteractiveEnvironment.cs b/implement/pine/ElmInteractive/ElmInteractiveEnvironment.cs
@@ -85,7 +85,7 @@ public static Result<string, PineValue> ApplyFunctionInElmModule(
     }
 
     public static Result<string, PineValue> ApplyFunction(
-        IPineVM pineVM,
+        Pine.Core.PineVM.IPineVM pineVM,
         FunctionRecord functionRecord,
         IReadOnlyList<PineValue> arguments)
     {

diff --git a/implement/pine/ElmInteractive/InteractiveSessionPine.cs b/implement/pine/ElmInteractive/InteractiveSessionPine.cs
@@ -1,5 +1,6 @@
 using Pine;
 using Pine.Core;
+using Pine.Core.PineVM;
 using Pine.Elm;
 using Pine.ElmInteractive;
 using Pine.PineVM;
@@ -632,25 +633,6 @@ public static IReadOnlyDictionary<ExpressionUsageAnalysis, ExpressionUsageProfil
         return pineExpressionsToOptimize;
     }
 
-    public class LockingPineVM : IPineVM
-    {
-        private readonly IPineVM pineVM;
-
-        private readonly object pineVMLock = new();
-
-        public LockingPineVM(IPineVM pineVM)
-        {
-            this.pineVM = pineVM;
-        }
-
-        public Result<string, PineValue> EvaluateExpression(Expression expression, PineValue environment)
-        {
-            lock (pineVMLock)
-            {
-                return pineVM.EvaluateExpression(expression, environment);
-            }
-        }
-    }
 
     public class PineVMWithPersistentCache : IPineVM
     {

diff --git a/implement/pine/Pine/PineVM/DynamicPGOShare.cs b/implement/pine/Pine/PineVM/DynamicPGOShare.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Pine.Core;
+using Pine.Core.PineVM;
 
 namespace Pine.PineVM;
 

diff --git a/implement/pine/Pine/PineVM/PineVM.cs b/implement/pine/Pine/PineVM/PineVM.cs
@@ -3,15 +3,10 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Pine.Core;
+using Pine.Core.PineVM;
 
 namespace Pine.PineVM;
 
-public interface IPineVM
-{
-    Result<string, PineValue> EvaluateExpression(
-        Expression expression,
-        PineValue environment);
-}
 
 public record struct EvalCacheEntryKey(
     PineValue ExprValue,

diff --git a/implement/pine/Pine/PineVM/ProfilingPineVM.cs b/implement/pine/Pine/PineVM/ProfilingPineVM.cs
@@ -3,6 +3,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Pine.Core;
+using Pine.Core.PineVM;
 using ExpressionUsageRecord = System.Collections.Generic.Dictionary<Pine.Core.PineValue, Pine.PineVM.ExpressionEnvUsageRecord>;
 
 namespace Pine.PineVM;

diff --git a/implement/test-elm-time/CompileElmCompilerTests.cs b/implement/test-elm-time/CompileElmCompilerTests.cs
@@ -2,6 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Pine;
 using Pine.Core;
+using Pine.Core.PineVM;
 using Pine.Elm;
 using Pine.ElmInteractive;
 using Pine.PineVM;