diff options
| author | krasimir <krasimir@chalmers.se> | 2009-03-04 13:41:33 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-03-04 13:41:33 +0000 |
| commit | 7babfd1da6808f65ae6369aef0dc246857822357 (patch) | |
| tree | 6693dc32ca5cd9fafc2172cb6c010593ca4d6534 /src/GF/Compile/Update.hs | |
| parent | ed6c31f3ef510a8fdc687ec8761aec0e18216096 (diff) | |
qualified/unqualified mode for GF.Grammar.Printer. Used in the "cc" command
Diffstat (limited to 'src/GF/Compile/Update.hs')
| -rw-r--r-- | src/GF/Compile/Update.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GF/Compile/Update.hs b/src/GF/Compile/Update.hs index 4bcea0db2..ba0f383a8 100644 --- a/src/GF/Compile/Update.hs +++ b/src/GF/Compile/Update.hs @@ -37,9 +37,9 @@ buildAnyTree m = go Map.empty Just i -> case unifyAnyInfo c i j of Ok k -> go (Map.insert c k map) is Bad _ -> fail $ render (text "cannot unify the informations" $$ - nest 4 (ppJudgement (c,i)) $$ + nest 4 (ppJudgement Qualified (c,i)) $$ text "and" $+$ - nest 4 (ppJudgement (c,j)) $$ + nest 4 (ppJudgement Qualified (c,j)) $$ text "in module" <+> ppIdent m) Nothing -> go (Map.insert c j map) is @@ -143,9 +143,9 @@ extendMod isCompl (name,cond) base old new = foldM try new $ Map.toList old Just j -> case unifyAnyInfo c i j of Ok k -> return $ updateTree (c,k) new Bad _ -> fail $ render (text "cannot unify the information" $$ - nest 4 (ppJudgement (c,i)) $$ + nest 4 (ppJudgement Qualified (c,i)) $$ text "in module" <+> ppIdent name <+> text "with" $$ - nest 4 (ppJudgement (c,j)) $$ + nest 4 (ppJudgement Qualified (c,j)) $$ text "in module" <+> ppIdent base) Nothing -> if isCompl then return $ updateTree (c,indirInfo name i) new |