Support the FldName namespace introduced in GHC 9.8

goldfirere · Oct 11, 2023 · baa6705 · baa6705
1 parent 6b24ff6
commit baa6705
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/singletons-th/src/Data/Singletons/TH/Promote.hs b/singletons-th/src/Data/Singletons/TH/Promote.hs
@@ -614,10 +614,11 @@ promoteInfixDecl mb_let_uniq name fixity = do
   mb_ns <- reifyNameSpace name
   case mb_ns of
     -- If we can't find the Name for some odd reason, fall back to promote_val
-    Nothing        -> promote_val
-    Just VarName   -> promote_val
-    Just DataName  -> never_mind
-    Just TcClsName -> do
+    Nothing          -> promote_val
+    Just VarName     -> promote_val
+    Just (FldName _) -> promote_val
+    Just DataName    -> never_mind
+    Just TcClsName   -> do
       mb_info <- dsReify name
       case mb_info of
         Just (DTyConI DClassD{} _)

diff --git a/singletons-th/src/Data/Singletons/TH/Single/Fixity.hs b/singletons-th/src/Data/Singletons/TH/Single/Fixity.hs
@@ -15,10 +15,11 @@ singInfixDecl name fixity = do
   case mb_ns of
     -- If we can't find the Name for some odd reason,
     -- fall back to singValName
-    Nothing        -> finish $ singledValueName   opts name
-    Just VarName   -> finish $ singledValueName   opts name
-    Just DataName  -> finish $ singledDataConName opts name
-    Just TcClsName -> do
+    Nothing          -> finish $ singledValueName   opts name
+    Just VarName     -> finish $ singledValueName   opts name
+    Just (FldName _) -> finish $ singledValueName   opts name
+    Just DataName    -> finish $ singledDataConName opts name
+    Just TcClsName   -> do
       mb_info <- dsReify name
       case mb_info of
         Just (DTyConI DClassD{} _)