Skip to content

Commit 15690b5

Browse files
dmillerdmiller
committed
Add method to print structured print-out of a PersistentHashMap tree -- for debugging only
1 parent 947bca0 commit 15690b5

4 files changed

Lines changed: 158 additions & 3 deletions

File tree

‎Clojure/Clojure.sln‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.30002.166
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.8.34601.278
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clojure", "Clojure\Clojure.csproj", "{F3D54017-088E-44E1-9395-7F92145E094C}"
66
EndProject
@@ -16,7 +16,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharp.Tests", "Csharp.Test
1616
EndProject
1717
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clojure.Main461", "Clojure.Main461\Clojure.Main461.csproj", "{1A87935F-20E0-4C15-A09B-B8A7B5110019}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clojure.Samples", "Clojure.Samples\Clojure.Samples.csproj", "{08563A3D-D4F1-45DB-84BD-000EEC94C55C}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clojure.Samples", "Clojure.Samples\Clojure.Samples.csproj", "{08563A3D-D4F1-45DB-84BD-000EEC94C55C}"
20+
EndProject
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}"
2022
EndProject
2123
Global
2224
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -56,6 +58,10 @@ Global
5658
{08563A3D-D4F1-45DB-84BD-000EEC94C55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
5759
{08563A3D-D4F1-45DB-84BD-000EEC94C55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
5860
{08563A3D-D4F1-45DB-84BD-000EEC94C55C}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{EB8B9CB5-4820-4F7F-9AA2-058C2A080235}.Release|Any CPU.Build.0 = Release|Any CPU
5965
EndGlobalSection
6066
GlobalSection(SolutionProperties) = preSolution
6167
HideSolutionNode = FALSE

‎Clojure/Clojure/Lib/PersistentHashMap.cs‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Collections;
1818
using System.Threading;
1919
using System.Collections.Generic;
20+
using System.Text;
2021

2122
namespace clojure.lang
2223
{
@@ -765,6 +766,9 @@ public interface INode
765766

766767
IEnumerator Iterator(KVMangleDel<Object> d);
767768
IEnumerator<T> IteratorT<T>(KVMangleDel<T> d);
769+
770+
// For debugging only
771+
void PrintContents(string prefix);
768772
}
769773

770774
#endregion
@@ -1004,6 +1008,30 @@ static object FoldTasks(List<Func<object>> tasks, IFn combinef, IFn fjtask, IFn
10041008
return combinef.invoke(FoldTasks(t1, combinef, fjtask, fjfork, fjjoin), fjjoin.invoke(forked));
10051009
}
10061010

1011+
public void PrintContents(string prefix)
1012+
{
1013+
var sb = new StringBuilder(prefix);
1014+
1015+
for (int i = 0; i < _array.Length; i++)
1016+
{
1017+
INode node = _array[i];
1018+
if (node != null)
1019+
sb.AppendFormat(" {0}:{1}", i, PersistentHashMap.NodeTypeDesignator(node));
1020+
}
1021+
1022+
Console.WriteLine(sb.ToString());
1023+
1024+
for (int i = 0; i < _array.Length; i++)
1025+
{
1026+
INode node = _array[i];
1027+
if (node != null)
1028+
{
1029+
var newPrefix = prefix + "-" + i.ToString() + ":" + PersistentHashMap.NodeTypeDesignator(node) + ":";
1030+
node.PrintContents(newPrefix);
1031+
}
1032+
}
1033+
}
1034+
10071035
#endregion
10081036

10091037
#region Implementation details
@@ -1438,6 +1466,50 @@ public object Fold(IFn combinef, IFn reducef, IFn fjtask, IFn fjfork, IFn fjjoin
14381466
}
14391467

14401468

1469+
public void PrintContents(string prefix)
1470+
{
1471+
var sb = new StringBuilder(prefix);
1472+
1473+
int j = 0;
1474+
1475+
for (int i = 0; i < 32; i++)
1476+
{
1477+
if ((_bitmap & (1 << i)) != 0)
1478+
{
1479+
var keyOrNull = _array[j];
1480+
var valOrNode = _array[j + 1];
1481+
if (keyOrNull == null)
1482+
sb.AppendFormat(" {0}:{1}", i, PersistentHashMap.NodeTypeDesignator((INode)valOrNode));
1483+
else
1484+
sb.AppendFormat(" {0} = Key {1}", i, keyOrNull);
1485+
1486+
j += 2;
1487+
}
1488+
}
1489+
1490+
Console.WriteLine(sb.ToString());
1491+
1492+
1493+
j = 0;
1494+
1495+
for (int i = 0; i < 32; i++)
1496+
{
1497+
if ((_bitmap & (1 << i)) != 0)
1498+
{
1499+
var keyOrNull = _array[j];
1500+
var valOrNode = _array[j + 1];
1501+
if (keyOrNull == null)
1502+
{
1503+
var newPrefix = prefix + "-" + i.ToString() + ":" + PersistentHashMap.NodeTypeDesignator((INode)valOrNode) + ":";
1504+
((INode)valOrNode).PrintContents(newPrefix);
1505+
}
1506+
1507+
1508+
j += 2;
1509+
}
1510+
}
1511+
}
1512+
14411513
#endregion
14421514

14431515
#region Implementation
@@ -1655,6 +1727,18 @@ public object Fold(IFn combinef, IFn reducef, IFn fjtask, IFn fjfork, IFn fjjoin
16551727
return NodeSeq.KvReduce(_array, reducef, combinef.invoke());
16561728
}
16571729

1730+
public void PrintContents(string prefix)
1731+
{
1732+
var sb = new StringBuilder(prefix);
1733+
1734+
for (int i = 0; i < _array.Length; i += 2)
1735+
{
1736+
sb.AppendFormat(" {0} = Key {1}", i, _array[i]);
1737+
}
1738+
1739+
Console.WriteLine(sb.ToString());
1740+
}
1741+
16581742
#endregion
16591743

16601744
#region Implementation
@@ -1863,6 +1947,29 @@ static public object KvReduce(object[] array, IFn f, object init)
18631947
#endregion
18641948
}
18651949

1950+
#endregion
1951+
1952+
#region debugging
1953+
1954+
public static string NodeTypeDesignator(INode node)
1955+
{
1956+
if (node is BitmapIndexedNode)
1957+
return "B";
1958+
if (node is ArrayNode)
1959+
return "A";
1960+
if (node is HashCollisionNode)
1961+
return "H";
1962+
return "?";
1963+
}
1964+
1965+
public void PrintContents()
1966+
{
1967+
Console.WriteLine($"PersistentHashMap: count={_count}, hashNull={_hasNull}");
1968+
if (_root != null)
1969+
_root.PrintContents("*" + NodeTypeDesignator(_root));
1970+
}
1971+
1972+
18661973
#endregion
18671974
}
18681975
}

‎Clojure/ConsoleApp1/ConsoleApp1.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="clojure.data.priority-map" Version="1.1.0" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\Clojure\Clojure.csproj" />
16+
</ItemGroup>
17+
18+
</Project>

‎Clojure/ConsoleApp1/Program.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// See https://aka.ms/new-console-template for more information
2+
//using clojure.lang;
3+
//using System.Reflection;
4+
5+
//Console.WriteLine("Hello, World!");
6+
7+
8+
//Assembly.LoadFrom("clojure.data.priority-map.dll");
9+
10+
//IFn require = clojure.clr.api.Clojure.var("clojure.core", "load");
11+
//require.invoke("clojure.data.priority-map");
12+
13+
14+
clojure.lang.IPersistentMap pv = clojure.lang.PersistentHashMap.EMPTY;
15+
16+
for (int i = 0; i <= 500; i++)
17+
{
18+
pv = pv.assoc("a"+i, i);
19+
}
20+
21+
22+
((clojure.lang.PersistentHashMap)pv).PrintContents();
23+
24+
Console.ReadLine();

0 commit comments

Comments
 (0)