=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/struct.c,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/asir2000/parse/struct.c 2000/08/21 08:31:47 1.2 +++ OpenXM_contrib2/asir2000/parse/struct.c 2003/05/14 06:20:13 1.6 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -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/parse/struct.c,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/struct.c,v 1.5 2001/10/09 01:36:25 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -54,79 +54,46 @@ struct oSS oLSS; SS LSS = &oLSS; -void structdef(name,member) -char *name; -NODE member; +int structdef(char *name,NODE member) { - int i,j,k,type; + int i,j; SDEF sdef,s; - NODE n,ms; - char *mname,*sname; + NODE n; + char *mname; + /* search the predefined structure */ for ( s = LSS->sa, i = 0; i < LSS->n; i++ ) if ( !strcmp(s[i].name,name) ) { fprintf(stderr,"redeclaration of %s\n",name); break; } if ( !LSS->sa || ((i == LSS->n)&&(LSS->n==LSS->asize)) ) reallocarray((char **)&LSS->sa,(int *)&LSS->asize,(int *)&LSS->n,(int)sizeof(struct oSDEF)); + /* sdef = room for new structure definition */ sdef = &LSS->sa[i]; if ( i == LSS->n ) LSS->n++; - for ( i = 0, n = member; n; n = NEXT(n), i++ ); + /* set the name of structure */ sdef->name = (char *)MALLOC(strlen(name)+1); bcopy(name,sdef->name,strlen(name)+1); - for ( j = 0, n = member; n; n = NEXT(n) ) - for ( ms = NEXT((NODE)BDY(n)); ms; ms = NEXT(ms), j++ ); + /* count the total number of members */ + for ( j = 0, n = member; n; n = NEXT(n), j++ ); sdef->n = j; - sdef->f = (struct oFIELD *)MALLOC(sdef->n*sizeof(struct oFIELD)); - for ( j = 0, n = member; n; n = NEXT(n) ) { - ms = (NODE)BDY(n); - if ( sname = (char *)BDY(ms) ) { - for ( s = LSS->sa, k = 0; k < LSS->n; k++ ) - if ( !strcmp(s[k].name,sname) ) - break; - if ( k == LSS->n ) { - fprintf(stderr,"%s: undefined structure\n",sname); return; - } else - type = k; - } else - type = -1; - for ( ms = NEXT(ms); ms; ms = NEXT(ms), j++ ) { - mname = (char *)MALLOC(strlen(BDY(ms))+1); - bcopy(BDY(ms),mname,strlen(BDY(ms))+1); - sdef->f[j].name = mname; sdef->f[j].type = type; - } + sdef->member = (char **)MALLOC(sdef->n*sizeof(char *)); + /* set the names of members */ + for ( j = 0, n = member; n; n = NEXT(n), j++ ) { + mname = (char *)MALLOC(strlen((char *)BDY(n))+1); + bcopy((char *)BDY(n),mname,strlen((char *)BDY(n))+1); + sdef->member[j] = mname; } + return i; } -void setstruct(name,vars) -char *name; -NODE vars; +void newstruct(int type,COMP *rp) { - SDEF s; - int i; - NODE n; - - for ( s = LSS->sa, i = 0; i < LSS->n; i++ ) - if ( !strcmp(s[i].name,name) ) - break; - if ( i == LSS->n ) { - fprintf(stderr,"%s: undefined structure\n",name); return; - } - s = &LSS->sa[i]; - for ( n = vars; n; n = NEXT(n) ) - CPVS->va[(int)BDY(n)].type = i; -} - -void newstruct(type,rp) -int type; -COMP *rp; -{ NEWCOMP(*rp,LSS->sa[type].n); (*rp)->type = type; } -int structtoindex(name) -char *name; +int structtoindex(char *name) { SDEF s; int i; @@ -140,145 +107,55 @@ char *name; return i; } -int membertoindex(type,name) -int type; -char *name; +int membertoindex(int type,char *name) { SDEF s; - FIELD f; + char **member; int i; s = &LSS->sa[type]; - for ( f = s->f, i = 0; i < s->n; i++ ) - if ( !strcmp(f[i].name,name) ) + for ( member = s->member, i = 0; i < s->n; i++ ) + if ( !strcmp(member[i],name) ) break; - if ( i == s->n ) { - fprintf(stderr,"structure has no member named `%s'\n",name); + if ( i == s->n ) return -1; - } else + else return i; } -int indextotype(type,index) -int type,index; +int getcompsize(int type) { - return LSS->sa[type].f[index].type; -} - -int gettype(index) -unsigned int index; -{ - if ( MSB & index ) - return (int)GPVS->va[index&~MSB].type; - else - return (int)CPVS->va[index].type; -} - -int getcompsize(type) -int type; -{ return LSS->sa[type].n; } -void getmember(expr,memp) -FNODE expr; -Obj *memp; +Obj memberofstruct(COMP a,char *name) { - int i; - FNODE root; - COMP t; - PV v0; - NODE2 mchain; + int type,ind; + char buf[BUFSIZ]; - root = (FNODE)FA1(expr); mchain = (NODE2)FA2(expr); - if ( ID(root) == I_PVAR ) { - i = (int)FA0(root); - v0 = i>=0?&CPVS->va[(unsigned int)i]:&GPVS->va[((unsigned int)i)&~MSB]; - t = (COMP)v0->priv; - } else - t = (COMP)eval(root); - for ( ; mchain; mchain = NEXT(mchain) ) - t = (COMP)(t->member[(int)BDY1(mchain)]); - *memp = (Obj)t; -} - -void getmemberp(expr,addrp) -FNODE expr; -Obj **addrp; -{ - int i; - FNODE root; - COMP t; - PV v0; - COMP *addr; - NODE2 mchain; - - root = (FNODE)FA1(expr); mchain = (NODE2)FA2(expr); - if ( ID(root) == I_PVAR ) { - i = (int)FA0(root); - v0 = i>=0?&CPVS->va[(unsigned int)i]:&GPVS->va[((unsigned int)i)&~MSB]; - addr = (COMP *)&v0->priv; - } else { - t = (COMP)eval(root); - addr = (COMP *)&t; + if ( !a || OID(a) != O_COMP ) + error("object is not a structure"); + type = a->type; + ind = membertoindex(type,name); + if ( ind < 0 ) { + sprintf(buf,"structure has no member named `%s'",name); + error(buf); } - for ( ; mchain; mchain = NEXT(mchain) ) - addr = (COMP *)&((*addr)->member[(int)BDY1(mchain)]); - *addrp = (Obj *)addr; + return (Obj)a->member[ind]; } -void getarrayp(a,ind,addrp) -Obj a; -NODE ind; -Obj **addrp; +void assign_to_member(COMP a,char *name,Obj obj) { - Obj len,row,col; - Obj *addr; - - switch ( OID(a) ) { - case O_VECT: - len = (Obj)BDY(ind); - if ( !rangecheck(len,((VECT)a)->len) ) - error("getarrayp : Out of range"); - else - addr = (Obj *)&(BDY((VECT)a)[QTOS((Q)len)]); - break; - case O_MAT: - row = (Obj)BDY(ind); col = (Obj)BDY(NEXT(ind)); - if ( !rangecheck(row,((MAT)a)->row) - || !rangecheck(col,((MAT)a)->col) ) - error("getarrayp : Out of range"); - else - addr = (Obj *)&(BDY((MAT)a)[QTOS((Q)row)][QTOS((Q)col)]); - break; - default: - addr = 0; - break; - } - *addrp = addr; -} - -void memberofstruct(pexpr,name,exprp) -FNODE pexpr; -char *name; -FNODE *exprp; -{ - NODE2 n,*np; int type,ind; + char buf[BUFSIZ]; - if ( pexpr->id != I_CAST ) { - if ( pexpr->id == I_PVAR ) - pexpr = (FNODE)mkfnode(3,I_CAST,gettype((unsigned int)pexpr->arg[0]),pexpr,0); - else - error("memberofstruct : ???"); - } - if ( !pexpr->arg[2] ) { - np = (NODE2 *)&(pexpr->arg[2]); type = (int)pexpr->arg[0]; - } else { - for ( n = (NODE2)pexpr->arg[2]; NEXT(n); n = NEXT(n) ); - np = &NEXT(n); type = (int)BDY2(n); - } + if ( !a || OID(a) != O_COMP ) + error("object is not a structure"); + type = a->type; ind = membertoindex(type,name); - MKNODE2(*np,ind,indextotype(type,ind),0); - *exprp = pexpr; + if ( ind < 0 ) { + sprintf(buf,"structure has no member named `%s'",name); + error(buf); + } + a->member[ind] = obj; }