GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-04 00:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

optimize/simplify the error reporting in the new API

Browse Source
This commit is contained in:
krasimir
2010-04-30 20:16:16 +00:00
parent 61a1171811
commit d2ae070eac
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime/haskell/PGF/Parse.hs
View File

@@ -39,12 +39,13 @@ data ParseResult
| ParseResult [Tree] -- ^ If the parsing was successful we get a list of abstract syntax trees. The list should be non-empty. | ParseResult [Tree] -- ^ If the parsing was successful we get a list of abstract syntax trees. The list should be non-empty.
parse :: PGF -> Language -> Type -> [String] -> (ParseResult,Maybe BracketedString) parse :: PGF -> Language -> Type -> [String] -> (ParseResult,Maybe BracketedString)
parse pgf lang typ toks = loop 0 (initState pgf lang typ) toks parse pgf lang typ toks = loop (initState pgf lang typ) toks
where where
loop i ps [] = getParseResult ps typ loop ps [] = getParseResult ps typ
loop i ps (t:ts) = case nextState ps t of loop ps (t:ts) = case nextState ps t of
Left es -> (ParseFailed i,Nothing) Left es -> case es of
Right ps -> loop (i+1) ps ts EState _ _ chart -> (ParseFailed (offset chart),Nothing)
Right ps -> loop ps ts
parseWithRecovery :: PGF -> Language -> Type -> [Type] -> [String] -> (ParseResult,Maybe BracketedString) parseWithRecovery :: PGF -> Language -> Type -> [Type] -> [String] -> (ParseResult,Maybe BracketedString)
parseWithRecovery pgf lang typ open_typs toks = accept (initState pgf lang typ) toks parseWithRecovery pgf lang typ open_typs toks = accept (initState pgf lang typ) toks
@@ -167,7 +168,11 @@ getParseResult (PState pgf cnc chart items) ty@(DTyp _ start _) =
Right e1 <- [checkExpr pgf e ty] Right e1 <- [checkExpr pgf e ty]
return e1 return e1
in (ParseResult exps,mb_bs) res = if null exps
then ParseFailed (offset chart)
else ParseResult exps
in (res,mb_bs)
where where
(mb_agenda,acc) = TMap.decompose items (mb_agenda,acc) = TMap.decompose items
agenda = maybe [] Set.toList mb_agenda agenda = maybe [] Set.toList mb_agenda