diff options
| author | kr.angelov <kr.angelov@chalmers.se> | 2008-05-21 13:10:54 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@chalmers.se> | 2008-05-21 13:10:54 +0000 |
| commit | c544ef31823c7d2c28c28cae408cca5d71e6978d (patch) | |
| tree | b9693bc684d1737062e45438cedf7536cf5513d5 /src-3.0/GF/GFCC/Macros.hs | |
| parent | 529374caaa6d451400f57f1ff82106d89d603944 (diff) | |
use ByteString internally in Ident, CId and Label
Diffstat (limited to 'src-3.0/GF/GFCC/Macros.hs')
| -rw-r--r-- | src-3.0/GF/GFCC/Macros.hs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src-3.0/GF/GFCC/Macros.hs b/src-3.0/GF/GFCC/Macros.hs index 4897aa667..5eaa4bdb3 100644 --- a/src-3.0/GF/GFCC/Macros.hs +++ b/src-3.0/GF/GFCC/Macros.hs @@ -4,7 +4,7 @@ import GF.GFCC.CId import GF.GFCC.DataGFCC import GF.Formalism.FCFG (FGrammar) import GF.Parsing.FCFG.PInfo (FCFPInfo, fcfPInfoToFGrammar) -----import GF.GFCC.PrintGFCC +import GF.Infra.PrintClass import Control.Monad import Data.Map import Data.Maybe @@ -39,7 +39,7 @@ lookFCFG :: GFCC -> CId -> Maybe FGrammar lookFCFG gfcc lang = fmap fcfPInfoToFGrammar $ lookParser gfcc lang lookStartCat :: GFCC -> String -lookStartCat gfcc = fromMaybe "S" $ msum $ Data.List.map (Data.Map.lookup (CId "startcat")) +lookStartCat gfcc = fromMaybe "S" $ msum $ Data.List.map (Data.Map.lookup (mkCId "startcat")) [gflags gfcc, aflags (abstract gfcc)] lookGlobalFlag :: GFCC -> CId -> String @@ -87,12 +87,6 @@ contextLength :: Type -> Int contextLength ty = case ty of DTyp hyps _ _ -> length hyps -cid :: String -> CId -cid = CId - -wildCId :: CId -wildCId = cid "_" - exp0 :: Exp exp0 = tree (AM 0) [] @@ -100,7 +94,7 @@ primNotion :: Exp primNotion = EEq [] term0 :: CId -> Term -term0 = TM . prCId +term0 = TM . prt tm0 :: Term tm0 = TM "?" |