[Shell-Parse] Use \STX and \ETX for quoting

Also drops escaping
This commit is contained in:
Nikolay Yakimov
2015-12-27 02:42:45 +03:00
parent 5e4026b946
commit fff9087ff7
2 changed files with 12 additions and 46 deletions

View File

@@ -16,35 +16,19 @@
module GHCMod.Options.ShellParse (parseCmdLine) where
import Data.Char
import Data.Maybe
isQuote :: Char -> Bool
isQuote = (==) '"'
isEscapeChar :: Char -> Bool
isEscapeChar = (==) '\\'
isEscapable :: Char -> Bool
isEscapable c = any ($ c) [isSpace, isQuote, isEscapeChar]
go :: String -> String -> [String] -> Maybe Char -> [String]
go :: String -> String -> [String] -> Bool -> [String]
-- result
go [] curarg accargs _ = reverse $ reverse curarg : accargs
-- escaped character
go (esc:c:cl) curarg accargs quote
| isEscapeChar esc
= if isEscapable c
then go cl (c:curarg) accargs quote
else go (c:cl) (esc:curarg) accargs quote
go (c:cl) curarg accargs quotes
-- quote character -- opens quotes
| isQuote c, isNothing quotes
= go cl curarg accargs (Just c)
-- open quotes
| c == '\STX', not quotes
= go cl curarg accargs True
-- close quotes
| quotes == Just c
= go cl curarg accargs Nothing
-- space separates argumetns outside quotes
| isSpace c, isNothing quotes
| c == '\ETX', quotes
= go cl curarg accargs False
-- space separates arguments outside quotes
| isSpace c, not quotes
= if null curarg
then go cl curarg accargs quotes
else go cl [] (reverse curarg : accargs) quotes
@@ -52,4 +36,4 @@ go (c:cl) curarg accargs quotes
| otherwise = go cl (c:curarg) accargs quotes
parseCmdLine :: String -> [String]
parseCmdLine comline = go comline [] [] Nothing
parseCmdLine comline = go comline [] [] False