diff options
| author | krasimir <krasimir@chalmers.se> | 2010-05-17 06:12:45 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-05-17 06:12:45 +0000 |
| commit | 77fb23fdbc0a453e2d1913c95c3386ae416e72d0 (patch) | |
| tree | 14a9ebc5834b7cd21757d52d8268f4f47bb11c9a | |
| parent | 7e7564adaa10e074b692e0434f4a01942cd6bbeb (diff) | |
simple refactoring: use ActiveKey in PGF.Parse.getParseResult instead of plain pair of FId and LIndex
| -rw-r--r-- | src/runtime/haskell/PGF/Parse.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs index 40cd3e9e9..9ae28bdab 100644 --- a/src/runtime/haskell/PGF/Parse.hs +++ b/src/runtime/haskell/PGF/Parse.hs @@ -158,11 +158,11 @@ recoveryStates open_types (EState pgf cnc chart) = getParseResult :: ParseState -> Type -> (ParseResult,Maybe BracketedString)
getParseResult (PState pgf cnc chart items) ty@(DTyp _ start _) =
let mb_bs = case roots of
- ((root,lbl):_) -> Just $ linearizeWithBrackets $ Forest (abstract pgf) cnc (forest st) root lbl
- _ -> Nothing
+ ((AK fid lbl):_) -> Just $ linearizeWithBrackets $ Forest (abstract pgf) cnc (forest st) fid lbl
+ _ -> Nothing
exps = nubsort $ do
- (fid,lbl) <- roots
+ (AK fid lbl) <- roots
(fvs,e) <- go Set.empty 0 (0,fid)
guard (Set.null fvs)
Right e1 <- [checkExpr pgf e ty]
@@ -182,7 +182,7 @@ getParseResult (PState pgf cnc chart items) ty@(DTyp _ start _) = Just (CncCat s e lbls) -> do cat <- range (s,e)
lbl <- indices lbls
fid <- maybeToList (lookupPC (PK cat lbl 0) (passive st))
- return (fid,lbl)
+ return (AK fid lbl)
Nothing -> mzero
go rec fcat' (d,fcat)
|