diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2013-09-03 07:51:25 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2013-09-03 07:51:25 +0000 |
| commit | df26b134fc13cee4c854afd4306d847873885270 (patch) | |
| tree | 3dd98c1e8b5286d60534b06f23d069676a743335 /src/runtime/haskell/PGF/Linearize.hs | |
| parent | d626a194de5c48e0ceedfc3946443f63fd6a4ad8 (diff) | |
fix in the GF compiler and runtime which let us to define pre construct detecting whether this is the last token.
Diffstat (limited to 'src/runtime/haskell/PGF/Linearize.hs')
| -rw-r--r-- | src/runtime/haskell/PGF/Linearize.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/haskell/PGF/Linearize.hs b/src/runtime/haskell/PGF/Linearize.hs index d24e98d38..cf4c78193 100644 --- a/src/runtime/haskell/PGF/Linearize.hs +++ b/src/runtime/haskell/PGF/Linearize.hs @@ -23,7 +23,7 @@ import qualified Data.Set as Set -- | Linearizes given expression as string in the language linearize :: PGF -> Language -> Tree -> String -linearize pgf lang = concat . take 1 . map (unwords . concatMap flattenBracketedString . snd . untokn "" . firstLin) . linTree pgf lang +linearize pgf lang = concat . take 1 . map (unwords . concatMap flattenBracketedString . snd . untokn Nothing . firstLin) . linTree pgf lang -- | The same as 'linearizeAllLang' but does not return -- the language. @@ -37,7 +37,7 @@ linearizeAllLang pgf t = [(lang,linearize pgf lang t) | lang <- Map.keys (concre -- | Linearizes given expression as a bracketed string in the language bracketedLinearize :: PGF -> Language -> Tree -> BracketedString -bracketedLinearize pgf lang = head . concat . map (snd . untokn "" . firstLin) . linTree pgf lang +bracketedLinearize pgf lang = head . concat . map (snd . untokn Nothing . firstLin) . linTree pgf lang where -- head [] = error "cannot linearize" head [] = Leaf "" @@ -53,7 +53,7 @@ firstLin (_,arr) tabularLinearizes :: PGF -> Language -> Expr -> [[(String,String)]] tabularLinearizes pgf lang e = map cnv (linTree pgf lang e) where - cnv ((cat,_),lin) = zip (lbls cat) $ map (unwords . concatMap flattenBracketedString . snd . untokn "") (elems lin) + cnv ((cat,_),lin) = zip (lbls cat) $ map (unwords . concatMap flattenBracketedString . snd . untokn Nothing) (elems lin) lbls cat = case Map.lookup cat (cnccats (lookConcr pgf lang)) of Just (CncCat _ _ lbls) -> elems lbls |