===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/compobj.c,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM_contrib2/asir2000/builtin/compobj.c	2002/01/22 01:00:08	1.5
+++ OpenXM_contrib2/asir2000/builtin/compobj.c	2018/03/29 01:32:50	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/builtin/compobj.c,v 1.4 2000/09/21 09:19:26 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/compobj.c,v 1.8 2004/03/16 06:20:03 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,63 +53,152 @@
 
 void Parfreg();
 void Pstruct_type();
+void Prange();
+void Pget_element_at();
+void Pput_element_at();
+void Pget_element_names();
+void Pget_struct_name();
 
 struct ftab comp_tab[] = {
-	{"arfreg",Parfreg,8},
-	{"struct_type",Pstruct_type,1},
-	{0,0,0},
+  {"arfreg",Parfreg,8},
+  {"struct_type",Pstruct_type,1},
+  {"get_element_at",Pget_element_at,2},
+  {"put_element_at",Pput_element_at,3},
+  {"get_element_names",Pget_element_names,1},
+  {"get_struct_name",Pget_struct_name,1},
+  {"range",Prange,2},
+  {0,0,0},
 };
 
-void Pstruct_type(arg,rp)
-NODE arg;
-Q *rp;
+void Pget_element_at(NODE arg,Obj *rp)
 {
-	Obj obj;
-	char *name;
-	int ind;
+  COMP obj;
+  char *name;
+  int i;
+  SDEF sdef;
 
-/*	asir_assert(ARG0(arg),O_STR,"struct_type"); */
-	obj = (Obj)ARG0(arg);
-	if ( !obj )
-		error("struct_type : invalid argument");
-	switch ( OID(obj) ) {
-		case O_STR:
-			name = ((STRING)obj)->body;
-			ind = structtoindex(name);
-			break;
-		case O_COMP:
-			ind = ((COMP)obj)->type;
-			break;
-		default:
-			error("struct_type : invalid argument");
-			break;
-	}
-	STOQ(ind,*rp);		
+  asir_assert(ARG0(arg),O_COMP,"get_element_at");
+  asir_assert(ARG1(arg),O_STR,"get_element_at");
+  name = BDY((STRING)ARG1(arg));
+  obj = (COMP)ARG0(arg);
+  sdef = LSS->sa+obj->type;
+  for ( i = 0; i < sdef->n; i++ )
+    if ( !strcmp(name,sdef->member[i]) ) break;
+  if ( i < sdef->n ) {
+    *rp = obj->member[i];
+  } else
+    error("get_element_at : no such member");
 }
 
-void Parfreg(arg,rp)
-NODE arg;
-Q *rp;
+void Pput_element_at(NODE arg,Obj *rp)
 {
-	char *name;
-	P t;
-	SDEF s;
-	int i;
+  COMP obj;
+  char *name;
+  int i;
+  SDEF sdef;
 
-	asir_assert(ARG0(arg),O_STR,"arfreg");
-	name = ((STRING)ARG0(arg))->body;
-	for ( s = LSS->sa, i = 0; i < LSS->n; i++ )
-		if ( !strcmp(s[i].name,name) )
-			break;
-	if ( i == LSS->n )
-		error("arfreg : no such structure");
-		
-	t = (P)ARG1(arg); s[i].arf.add = !t ? 0 : (FUNC)VR(t)->priv;
-	t = (P)ARG2(arg); s[i].arf.sub = !t ? 0 : (FUNC)VR(t)->priv;
-	t = (P)ARG3(arg); s[i].arf.mul = !t ? 0 : (FUNC)VR(t)->priv;
-	t = (P)ARG4(arg); s[i].arf.div = !t ? 0 : (FUNC)VR(t)->priv;
-	t = (P)ARG5(arg); s[i].arf.pwr = !t ? 0 : (FUNC)VR(t)->priv;
-	t = (P)ARG6(arg); s[i].arf.chsgn = !t ? 0 : (FUNC)VR(t)->priv;
-	t = (P)ARG7(arg); s[i].arf.comp = !t ? 0 : (FUNC)VR(t)->priv;
-	*rp = ONE;
+  asir_assert(ARG0(arg),O_COMP,"put_element_at");
+  asir_assert(ARG1(arg),O_STR,"put_element_at");
+  name = BDY((STRING)ARG1(arg));
+  obj = (COMP)ARG0(arg);
+  sdef = LSS->sa+obj->type;
+  for ( i = 0; i < sdef->n; i++ )
+    if ( !strcmp(name,sdef->member[i]) ) break;
+  if ( i < sdef->n ) {
+    obj->member[i] = (Obj)ARG2(arg);
+    *rp = obj->member[i];
+  } else
+    error("put_element_at : no such member");
+}
+
+void Pget_element_names(NODE arg,LIST *rp)
+{
+  COMP obj;
+  int i;
+  SDEF sdef;
+  NODE t,t1;
+  STRING name;
+
+  asir_assert(ARG0(arg),O_COMP,"get_element_names");
+  obj = (COMP)ARG0(arg);
+  sdef = LSS->sa+obj->type;
+  t = 0;
+  for ( i = sdef->n-1; i >= 0; i-- ) {
+    MKSTR(name,sdef->member[i]);
+    MKNODE(t1,(pointer)name,t);
+    t = t1;
+  }
+  MKLIST(*rp,t);
+}
+
+void Pget_struct_name(NODE arg,STRING *rp)
+{
+  COMP obj;
+  SDEF sdef;
+
+  asir_assert(ARG0(arg),O_COMP,"get_struct_name");
+  obj = (COMP)ARG0(arg);
+  sdef = LSS->sa+obj->type;
+  MKSTR(*rp,sdef->name);
+}
+
+void Pstruct_type(NODE arg,Q *rp)
+{
+  Obj obj;
+  char *name;
+  int ind;
+
+/*  asir_assert(ARG0(arg),O_STR,"struct_type"); */
+  obj = (Obj)ARG0(arg);
+  if ( !obj )
+    error("struct_type : invalid argument");
+  switch ( OID(obj) ) {
+    case O_STR:
+      name = ((STRING)obj)->body;
+      ind = structtoindex(name);
+      break;
+    case O_COMP:
+      ind = ((COMP)obj)->type;
+      break;
+    default:
+      error("struct_type : invalid argument");
+      break;
+  }
+  STOQ(ind,*rp);    
+}
+
+void Parfreg(NODE arg,Q *rp)
+{
+  char *name;
+  P t;
+  SDEF s;
+  int i;
+  FUNC func;
+
+  asir_assert(ARG0(arg),O_STR,"arfreg");
+  name = ((STRING)ARG0(arg))->body;
+  for ( s = LSS->sa, i = 0; i < LSS->n; i++ )
+    if ( !strcmp(s[i].name,name) )
+      break;
+  if ( i == LSS->n )
+    error("arfreg : no such structure");
+    
+  t = (P)ARG1(arg); s[i].arf.add = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  t = (P)ARG2(arg); s[i].arf.sub = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  t = (P)ARG3(arg); s[i].arf.mul = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  t = (P)ARG4(arg); s[i].arf.div = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  t = (P)ARG5(arg); s[i].arf.pwr = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  t = (P)ARG6(arg); s[i].arf.chsgn = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  t = (P)ARG7(arg); s[i].arf.comp = !t ? 0 : (gen_searchf(NAME(VR(t)),&func), func);
+  *rp = ONE;
+}
+
+void Prange(NODE arg,RANGE *rp)
+{
+  RANGE range;
+
+  NEWRANGE(range);
+  range->start = (Obj)ARG0(arg);
+  range->end = (Obj)ARG1(arg);
+  *rp = range;
 }