dnl newlines now passes tests; resolves #28

mengwong/mp/src/Lib.hs

@@ -353,7 +353,7 @@ pRegRuleNormal = do
   guard $ leftX >= depth
   (party_every, entitytype)   <- pActor Party <|> pActor Every
   -- (Who, (BoolStruct,[Rule]))
-  whoBool                     <- optional (withDepth leftX preambleBoolRules)               <* dnl
+  whoBool                     <- optional (withDepth leftX preambleBoolRules)
   -- the below are going to be permutables
   myTraceM $ "pRegRuleNormal: preambleBoolRules returned " ++ show whoBool
   rulebody <- permutations
@@ -468,8 +468,8 @@ pAndGroup ::  Parser BoolRules
 pAndGroup = do
   debugPrint "pAndGroup"
   currentX <- lookAhead pXLocation -- we are positioned at the OtherVal
-  orGroup1 <- pOrGroup                                                <* dnl
-  orGroupN <- many $ dToken And *> pOrGroup      <* optional dnl
+  orGroup1 <- pOrGroup
+  orGroupN <- many $ dToken And *> pOrGroup
   let toreturn = if null orGroupN
                  then orGroup1
                  else ( Just (AA.All (AA.Pre "all of:") (catMaybes $ fst <$> (orGroup1 : orGroupN)))
@@ -481,8 +481,8 @@ pOrGroup ::  Parser BoolRules
 pOrGroup = do
   depth <- asks callDepth
   debugPrint "pOrGroup"
-  elem1    <- withDepth (depth + 1) pElement                                      <* dnl
-  elems    <- many $ dToken Or *> withDepth (depth+1) pElement     <* dnl
+  elem1    <- withDepth (depth + 1) pElement
+  elems    <- many $ dToken Or *> withDepth (depth+1) pElement
   let toreturn = if null elems
                  then elem1
                  else ( Just (AA.Any (AA.Pre "any of:") (catMaybes $ fst <$> (elem1 : elems)))
@@ -529,7 +529,7 @@ pBoolConnector = do
   debugPrint "pBoolConnector"
   currentX <- lookAhead pXLocation
   guard $ currentX >= depth
-  andor <- (pToken And <|> pToken Or <|> pToken Unless) <* dnl
+  andor <- (pToken And <|> pToken Or <|> pToken Unless)
   myTraceM $ "pBoolConnector returning " ++ show andor
   return andor