From 78605a758d20745d6f4fb7464300fcbf598651f1 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Mon, 17 Jun 2024 13:43:21 -0400
Subject: [PATCH] xo-expression: minor refactor: if_expr -> ifexpr

---
 include/xo/expression/Expression.hpp | 3 +++
 include/xo/expression/IfExpr.hpp     | 8 ++++----
 include/xo/expression/exprtype.hpp   | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/xo/expression/Expression.hpp b/include/xo/expression/Expression.hpp
index cd23df53..c9c4e0c0 100644
--- a/include/xo/expression/Expression.hpp
+++ b/include/xo/expression/Expression.hpp
@@ -20,6 +20,9 @@ namespace xo {
          *  - execute it on a VM
          *  - compile using LLVM
          *    see xo-jit/
+         *
+         *  Expressions are immutable.  This means they can resused
+         *  across jit interactions
          **/
         class Expression : public ref::Refcount {
         public:
diff --git a/include/xo/expression/IfExpr.hpp b/include/xo/expression/IfExpr.hpp
index d60ab1d3..592c585c 100644
--- a/include/xo/expression/IfExpr.hpp
+++ b/include/xo/expression/IfExpr.hpp
@@ -25,7 +25,7 @@ namespace xo {
             IfExpr(const ref::rp<Expression> & test,
                    const ref::rp<Expression> & when_true,
                    const ref::rp<Expression> & when_false)
-                : Expression(exprtype::if_expr),
+                : Expression(exprtype::ifexpr),
                   test_{test},
                   when_true_{when_true},
                   when_false_{when_false} {}
@@ -55,9 +55,9 @@ namespace xo {
         }; /*IfExpr*/
 
         inline ref::rp<IfExpr>
-        make_if_expr(const ref::rp<Expression> & test,
-                     const ref::rp<Expression> & when_true,
-                     const ref::rp<Expression> & when_false)
+        make_ifexpr(const ref::rp<Expression> & test,
+                    const ref::rp<Expression> & when_true,
+                    const ref::rp<Expression> & when_false)
         {
             return new IfExpr(test, when_true, when_false);
         }
diff --git a/include/xo/expression/exprtype.hpp b/include/xo/expression/exprtype.hpp
index ee33190e..d8e66a61 100644
--- a/include/xo/expression/exprtype.hpp
+++ b/include/xo/expression/exprtype.hpp
@@ -29,7 +29,7 @@ namespace xo {
             /** variable reference **/
             variable,
             /** if-then-else **/
-            if_expr,
+            ifexpr,
 
             /** not an expression.  comes last, counts entries **/
             n_expr
@@ -45,7 +45,7 @@ namespace xo {
             case exprtype::apply: return "apply";
             case exprtype::lambda: return "lambda";
             case exprtype::variable: return "variable";
-            case exprtype::if_expr: return "if_expr";
+            case exprtype::ifexpr: return "if_expr";
             default: break;
             }