diff options
| author | krasimir <krasimir@chalmers.se> | 2010-01-05 08:35:33 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-01-05 08:35:33 +0000 |
| commit | ee3ce9694c134d697bf3fa6b8910c7d863f84dab (patch) | |
| tree | 408e9d0b6e89db9a2cec05dcb460910f958a91c6 /src/runtime/haskell/PGF/Parse.hs | |
| parent | 3ed19a482e796b0a62d234ec9ffd1981d5fee64e (diff) | |
store the label names in PMCFG
Diffstat (limited to 'src/runtime/haskell/PGF/Parse.hs')
| -rw-r--r-- | src/runtime/haskell/PGF/Parse.hs | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs index 44ff525b4..6de7f29a8 100644 --- a/src/runtime/haskell/PGF/Parse.hs +++ b/src/runtime/haskell/PGF/Parse.hs @@ -56,14 +56,15 @@ parseWithRecovery pgf lang typ open_typs toks = accept (initState pgf lang typ) -- startup category.
initState :: PGF -> Language -> Type -> ParseState
initState pgf lang (DTyp _ start _) =
- let items = do
- cat <- maybe [] range (Map.lookup start (startCats pinfo))
- (funid,args) <- foldForest (\funid args -> (:) (funid,args)) (\_ _ args -> args)
- [] cat (productions pinfo)
- let FFun fn lins = functions pinfo ! funid
- (lbl,seqid) <- assocs lins
- return (Active 0 0 funid seqid args (AK cat lbl))
-
+ let items = case Map.lookup start (startCats pinfo) of
+ Just (s,e,labels) -> do cat <- range (s,e)
+ (funid,args) <- foldForest (\funid args -> (:) (funid,args)) (\_ _ args -> args)
+ [] cat (productions pinfo)
+ let FFun fn lins = functions pinfo ! funid
+ (lbl,seqid) <- assocs lins
+ return (Active 0 0 funid seqid args (AK cat lbl))
+ Nothing -> mzero
+
pinfo =
case lookParser pgf lang of
Just pinfo -> pinfo
@@ -131,8 +132,10 @@ recoveryStates open_types (EState pgf pinfo chart) = }
in (PState pgf pinfo chart (TMap.singleton [] (Set.fromList agenda)), fmap (PState pgf pinfo chart2) acc)
where
- type2fcats (DTyp _ cat _) = maybe [] range (Map.lookup cat (startCats pinfo))
-
+ type2fcats (DTyp _ cat _) = case Map.lookup cat (startCats pinfo) of
+ Just (s,e,labels) -> range (s,e)
+ Nothing -> []
+
complete open_fcats items ac =
foldl (Set.fold (\(Active j' ppos funid seqid args keyc) ->
(:) (Active j' (ppos+1) funid seqid args keyc)))
@@ -153,16 +156,15 @@ extractTrees (PState pgf pinfo chart items) ty@(DTyp _ start _) = agenda = maybe [] Set.toList mb_agenda
(_,st) = process Nothing (\_ _ -> id) (sequences pinfo) (functions pinfo) agenda () chart
- exps = do
- cat <- maybe [] range (Map.lookup start (startCats pinfo))
- (funid,args) <- foldForest (\funid args -> (:) (funid,args)) (\_ _ args -> args)
- [] cat (productions pinfo)
- let FFun fn lins = functions pinfo ! funid
- lbl <- indices lins
- Just fid <- [lookupPC (PK cat lbl 0) (passive st)]
- (fvs,tree) <- go Set.empty 0 (0,fid)
- guard (Set.null fvs)
- return tree
+ exps =
+ case Map.lookup start (startCats pinfo) of
+ Just (s,e,lbls) -> do cat <- range (s,e)
+ lbl <- indices lbls
+ Just fid <- [lookupPC (PK cat lbl 0) (passive st)]
+ (fvs,tree) <- go Set.empty 0 (0,fid)
+ guard (Set.null fvs)
+ return tree
+ Nothing -> mzero
go rec fcat' (d,fcat)
| fcat < totalCats pinfo = return (Set.empty,EMeta (fcat'*10+d)) -- FIXME: here we assume that every rule has at most 10 arguments
|