===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/struct.c,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- OpenXM_contrib2/asir2000/parse/struct.c	2000/09/21 09:19:27	1.4
+++ OpenXM_contrib2/asir2000/parse/struct.c	2018/03/29 01:32:54	1.9
@@ -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.3 2000/08/22 05:04:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/struct.c,v 1.8 2017/02/07 08:30:31 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -54,203 +54,109 @@
 struct oSS oLSS;
 SS LSS = &oLSS;
 
-int structdef(name,member)
-char *name;
-NODE member;
+int structdef(char *name,NODE member)
 {
-	int i,j,k,type;
-	SDEF sdef,s;
-	NODE n,ms;
-	char *mname,*sname;
+  int i,j;
+  SDEF sdef,s;
+  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++;
-	/* set the name of structure */
-	sdef->name = (char *)MALLOC(strlen(name)+1);
-	bcopy(name,sdef->name,strlen(name)+1);
-	/* count the total number of members */
-	for ( j = 0, n = member; n; n = NEXT(n), j++ );
-	sdef->n = j;
-	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;
+  /* 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)) )
+    asir_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++;
+  /* set the name of structure */
+  sdef->name = (char *)MALLOC(strlen(name)+1);
+  bcopy(name,sdef->name,strlen(name)+1);
+  /* count the total number of members */
+  for ( j = 0, n = member; n; n = NEXT(n), j++ );
+  sdef->n = j;
+  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 newstruct(type,rp)
-int type;
-COMP *rp;
+void newstruct(int type,COMP *rp)
 {
-	NEWCOMP(*rp,LSS->sa[type].n); (*rp)->type = type;
+  if ( type < 0 || type >= LSS->n ) error("");
+  NEWCOMP(*rp,LSS->sa[type].n); (*rp)->type = type;
 }
 
-int structtoindex(name)
-char *name;
+int structtoindex(char *name)
 {
-	SDEF s;
-	int i;
+  SDEF s;
+  int i;
 
-	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 -1; /* XXX */
-	} else
-		return i;
+  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 -1; /* XXX */
+  } else
+    return i;
 }
 
-int membertoindex(type,name)
-int type;
-char *name;
+int membertoindex(int type,char *name)
 {
-	SDEF s;
-	char **member;
-	int i;
+  SDEF s;
+  char **member;
+  int i;
 
-	s = &LSS->sa[type];
-	for ( member = s->member, i = 0; i < s->n; i++ )
-		if ( !strcmp(member[i],name) )
-			break;
-	if ( i == s->n )
-		return -1;
-	else
-		return i;
+  s = &LSS->sa[type];
+  for ( member = s->member, i = 0; i < s->n; i++ )
+    if ( !strcmp(member[i],name) )
+      break;
+  if ( i == s->n )
+    return -1;
+  else
+    return i;
 }
 
-int getcompsize(type)
-int type;
+int getcompsize(int type)
 {
-	return LSS->sa[type].n;
+  return LSS->sa[type].n;
 }
 
-#if 0
-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;
+  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);
+  }
+  return (Obj)a->member[ind];
 }
 
-void getmemberp(expr,addrp)
-FNODE expr;
-Obj **addrp;
+void assign_to_member(COMP a,char *name,Obj obj)
 {
-	int i;
-	FNODE root;
-	COMP t;
-	PV v0;
-	COMP *addr;
-	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];
-		addr = (COMP *)&v0->priv;
-	} else {
-		t = (COMP)eval(root);
-		addr = (COMP *)&t;
-	}
-	for ( ; mchain; mchain = NEXT(mchain) )
-		addr = (COMP *)&((*addr)->member[(int)BDY1(mchain)]);
-	*addrp = (Obj *)addr;
-}
-
-void getarrayp(a,ind,addrp)
-Obj a;
-NODE ind;
-Obj **addrp;
-{
-	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;
-}
-#endif
-
-Obj memberofstruct(a,name)
-COMP a;
-char *name;
-{
-	NODE2 n,*np;
-	int type,ind;
-	char buf[BUFSIZ];
-
-	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);
-	}
-	return (Obj)a->member[ind];
-}
-
-void assign_to_member(a,name,obj)
-COMP a;
-char *name;
-Obj obj;
-{
-	NODE2 n,*np;
-	int type,ind;
-	char buf[BUFSIZ];
-
-	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);
-	}
-	a->member[ind] = obj;
+  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);
+  }
+  a->member[ind] = obj;
 }