Accept various builtin types in type expressions

1 files changed, 4 insertions, 1 deletions

diff --git a/src/Script/Expr.hs b/src/Script/Expr.hs
index 09b7c80..e6f945d 100644
--- a/src/Script/Expr.hs
+++ b/src/Script/Expr.hs
@@ -8,6 +8,7 @@ module Script.Expr (
 
     FunctionType, DynamicType,
     ExprType(..), SomeExpr(..),
+    SomePrimType(..),
     TypeVar(..), SomeExprType(..), someExprType, textSomeExprType,
     renameTypeVar, renameVarInType,
 
@@ -293,6 +294,8 @@ instance ExprType DynamicType where
 
 data SomeExpr = forall a. ExprType a => SomeExpr (Expr a)
 
+data SomePrimType = forall a. ExprType a => SomePrimType (Proxy a)
+
 newtype TypeVar = TypeVar Text
     deriving (Eq, Ord)
 
@@ -569,7 +572,7 @@ data Regex = RegexCompiled Text RE.Regex
            | RegexString Text
 
 instance ExprType Regex where
-    textExprType _ = T.pack "regex"
+    textExprType _ = T.pack "Regex"
     textExprValue _ = T.pack "<regex>"
 
     exprExpansionConvFrom = listToMaybe $ catMaybes