From de65eec7aa268d777d1a507f731f43db45fd5e6f Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 11 May 2025 01:42:30 -0500
Subject: [PATCH] + xo-reader

---
 .github/workflows/main-stock-ubuntu.yml |  3 +++
 CMakeLists.txt                          |  2 +-
 default.nix                             |  2 +-
 pkgs/xo-reader.nix                      | 22 ++++++++++++++++++++++
 pkgs/xo-userenv.nix                     |  4 ++--
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/xo-reader.nix

diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml
index ec67fb5b..c5f2665e 100644
--- a/.github/workflows/main-stock-ubuntu.yml
+++ b/.github/workflows/main-stock-ubuntu.yml
@@ -113,6 +113,9 @@ jobs:
           echo "::group::xo-tokenizer build"
           cmake --build .build -- xo-tokenizer
 
+          echo "::group::xo-reader build"
+          cmake --build .build -- xo-reader
+
           ##############
 
           echo "::group::xo build (catch all)"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4373c31..7bc8c91d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ add_subdirectory(xo-pyunit)
 add_subdirectory(xo-expression)
 add_subdirectory(xo-pyexpression)
 add_subdirectory(xo-tokenizer)
-#add_subdirectory(xo-reader)
+add_subdirectory(xo-reader)
 #add_subdirectory(xo-jit)
 #add_subdirectory(xo-pyjit)
 #add_subdirectory(xo-callback)
diff --git a/default.nix b/default.nix
index 8a716640..3e2ee09a 100644
--- a/default.nix
+++ b/default.nix
@@ -55,8 +55,8 @@ let
           xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
           xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
           xo-tokenizer      = self.callPackage pkgs/xo-tokenizer.nix      {};
+          xo-reader         = self.callPackage pkgs/xo-reader.nix         {};
 
-#          xo-reader         = self.callPackage pkgs/xo-reader.nix         {};
 #          xo-jit            = self.callPackage pkgs/xo-jit.nix            { stdenv = customStdenv;
 #                                                                            clang = llvmPackages.clang;
 #                                                                            llvm = llvmPackages.llvm; };
diff --git a/pkgs/xo-reader.nix b/pkgs/xo-reader.nix
new file mode 100644
index 00000000..b298d45a
--- /dev/null
+++ b/pkgs/xo-reader.nix
@@ -0,0 +1,22 @@
+{
+  # dependencies
+  stdenv, cmake, catch2,
+
+  xo-cmake, xo-expression, xo-tokenizer
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-reader";
+    version = "1.0";
+
+    src = ../xo-reader;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [ cmake catch2
+                          xo-cmake
+                          xo-expression
+                          xo-tokenizer
+                        ];
+  })
diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix
index 020102af..7ecb7a90 100644
--- a/pkgs/xo-userenv.nix
+++ b/pkgs/xo-userenv.nix
@@ -51,7 +51,7 @@
   xo-expression,
   xo-pyexpression,
   xo-tokenizer,
-# xo-reader,
+  xo-reader,
 #  xo-jit,
 #  xo-pyjit
 
@@ -80,8 +80,8 @@ buildEnv {
             xo-expression
             xo-pyexpression
             xo-tokenizer
+            xo-reader
 
-#            xo-reader
 #            xo-jit
 #            xo-pyjit
 #            xo-callback