===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/var.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM_contrib2/asir2000/builtin/var.c	2000/08/21 08:31:21	1.2
+++ OpenXM_contrib2/asir2000/builtin/var.c	2006/08/09 10:08:46	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,14 +45,12 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/var.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/var.c,v 1.5 2005/10/26 07:33:03 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 void Pvar(), Pvars(), Puc(), Pvars_recursive();
-void get_vars(Obj,VL *);
-void get_vars_recursive(Obj,VL *);
 
 struct ftab var_tab[] = {
 	{"var",Pvar,1},
@@ -62,9 +60,7 @@ struct ftab var_tab[] = {
 	{0,0,0},
 };
 
-void Pvar(arg,rp)
-NODE arg;
-Obj *rp;
+void Pvar(NODE arg,Obj *rp)
 {
 	Obj t;
 	P p;
@@ -90,9 +86,7 @@ Obj *rp;
 		*rp = 0;
 }
 
-void Pvars(arg,rp)
-NODE arg;
-LIST *rp;
+void Pvars(NODE arg,LIST *rp)
 {
 	VL vl;
 	NODE n,n0;
@@ -107,9 +101,7 @@ LIST *rp;
 	MKLIST(*rp,n0);
 }
 
-void Pvars_recursive(arg,rp)
-NODE arg;
-LIST *rp;
+void Pvars_recursive(NODE arg,LIST *rp)
 {
 	VL vl;
 	NODE n,n0;
@@ -124,9 +116,7 @@ LIST *rp;
 	MKLIST(*rp,n0);
 }
 
-void get_vars_recursive(obj,vlp)
-Obj obj;
-VL *vlp;
+void get_vars_recursive(Obj obj,VL *vlp)
 {
 	VL vl,vl0,vl1,vl2,t;
 	PFINS ins;
@@ -148,9 +138,7 @@ VL *vlp;
 	mergev(CO,vl,vl0,vlp);
 }
 
-void get_vars(t,vlp)
-Obj t;
-VL *vlp;
+void get_vars(Obj t,VL *vlp)
 {
 	pointer *vb;
 	pointer **mb;
@@ -194,26 +182,38 @@ VL *vlp;
 					vl = vl2;
 				}
 				break;
+			case O_NBP:
+				n = BDY((NBP)t);
+				for ( vl = 0; n; n = NEXT(n) ) {
+					get_vars((Obj)(((NBM)BDY(n))->c),&vl1); 
+					mergev(CO,vl,vl1,&vl2);
+					vl = vl2;
+				}
+				break;
 			default:
 				vl = 0; break;
 		}
 	*vlp = vl;
 }
 
-void Puc(p)
-Obj *p;
+void Puc(Obj *p)
 {
 	VL vl;
 	V v;
 	P t;
 	char buf[BUFSIZ];
+	char *n,*nv;
 	static int UCN;
 
 	NEWV(v); v->attr = (pointer)V_UC;
 	sprintf(buf,"_%d",UCN++);
-	NAME(v) = (char *)CALLOC(strlen(buf)+1,sizeof(char));
+	nv = NAME(v) = (char *)CALLOC(strlen(buf)+1,sizeof(char));
 	strcpy(NAME(v),buf);
-	for ( vl = CO; NEXT(vl); vl = NEXT(vl) );
-	NEWVL(NEXT(vl)); VR(NEXT(vl)) = v; NEXT(NEXT(vl)) = 0;
+	for ( vl = CO; vl; vl = NEXT(vl) )
+		if ( (n=NAME(VR(vl))) && !strcmp(n,nv) ) break;
+		else if ( !NEXT(vl) ) {
+			NEWVL(NEXT(vl)); VR(NEXT(vl)) = v; NEXT(NEXT(vl)) = 0;
+			break;
+		}
 	MKV(v,t); *p = (Obj)t;
 }