summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorkrasimir <krasimir@chalmers.se>2010-04-30 20:18:26 +0000
committerkrasimir <krasimir@chalmers.se>2010-04-30 20:18:26 +0000
commit9e7b914c3c5384feed3981acae89afaa7402e92b (patch)
tree1b1e1e1132cbfb752b38d2b9675583c7c7067092 /src/compiler
parent1c590e41f4a1e94e050980a6b161e4385a9e7cfa (diff)
for backward compatibility we have the old parse function again. the old functionality is exposed by parse_
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/GF/Command/Commands.hs2
-rw-r--r--src/compiler/GF/Compile/ExampleBased.hs2
-rw-r--r--src/compiler/GF/Quiz.hs5
3 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index f89e497ad..2de7fb9cf 100644
--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -897,7 +897,7 @@ allCommands env@(pgf, mos) = Map.fromList [
]
where
par opts s = case optOpenTypes opts of
- [] -> [parse pgf lang (optType opts) s | lang <- optLangs opts]
+ [] -> [parse_ pgf lang (optType opts) s | lang <- optLangs opts]
open_typs -> [parseWithRecovery pgf lang (optType opts) open_typs s | lang <- optLangs opts]
void = ([],[])
diff --git a/src/compiler/GF/Compile/ExampleBased.hs b/src/compiler/GF/Compile/ExampleBased.hs
index f197722ba..5c56c0ce5 100644
--- a/src/compiler/GF/Compile/ExampleBased.hs
+++ b/src/compiler/GF/Compile/ExampleBased.hs
@@ -41,7 +41,7 @@ convertFile conf src file = do
convEx (cat,ex) = do
appn "("
let typ = maybe (error "no valid cat") id $ readType cat
- ws <- case fst (parse pgf lang typ ex) of
+ ws <- case fst (parse_ pgf lang typ ex) of
ParseFailed _ -> do
let ws = morphoMissing morpho (words ex)
appv ("WARNING: cannot parse example " ++ ex)
diff --git a/src/compiler/GF/Quiz.hs b/src/compiler/GF/Quiz.hs
index 2a9b28ccb..0c48ea67d 100644
--- a/src/compiler/GF/Quiz.hs
+++ b/src/compiler/GF/Quiz.hs
@@ -46,10 +46,7 @@ translationList mex mprobs pgf ig og typ number = do
return $ map mkOne $ ts
where
mkOne t = (norml (linearize pgf ig t), map (norml . linearize pgf og) (homonyms t))
- homonyms t =
- case (fst . parse pgf ig typ . linearize pgf ig) t of
- ParseResult ts -> ts
- _ -> []
+ homonyms = parse pgf ig typ . linearize pgf ig
morphologyList ::
Maybe Expr -> Maybe Probabilities ->