fix the handling of wildcards

2 files changed, 5 insertions, 2 deletions

diff --git a/src/GF/Grammar/PatternMatch.hs b/src/GF/Grammar/PatternMatch.hs
index 021735c79..a14b405f3 100644
--- a/src/GF/Grammar/PatternMatch.hs
+++ b/src/GF/Grammar/PatternMatch.hs
@@ -82,7 +82,7 @@ tryMatch (p,t) = do
       (PVal pa _ _,_) -> trym pa t'
       (_, (_,Val te _ _,_)) -> tryMatch (p, te)
       (_,(x,Empty,y)) -> trym p (x,K [],y)   -- because "" = [""] = []
-      (PV IW, _) | isInConstantFormt -> return [] -- optimization with wildcard
+      (PW, _) | isInConstantFormt -> return [] -- optimization with wildcard
       (PV x,  _) | isInConstantFormt -> return [(x,t)]
       (PString s, ([],K i,[])) | s==i -> return []
       (PInt s, ([],EInt i,[])) | s==i -> return []
@@ -159,7 +159,7 @@ isInConstantForm trm = case trm of
 
 varsOfPatt :: Patt -> [Ident]
 varsOfPatt p = case p of
-  PV x -> [x | not (isWildIdent x)]
+  PV x -> [x]
   PC _ ps -> concat $ map varsOfPatt ps
   PP _ _ ps -> concat $ map varsOfPatt ps
   PR r    -> concat $ map (varsOfPatt . snd) r
diff --git a/src/GF/Grammar/Printer.hs b/src/GF/Grammar/Printer.hs
index b658cc9d1..383d36d4f 100644
--- a/src/GF/Grammar/Printer.hs
+++ b/src/GF/Grammar/Printer.hs
@@ -218,6 +218,7 @@ ppPatt q d (PChar)      = char '?'
 ppPatt q d (PChars s)   = brackets (text (show s))

 ppPatt q d (PMacro id)  = char '#' <> ppIdent id

 ppPatt q d (PM m id)    = char '#' <> ppIdent m <> char '.' <> ppIdent id

+ppPatt q d PW           = char '_'

 ppPatt q d (PV id)      = ppIdent id

 ppPatt q d (PInt n)     = integer n

 ppPatt q d (PFloat f)   = double f

@@ -269,6 +270,8 @@ getAbs e         = ([],e)
 getCTable :: Term -> ([Ident], Term)

 getCTable (T TRaw [(PV v,e)]) = let (vs,e') = getCTable e

                                 in (v:vs,e')

+getCTable (T TRaw [(PW,  e)]) = let (vs,e') = getCTable e

+                                in (identW:vs,e')

 getCTable e                   = ([],e)

 

 getLet :: Term -> ([LocalDef], Term)