[BACK]Return to subst.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/subst.c between version 1.9 and 1.10

version 1.9, 2010/01/31 03:25:54 version 1.10, 2015/09/24 04:43:13
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * 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.9 2010/01/31 03:25:54 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 55  void Psubstr2np();
Line 55  void Psubstr2np();
   
 struct ftab subst_tab[] = {  struct ftab subst_tab[] = {
         {"subst",Psubst,-99999999},          {"subst",Psubst,-99999999},
         {"substr2np",Psubstr2np,2},          {"substr2np",Psubstr2np,-3},
         {"subst_quote",Psubst_quote,-99999999},          {"subst_quote",Psubst_quote,-99999999},
         {"psubst",Ppsubst,-99999999},          {"psubst",Ppsubst,-99999999},
         {"substf",Psubstf,-99999999},          {"substf",Psubstf,-99999999},
Line 64  struct ftab subst_tab[] = {
Line 64  struct ftab subst_tab[] = {
   
 extern Obj VOIDobj;  extern Obj VOIDobj;
   
   /* substr2np(P,[[v,a],...]) or substr2np(P,[v1,...],[a1,...]) */
   
 void Psubstr2np(NODE arg,Obj *rp)  void Psubstr2np(NODE arg,Obj *rp)
 {  {
         Obj a;          Obj a;
         P nm,dn,p;          P nm,dn,p;
         R r;          R r;
         VL vl,tvl;          VL vl,tvl;
         int nv,i;          int nv,i,ac;
         NODE slist,t,ps;          NODE slist,t,ps,u,vlist;
         P s;          P s;
         P *svect;          P *svect;
         V v;          V v;
Line 90  void Psubstr2np(NODE arg,Obj *rp)
Line 92  void Psubstr2np(NODE arg,Obj *rp)
         vvect = (V *)MALLOC(nv*sizeof(V));          vvect = (V *)MALLOC(nv*sizeof(V));
         for ( i = 0, tvl = vl; tvl; tvl = NEXT(tvl), i++ ) vvect[i] = tvl->v;          for ( i = 0, tvl = vl; tvl; tvl = NEXT(tvl), i++ ) vvect[i] = tvl->v;
         svect = (P *)MALLOC(nv*sizeof(P));          svect = (P *)MALLOC(nv*sizeof(P));
         slist = BDY((LIST)ARG1(arg));      ac = argc(arg);
         for ( i = 0; i < nv; i++ ) svect[i] = (P)VOIDobj;      if ( ac == 2 ) {
         for ( t = slist; t; t = NEXT(t) ) {            slist = BDY((LIST)ARG1(arg));
                 ps = BDY((LIST)BDY(t)); p = (P)BDY(ps); s = (P)BDY(NEXT(ps));            for ( i = 0; i < nv; i++ ) svect[i] = (P)VOIDobj;
                 asir_assert(p,O_P,"substr2np"); asir_assert(s,O_N,"substr2np");            for ( t = slist; t; t = NEXT(t) ) {
                 v = VR(p);                    ps = BDY((LIST)BDY(t)); p = (P)BDY(ps); s = (P)BDY(NEXT(ps));
                 for ( i = 0; i < nv; i++ ) if ( vvect[i] == v ) break;                    asir_assert(p,O_P,"substr2np"); asir_assert(s,O_N,"substr2np");
                 svect[i] = s;                    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");
   
         switch ( OID(a) ) {          switch ( OID(a) ) {
                 case O_P:                  case O_P:
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>