diff options
| -rw-r--r-- | src/GF/Devel/Compile/Factorize.hs | 2 | ||||
| -rw-r--r-- | src/GF/Devel/Compile/Refresh.hs | 4 | ||||
| -rw-r--r-- | src/GF/Devel/Compile/Rename.hs | 15 | ||||
| -rw-r--r-- | src/GF/Devel/Compile/SourceToGF.hs | 2 | ||||
| -rw-r--r-- | src/GF/Devel/Grammar/GFtoSource.hs | 1 |
5 files changed, 15 insertions, 9 deletions
diff --git a/src/GF/Devel/Compile/Factorize.hs b/src/GF/Devel/Compile/Factorize.hs index cb9a684ff..7386f3ed5 100644 --- a/src/GF/Devel/Compile/Factorize.hs +++ b/src/GF/Devel/Compile/Factorize.hs @@ -89,7 +89,7 @@ factor c i t = case t of --- we hope this will be fresh and don't check... -qqIdent c i = identC ("_q" ++ prt c ++ "__" ++ show i) +qqIdent c i = identC ("_q_" ++ prt c ++ "__" ++ show i) -- we need to replace subterms diff --git a/src/GF/Devel/Compile/Refresh.hs b/src/GF/Devel/Compile/Refresh.hs index 242099606..1708761fc 100644 --- a/src/GF/Devel/Compile/Refresh.hs +++ b/src/GF/Devel/Compile/Refresh.hs @@ -54,7 +54,7 @@ refresh e = case e of Prod x a b -> do a' <- refresh a - x' <- refVar x + x' <- refVarPlus x b' <- refresh b return $ Prod x' a' b' @@ -79,7 +79,7 @@ refreshCase :: (Patt,Term) -> STM IdState (Patt,Term) refreshCase (p,t) = liftM2 (,) (refreshPatt p) (refresh t) refreshPatt p = case p of - PV x -> liftM PV (refVar x) + PV x -> liftM PV (refVarPlus x) PC c ps -> liftM (PC c) (mapM refreshPatt ps) PP q c ps -> liftM (PP q c) (mapM refreshPatt ps) PR r -> liftM PR (mapPairsM refreshPatt r) diff --git a/src/GF/Devel/Compile/Rename.hs b/src/GF/Devel/Compile/Rename.hs index fe4f8175f..b6d44c7ed 100644 --- a/src/GF/Devel/Compile/Rename.hs +++ b/src/GF/Devel/Compile/Rename.hs @@ -47,12 +47,15 @@ renameSourceTerm g m t = do -} renameModule :: GF -> SourceModule -> Err SourceModule -renameModule gf sm@(name,mo) = errIn ("renaming module" +++ prt name) $ do - let gf1 = gf {gfmodules = Map.insert name mo (gfmodules gf)} - let rename = renameTerm (gf1,sm) [] - mo1 <- termOpModule rename mo - let mo2 = mo1 {mopens = [(i,i) | (_,i) <- mopens mo1]} - return (name,mo2) +renameModule gf sm@(name,mo) = case mtype mo of + MTInterface -> return sm + _ | not (isCompleteModule mo) -> return sm + _ -> errIn ("renaming module" +++ prt name) $ do + let gf1 = gf {gfmodules = Map.insert name mo (gfmodules gf)} + let rename = renameTerm (gf1,sm) [] + mo1 <- termOpModule rename mo + let mo2 = mo1 {mopens = nub [(i,i) | (_,i) <- mopens mo1]} + return (name,mo2) type RenameEnv = (GF,SourceModule) diff --git a/src/GF/Devel/Compile/SourceToGF.hs b/src/GF/Devel/Compile/SourceToGF.hs index 103982147..5e7d8dc9e 100644 --- a/src/GF/Devel/Compile/SourceToGF.hs +++ b/src/GF/Devel/Compile/SourceToGF.hs @@ -504,6 +504,7 @@ transSort x = case x of transPatt :: Patt -> Err G.Patt transPatt x = case x of PW -> return wildPatt + PV (PIdent (_,"_")) -> return wildPatt PV id -> liftM G.PV $ transIdent id PC id patts -> liftM2 G.PC (transIdent id) (mapM transPatt patts) PCon id -> liftM2 G.PC (transIdent id) (return []) @@ -529,6 +530,7 @@ transPatt x = case x of transBind :: Bind -> Err Ident transBind x = case x of + BPIdent (PIdent (_,"_")) -> return identW BPIdent id -> transIdent id BWild -> return identW diff --git a/src/GF/Devel/Grammar/GFtoSource.hs b/src/GF/Devel/Grammar/GFtoSource.hs index 9ac65469a..6618eaa20 100644 --- a/src/GF/Devel/Grammar/GFtoSource.hs +++ b/src/GF/Devel/Grammar/GFtoSource.hs @@ -146,6 +146,7 @@ trt trm = case trm of T _ cc -> P.ETable (map trCase cc) V ty cc -> P.EVTable (trt ty) (map trt cc) + Typed tr ty -> P.ETyped (trt tr) (trt ty) Table x v -> P.ETType (trt x) (trt v) S f x -> P.ESelect (trt f) (trt x) Let (x,(ma,b)) t -> |