msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

defLinType and pr no s label

Browse Source
This commit is contained in:
aarne
2005-04-17 18:48:34 +00:00
parent df4f4bcd6f
commit 1323b74063
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GF/CF/CFtoGrammar.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/02/18 19:21:07 $ -- > CVS $Date: 2005/04/17 19:48:34 $
-- > CVS $Author: peb $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.5 $ -- > CVS $Revision: 1.6 $
-- --
-- 26\/1\/2000 -- 18\/4 -- 24\/3\/2004 -- 26\/1\/2000 -- 18\/4 -- 24\/3\/2004
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@@ -36,7 +36,7 @@ cf2grammar cf = concatMap S.trAnyDef (abs ++ conc) where
conc = lintypes ++ lins conc = lintypes ++ lins
cats = [(cat, AbsCat (yes []) (yes [])) | cats = [(cat, AbsCat (yes []) (yes [])) |
cat <- nub (concat (map cf2cat rules))] ----notPredef cat cat <- nub (concat (map cf2cat rules))] ----notPredef cat
lintypes = [] ----[(cat, CncCat (yes) nope Nothing) | (cat,AbsCat _ _) <- cats] lintypes = [(cat, CncCat (yes defLinType) nope nope) | (cat,AbsCat _ _) <- cats]
(funs,lins) = unzip (map cf2rule rules) (funs,lins) = unzip (map cf2rule rules)
cf2cat :: CFRule -> [Ident] cf2cat :: CFRule -> [Ident]

10
src/GF/CF/PPrCF.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/02/18 19:21:07 $ -- > CVS $Date: 2005/04/17 19:48:34 $
-- > CVS $Author: peb $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.9 $ -- > CVS $Revision: 1.10 $
-- --
-- printing and parsing CF grammars, rules, and trees AR 26/1/2000 -- 9/6/2003 -- printing and parsing CF grammars, rules, and trees AR 26/1/2000 -- 9/6/2003
-- --
@@ -48,7 +48,9 @@ prCFFun' profs (CFFun (t, p)) = prt_ t ++ pp p where
normal p = and [x==y && null b | ((b,x),y) <- zip p (map (:[]) [0..])] normal p = and [x==y && null b | ((b,x),y) <- zip p (map (:[]) [0..])]
prCFCat :: CFCat -> String prCFCat :: CFCat -> String
prCFCat (CFCat (c,l)) = prt_ c ++ "-" ++ prt_ l ---- prCFCat (CFCat (c,l)) = prt_ c ++ case prt_ l of
"s" -> []
_ -> "-" ++ prt_ l ----
prCFItem :: CFItem -> String prCFItem :: CFItem -> String
prCFItem (CFNonterm c) = prCFCat c prCFItem (CFNonterm c) = prCFCat c