i'll look at the tests tomorrow.

mengwong/mp/src/Lib.hs

@@ -48,7 +48,7 @@ someFunc = do
 
 -- TODO: integrate debugging and callstack depth with the runConfig, thread it through all the functions here
 -- printf debugging infrastructure
-debuggery = False
+debuggery = True
 myTraceM x = when debuggery (traceM x)
 debugPrint depth str = when debuggery $ do
   lookingAt <- lookAhead (getToken :: Parser MyToken)
@@ -282,7 +282,8 @@ pRule = do
 
 pConstitutiveRule :: Depth -> Parser [Rule]
 pConstitutiveRule depth = do
-  term               <- (pOtherVal <* dnl) <?> "defined term"
+  debugPrint depth "pConstitutiveRule"
+  term               <- (dnl *> pOtherVal <* dnl) <?> "defined term"
   leftX              <- lookAhead pXLocation -- this is the column where we expect IF/AND/OR etc.
   guard $ leftX >= depth
   defWord            <- (pToken Means <|> pToken Is)  <* dnl
@@ -353,8 +354,8 @@ mergePBRS xs =
       pre_a = fst . snd <$> tail xs
       toreturn = (w,( a <> mconcat pre_a
                     ,      concat (b : (snd . snd <$> tail xs) )))
-  in trace ("mergePBRS: called with " ++ show xs)
-     trace ("mergePBRS: about to return " ++ show toreturn)
+  in -- trace ("mergePBRS: called with " ++ show xs)
+     -- trace ("mergePBRS: about to return " ++ show toreturn)
      toreturn
 
 pTemporal :: Parser (TemporalConstraint Text.Text)

mengwong/mp/test/Spec.hs

@@ -22,7 +22,7 @@ main = hspec $ do
         `shouldParse`
         [ Regulative {
             every = "person"
-            , who = Just (Any ( Pre "Always" ) [ ])
+            , who = Nothing
             , cond = Nothing
             , deontic = DMust
             , action = ("sing",[])