]> hydra-www.ietfng.org Git - dyna2/commitdiff
Tweak aggr-mismatch error message
authorNathaniel Wesley Filardo <nwf@cs.jhu.edu>
Wed, 12 Jun 2013 16:47:49 +0000 (12:47 -0400)
committerNathaniel Wesley Filardo <nwf@cs.jhu.edu>
Wed, 12 Jun 2013 16:47:49 +0000 (12:47 -0400)
src/Dyna/Analysis/Aggregation.hs

index cb353f44008944481318b24fa2d24096296c0d8d..6ab603179100cd8fdbdccf15d3ff3d7ae5b23ba1 100644 (file)
@@ -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
 
 ------------------------------------------------------------------------}}}