From 68c11b78914aaf7c5d5549637ceedfd2abe77c64 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Thu, 28 Jan 2010 19:33:02 +0100 Subject: Allow comments and leading whitespace in config (Adam Vogt) Ignore-this: 121d37987dbb55c41ee5799a5ec94e57 darcs-hash:20100128183302-1d908-45e2953a96d886af0a8c5070aca3c9024ad0deaa.gz --- Parsers.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Parsers.hs b/Parsers.hs index 88b25f1..57fae00 100644 --- a/Parsers.hs +++ b/Parsers.hs @@ -119,10 +119,10 @@ stripComments = unlines . map (drop 5 . strip False . (replicate 5 ' '++)) . lin parseConfig :: String -> Either ParseError (Config,[String]) parseConfig = runParser parseConf fields "Config" . stripComments where - parseConf = do - many space - sepEndSpc ["Config","{"] - x <- perms + parseConf = parse $ do + sepEndSpaces ["Config","{"] + x <- unWrapParser perms + wrapSkip (string "}") eof s <- getState return (x,s) -- cgit v1.2.3