From 1918dd06e5ebe3998bed331007f49694152667ad Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 15 Feb 2026 16:16:02 -0500
Subject: [PATCH] xo-reader2 stack: streamline + mem sizing + bugfixes

---
 include/xo/expression2/DGlobalSymtab.hpp | 6 +++---
 src/expression2/DGlobalSymtab.cpp        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/xo/expression2/DGlobalSymtab.hpp b/include/xo/expression2/DGlobalSymtab.hpp
index 8eec6d2e..879c7073 100644
--- a/include/xo/expression2/DGlobalSymtab.hpp
+++ b/include/xo/expression2/DGlobalSymtab.hpp
@@ -43,9 +43,9 @@ namespace xo {
              *  Use memory from @p mm for DGlobalSymtab instance.
              *  Hashmap configured per @p cfg.
              **/
-            dp<DGlobalSymtab> make(obj<AAllocator> fixed_mm,
-                                   obj<AAllocator> mm,
-                                   const ArenaHashMapConfig & cfg);
+            static dp<DGlobalSymtab> make(obj<AAllocator> mm,
+                                          obj<AAllocator> fixed_mm,
+                                          const ArenaHashMapConfig & cfg);
 
             /** non-trivial destructor for @ref map_ **/
             ~DGlobalSymtab() = default;
diff --git a/src/expression2/DGlobalSymtab.cpp b/src/expression2/DGlobalSymtab.cpp
index b7eb4d73..c9897670 100644
--- a/src/expression2/DGlobalSymtab.cpp
+++ b/src/expression2/DGlobalSymtab.cpp
@@ -25,8 +25,8 @@ namespace xo {
         }
 
         dp<DGlobalSymtab>
-        DGlobalSymtab::make(obj<AAllocator> aux_mm,
-                            obj<AAllocator> mm,
+        DGlobalSymtab::make(obj<AAllocator> mm,
+                            obj<AAllocator> aux_mm,
                             const ArenaHashMapConfig & cfg)
         {
             auto map = dp<repr_type>::make(aux_mm, cfg);