better movpos debugging

diff --git a/hostside/commands.c b/hostside/commands.c
index 9f5b1e4776cd91d9ad33aa46620fe1525d8638ce..a23a1a35bcc0e12b2c8bc198afdc8cfcda1a5df7 100644 (file)
--- 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 32b3015bcae574214f3f985be513ce8a17ca3611..aed8286e4f605bc70a91d3f74a509c5da880011b 100644 (file)
--- 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 12db14de1e194f620af40c73141c2f3bef990abd..82b581f5f294571945802c3dfb6713b0877ec2c2 100644 (file)
--- 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;