summaryrefslogtreecommitdiff
path: root/src/GF/CF
diff options
context:
space:
mode:
authoraarne <unknown>2005-11-15 16:56:13 +0000
committeraarne <unknown>2005-11-15 16:56:13 +0000
commit2cea1a25bb9082953aa4e9c1a8ac41db09b5c761 (patch)
treebf1a237c80f6eae70a454418d03654e23b4e61f4 /src/GF/CF
parent1fd1f44fcc81149b286992dd13b3128d42c4736e (diff)
work on cf
Diffstat (limited to 'src/GF/CF')
-rw-r--r--src/GF/CF/PPrCF.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/GF/CF/PPrCF.hs b/src/GF/CF/PPrCF.hs
index 6d617c6be..d40a93c57 100644
--- a/src/GF/CF/PPrCF.hs
+++ b/src/GF/CF/PPrCF.hs
@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
--- > CVS $Date: 2005/11/15 11:43:33 $
+-- > CVS $Date: 2005/11/15 17:56:13 $
-- > CVS $Author: aarne $
--- > CVS $Revision: 1.12 $
+-- > CVS $Revision: 1.13 $
--
-- printing and parsing CF grammars, rules, and trees AR 26/1/2000 -- 9/6/2003
--
@@ -89,11 +89,11 @@ getCFRule mo s = getcf (wrds s) where
clean = filter isAlphaNum -- to form valid identifiers
wrds = takeWhile (/= ";") . words -- to permit semicolon in the end
-pCF :: String -> String -> Err CF
+pCF :: String -> String -> Err [CFRule]
pCF mo s = do
rules <- mapM (getCFRule mo) $ filter isRule $ lines s
- return $ rules2CF $ concat rules
+ return $ concat rules
where
- isRule line = case line of
+ isRule line = case dropWhile isSpace line of
'-':'-':_ -> False
_ -> not $ all isSpace line