msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Add case for when pre is not followed by anything

Browse Source
This commit is contained in:
John J. Camilleri
2021-02-16 21:01:01 +01:00
parent 7227ede24b
commit 4c06c3f825
5 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime/haskell/LPGF.hs
View File

@@ -167,6 +167,7 @@ lin2string l = case l of
LFSpace -> "" -- when encountered at beginning/end
LFToken tok -> tok
LFTuple [l] -> lin2string l
LFPre pts df -> lin2string df -- when encountered at end
LFConcat (LFPre pts df) l2 -> lin2string $ LFConcat l1 l2
where
l2' = lin2string l2
@@ -177,7 +178,7 @@ lin2string l = case l of
LFConcat LFCapit l2 -> let l = lin2string l2 in T.toUpper (T.take 1 l) `T.append` T.drop 1 l
LFConcat LFAllCapit l2 -> let tks = T.words (lin2string l2) in T.unwords $ T.toUpper (head tks) : tail tks
LFConcat l1 l2 -> T.unwords $ filter (not.T.null) [lin2string l1, lin2string l2]
x -> T.pack $ printf "[%s]" (show x)
x -> T.pack $ printf "<%s>" (show x)
-- | List indexing with more verbose error messages
(!!) :: (Show a) => [a] -> Int -> a