Merge

diff --cc src/Dyna/ParserHS/Parser.hs
index 7da660d670573836ebbc457f4f4b10b724967706,49077718ca973e8746221bb26d44b82de1f9699e..c92290ad077d6419af78b847f34db74eb33e315c
--- 1/src/Dyna/ParserHS/Parser.hs
--- 2/src/Dyna/ParserHS/Parser.hs
+++ b/src/Dyna/ParserHS/Parser.hs
@@@ -248,11 -248,12 +248,13 @@@ dtexpr = unDL texp
  -- Rules                                                                {{{
  
  -- | Grab the head (term!) and aggregation operator from a line that
- -- we hope is a rule.  
+ -- we hope is a rule.
  rulepfx :: DeltaParsing f => f ([Spanned Term] -> Spanned Term -> Rule)
  rulepfx = Rule <$> term
 -               <*  spaces
 -               <*> ((bsf $ some $ satisfy $ not . isSpace) <?> "Aggregator")  -- XXX probably a better way to do this.. probably want aggregators have suffix =
 -               <*  spaces
 +               <*  whiteSpace
-                <*> (bsf $ ident dynaOperStyle <?> "Aggregator")
++               -- XXX probably a better way to do this.. probably want aggregators have suffix =
++               <*> ((bsf $ some $ satisfy $ not . isSpace) <?> "Aggregator")
++               <*  whiteSpace
  
  rule :: DeltaParsing m => m Rule
  rule = choice [
@@@ -271,10 -272,10 +273,10 @@@
                , Fact   <$> term
                ]
   where
-   hrss = highlight ReservedOperator . spanned . symbol 
+   hrss = highlight ReservedOperator . spanned . symbol
  
  drule :: DeltaParsing m => m (Spanned Rule)
 -drule = spanned rule
 +drule = unDL (spanned rule)
  
  ------------------------------------------------------------------------}}}
  -- Lines                                                                {{{