GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 03:09:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

parsing escaped strings from command line fixed

Browse Source
This commit is contained in:
aarne
2005-12-21 19:46:48 +00:00
parent f4c5fcf44a
commit 89ec5b808b
6 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GF/UseGrammar/Tokenize.hs
View File

@@ -22,7 +22,8 @@ module GF.UseGrammar.Tokenize ( tokWords,
lexText,
lexC2M, lexC2M',
lexTextLiteral,
lexIgnore
lexIgnore,
wordsLits
) where
import GF.Data.Operations
@@ -39,7 +40,7 @@ tokWords :: String -> [CFTok]
tokWords = map tS . words
tokLits :: String -> [CFTok]
tokLits = map mkCFTok . mergeStr . words where
tokLits = map mkCFTok . mergeStr . wordsLits where
mergeStr ss = case ss of
w@(c:cs):rest | elem c "\'\"" && c /= last w -> getStr [w] rest
w :rest -> w : mergeStr rest
@@ -50,7 +51,7 @@ tokLits = map mkCFTok . mergeStr . words where
[] -> reverse v
tokVars :: String -> [CFTok]
tokVars = map mkCFTokVar . words
tokVars = map mkCFTokVar . wordsLits
isFloat s = case s of
c:cs | isDigit c -> isFloat cs
@@ -208,3 +209,4 @@ lexIgnore isKnown = concatMap mkOne where
| isKnown s = [t]
| otherwise = []
mkOne t = [t]