From c3f4c3eba7b7d98f48cfe56711eb18611bb89515 Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 28 May 2010 14:15:15 +0000 Subject: refactoring in GF.Grammar.Grammar --- src/compiler/GF/Compile/Optimize.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/compiler/GF/Compile/Optimize.hs') diff --git a/src/compiler/GF/Compile/Optimize.hs b/src/compiler/GF/Compile/Optimize.hs index a9e182f7f..62fd833a9 100644 --- a/src/compiler/GF/Compile/Optimize.hs +++ b/src/compiler/GF/Compile/Optimize.hs @@ -146,10 +146,10 @@ mkLinDefault gr typ = liftM (Abs Explicit varStr) $ mkDefField typ let T _ cs = mkWildCases t' return $ T (TWild p) cs Sort s | s == cStr -> return $ Vr varStr - QC q p -> do vs <- lookupParamValues gr q p - case vs of - v:_ -> return v - _ -> Bad (render (text "no parameter values given to type" <+> ppIdent p)) + QC p -> do vs <- lookupParamValues gr p + case vs of + v:_ -> return v + _ -> Bad (render (text "no parameter values given to type" <+> ppQIdent Qualified p)) RecType r -> do let (ls,ts) = unzip r ts <- mapM mkDefField ts @@ -181,7 +181,7 @@ evalPrintname gr c ppr lin = C x y -> C (oneBranch x) (oneBranch y) S x _ -> oneBranch x P x _ -> oneBranch x - Alts (d,_) -> oneBranch d + Alts d _ -> oneBranch d _ -> t --- very unclean cleaner @@ -222,7 +222,7 @@ replace :: Term -> Term -> Term -> Term replace old new trm = case trm of -- these are the important cases, since they can correspond to patterns - QC _ _ | trm == old -> new + QC _ | trm == old -> new App _ _ | trm == old -> new R _ | trm == old -> new App x y -> App (replace old new x) (replace old new y) -- cgit v1.2.3