hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/GHCMod/Options/ShellParse.hs
View File

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

24
test/ShellParseSpec.hs
View File

@ -10,27 +10,9 @@ spec =
describe "parseCmdLine" $ do describe "parseCmdLine" $ do
it "splits arguments" $ it "splits arguments" $
parseCmdLine "test command line" `shouldBe` ["test", "command", "line"] parseCmdLine "test command line" `shouldBe` ["test", "command", "line"]
it "honors double quotes" $ it "honors quoted segments" $
parseCmdLine "test command line \"with double quotes\"" parseCmdLine "test command line \STXwith quoted segment\ETX"
`shouldBe` ["test", "command", "line", "with double quotes"] `shouldBe` ["test", "command", "line", "with quoted segment"]
it "escapes spaces" $ do
parseCmdLine "with\\ spaces"
`shouldBe` ["with spaces"]
parseCmdLine "\"with\\ spaces\""
`shouldBe` ["with spaces"]
it "escapes '\\'" $ do
parseCmdLine "\\\\"
`shouldBe` ["\\"]
parseCmdLine "\"\\\\\""
`shouldBe` ["\\"]
it "escapes double quotes" $ do
parseCmdLine "\\\""
`shouldBe` ["\""]
parseCmdLine "\"\\\"\""
`shouldBe` ["\""]
it "doesn't escape random characters" $
parseCmdLine "\\a\\b\\c"
`shouldBe` ["\\a\\b\\c"]
it "squashes multiple spaces" $ it "squashes multiple spaces" $
parseCmdLine "test command" parseCmdLine "test command"
`shouldBe` ["test", "command"] `shouldBe` ["test", "command"]