summaryrefslogtreecommitdiff
path: root/src/runtime
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2014-04-09 17:26:23 +0000
committerhallgren <hallgren@chalmers.se>2014-04-09 17:26:23 +0000
commit677d849840e3a5b8f69044ef43151908b0f6737b (patch)
treec225873b493ff34cac065b2c7d682aca47fe0014 /src/runtime
parent04a6260eeaf626cf4774d087d8810d438f554b46 (diff)
Unlexers: move capitalization of first word from GF.Text.Lexing to PGF.Lexing
The capitalization of the first word was done in GF.Text.Lexing.stringOp, but is now done in the functions unlexText and unlexMixed in PGF.Lexing. These functions are only used in stringOp and in PGFService (where the change is needed), so the subtle change in behaviour should not cause any bugs.
Diffstat (limited to 'src/runtime')
-rw-r--r--src/runtime/haskell/PGF/Lexing.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/haskell/PGF/Lexing.hs b/src/runtime/haskell/PGF/Lexing.hs
index 10d8332f7..a49328826 100644
--- a/src/runtime/haskell/PGF/Lexing.hs
+++ b/src/runtime/haskell/PGF/Lexing.hs
@@ -20,7 +20,7 @@ lexText' uncap1 = uncap . lext where
_ -> s
unlexText :: [String] -> String
-unlexText = unlext where
+unlexText = capitInit . unlext where
unlext s = case s of
w:[] -> w
w:[c]:[] | isPunct c -> w ++ [c]
@@ -67,7 +67,7 @@ lexMixed = concat . alternate False where
lex env = if env then lexCode else lexText
unlexMixed :: [String] -> String
-unlexMixed = concat . alternate False where
+unlexMixed = capitInit . concat . alternate False where
alternate env s = case s of
_:_ -> case break (=="$") s of
(t,[]) -> unlex env t : []