===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/compobj.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM_contrib2/asir2000/builtin/compobj.c	2000/08/21 08:31:18	1.2
+++ OpenXM_contrib2/asir2000/builtin/compobj.c	2003/12/29 10:53:12	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,19 +45,48 @@
  * 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.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/compobj.c,v 1.5 2002/01/22 01:00:08 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "comp.h"
 
 void Parfreg();
+void Pstruct_type();
 
 struct ftab comp_tab[] = {
 	{"arfreg",Parfreg,8},
+	{"struct_type",Pstruct_type,1},
 	{0,0,0},
 };
 
+void Pstruct_type(arg,rp)
+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(arg,rp)
 NODE arg;
 Q *rp;
@@ -66,6 +95,7 @@ Q *rp;
 	P t;
 	SDEF s;
 	int i;
+	FUNC func;
 
 	asir_assert(ARG0(arg),O_STR,"arfreg");
 	name = ((STRING)ARG0(arg))->body;
@@ -73,14 +103,14 @@ Q *rp;
 		if ( !strcmp(s[i].name,name) )
 			break;
 	if ( i == LSS->n )
-		error("argreg : no such structure");
+		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;
+	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;
 }