reach

giovinazzo-kevin · Apr 30, 2024 · 32596ab · 32596ab
1 parent 20df60a
commit 32596ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/Ergo/Ergo.csproj b/Ergo/Ergo.csproj
@@ -7,15 +7,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>$(DefineConstants);TRACE;_ERGO_PARSER_DIAGNOSTICS;_ERGO_INTERPRETER_DIAGNOSTICS;_ERGO_VM_DIAGNOSTICS</DefineConstants>
+    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>$(DefineConstants);_ERGO_PARSER_DIAGNOSTICS;_ERGO_INTERPRETER_DIAGNOSTICS;_ERGO_VM_DIAGNOSTICS</DefineConstants>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'" />
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Diagnostics|AnyCPU'">
-		<DefineConstants>$(DefineConstants);TRACE;ERGO_PARSER_DIAGNOSTICS;ERGO_INTERPRETER_DIAGNOSTICS;ERGO_VM_DIAGNOSTICS</DefineConstants>
+		<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
 	</PropertyGroup>
 
   <ItemGroup>

diff --git a/Ergo/Lang/Compiler/ExecutionGraph.cs b/Ergo/Lang/Compiler/ExecutionGraph.cs
@@ -1,6 +1,5 @@
 using Ergo.Interpreter;
 using Ergo.Runtime.BuiltIns;
-using System.Diagnostics;
 
 namespace Ergo.Lang.Compiler;
 
@@ -23,7 +22,7 @@ private ErgoVM.Op CompileAndCache()
         if (Root is not SequenceNode)
             Root.IsContinuationDet = true;
         var compiledRoot = Root.Compile();
-        Debug.WriteLine(Root.Explain(false));
+        //Debug.WriteLine(Root.Explain(false));
         // NOTE: PrepareDelegate pre-JITs 'op' so that we don't incur JIT overhead at runtime.
         RuntimeHelpers.PrepareDelegate(compiledRoot);
         Compiled = compiledRoot;

diff --git a/Ergo/Lang/Types/TermMarshall.cs b/Ergo/Lang/Types/TermMarshall.cs
@@ -46,6 +46,8 @@ internal static ITypeResolver EnsureNamedResolver(Type t)
 
     private static TermAttribute GetAttribute(Type type)
     {
+        if (type.IsArray)
+            type = type.GetElementType();
         if (AttributeCache.TryGetValue(type, out var attribute)) return attribute;
         return AttributeCache[type] = type.GetCustomAttribute<TermAttribute>();
     }

diff --git a/Ergo/Runtime/ErgoVM.cs b/Ergo/Runtime/ErgoVM.cs
@@ -362,7 +362,7 @@ protected virtual void CleanUp()
         SubstitutionMap.Pool.Release(Environment);
     }
 
-    [Conditional("DEBUG")]
+    [Conditional("ERGO_VM_DIAGNOSTICS")]
     internal void LogState([CallerMemberName] string state = null)
     {
         Debug.WriteLine($"vm{Id:000}:: {state}".Indent(NumChoicePoints, tabWidth: 1));