a bit more refactoring

src/compiler/GF/Compile/GrammarToCanonical.hs

@@ -15,8 +15,7 @@ import GF.Grammar.Lookup(lookupOrigInfo,allOrigInfos,allParamValues)
 import GF.Grammar.Macros(typeForm,collectOp,collectPattOp,composSafeOp,mkAbs,mkApp,term2patt,sortRec)
 import GF.Grammar.Lockfield(isLockLabel)
 import GF.Grammar.Predef(cPredef,cInts)
--- import GF.Compile.Compute.Value(Predefined(..))
-import GF.Infra.Ident(ModuleName(..),Ident,ident2raw,rawIdentS,showIdent,isWildIdent)
+import GF.Infra.Ident(ModuleName(..),Ident,identW,ident2raw,rawIdentS,showIdent)
 import GF.Infra.Option(Options,optionsPGF)
 import GF.Infra.CheckM
 import PGF2(Literal(..))
@@ -399,7 +398,7 @@ class FromIdent i where
   gId :: Ident -> i
 
 instance FromIdent VarId where
-  gId i = if isWildIdent i then Anonymous else VarId (ident2raw i)
+  gId i = if i == identW then Anonymous else VarId (ident2raw i)
 
 instance FromIdent C.FunId where gId = C.FunId . ident2raw
 instance FromIdent CatId where gId = CatId . ident2raw

src/compiler/GF/Compile/Rename.hs

@@ -332,7 +332,7 @@ renameContext :: Status -> Context -> Check Context
 renameContext b = renc [] where
   renc vs cont = case cont of
     (bt,x,t) : xts
-      | isWildIdent x -> do
+      | x == identW -> do
           t'   <- ren vs t
           xts' <- renc vs xts
           return $ (bt,x,t') : xts'

src/compiler/GF/Compile/TypeCheck/Concrete.hs

@@ -125,7 +125,7 @@ inferLType gr g trm = case trm of
          case fty' of
            Prod bt z arg val -> do
              a' <- justCheck g a arg
-             ty <- if isWildIdent z
+             ty <- if z == identW
                       then return val
                       else substituteLType [(bt,z,a')] val
              return (App f' a',ty)
@@ -472,7 +472,7 @@ checkLType gr g trm typ0 = do
     Abs bt x c -> do
       case typ of
         Prod bt' z a b -> do
-          (c',b') <- if isWildIdent z
+          (c',b') <- if z == identW
                        then checkLType gr ((bt,x,a):g) c b
                        else do b' <- checkIn (pp "abs") $ substituteLType [(bt',z,Vr x)] b
                                checkLType gr ((bt,x,a):g) c b'