Added brun & test

CLVMDotNet/src/CLVM/Program.cs

@@ -10,7 +10,7 @@ public static Tuple<BigInteger, SExp> RunProgram(SExp program, SExp args, BigInt
         Stack<Func<Stack<SExp>, BigInteger>> opStack = new Stack<Func<Stack<SExp>, BigInteger>>();
 
         var valueStack = new Stack<SExp>();
-        valueStack.Push(args);
+        valueStack.Push(prog.Cons(args));
         opStack.Push(stack => EvalOp(opStack, valueStack));
 
         BigInteger cost = 0;

CLVMDotNet/src/CLVMDotNet.csproj

@@ -12,8 +12,4 @@
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Tools\Stages\Stage2\" />
-    </ItemGroup>
-
 </Project>

CLVMDotNet/src/Tools/IR/BinUtils.cs

@@ -45,8 +45,8 @@ public static SExp AssembleFromIR(SExp ir_sexp)
 
             // handle "q"
             var first = Utils.IrFirst(ir_sexp);
-            var keyword2 = Utils.IrAsSymbol(first) as string;
-            if (keyword2 == "q")
+            keyword = Utils.IrAsSymbol(first) as string;
+            if (keyword == "q")
             {
                 // TODO: note that any symbol is legal after this point
             }

CLVMDotNet/src/Tools/IR/Utils.cs

@@ -25,7 +25,8 @@ public static BigInteger ConvertToBase256(string s)
         {
             if (irSexp.Listp() && IrType(irSexp) == IRType.SYMBOL)
             {
-                return Encoding.UTF8.GetString(IrAsSexp(irSexp).AsAtom());
+                var sexp = IrAsSexp(irSexp);
+                return Encoding.UTF8.GetString(sexp.AsAtom());
             }
 
             return null;

CLVMDotNet/src/Tools/Stages/Stage2/Bindings.cs

@@ -0,0 +1,11 @@
+using CLVMDotNet.CLVM;
+using CLVMDotNet.Tools.IR;
+
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public static class Bindings
+{
+    public static SExp Brun => BinUtils.Assemble("(a 2 3)");
+
+    public static SExp Run => BinUtils.Assemble("(a (opt (com 2)) 3)");
+}

CLVMDotNet/src/Tools/Stages/Stage2/Compile.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public class Compile
+{
+
+}

CLVMDotNet/src/Tools/Stages/Stage2/Defaults.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public class Defaults
+{
+
+}

CLVMDotNet/src/Tools/Stages/Stage2/Helpers.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public class Helpers
+{
+
+}

CLVMDotNet/src/Tools/Stages/Stage2/Mod.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public class Mod
+{
+
+}

CLVMDotNet/src/Tools/Stages/Stage2/Operators.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public class Operators
+{
+
+}

CLVMDotNet/src/Tools/Stages/Stage2/Optimize.cs

@@ -0,0 +1,9 @@
+using CLVMDotNet.CLVM;
+using CLVMDotNet.Tools.IR;
+
+namespace CLVMDotNet.Tools.Stages.Stage2;
+
+public class Optimize
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage0/Stage0.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage0;
+
+public class Stage0
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage2/BindingTests.cs

@@ -0,0 +1,49 @@
+using CLVMDotNet.Tools.Stages.Stage2;
+using Xunit;
+
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class BindingTests
+{
+    [Fact]
+    public void TestBrun()
+    {
+        // Arrange
+
+        // Act
+        var brun = Bindings.Brun;
+
+        // Assert
+        Assert.Null(brun.Atom);
+        Assert.NotNull(brun.Pair);
+        Assert.True(brun.AsPair().Item1.AsAtom().SequenceEqual(new byte[] { 0x02 }));
+        Assert.Null(brun.AsPair().Item1.Pair);
+        Assert.Null(brun.AsPair().Item2.Atom);
+        Assert.NotNull(brun.AsPair().Item2.Pair);
+        Assert.True(brun.AsPair().Item2.AsPair().Item1.AsAtom().SequenceEqual(new byte[] { 0x02}));
+        Assert.Null(brun.AsPair().Item2.AsPair().Item2.Atom);
+        Assert.NotNull(brun.AsPair().Item2.AsPair().Item2.Pair);
+        Assert.True(brun.AsPair().Item2.AsPair().Item2.AsPair().Item1.AsAtom().SequenceEqual(new byte []{ 0x03}));
+        Assert.Empty(brun.AsPair().Item2.AsPair().Item2.AsPair().Item2.AsAtom());
+    }
+
+    [Fact(Skip = "Skipping for now")]
+    public void TestRun()
+    {
+        // Arrange
+
+        // Act
+        var run = Bindings.Run;
+
+        // Assert
+        Assert.Null(run.Atom);
+        Assert.True(run.AsPair().Item1.AsAtom().SequenceEqual(new byte[] { 0x02 }));
+        Assert.Null(run.AsPair().Item1.Pair);
+        Assert.Null(run.AsPair().Item2.Atom);
+        Assert.NotNull(run.AsPair().Item2.Pair);
+        Assert.NotNull(run.AsPair().Item2.AsPair().Item2);
+        Assert.NotNull(run.AsPair().Item2.AsPair().Item1);
+
+
+    }
+}

CLVMDotNet/tests/Tools/Stages/Stage2/CompileTests.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class CompileTests
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage2/DefaultsTests.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class DefaultsTests
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage2/HelperTests.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class HelperTests
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage2/ModTests.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class ModTests
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage2/OperatorTests.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class OperatorTests
+{
+
+}

CLVMDotNet/tests/Tools/Stages/Stage2/OptimizeTests.cs

@@ -0,0 +1,6 @@
+namespace CLVMDotNet.Tests.Tools.Stages.Stage2;
+
+public class OptimizeTests
+{
+
+}