From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Wed, 12 Jun 2013 16:47:49 +0000 (-0400)
Subject: Tweak aggr-mismatch error message
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=d05b144dbfc7f8ac7b9d3a230ca8e3ea66ebd246;p=dyna2

Tweak aggr-mismatch error message
---

diff --git a/src/Dyna/Analysis/Aggregation.hs b/src/Dyna/Analysis/Aggregation.hs
index cb353f4..6ab6031 100644
--- a/src/Dyna/Analysis/Aggregation.hs
+++ b/src/Dyna/Analysis/Aggregation.hs
@@ -41,12 +41,15 @@ buildAggMap = go
  where
   go m []      = m
   go m (ar@(Rule _ _ a _ sp _ _ _):xs) =
-    let d = procANF ar
+    let d@(f,n) = procANF ar
     in case mapUpsert d a m of
          Left a' -> dynacUserErr $     "Conflicting aggregators; rule"
-                                   <+> prettySpanLoc sp <+> "uses" <+> (pretty a)
+                                   <+> prettySpanLoc sp <//> "uses"
+                                   <+> squotes (pretty a)
+                                   <+> "for" <+> pretty f <> char '/' <> pretty n
                                    <+> "but I had been lead to expect"
-                                   <+> pretty a'
+                                   <+> squotes (pretty a')
+                                   <>  dot
          Right m' -> go m' xs
 
 ------------------------------------------------------------------------}}}