Do not discard trailing comments after last test

Author: schoettl

src/Parse.hs

@@ -69,11 +69,12 @@ shelltestfile = do
         <|>
         (many $ try format1test)
   ptrace_ "shelltestfile 1"
-  skipMany whitespaceorcommentline
+  trailingComments <- many whitespaceorcommentline
   ptrace_ "shelltestfile 2"
   eof
-  ptrace "shelltestfile ." ts
-  return ts
+  let ts' = init ts ++ [(last ts) { trailingComments = trailingComments }]
+  ptrace "shelltestfile ." ts'
+  return ts'
 
 
 ----------------------------------------------------------------------
@@ -97,7 +98,7 @@ format1test = do
   ptrace " format1test x" x
   when (null (show c) && (isNothing i) && (null $ catMaybes [o,e]) && null (show x)) $ fail ""
   f <- sourceName . statePos <$> getParserState
-  let t = ShellTest{testname=f,command=c,stdin=i,stdoutExpected=o,stderrExpected=e,exitCodeExpected=x,lineNumber=ln,comments=comments}
+  let t = ShellTest{testname=f,command=c,stdin=i,stdoutExpected=o,stderrExpected=e,exitCodeExpected=x,lineNumber=ln,comments=comments,trailingComments=[]}
   ptrace " format1test ." t
   return t
 
@@ -166,7 +167,7 @@ format2test i = do
   ptrace "  format2test x" x
   when (null (show c) && (isNothing i) && (null $ catMaybes [o,e]) && null (show x)) $ fail ""
   f <- sourceName . statePos <$> getParserState
-  let t = ShellTest{testname=f,command=c,stdin=i,stdoutExpected=o,stderrExpected=e,exitCodeExpected=x,lineNumber=ln,comments=comments}
+  let t = ShellTest{testname=f,command=c,stdin=i,stdoutExpected=o,stderrExpected=e,exitCodeExpected=x,lineNumber=ln,comments=comments,trailingComments=[]}
   ptrace "  format2test ." t
   return t
 
@@ -264,7 +265,7 @@ format3test i = do
   ptrace "  format3test x" x
   when (null (show c) && (isNothing i) && (null $ catMaybes [o,e]) && null (show x)) $ fail ""
   f <- sourceName . statePos <$> getParserState
-  let t = ShellTest{testname=f,command=c,stdin=i,stdoutExpected=o,stderrExpected=e,exitCodeExpected=x,lineNumber=ln,comments=comments}
+  let t = ShellTest{testname=f,command=c,stdin=i,stdoutExpected=o,stderrExpected=e,exitCodeExpected=x,lineNumber=ln,comments=comments,trailingComments=[]}
   ptrace "  format3test ." t
   return t
 

src/Print.hs

@@ -15,7 +15,7 @@ printShellTest
   -> Either String String -- ^ Non-matching or matching exit status
   -> Either Int Int       -- ^ Non-matching or matching exit status
   -> IO ()
-printShellTest format actualMode ShellTest{command=c,stdin=i,comments=comments,
+printShellTest format actualMode ShellTest{command=c,stdin=i,comments=comments,trailingComments=trailingComments,
                stdoutExpected=o_expected,stderrExpected=e_expected,exitCodeExpected=x_expected}
                o_actual e_actual x_actual = do
           (o,e,x) <- computeResults actualMode
@@ -27,20 +27,23 @@ printShellTest format actualMode ShellTest{command=c,stdin=i,comments=comments,
               printStdouterr ">>>" $ justMatcherOutErr o
               printStdouterr ">>>2" $ justMatcherOutErr e
               printExitStatus True ">>>=" x
+              printComments trailingComments
             "v2" -> do
               printComments comments
               printCommand "$ " c
               printStdin "<<<" i
               printStdouterr ">>>" o
               printStdouterr ">>>2" e
               printExitStatus False ">>>=" x
+              printComments trailingComments
             "v3" -> do
               printComments comments
               printCommand "$ "  c
               printStdin "<" i
               printStdouterr ">" o
               printStdouterr ">2" e
               printExitStatus False ">=" x
+              printComments trailingComments
             _ -> fail $ "Unsupported --print format: " ++ format
   where
     computeResults :: Maybe String -> IO (Maybe Matcher, Maybe Matcher, Matcher)

src/Types.hs

@@ -7,6 +7,7 @@ import Text.Parsec
 
 data ShellTest = ShellTest {
      comments         :: [String] -- # COMMENTS OR BLANK LINES before test
+    ,trailingComments :: [String] -- # COMMENTS OR BLANK LINES after the last test
     ,command          :: TestCommand
     ,stdin            :: Maybe String
     ,stdoutExpected   :: Maybe Matcher