diff options
| author | krasimir <krasimir@chalmers.se> | 2009-10-28 16:47:01 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-10-28 16:47:01 +0000 |
| commit | 980844a4ad13c0423a3223f0e89e43d6e9be1ba3 (patch) | |
| tree | 810ad7002888c5f5f3847d8a6b7b9773c9672576 /src/GF/Compile/GrammarToGFCC.hs | |
| parent | f2e5281602516e1c0eb4a2f69d64e6c075fb79da (diff) | |
restructure ResParam and ResValue
Diffstat (limited to 'src/GF/Compile/GrammarToGFCC.hs')
| -rw-r--r-- | src/GF/Compile/GrammarToGFCC.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index dd3a14f38..bf854e7ac 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -309,8 +309,8 @@ canon2canon opts abs cg0 = -- flatten record arguments of param constructors p2p (f,j) = case j of - ResParam (Just (ps,v)) -> - ResParam (Just ([(c,concatMap unRec cont) | (c,cont) <- ps],Nothing)) + ResParam (Just ps) _ -> + ResParam (Just [(c,concatMap unRec cont) | (c,cont) <- ps]) Nothing _ -> j unRec (bt,x,ty) = case ty of RecType fs -> [ity | (_,typ) <- fs, ity <- unRec (Explicit,identW,typ)] @@ -355,7 +355,7 @@ paramValues cgr = (labels,untyps,typs) where ty <- typsFrom ty0 ] ++ [ Q m ty | - (m,(ty,ResParam _)) <- jments + (m,(ty,ResParam _ _)) <- jments ] ++ [ty | (_,(_,CncFun _ (Just tr) _)) <- jments, ty <- err (const []) snd $ appSTM (typsFromTrm tr) [] |