diff options
| author | krasimir <krasimir@chalmers.se> | 2010-12-06 14:19:51 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-12-06 14:19:51 +0000 |
| commit | b6446ec36dcb537f39d38893f8cbe8c355c1b504 (patch) | |
| tree | f6eababb1d764fe364f268f1a1959bc24f6b7c0a /src/compiler | |
| parent | 0f444d889302b68f2b7edbe31e4ddcd37e45454a (diff) | |
simple refactoring in PGF.Macros and related
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/GF/Command/Commands.hs | 2 | ||||
| -rw-r--r-- | src/compiler/GF/Speech/PGFToCFG.hs | 2 | ||||
| -rw-r--r-- | src/compiler/GF/Speech/VoiceXML.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs index 47960f0fe..82ce69b41 100644 --- a/src/compiler/GF/Command/Commands.hs +++ b/src/compiler/GF/Command/Commands.hs @@ -985,7 +985,7 @@ allCommands env@(pgf, mos) = Map.fromList [ Fun cid [] -> t Fun cid ts -> Fun (mk cid) (map t2m ts) _ -> t - mk = mkCId . ("mk" ++) . showCId . lookValCat pgf + mk = mkCId . ("mk" ++) . showCId . lookValCat (abstract pgf) unlex opts lang = stringOps Nothing (getUnlex opts lang ++ map prOpt opts) ---- diff --git a/src/compiler/GF/Speech/PGFToCFG.hs b/src/compiler/GF/Speech/PGFToCFG.hs index 01c16393e..4b1afa8d6 100644 --- a/src/compiler/GF/Speech/PGFToCFG.hs +++ b/src/compiler/GF/Speech/PGFToCFG.hs @@ -107,7 +107,7 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co profilesToTerm :: [Profile] -> CFTerm profilesToTerm ps = CFObj f (zipWith profileToTerm argTypes ps) - where (argTypes,_) = catSkeleton $ lookType pgf f + where (argTypes,_) = catSkeleton $ lookType (abstract pgf) f profileToTerm :: CId -> Profile -> CFTerm profileToTerm t [] = CFMeta t diff --git a/src/compiler/GF/Speech/VoiceXML.hs b/src/compiler/GF/Speech/VoiceXML.hs index 40976dc02..308806bea 100644 --- a/src/compiler/GF/Speech/VoiceXML.hs +++ b/src/compiler/GF/Speech/VoiceXML.hs @@ -39,7 +39,7 @@ grammar2vxml pgf cnc = showsXMLDoc (skel2vxml name language start skel qs) "" type Skeleton = [(CId, [(CId, [CId])])] pgfSkeleton :: PGF -> Skeleton -pgfSkeleton pgf = [(c,[(f,fst (catSkeleton (lookType pgf f))) | (_,f) <- fs]) +pgfSkeleton pgf = [(c,[(f,fst (catSkeleton (lookType (abstract pgf) f))) | (_,f) <- fs]) | (c,(_,fs)) <- Map.toList (cats (abstract pgf))] -- |