From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Thu, 15 Nov 2012 03:36:40 +0000 (-0500)
Subject: Merge
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=9012ef7fb25fecb450797a8552e3bde79fd27e7d;p=dyna2

Merge
---

9012ef7fb25fecb450797a8552e3bde79fd27e7d
diff --cc src/Dyna/ParserHS/Parser.hs
index 7da660d,4907771..c92290a
--- a/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                                                                {{{