Minor parser nits

diff --git a/src/Dyna/ParserHS/Parser.hs b/src/Dyna/ParserHS/Parser.hs
index c92290ad077d6419af78b847f34db74eb33e315c..3956bf9878f89b5f963b92d0a480b4ad0f478067 100644 (file)
--- a/src/Dyna/ParserHS/Parser.hs
+++ b/src/Dyna/ParserHS/Parser.hs
@@ -258,16 +258,16 @@ rulepfx = Rule <$> term
 
 rule :: DeltaParsing m => m Rule
 rule = choice [
-                -- HEAD OP= RESULT EXPR whenever EXPRS .
+                -- HEAD OP= RESULTEXPR whenever EXPRS .
                (try (liftA flip rulepfx
                            <*> texpr
                            <*  hrss "whenever"))
                            <*> (texpr `sepBy1` symbolic ',')
 
-                -- HEAD OP= EXPRS, RESULT EXPR .
-              , (try rulepfx)
+                -- HEAD OP= EXPRS, RESULTEXPR .
+              , try (rulepfx
                            <*> many (try (texpr <* symbolic ','))
-                           <*> texpr
+                           <*> texpr)
 
                 -- HEAD .
               , Fact   <$> term
@@ -289,7 +289,7 @@ progline  = do
                   ])
 
 dline :: DeltaParsing m => m (Spanned Line)
-dline = unDL (progline <* optional (char '.') <* optional newline)
+dline = unDL (progline <* optional (char '.') <* optional whiteSpace)
 
 dlines :: DeltaParsing m => m [Spanned Line]
 dlines = unDL (progline `sepEndBy` (char '.' <* whiteSpace))