From: ian <ian>
Date: Sat, 19 Apr 2008 23:48:17 +0000 (+0000)
Subject: number rather than name a movposcombinfo's segmentlinks
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=1b845213b366af51d8d0c201526a88dc9bdfba23;p=trains.git

number rather than name a movposcombinfo's segmentlinks
---

diff --git a/layout/data2safety b/layout/data2safety
index 95c1eb9..bfb7330 100755
--- a/layout/data2safety
+++ b/layout/data2safety
@@ -493,11 +493,12 @@ sub writeout () {
 			      ($comb / $featr->{Weight}) % $featr->{Posns});
 	    }
 	    o("$delim\n");
-	    o(sprintf " { %-7s%4d",
+	    o(sprintf " { %-7s%4d, { ",
 	      '"'.$pi.'",',
 	      $segr->{Dist}[$comb]);
 	    for ($end=0; $end<2; $end++) {
-		o(", {");
+		o(", ") if $end;
+		o("{");
 		$otherend= $segr->{Ends}[$comb][$end];
 		defined $otherend or die "$seg $comb $end ?";
 		($node,$side) = @$otherend;
@@ -515,7 +516,7 @@ sub writeout () {
 		}
 		o(" }");
 	    }
-	    o(sprintf " }");
+	    o(sprintf " } }");
 	    $delim= ',';
 
 	    $pcname= "$seg/$pi";
diff --git a/layout/layout-data.h b/layout/layout-data.h
index 6688c1b..12db14d 100644
--- a/layout/layout-data.h
+++ b/layout/layout-data.h
@@ -48,7 +48,7 @@ typedef struct {
 typedef struct {
   const char *pname;
   Distance dist;
-  SegmentLinkInfo backwards, forwards;
+  SegmentLinkInfo link[2]; /* 0: forwards; 1: backwards */
 } SegPosCombInfo;
 
 typedef struct {