From 83b41059284d09f15d5694feb9df9636acf4d9f3 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Thu, 24 Apr 2008 17:58:53 +0000
Subject: [PATCH] better movpos debugging

---
 hostside/commands.c  | 6 ++++--
 hostside/movpos.c    | 8 ++++----
 layout/layout-data.h | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/hostside/commands.c b/hostside/commands.c
index 9f5b1e4..a23a1a3 100644
--- a/hostside/commands.c
+++ b/hostside/commands.c
@@ -222,15 +222,17 @@ static int cmd_movfeat(ParseState *ps, const CmdInfo *ci) {
   Segment *move;
   const SegmentInfo *movei;
   long ms;
-  long poscomb;
+  MovPosComb poscomb;
+  long poscomb_l;
   
   MUSTECR( ps_needsegmentperhaps(ps,&move,&movei) );
   MUSTECR( ps_needword(ps) );
   if (CTYPE(isdigit,*ps->thisword)) {
     if (!move) badcmd(ps,"invalid movement specification");
     ps_pushbackword(ps);
-    MUSTECR( ps_neednumber(ps,&poscomb,0,movei->n_poscombs,
+    MUSTECR( ps_neednumber(ps,&poscomb_l,0,movei->n_poscombs,
 			   "position number") );
+    poscomb= poscomb_l;
   } else {
     Segment *back, *fwd;
     back= move;
diff --git a/hostside/movpos.c b/hostside/movpos.c
index 32b3015..aed8286 100644
--- a/hostside/movpos.c
+++ b/hostside/movpos.c
@@ -624,10 +624,10 @@ ErrorCode movpos_change(Segment *move, MovPosComb target,
 
   oprintf(DUPO("movpos/change") "%s/%s maxdelay_ms=%d actual=%s\n",
 	  move->i->pname, posnpname(move,target),
-	  maxdelay_ms, prposn(move, actual));
+	  maxdelay_ms, posnpname(move, actual));
   if (chg) oprintf(DUPO("movpos/change") " chg=%s:%s/%s\n",
 		   chg->ki->pname, chg->move->i->pname,
-		   posnpname(chg->move, chg->move->intent));
+		   posnpname(chg->move, chg->intent));
 
   { /* provide horizon for visibility of motions[] */
     int n_motions=0;
@@ -682,7 +682,7 @@ movpos_reserve(Segment *move, int maxdelay_ms, MovPosChange **res_r,
 
   oprintf(DUPO("movpos/reserve") "%s/%s maxdelay_ms=%d startpoint=%s\n",
 	  move->i->pname, posnpname(move,target),
-	  maxdelay_ms, prposn(move, startpoint));
+	  maxdelay_ms, posnpname(move,startpoint));
 
   nchanges= evaluate_target(move,target,startpoint,&kind);
   if (nchanges==-1) return EC_MovFeatKindsCombination;
@@ -706,7 +706,7 @@ void movpos_unreserve(MovPosChange *res) {
   if (!res) return;
   oprintf(DUPO("movpos/unreserve") "%s:%s/%s\n",
 	  res->ki->pname, res->move->i->pname,
-	  posnpname(chg->move, chg->move->intent));
+	  posnpname(res->move, res->intent));
   res->ki->destroy(res);
 }
 
diff --git a/layout/layout-data.h b/layout/layout-data.h
index 12db14d..82b581f 100644
--- a/layout/layout-data.h
+++ b/layout/layout-data.h
@@ -16,7 +16,7 @@
 
 typedef int TrainNum;
 typedef int SegmentNum;
-typedef long MovPosComb;
+typedef int MovPosComb;
 typedef int BoardObject;
 typedef int Small;
 typedef short SegmentNumInMap;
-- 
2.30.2