X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=normalise;h=0af8f19623d021aa3d9c34f912fc3be0584fc908;hb=4642960b13763e24dcb10ab40cd650e12e1f84fe;hp=c5a9077365b97b96a34d66e16ca6f7861738193e;hpb=8e0de3a8a82d07d9428f292a755d15ff3e5996ee;p=appendix-a6.git

diff --git a/normalise b/normalise
index c5a9077..0af8f19 100755
--- a/normalise
+++ b/normalise
@@ -14,9 +14,11 @@ use strict;
 
 our @options;
 our %candidates; # $candidates{CAND}{Desc}, {Opts}[]
+our %candref; # $candref{CAND} => msg of why needed
 our @ballots;
 
 my $candvoter_re = '\w+';
+my $cands_re = '\w+(?,\w+)*';
 my $opt_re = '\w+(?:=\S*)?';
 
 sub badinput ($) {
@@ -31,6 +33,17 @@ sub normalise_opts_list ($$) {
     foreach my $o (split /\s+/, $os) {
 	if ($o =~ m/^\w+$/) {
 	    push @o, $&;
+	} elsif ($o =~ s/^_[Tt]ie\=//) {
+	    $o =~ m/^($cands_re)([<>])($cands_re)$/
+		or badinput "bad value \`$_' for tie option";
+	    my ($l,$op,$r) = ($1,$2,$3);
+	    ($l,$op,$r) = ($r,'>',$l) if $op eq '<';
+	    $candref{$_} = "tie break spec" foreach $o =~ m/\w+/g;
+	    $l = join ',', sort split /\,/, $l;
+	    $r = join ',', sort split /\,/, $r;
+	    $l =~ m/\b$_\b/ and badinput "reflexive tie"
+		foreach split /\,/, $r;
+	    push @o, "$l$op$r";
 	} elsif ($o =~ m/^\w+\=\S+$/) {
 	    push @o, $&;
 	} elsif ($o !~ m/\S/) {
@@ -111,6 +124,11 @@ print STDERR Dumper($1,$2,$3);
 
 print "| @options\n" or die $!;
 
+foreach my $cand (sort keys %candref) {
+    badinput "missing candidate $cand (ref. by $candref{$cand}"
+	unless defined $candidates{$cand};
+}
+
 foreach my $cand (sort keys %candidates) {
     my $c = $candidates{$cand};
     $c->{Desc} //= $cand;