From: Tara L Andrews <tla@mit.edu>
Date: Mon, 27 Aug 2012 22:48:08 +0000 (+0200)
Subject: cosmetic fixes to error messages
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7040667388eb95049f218594d29afe273aacd4b8;p=scpubgit%2Fstemmatology.git

cosmetic fixes to error messages
---

diff --git a/lib/Text/Tradition/Analysis/Result.pm b/lib/Text/Tradition/Analysis/Result.pm
index d311ad2..91c8a49 100644
--- a/lib/Text/Tradition/Analysis/Result.pm
+++ b/lib/Text/Tradition/Analysis/Result.pm
@@ -226,9 +226,9 @@ around BUILDARGS => sub {
 	
 	# Convert the set list into a list of Set::Scalars, ordered first by size and
 	# then alphabetically by first-sorted.
-	die "Must specify a set list to Analysis::Result->new()" 
+	throw( "Must specify a set list to Analysis::Result->new()" )
 		unless ref( $args->{'setlist'} ) eq 'ARRAY'; 
-	die "Empty set list specified to Analysis::Result->new()"
+	throw( "Empty set list specified to Analysis::Result->new()" )
 		unless @{$args->{'setlist'}};
 	# Order the sets and make sure they are all distinct Set::Scalars.
 	$args->{'setlist'} = [ sort { by_size_and_alpha( $a, $b ) } 
@@ -248,7 +248,7 @@ around BUILDARGS => sub {
 		} elsif( $type eq 'Graph' ) {
 			$args->{'graph'} = Text::Tradition::Stemma::editable_graph( $st, $gopt );
 		} else {
-			die "Passed argument to graph that is neither Stemma nor Graph";
+			throw( "Passed argument to graph that is neither Stemma nor Graph" );
 		}
 	} 
 	
@@ -268,12 +268,12 @@ sub _check_set_args {
 		# Check uniqueness of the current set
 		if( ref( $set ) ne 'Set::Scalar' ) {
 			$s = Set::Scalar->new( @$set );
-			die "Duplicate element(s) in set or group passed to Analysis::Result->new()"
+			throw( "Duplicate element(s) in set or group passed to Analysis::Result->new()" )
 				unless @$set == $s->elements;
 		}
 		# Check distinctness of the set from all other sets given so far
 		foreach my $ps ( @sets ) {
-			die "Two sets are not disjoint"
+			throw( "Two sets $s / $ps are not disjoint" )
 				unless $s->is_disjoint( $ps );
 		}
 		# Save the set.