From 686ceffe5c85ca71ac84a5422f012204bcb7047e Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Mon, 28 Jul 2025 10:13:25 -0400
Subject: [PATCH] refactor xo::ast -> xo::scm + restore nodef ppdetail_atomic
 build

---
 example/ex1/ex1.cpp                             |  6 +++---
 include/xo/expression/Apply.hpp                 |  4 ++--
 include/xo/expression/AssignExpr.hpp            |  4 ++--
 include/xo/expression/Constant.hpp              |  4 ++--
 include/xo/expression/ConstantInterface.hpp     |  4 ++--
 include/xo/expression/ConvertExpr.hpp           |  4 ++--
 include/xo/expression/DefineExpr.hpp            |  4 ++--
 include/xo/expression/Environment.hpp           |  4 ++--
 include/xo/expression/Expression.hpp            |  4 ++--
 include/xo/expression/FunctionInterface.hpp     |  4 ++--
 include/xo/expression/GeneralizedExpression.hpp |  4 ++--
 include/xo/expression/GlobalEnv.hpp             |  4 ++--
 include/xo/expression/IfExpr.hpp                |  4 ++--
 include/xo/expression/Lambda.hpp                |  4 ++--
 include/xo/expression/LocalEnv.hpp              |  4 ++--
 include/xo/expression/Primitive.hpp             |  4 ++--
 include/xo/expression/PrimitiveInterface.hpp    |  4 ++--
 include/xo/expression/Sequence.hpp              |  4 ++--
 include/xo/expression/Variable.hpp              |  4 ++--
 include/xo/expression/binding_path.hpp          |  4 ++--
 include/xo/expression/exprtype.hpp              |  6 +++---
 include/xo/expression/llvmintrinsic.hpp         |  8 ++++----
 include/xo/expression/pretty_expression.hpp     |  8 ++++----
 include/xo/expression/pretty_localenv.hpp       | 10 +++++-----
 include/xo/expression/pretty_variable.hpp       |  4 ++--
 src/expression/Apply.cpp                        |  4 ++--
 src/expression/AssignExpr.cpp                   |  4 ++--
 src/expression/ConvertExpr.cpp                  |  4 ++--
 src/expression/DefineExpr.cpp                   |  4 ++--
 src/expression/Expression.cpp                   |  4 ++--
 src/expression/GeneralizedExpression.cpp        |  4 ++--
 src/expression/GlobalEnv.cpp                    |  4 ++--
 src/expression/IfExpr.cpp                       |  4 ++--
 src/expression/Lambda.cpp                       |  4 ++--
 src/expression/LocalEnv.cpp                     |  4 ++--
 src/expression/Primitive.cpp                    |  2 +-
 src/expression/Sequence.cpp                     |  2 +-
 src/expression/Variable.cpp                     |  6 +++---
 38 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/example/ex1/ex1.cpp b/example/ex1/ex1.cpp
index 0c69cab4..470941af 100644
--- a/example/ex1/ex1.cpp
+++ b/example/ex1/ex1.cpp
@@ -16,9 +16,9 @@ double xo_sqrt(double x) {
 
 int
 main() {
-    using xo::ast::make_constant;
-    using xo::ast::make_primitive;
-    using xo::ast::llvmintrinsic;
+    using xo::scm::make_constant;
+    using xo::scm::make_primitive;
+    using xo::scm::llvmintrinsic;
     using std::cout;
     using std::endl;
 
diff --git a/include/xo/expression/Apply.hpp b/include/xo/expression/Apply.hpp
index dc961feb..161806fc 100644
--- a/include/xo/expression/Apply.hpp
+++ b/include/xo/expression/Apply.hpp
@@ -10,7 +10,7 @@
 //#include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
 
         /** @class Apply
          *  @brief syntax for a function call.
@@ -210,7 +210,7 @@ namespace xo {
                 : Apply(apply_valuetype, fn, argv) {}
         };
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/AssignExpr.hpp b/include/xo/expression/AssignExpr.hpp
index 8cc2b7c7..0672e8c2 100644
--- a/include/xo/expression/AssignExpr.hpp
+++ b/include/xo/expression/AssignExpr.hpp
@@ -9,7 +9,7 @@
 #include "Variable.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class AssignExpr
          *  @brief Provide expression for assigning to a variable
          *
@@ -55,7 +55,7 @@ namespace xo {
             /** free variables for this assignment **/
             std::set<std::string> free_var_set_;
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/Constant.hpp b/include/xo/expression/Constant.hpp
index 9da00a3a..a302a43b 100644
--- a/include/xo/expression/Constant.hpp
+++ b/include/xo/expression/Constant.hpp
@@ -10,7 +10,7 @@
 #include <type_traits>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class Constant
          *  @brief syntax for a literal constant.
          *
@@ -104,7 +104,7 @@ namespace xo {
             return Constant<T>::make(x);
         }
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end Constant.hpp **/
diff --git a/include/xo/expression/ConstantInterface.hpp b/include/xo/expression/ConstantInterface.hpp
index 0e4c9580..474f8f3f 100644
--- a/include/xo/expression/ConstantInterface.hpp
+++ b/include/xo/expression/ConstantInterface.hpp
@@ -11,7 +11,7 @@
 #include <type_traits>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class ConstantInterface
          *  @brief syntax for a literal constant.
          **/
@@ -44,7 +44,7 @@ namespace xo {
 
         }; /*ConstantInterface*/
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end ConstantInterface.hpp **/
diff --git a/include/xo/expression/ConvertExpr.hpp b/include/xo/expression/ConvertExpr.hpp
index d8969eb8..9b6808bf 100644
--- a/include/xo/expression/ConvertExpr.hpp
+++ b/include/xo/expression/ConvertExpr.hpp
@@ -8,7 +8,7 @@
 #include "Expression.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class Convertexpr
          *  @brief Convenience for automatic type conversion
          *
@@ -103,7 +103,7 @@ namespace xo {
                               std::move(arg))
                 {}
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/DefineExpr.hpp b/include/xo/expression/DefineExpr.hpp
index ce6e84ec..5df7ea1a 100644
--- a/include/xo/expression/DefineExpr.hpp
+++ b/include/xo/expression/DefineExpr.hpp
@@ -8,7 +8,7 @@
 #include "Expression.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class DefineExpr
          *  @brief Provide definition for a constant, variable or function
          *
@@ -125,7 +125,7 @@ namespace xo {
                 {}
         };
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /* end DefineExpr.hpp */
diff --git a/include/xo/expression/Environment.hpp b/include/xo/expression/Environment.hpp
index 92103553..51746d99 100644
--- a/include/xo/expression/Environment.hpp
+++ b/include/xo/expression/Environment.hpp
@@ -11,7 +11,7 @@
 
 namespace xo {
 
-    namespace ast {
+    namespace scm {
         class Expression;
 
         class Environment : public ref::Refcount {
@@ -45,7 +45,7 @@ namespace xo {
             x.print(os);
             return os;
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/Expression.hpp b/include/xo/expression/Expression.hpp
index 3e7b9c67..07ac6afe 100644
--- a/include/xo/expression/Expression.hpp
+++ b/include/xo/expression/Expression.hpp
@@ -10,7 +10,7 @@
 #include <set>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         class Variable; /* see Variable.hpp */
         class Lambda;   /* see Lamnbda.hpp */
         class Environment; /* see Environment.hpp */
@@ -84,7 +84,7 @@ namespace xo {
 
         }; /*Expression*/
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end Expression.hpp **/
diff --git a/include/xo/expression/FunctionInterface.hpp b/include/xo/expression/FunctionInterface.hpp
index 4b369e00..a568a71d 100644
--- a/include/xo/expression/FunctionInterface.hpp
+++ b/include/xo/expression/FunctionInterface.hpp
@@ -9,7 +9,7 @@
 //#include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         class FunctionInterface : public Expression {
         public:
             FunctionInterface(exprtype extype, TypeDescr fn_type)
@@ -27,7 +27,7 @@ namespace xo {
 
         private:
         }; /*FunctionInterface*/
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end FunctionInterface.hpp **/
diff --git a/include/xo/expression/GeneralizedExpression.hpp b/include/xo/expression/GeneralizedExpression.hpp
index 0c7c2f84..4096aaca 100644
--- a/include/xo/expression/GeneralizedExpression.hpp
+++ b/include/xo/expression/GeneralizedExpression.hpp
@@ -11,7 +11,7 @@
 #include "exprtype.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class GeneralizedExpression
          *  @brief abstract syntax tree (non-executable) for schematica
          *
@@ -65,7 +65,7 @@ namespace xo {
             x.display(os);
             return os;
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/GlobalEnv.hpp b/include/xo/expression/GlobalEnv.hpp
index 798c8c76..b9cc026e 100644
--- a/include/xo/expression/GlobalEnv.hpp
+++ b/include/xo/expression/GlobalEnv.hpp
@@ -10,7 +10,7 @@
 #include <string>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         class GlobalEnv : public Environment {
         public:
             /** create instance.  Probably only need one of these **/
@@ -53,7 +53,7 @@ namespace xo {
              */
             std::map<std::string, rp<Expression>> global_map_;
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/IfExpr.hpp b/include/xo/expression/IfExpr.hpp
index 462a049f..b6dd0cc9 100644
--- a/include/xo/expression/IfExpr.hpp
+++ b/include/xo/expression/IfExpr.hpp
@@ -11,7 +11,7 @@
 //#include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class IfExpr
          *  @brief abstract syntax tree for a function definition
          *
@@ -168,7 +168,7 @@ namespace xo {
                          std::move(when_true),
                          std::move(when_false)) {}
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end IfExpr.hpp **/
diff --git a/include/xo/expression/Lambda.hpp b/include/xo/expression/Lambda.hpp
index 040420bb..0b480d8f 100644
--- a/include/xo/expression/Lambda.hpp
+++ b/include/xo/expression/Lambda.hpp
@@ -15,7 +15,7 @@
 //#include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class Lambda
          *  @brief abstract syntax tree for a function definition
          *
@@ -237,7 +237,7 @@ namespace xo {
 
 
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end Lambda.hpp **/
diff --git a/include/xo/expression/LocalEnv.hpp b/include/xo/expression/LocalEnv.hpp
index 8ae757ea..ea4e7e0a 100644
--- a/include/xo/expression/LocalEnv.hpp
+++ b/include/xo/expression/LocalEnv.hpp
@@ -10,7 +10,7 @@
 #include "xo/reflect/TypeDescr.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         class Lambda;
 
         /** @brief LocalEnv
@@ -103,7 +103,7 @@ namespace xo {
             rp<Environment> parent_env_;
         };
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/Primitive.hpp b/include/xo/expression/Primitive.hpp
index 43b4690c..fbcd201c 100644
--- a/include/xo/expression/Primitive.hpp
+++ b/include/xo/expression/Primitive.hpp
@@ -19,7 +19,7 @@ extern "C" {
 };
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class Primitive
          *  @brief syntax for a constant that refers to a known function.
          *
@@ -245,7 +245,7 @@ namespace xo {
             /** div2_f64: divide two 64-bit floating-point numbers **/
             static rp<PrimitiveType> make_div2_f64();
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/PrimitiveInterface.hpp b/include/xo/expression/PrimitiveInterface.hpp
index b3fb7bd3..2654a535 100644
--- a/include/xo/expression/PrimitiveInterface.hpp
+++ b/include/xo/expression/PrimitiveInterface.hpp
@@ -12,7 +12,7 @@
 
 #include <type_traits>
 namespace xo {
-    namespace ast {
+    namespace scm {
         class PrimitiveInterface : public FunctionInterface {
         public:
             using void_function_type = void (*)();
@@ -70,7 +70,7 @@ namespace xo {
 
         private:
         }; /*PrimitiveInterface*/
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/Sequence.hpp b/include/xo/expression/Sequence.hpp
index 6faa0d12..416c0c6c 100644
--- a/include/xo/expression/Sequence.hpp
+++ b/include/xo/expression/Sequence.hpp
@@ -8,7 +8,7 @@
 #include "Expression.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         class Sequence : public Expression {
         public:
             Sequence(const std::vector<rp<Expression>> & xv)
@@ -44,7 +44,7 @@ namespace xo {
              **/
             std::vector<rp<Expression>> expr_v_;
         };
-    } /*namespace ast*/
+    } /*namespace scm*/
 
 } /*namespace xo*/
 
diff --git a/include/xo/expression/Variable.hpp b/include/xo/expression/Variable.hpp
index 2b4d70df..846be5ab 100644
--- a/include/xo/expression/Variable.hpp
+++ b/include/xo/expression/Variable.hpp
@@ -9,7 +9,7 @@
 #include "binding_path.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
 
         /** @class Variable
          *  @brief syntax for a variable reference
@@ -91,7 +91,7 @@ namespace xo {
                  reflect::TypeDescr var_type) {
             return Variable::make(name, var_type);
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/binding_path.hpp b/include/xo/expression/binding_path.hpp
index 7aef8c51..61e48e87 100644
--- a/include/xo/expression/binding_path.hpp
+++ b/include/xo/expression/binding_path.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @class path
          *
          *  @brief path from the *use* of a variable to the environment
@@ -22,7 +22,7 @@ namespace xo {
              **/
             int j_slot_ = 0;
         }; /*binding_path*/
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/exprtype.hpp b/include/xo/expression/exprtype.hpp
index e9b8393c..a32961ee 100644
--- a/include/xo/expression/exprtype.hpp
+++ b/include/xo/expression/exprtype.hpp
@@ -9,9 +9,9 @@
 //#include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @enum exprtype
-         *  @brief enum to identify subclasses of xo::ast::Expression.
+         *  @brief enum to identify subclasses of xo::scm::Expression.
          *
          **/
         enum class exprtype {
@@ -74,7 +74,7 @@ namespace xo {
             os << expr2str(x);
             return os;
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/include/xo/expression/llvmintrinsic.hpp b/include/xo/expression/llvmintrinsic.hpp
index ede8719a..fcc26734 100644
--- a/include/xo/expression/llvmintrinsic.hpp
+++ b/include/xo/expression/llvmintrinsic.hpp
@@ -8,20 +8,20 @@
 //#include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         /** @enum llvminstrinsic
          *  @brief enum to identify an LLVM instrinsic, e.g. @c IRBuilder::CreateFAdd
          *
          *  Associate an @c llvminstrinsic with an AST @c Primitive p.
          *  Later, in @c xo::jit::IrPipeline
-         *  - when generating code for @c xo::ast::Apply
+         *  - when generating code for @c xo::scm::Apply
          *  - with *p* is in the function-call position
          *  can use the associated llvm instrinsic instead of generating a function call
          *  @c Primitive::value
          *
          *  @note llvm will still sometimes need to use
          *  @c Primitive::value (and generate a function call sequence),
-         *  for example when handling an @c xo::ast::Apply instance
+         *  for example when handling an @c xo::scm::Apply instance
          *  where the function position is a computed function.
          *  @endnote
          *
@@ -153,7 +153,7 @@ namespace xo {
 
             return "???llvmintrinsic???";
         } /*llvmintrinsic2str*/
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /** end llvmintrinsic.hpp **/
diff --git a/include/xo/expression/pretty_expression.hpp b/include/xo/expression/pretty_expression.hpp
index 44045a66..a4e07a84 100644
--- a/include/xo/expression/pretty_expression.hpp
+++ b/include/xo/expression/pretty_expression.hpp
@@ -12,17 +12,17 @@
 namespace xo {
     namespace print {
         template<>
-        struct ppdetail<xo::ast::GeneralizedExpression> {
+        struct ppdetail<xo::scm::GeneralizedExpression> {
             static bool print_pretty(const ppindentinfo & ppii,
-                                     const xo::ast::GeneralizedExpression & x) {
+                                     const xo::scm::GeneralizedExpression & x) {
                 return x.pretty_print(ppii);
             }
         };
 
         template <>
-        struct ppdetail<xo::ast::Expression> {
+        struct ppdetail<xo::scm::Expression> {
             static bool print_pretty(const ppindentinfo & ppii,
-                                     const xo::ast::Expression & x) {
+                                     const xo::scm::Expression & x) {
                 return x.pretty_print(ppii);
             }
         };
diff --git a/include/xo/expression/pretty_localenv.hpp b/include/xo/expression/pretty_localenv.hpp
index 83670af8..275ec095 100644
--- a/include/xo/expression/pretty_localenv.hpp
+++ b/include/xo/expression/pretty_localenv.hpp
@@ -9,20 +9,20 @@
 namespace xo {
     namespace print {
         template <>
-        struct ppdetail<xo::ast::LocalEnv> {
-            static bool print_pretty(const ppindentinfo & ppii, const xo::ast::LocalEnv & x) {
+        struct ppdetail<xo::scm::LocalEnv> {
+            static bool print_pretty(const ppindentinfo & ppii, const xo::scm::LocalEnv & x) {
                 return x.pretty_print(ppii);
             }
         };
 
         template <>
-        struct ppdetail<xo::ast::LocalEnv*> {
-            static bool print_pretty(const ppindentinfo & ppii, const xo::ast::LocalEnv* x) {
+        struct ppdetail<xo::scm::LocalEnv*> {
+            static bool print_pretty(const ppindentinfo & ppii, const xo::scm::LocalEnv* x) {
                 if (x) {
                     return x->pretty_print(ppii);
                 } else {
                     ppii.pps()->write("<nullptr ");
-                    ppii.pps()->write(reflect::type_name<xo::ast::LocalEnv>());
+                    ppii.pps()->write(reflect::type_name<xo::scm::LocalEnv>());
                     ppii.pps()->write(">");
                     return ppii.pps()->has_margin();
                 }
diff --git a/include/xo/expression/pretty_variable.hpp b/include/xo/expression/pretty_variable.hpp
index 07eb9910..d0440b8e 100644
--- a/include/xo/expression/pretty_variable.hpp
+++ b/include/xo/expression/pretty_variable.hpp
@@ -11,8 +11,8 @@
 namespace xo {
     namespace print {
         template <>
-        struct ppdetail<xo::ast::Variable> {
-            static bool print_pretty(const ppindentinfo & ppii, const xo::ast::Expression & x) {
+        struct ppdetail<xo::scm::Variable> {
+            static bool print_pretty(const ppindentinfo & ppii, const xo::scm::Expression & x) {
                 return x.pretty_print(ppii);
             }
         };
diff --git a/src/expression/Apply.cpp b/src/expression/Apply.cpp
index 86582bdc..91172c63 100644
--- a/src/expression/Apply.cpp
+++ b/src/expression/Apply.cpp
@@ -9,7 +9,7 @@
 #include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         rp<Apply>
         Apply::make(const rp<Expression> & fn,
                     const std::vector<rp<Expression>> & argv)
@@ -196,7 +196,7 @@ namespace xo {
 #endif
         }
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/AssignExpr.cpp b/src/expression/AssignExpr.cpp
index 2d07f4e7..26dc7bed 100644
--- a/src/expression/AssignExpr.cpp
+++ b/src/expression/AssignExpr.cpp
@@ -10,7 +10,7 @@
 #include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         rp<AssignExpr>
         AssignExpr::make(const rp<Variable> & lhs,
                          const rp<Expression> & rhs)
@@ -96,7 +96,7 @@ namespace xo {
                                              refrtag("lhs", lhs_),
                                              refrtag("rhs", rhs_));
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/ConvertExpr.cpp b/src/expression/ConvertExpr.cpp
index f09e1eb9..bb3f9099 100644
--- a/src/expression/ConvertExpr.cpp
+++ b/src/expression/ConvertExpr.cpp
@@ -7,7 +7,7 @@
 #include "pretty_expression.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         rp<ConvertExpr>
         ConvertExpr::make(TypeDescr dest_type,
                           rp<Expression> arg)
@@ -54,7 +54,7 @@ namespace xo {
             return new ConvertExprAccess(nullptr /*dest_type*/,
                                          nullptr /*arg*/);
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/DefineExpr.cpp b/src/expression/DefineExpr.cpp
index 0e09d000..093503d8 100644
--- a/src/expression/DefineExpr.cpp
+++ b/src/expression/DefineExpr.cpp
@@ -9,7 +9,7 @@
 #include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         rp<DefineExpr>
         DefineExpr::make(std::string lhs_name,
                          rp<Expression> rhs)
@@ -117,7 +117,7 @@ namespace xo {
             this->free_var_set_ = this->calc_free_variables();
         }
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/Expression.cpp b/src/expression/Expression.cpp
index e9f02932..16b31171 100644
--- a/src/expression/Expression.cpp
+++ b/src/expression/Expression.cpp
@@ -3,8 +3,8 @@
 #include "Expression.hpp"
 
 namespace xo {
-    namespace ast {
-    } /*namespace ast*/
+    namespace scm {
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/GeneralizedExpression.cpp b/src/expression/GeneralizedExpression.cpp
index 9365241e..b0aa6faf 100644
--- a/src/expression/GeneralizedExpression.cpp
+++ b/src/expression/GeneralizedExpression.cpp
@@ -5,7 +5,7 @@
 #include <cstdint>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         namespace {
             using xo::scm::prefix_type;
 
@@ -70,7 +70,7 @@ namespace xo {
             return ppii.upto() ? pps->scan_no_newline(saved) : true;
         }
 #endif
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /* end GeneralizedExpression.cpp */
diff --git a/src/expression/GlobalEnv.cpp b/src/expression/GlobalEnv.cpp
index 8ae06f69..23962fd0 100644
--- a/src/expression/GlobalEnv.cpp
+++ b/src/expression/GlobalEnv.cpp
@@ -8,7 +8,7 @@
 #include "Expression.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         GlobalEnv::GlobalEnv() = default;
 
         bp<Expression>
@@ -49,5 +49,5 @@ namespace xo {
                 return false;
             }
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
diff --git a/src/expression/IfExpr.cpp b/src/expression/IfExpr.cpp
index 7027f433..b08fe6e7 100644
--- a/src/expression/IfExpr.cpp
+++ b/src/expression/IfExpr.cpp
@@ -6,7 +6,7 @@
 //#include "xo/indentlog/print/vector.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         auto IfExpr::check_consistent_valuetype(const rp<Expression> & when_true,
                                                 const rp<Expression> & when_false) -> TypeDescr
         {
@@ -95,7 +95,7 @@ namespace xo {
         {
             this->when_false_ = std::move(x);
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/Lambda.cpp b/src/expression/Lambda.cpp
index cdcbdb27..3988d9c9 100644
--- a/src/expression/Lambda.cpp
+++ b/src/expression/Lambda.cpp
@@ -17,7 +17,7 @@ namespace xo {
     using xo::reflect::FunctionTdxInfo;
     using std::stringstream;
 
-    namespace ast {
+    namespace scm {
         TypeDescr
         Lambda::assemble_lambda_td(const std::vector<rp<Variable>> & argv,
                                    TypeDescr return_td)
@@ -404,7 +404,7 @@ namespace xo {
 
             this->complete_assembly_from_body();
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 /* end Lambda.cpp */
diff --git a/src/expression/LocalEnv.cpp b/src/expression/LocalEnv.cpp
index f0458cbc..d8a15474 100644
--- a/src/expression/LocalEnv.cpp
+++ b/src/expression/LocalEnv.cpp
@@ -10,7 +10,7 @@
 
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         rp<LocalEnv>
         LocalEnv::make_empty() {
             return new LocalEnv(std::vector<rp<Variable>>(), nullptr);
@@ -142,7 +142,7 @@ namespace xo {
             }
         }
 
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/
 
 
diff --git a/src/expression/Primitive.cpp b/src/expression/Primitive.cpp
index d6657b55..4a69ef8e 100644
--- a/src/expression/Primitive.cpp
+++ b/src/expression/Primitive.cpp
@@ -84,7 +84,7 @@ extern "C" {
 }
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         auto
         Primitive_cmp_i64::make_cmp_eq2_i64() -> rp<PrimitiveType>
         {
diff --git a/src/expression/Sequence.cpp b/src/expression/Sequence.cpp
index 3153c06e..cce57945 100644
--- a/src/expression/Sequence.cpp
+++ b/src/expression/Sequence.cpp
@@ -5,7 +5,7 @@
 #include <cstddef>
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         std::set<std::string>
         Sequence::get_free_variables() const {
             std::set<std::string> retval;
diff --git a/src/expression/Variable.cpp b/src/expression/Variable.cpp
index 4ad50357..903321d2 100644
--- a/src/expression/Variable.cpp
+++ b/src/expression/Variable.cpp
@@ -5,7 +5,7 @@
 #include "pretty_expression.hpp"
 
 namespace xo {
-    namespace ast {
+    namespace scm {
         std::string
         Variable::gensym(const std::string & prefix) {
             static std::size_t s_counter = 0;
@@ -46,11 +46,11 @@ namespace xo {
              */
             return ppii.pps()->pretty_struct(ppii, "Variable",
                                              refrtag("name", name_),
-                                             rtag("type", print::quot(this->valuetype()
+                                             rtag("type", print::unq(this->valuetype()
                                                                       ? this->valuetype()->short_name()
                                                                       : "nullptr")));
         }
-    } /*namespace ast*/
+    } /*namespace scm*/
 } /*namespace xo*/