===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/subst.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/asir2000/builtin/subst.c	2010/01/31 03:25:54	1.9
+++ OpenXM_contrib2/asir2000/builtin/subst.c	2018/03/29 01:32:50	1.13
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/subst.c,v 1.8 2010/01/28 08:56:26 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/subst.c,v 1.12 2018/03/27 06:29:19 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,180 +54,221 @@ void Psubst(), Ppsubst(), Psubstf(), Psubst_quote();
 void Psubstr2np();
 
 struct ftab subst_tab[] = {
-	{"subst",Psubst,-99999999},
-	{"substr2np",Psubstr2np,2},
-	{"subst_quote",Psubst_quote,-99999999},
-	{"psubst",Ppsubst,-99999999},
-	{"substf",Psubstf,-99999999},
-	{0,0,0},
+  {"subst",Psubst,-99999999},
+  {"substr2np",Psubstr2np,-3},
+  {"subst_quote",Psubst_quote,-99999999},
+  {"psubst",Ppsubst,-99999999},
+  {"substf",Psubstf,-99999999},
+  {0,0,0},
 };
 
 extern Obj VOIDobj;
 
+/* substr2np(P,[[v,a],...]) or substr2np(P,[v1,...],[a1,...]) */
+
 void Psubstr2np(NODE arg,Obj *rp)
 {
-	Obj a;
-	P nm,dn,p;
-	R r;
-	VL vl,tvl;
-	int nv,i;
-	NODE slist,t,ps;
-	P s;
-	P *svect;
-	V v;
-	V *vvect;
+  Obj a,b;
+  P nm,dn,p,q;
+  R r;
+  VL vl,tvl;
+  int nv,i,ac,j;
+  NODE slist,t,ps,u,vlist;
+  P s;
+  P *svect;
+  V v;
+  V *vvect;
 
-	a = (Obj)ARG0(arg);
-	if ( !a || NUM(a) ) {
-		*rp = a;
-		return;
-	}
-	asir_assert(ARG0(arg),O_R,"substr2np");
-	asir_assert(ARG1(arg),O_LIST,"substr2np");
-	get_vars(a,&vl);
-	for ( i = 0, tvl = vl; tvl; tvl = NEXT(tvl), i++ );
-	nv = i;
-	vvect = (V *)MALLOC(nv*sizeof(V));
-	for ( i = 0, tvl = vl; tvl; tvl = NEXT(tvl), i++ ) vvect[i] = tvl->v;
-	svect = (P *)MALLOC(nv*sizeof(P));
-	slist = BDY((LIST)ARG1(arg));
-	for ( i = 0; i < nv; i++ ) svect[i] = (P)VOIDobj;
-	for ( t = slist; t; t = NEXT(t) ) {
-		ps = BDY((LIST)BDY(t)); p = (P)BDY(ps); s = (P)BDY(NEXT(ps));	
-		asir_assert(p,O_P,"substr2np"); asir_assert(s,O_N,"substr2np");
-		v = VR(p);
-		for ( i = 0; i < nv; i++ ) if ( vvect[i] == v ) break;
-		svect[i] = s;
-	}
-	
-	switch ( OID(a) ) {
-		case O_P:
-			substpp(vl,(P)a,vvect,svect,nv,&nm); *rp = (Obj)nm;
-			return;
-		case O_R:
-			substpp(vl,(P)NM((R)a),vvect,svect,nv,&nm);
-			substpp(vl,(P)DN((R)a),vvect,svect,nv,&dn);
-			if ( !dn )
-				error("substr2np: division by 0");
-			else if ( !nm )
-				*rp = 0;
-			else if ( NUM(dn) ) {
-				divsp(vl,nm,dn,&p);
-				*rp = (Obj)p;
-			} else {
-				MKRAT(nm,dn,0,r);
-				*rp = (Obj)r;
-			}
-			return;
-		default:
-			error("substr2np: invalid argument");
-	}
+  a = (Obj)ARG0(arg);
+  if ( !a || NUM(a) ) {
+    *rp = a;
+    return;
+  }
+  asir_assert(ARG0(arg),O_R,"substr2np");
+  asir_assert(ARG1(arg),O_LIST,"substr2np");
+  get_vars(a,&vl);
+  for ( i = 0, tvl = vl; tvl; tvl = NEXT(tvl), i++ );
+  nv = i;
+  vvect = (V *)MALLOC((nv)*sizeof(V));
+  for ( i = 0, tvl = vl; tvl; tvl = NEXT(tvl), i++ ) vvect[i] = tvl->v;
+  svect = (P *)MALLOC((nv)*sizeof(P));
+  ac = argc(arg);
+  if ( ac == 2 ) {
+    slist = BDY((LIST)ARG1(arg));
+    for ( i = 0; i < nv; i++ ) svect[i] = (P)VOIDobj;
+    for ( t = slist; t; t = NEXT(t) ) {
+      ps = BDY((LIST)BDY(t)); p = (P)BDY(ps); s = (P)BDY(NEXT(ps));  
+      asir_assert(p,O_P,"substr2np"); asir_assert(s,O_P,"substr2np");
+      v = VR(p);
+      for ( i = 0; i < nv; i++ ) if ( vvect[i] == v ) break;
+      svect[i] = s;
+    }
+  } else if ( ac == 3 ) {
+    asir_assert(ARG2(arg),O_LIST,"substr2np");
+    vlist = BDY((LIST)ARG1(arg));
+    slist = BDY((LIST)ARG2(arg));
+    for ( i = 0; i < nv; i++ ) svect[i] = (P)VOIDobj;
+      for ( u = vlist, t = slist; u && t; u = NEXT(u), t = NEXT(t) ) {
+        v = VR((P)BDY(u));
+        for ( i = 0; i < nv; i++ ) if ( vvect[i] == v ) break;
+        svect[i] = (P)BDY(t);
+      }
+    } else
+      error("substr2np : argument mismatch");
+  for ( i = 0; i < nv; i++ ) {
+    if ( (int)(vvect[i]->attr) == V_PF ) {
+      MKV(vvect[i],p);
+      for ( j = 0; j < nv; j++ )
+        if ( j != i ) {
+          substr(CO,0,(Obj)p,vvect[j],(Obj)svect[j],&b); p = (P)b;
+        }
+      if ( OID(svect[i]) == O_VOID ) svect[i] = p;
+      else if ( arf_comp(CO,(Obj)p,(Obj)svect[i]) )
+        error("substr2np : inconsistent values for substitution");
+    }
+  }
+  switch ( OID(a) ) {
+    case O_P:
+      substpp(CO,(P)a,vvect,svect,nv,&nm); *rp = (Obj)nm;
+      return;
+    case O_R:
+      substpp(CO,(P)NM((R)a),vvect,svect,nv,&nm);
+      substpp(CO,(P)DN((R)a),vvect,svect,nv,&dn);
+      if ( !dn )
+        error("substr2np: division by 0");
+      else if ( !nm )
+        *rp = 0;
+      else if ( NUM(dn) ) {
+        divsp(CO,nm,dn,&p);
+        *rp = (Obj)p;
+      } else {
+        MKRAT(nm,dn,0,r);
+        *rp = (Obj)r;
+      }
+      return;
+    default:
+      error("substr2np: invalid argument");
+  }
 }
 
 void Psubst(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Obj a,b,t;
-	LIST l;
-	V v;
-	int row,col,len;
-	VECT vect;
-	MAT mat;
-	int i,j;
-	NODE n0,n,nd;
-	struct oNODE arg0;
-	MP m,mp,mp0;
-	DP d;
+  Obj a,b,t;
+  LIST l;
+  V v;
+  int row,col,len;
+  VECT vect;
+  MAT mat;
+  int i,j;
+  NODE n0,n,nd;
+  struct oNODE arg0;
+  MP m,mp,mp0;
+  DP d;
+  VL lastvl,vl,tvl,prev,cur;
 
-	if ( !arg ) {
-		*rp = 0; return;
-	}
-	a = (Obj)ARG0(arg);
-	if ( !a ) {
-		*rp = 0;
-		return;
-	}
-	switch ( OID(a) ) {
-		case O_N: case O_P: case O_R:
-			reductr(CO,(Obj)ARG0(arg),&a);
-			arg = NEXT(arg);
-			if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
-				arg = BDY(l);
-			while ( arg ) {
-				if ( !BDY(arg) || OID((Obj)BDY(arg)) != O_P )
-					error("subst : invalid argument");
-				v = VR((P)BDY(arg)); arg = NEXT(arg);
-				if ( !arg )
-					error("subst : invalid argument");
-				asir_assert(ARG0(arg),O_R,"subst");
-				reductr(CO,(Obj)BDY(arg),&b); arg = NEXT(arg);
-		/*		b = (Obj)BDY(arg); arg = NEXT(arg); */
-				substr(CO,0,a,v,b,&t); a = t;
-			}
-			*rp = a;
-			break;
-		case O_LIST:
-			n0 = 0;
-			for ( nd = BDY((LIST)a); nd; nd = NEXT(nd) ) {
-				NEXTNODE(n0,n);
-				arg0.body = (pointer)BDY(nd);
-				arg0.next = NEXT(arg);
-				Psubst(&arg0,&b);
-				BDY(n) = (pointer)b;
-			}
-			if ( n0 )
-				NEXT(n) = 0;
-			MKLIST(l,n0);
-			*rp = (Obj)l;
-			break;
-		case O_VECT:
-			len = ((VECT)a)->len;
-			MKVECT(vect,len);
-			for ( i = 0; i < len; i++ ) {
-				arg0.body = (pointer)BDY((VECT)a)[i];
-				arg0.next = NEXT(arg);
-				Psubst(&arg0,&b);
-				BDY(vect)[i] = (pointer)b;
-			}
-			*rp = (Obj)vect;
-			break;
-		case O_MAT:
-			row = ((MAT)a)->row;
-			col = ((MAT)a)->col;
-			MKMAT(mat,row,col);
-			for ( i = 0; i < row; i++ )
-				for ( j = 0; j < col; j++ ) {
-					arg0.body = (pointer)BDY((MAT)a)[i][j];
-					arg0.next = NEXT(arg);
-					Psubst(&arg0,&b);
-					BDY(mat)[i][j] = (pointer)b;
-				}
-			*rp = (Obj)mat;
-			break;
-		case O_DP:
-			mp0 = 0;
-			for ( m = BDY((DP)a); m; m = NEXT(m) ) {
-				arg0.body = (pointer)C(m);
-				arg0.next = NEXT(arg);
-				Psubst(&arg0,&b);
-				if ( b ) {
-					NEXTMP(mp0,mp);
-					C(mp) = (P)b;
-					mp->dl = m->dl;
-				}
-			}
-			if ( mp0 ) {
-				MKDP(NV((DP)a),mp0,d);
-				d->sugar = ((DP)a)->sugar;
-				*rp = (Obj)d;
-			} else
-				*rp = 0;
+  if ( !arg ) {
+    *rp = 0; return;
+  }
+  a = (Obj)ARG0(arg);
+  if ( !a ) {
+    *rp = 0;
+    return;
+  }
+  lastvl = LASTCO;
+  switch ( OID(a) ) {
+    case O_N: case O_P: case O_R:
+      reductr(CO,(Obj)ARG0(arg),&a);
+      arg = NEXT(arg);
+      if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
+        arg = BDY(l);
+      while ( arg ) {
+        if ( !BDY(arg) || OID((Obj)BDY(arg)) != O_P )
+          error("subst : invalid argument");
+        v = VR((P)BDY(arg)); arg = NEXT(arg);
+        if ( !arg )
+          error("subst : invalid argument");
+        asir_assert(ARG0(arg),O_R,"subst");
+        reductr(CO,(Obj)BDY(arg),&b); arg = NEXT(arg);
+    /*    b = (Obj)BDY(arg); arg = NEXT(arg); */
+        substr(CO,0,a,v,b,&t); a = t;
+      }
+      *rp = a;
+      break;
+    case O_LIST:
+      n0 = 0;
+      for ( nd = BDY((LIST)a); nd; nd = NEXT(nd) ) {
+        NEXTNODE(n0,n);
+        arg0.body = (pointer)BDY(nd);
+        arg0.next = NEXT(arg);
+        Psubst(&arg0,&b);
+        BDY(n) = (pointer)b;
+      }
+      if ( n0 )
+        NEXT(n) = 0;
+      MKLIST(l,n0);
+      *rp = (Obj)l;
+      break;
+    case O_VECT:
+      len = ((VECT)a)->len;
+      MKVECT(vect,len);
+      for ( i = 0; i < len; i++ ) {
+        arg0.body = (pointer)BDY((VECT)a)[i];
+        arg0.next = NEXT(arg);
+        Psubst(&arg0,&b);
+        BDY(vect)[i] = (pointer)b;
+      }
+      *rp = (Obj)vect;
+      break;
+    case O_MAT:
+      row = ((MAT)a)->row;
+      col = ((MAT)a)->col;
+      MKMAT(mat,row,col);
+      for ( i = 0; i < row; i++ )
+        for ( j = 0; j < col; j++ ) {
+          arg0.body = (pointer)BDY((MAT)a)[i][j];
+          arg0.next = NEXT(arg);
+          Psubst(&arg0,&b);
+          BDY(mat)[i][j] = (pointer)b;
+        }
+      *rp = (Obj)mat;
+      break;
+    case O_DP:
+      mp0 = 0;
+      for ( m = BDY((DP)a); m; m = NEXT(m) ) {
+        arg0.body = (pointer)C(m);
+        arg0.next = NEXT(arg);
+        Psubst(&arg0,&b);
+        if ( b ) {
+          NEXTMP(mp0,mp);
+          C(mp) = (P)b;
+          mp->dl = m->dl;
+        }
+      }
+      if ( mp0 ) {
+        MKDP(NV((DP)a),mp0,d);
+        d->sugar = ((DP)a)->sugar;
+        *rp = (Obj)d;
+      } else
+        *rp = 0;
 
-			break;
-		default:
-			error("subst : invalid argument");
-	}
+      break;
+    default:
+      error("subst : invalid argument");
+  }
+  if ( lastvl != LASTCO ) {
+    get_vars_recursive(*rp,&vl);
+    prev = lastvl; cur = NEXT(prev);
+    while ( cur ) {
+      v = cur->v;
+      for ( tvl = vl; tvl && tvl->v != v; tvl = NEXT(tvl) );
+      if ( !tvl ) NEXT(prev) = NEXT(cur);
+      else prev = cur;
+      cur = NEXT(cur);
+    }
+    update_LASTCO();
+  }
 }
 
 FNODE subst_in_fnode();
@@ -236,91 +277,91 @@ void Psubst_quote(arg,rp)
 NODE arg;
 QUOTE *rp;
 {
-	QUOTE h;
-	FNODE fn;
-	Obj g;
-	LIST l;
-	V v;
+  QUOTE h;
+  FNODE fn;
+  Obj g;
+  LIST l;
+  V v;
 
-	if ( !arg ) {
-		*rp = 0; return;
-	}
-	asir_assert(ARG0(arg),O_QUOTE,"subst_quote");
-	fn = BDY((QUOTE)ARG0(arg)); arg = NEXT(arg);
-	if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
-		arg = BDY(l);
-	while ( arg ) {
-		asir_assert(BDY(arg),O_P,"subst_quote");
-		v = VR((P)BDY(arg)); arg = NEXT(arg);
-		if ( !arg )
-			error("subst_quote : invalid argument");
-		g = (Obj)ARG0(arg); arg = NEXT(arg);
-		if ( !g || OID(g) != O_QUOTE )
-			objtoquote(g,&h);
-		else
-			h = (QUOTE)g;
-		fn = subst_in_fnode(fn,v,BDY(h));
-	}
-	MKQUOTE(*rp,fn);
+  if ( !arg ) {
+    *rp = 0; return;
+  }
+  asir_assert(ARG0(arg),O_QUOTE,"subst_quote");
+  fn = BDY((QUOTE)ARG0(arg)); arg = NEXT(arg);
+  if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
+    arg = BDY(l);
+  while ( arg ) {
+    asir_assert(BDY(arg),O_P,"subst_quote");
+    v = VR((P)BDY(arg)); arg = NEXT(arg);
+    if ( !arg )
+      error("subst_quote : invalid argument");
+    g = (Obj)ARG0(arg); arg = NEXT(arg);
+    if ( !g || OID(g) != O_QUOTE )
+      objtoquote(g,&h);
+    else
+      h = (QUOTE)g;
+    fn = subst_in_fnode(fn,v,BDY(h));
+  }
+  MKQUOTE(*rp,fn);
 }
 
 void Ppsubst(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Obj a,b,t;
-	LIST l;
-	V v;
+  Obj a,b,t;
+  LIST l;
+  V v;
 
-	if ( !arg ) {
-		*rp = 0; return;
-	}
-	asir_assert(ARG0(arg),O_R,"psubst");
-	reductr(CO,(Obj)ARG0(arg),&a);
-/*	a = (Obj)ARG0(arg); */
-	arg = NEXT(arg);
-	if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
-		arg = BDY(l);
-	while ( arg ) {
-		asir_assert(BDY(arg),O_P,"psubst");
-		v = VR((P)BDY(arg)); arg = NEXT(arg);
-		if ( !arg )
-			error("psubst : invalid argument");
-		asir_assert(ARG0(arg),O_R,"psubst");
-		reductr(CO,(Obj)BDY(arg),&b); arg = NEXT(arg);
-/*		b = (Obj)BDY(arg); arg = NEXT(arg); */
-		substr(CO,1,a,v,b,&t); a = t;
-	}
-	*rp = a;
+  if ( !arg ) {
+    *rp = 0; return;
+  }
+  asir_assert(ARG0(arg),O_R,"psubst");
+  reductr(CO,(Obj)ARG0(arg),&a);
+/*  a = (Obj)ARG0(arg); */
+  arg = NEXT(arg);
+  if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
+    arg = BDY(l);
+  while ( arg ) {
+    asir_assert(BDY(arg),O_P,"psubst");
+    v = VR((P)BDY(arg)); arg = NEXT(arg);
+    if ( !arg )
+      error("psubst : invalid argument");
+    asir_assert(ARG0(arg),O_R,"psubst");
+    reductr(CO,(Obj)BDY(arg),&b); arg = NEXT(arg);
+/*    b = (Obj)BDY(arg); arg = NEXT(arg); */
+    substr(CO,1,a,v,b,&t); a = t;
+  }
+  *rp = a;
 }
 
 void Psubstf(arg,rp)
 NODE arg;
 Obj *rp;
 {
-	Obj a,t;
-	LIST l;
-	V v,f;
+  Obj a,t;
+  LIST l;
+  V v,f;
 
-	if ( !arg ) {
-		*rp = 0; return;
-	}
-	asir_assert(ARG0(arg),O_R,"substf");
-	reductr(CO,(Obj)ARG0(arg),&a);
-/*	a = (Obj)ARG0(arg); */
-	arg = NEXT(arg);
-	if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
-		arg = BDY(l);
-	while ( arg ) {
-		asir_assert(BDY(arg),O_P,"substf");
-		v = VR((P)BDY(arg)); arg = NEXT(arg);
-		if ( !arg || (int)v->attr != V_SR )
-			error("substf : invalid argument");
-		f = VR((P)BDY(arg)); arg = NEXT(arg);
-		if ( (int)f->attr != V_SR )
-			error("substf : invalid argument\n");
-		substfr(CO,a,((FUNC)v->priv)->f.puref,((FUNC)f->priv)->f.puref,&t);
-		a = t;
-	}
-	*rp = a;
+  if ( !arg ) {
+    *rp = 0; return;
+  }
+  asir_assert(ARG0(arg),O_R,"substf");
+  reductr(CO,(Obj)ARG0(arg),&a);
+/*  a = (Obj)ARG0(arg); */
+  arg = NEXT(arg);
+  if ( arg && (l = (LIST)ARG0(arg)) && OID(l) == O_LIST )
+    arg = BDY(l);
+  while ( arg ) {
+    asir_assert(BDY(arg),O_P,"substf");
+    v = VR((P)BDY(arg)); arg = NEXT(arg);
+    if ( !arg || (int)v->attr != V_SR )
+      error("substf : invalid argument");
+    f = VR((P)BDY(arg)); arg = NEXT(arg);
+    if ( (int)f->attr != V_SR )
+      error("substf : invalid argument\n");
+    substfr(CO,a,((FUNC)v->priv)->f.puref,((FUNC)f->priv)->f.puref,&t);
+    a = t;
+  }
+  *rp = a;
 }