===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.114
retrieving revision 1.121
diff -u -p -r1.114 -r1.121
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/12/19 01:31:43	1.114
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2011/03/30 02:43:18	1.121
@@ -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/strobj.c,v 1.113 2005/12/18 06:54:28 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.120 2010/04/23 06:53:30 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -104,10 +104,11 @@ void Pnqt_match_rewrite();
 void Pqt_to_nbp();
 void Pshuffle_mul(), Pharmonic_mul();
 void Pnbp_hm(), Pnbp_ht(), Pnbp_hc(), Pnbp_rest();
-void Pnbm_deg();
+void Pnbp_tm(), Pnbp_tt(), Pnbp_tc(), Pnbp_trest();
+void Pnbm_deg(), Pnbm_index();
 void Pnbm_hp_rest();
 void Pnbm_hxky(), Pnbm_xky_rest();
-void Pnbm_hv(), Pnbm_rest();
+void Pnbm_hv(), Pnbm_tv(), Pnbm_rest(),Pnbm_trest();
 
 void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name();
 void Pqt_match(),Pget_quote_id();
@@ -182,12 +183,19 @@ struct ftab str_tab[] = {
 	{"nbp_ht", Pnbp_ht,1},
 	{"nbp_hc", Pnbp_hc,1},
 	{"nbp_rest", Pnbp_rest,1},
+	{"nbp_tm", Pnbp_tm,1},
+	{"nbp_tt", Pnbp_tt,1},
+	{"nbp_tc", Pnbp_tc,1},
+	{"nbp_trest", Pnbp_trest,1},
 	{"nbm_deg", Pnbm_deg,1},
+	{"nbm_index", Pnbm_index,1},
 	{"nbm_hxky", Pnbm_hxky,1},
 	{"nbm_xky_rest", Pnbm_xky_rest,1},
 	{"nbm_hp_rest", Pnbm_hp_rest,1},
 	{"nbm_hv", Pnbm_hv,1},
+	{"nbm_tv", Pnbm_tv,1},
 	{"nbm_rest", Pnbm_rest,1},
+	{"nbm_trest", Pnbm_trest,1},
 
 	{"qt_to_nary",Pqt_to_nary,1},
 	{"qt_to_bin",Pqt_to_bin,2},
@@ -462,7 +470,7 @@ int register_conv_func(Obj arg)
 	if ( !arg ) {
 		convfunc = 0;
 		return 1;
-	} else if ( OID(arg) == O_P && (int)(VR((P)arg))->attr == V_SR ) {
+	} else if ( OID(arg) == O_P && (long)(VR((P)arg))->attr == V_SR ) {
 		convfunc = (FUNC)(VR((P)arg)->priv);
 		/* f must be a function which takes single argument */
 		return 1;
@@ -841,7 +849,7 @@ void do_assign(NODE arg)
 
 	for ( t = arg; t; t = NEXT(t) ) {
 		pair = BDY((LIST)BDY(t));
-		pv = (int)FA0((FNODE)BDY((QUOTE)BDY(pair)));
+		pv = (long)FA0((FNODE)BDY((QUOTE)BDY(pair)));
 		value = (QUOTE)(BDY(NEXT(pair)));
 		ASSPV(pv,value);
 	}
@@ -1280,6 +1288,7 @@ NODE arg;
 Obj *rp;
 {
 	FNODE fnode;
+	SNODE snode;
 	char *cmd;
 #if defined(PARI)
 	void recover(int);
@@ -1293,8 +1302,13 @@ Obj *rp;
 #  endif
 #endif
 	cmd = BDY((STRING)ARG0(arg));
+#if 0
 	exprparse_create_var(0,cmd,&fnode);
 	*rp = eval(fnode);
+#else
+	exprparse_create_var(0,cmd,&snode);
+	*rp = evalstat(snode);
+#endif
 }
 
 void Prtostr(arg,rp)
@@ -1316,6 +1330,7 @@ NODE arg;
 P *rp;
 {
 	char *p;
+	FUNC f;
 
 	p = BDY((STRING)ARG0(arg));
 #if 0
@@ -1329,7 +1344,11 @@ P *rp;
 			makevar(p,rp);
 	}
 #else
-	makevar(p,rp);
+	gen_searchf_searchonly(p,&f);
+	if ( f )
+		makesrvar(f,rp);
+	else
+		makevar(p,rp);
 #endif
 }
 
@@ -1417,18 +1436,23 @@ char *symbol_name(char *name)
 
 void Pget_function_name(NODE arg,STRING *rp)
 {
-		QUOTEARG qa;
-		ARF f;
-		char *opname;
+	QUOTEARG qa;
 
-		qa = (QUOTEARG)BDY(arg);
-		if ( !qa || OID(qa) != O_QUOTEARG || qa->type != A_arf )
+	qa = (QUOTEARG)BDY(arg);
+	if ( !qa || OID(qa) != O_QUOTEARG ) {
+		*rp = 0; return;
+	}
+	switch ( qa->type ) {
+		case A_arf:
+			MKSTR(*rp,((ARF)BDY(qa))->name);
+			break;
+		case A_func:
+			MKSTR(*rp,((FUNC)BDY(qa))->name);
+			break;
+		default:
 			*rp = 0;
-		else {
-			f = (ARF)BDY(qa);
-			opname = f->name;
-			MKSTR(*rp,opname);
-		}
+			break;
+	}
 }
 
 FNODE strip_paren(FNODE);
@@ -2410,13 +2434,13 @@ void Pnbp_ht(NODE arg, NBP *rp)
 	else {
 		m = (NBM)BDY(BDY(p));
 		NEWNBM(m1);
-		m1->d = m->d; m1->c = ONE; m1->b = m->b;
+		m1->d = m->d; m1->c = (P)ONE; m1->b = m->b;
 		MKNODE(n,m1,0);
 		MKNBP(*rp,n);
 	}
 }
 
-void Pnbp_hc(NODE arg, Q *rp)
+void Pnbp_hc(NODE arg, P *rp)
 {
 	NBP p;
 	NBM m;
@@ -2444,6 +2468,76 @@ void Pnbp_rest(NODE arg, NBP *rp)
 	}
 }
 
+void Pnbp_tm(NODE arg, NBP *rp)
+{
+	NBP p;
+	NODE n;
+	NBM m;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		for ( n = BDY(p); NEXT(n); n = NEXT(n) );
+		m = (NBM)BDY(n);
+		MKNODE(n,m,0);
+		MKNBP(*rp,n);
+	}
+}
+	
+void Pnbp_tt(NODE arg, NBP *rp)
+{
+	NBP p;
+	NODE n;
+	NBM m,m1;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		for ( n = BDY(p); NEXT(n); n = NEXT(n) );
+		m = (NBM)BDY(n);
+		NEWNBM(m1);
+		m1->d = m->d; m1->c = (P)ONE; m1->b = m->b;
+		MKNODE(n,m1,0);
+		MKNBP(*rp,n);
+	}
+}
+
+void Pnbp_tc(NODE arg, P *rp)
+{
+	NBP p;
+	NBM m;
+	NODE n;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		for ( n = BDY(p); NEXT(n); n = NEXT(n) );
+		m = (NBM)BDY(n);
+		*rp = m->c;
+	}
+}
+
+void Pnbp_trest(NODE arg, NBP *rp)
+{
+	NBP p;
+	NODE n,r,r0;
+
+	p = (NBP)ARG0(arg);
+	if ( !p ) *rp = 0;
+	else {
+		n = BDY(p);
+		for ( r0 = 0; NEXT(n); n = NEXT(n) ) {
+			NEXTNODE(r0,r);
+			BDY(r) = (pointer)BDY(n);
+		}
+		if ( r0 ) {
+			NEXT(r) = 0;
+			MKNBP(*rp,r0);
+		} else
+			*rp = 0;
+	}
+}
+
 void Pnbm_deg(NODE arg, Q *rp)
 {
 	NBP p;
@@ -2458,6 +2552,28 @@ void Pnbm_deg(NODE arg, Q *rp)
 	}
 }
 
+void Pnbm_index(NODE arg, Q *rp)
+{
+	NBP p;
+	NBM m;
+	unsigned int *b;
+	int d,i,r;
+
+	p = (NBP)ARG0(arg);
+	if ( !p )
+		STOQ(0,*rp);
+	else {
+		m = (NBM)BDY(BDY(p));	
+		d = m->d;
+		if ( d > 32 )
+			error("nbm_index : weight too large");
+		b = m->b;
+		for ( r = 0, i = d-2; i > 0; i-- )
+			if ( !NBM_GET(b,i) ) r |= (1<<(d-2-i));
+		STOQ(r,*rp);
+	}
+}
+
 void Pnbm_hp_rest(NODE arg, LIST *rp)
 {
 	NBP p,h,r;
@@ -2479,14 +2595,14 @@ void Pnbm_hp_rest(NODE arg, LIST *rp)
 			for ( i = 1; i < d; i++ )
 				if ( NBM_GET(b,i) != v ) break;
 			NEWNBM(m1); NEWNBMBDY(m1,i); 
-			b1 = m1->b; m1->d = i; m1->c = ONE;
+			b1 = m1->b; m1->d = i; m1->c = (P)ONE;
 			if ( v ) for ( j = 0; j < i; j++ ) NBM_SET(b1,j);
 			else for ( j = 0; j < i; j++ ) NBM_CLR(b1,j);
 			MKNODE(n,m1,0); MKNBP(h,n);
 
 			d1 = d-i;
 			NEWNBM(m1); NEWNBMBDY(m1,d1);
-			b1 = m1->b; m1->d = d1; m1->c = ONE;
+			b1 = m1->b; m1->d = d1; m1->c = (P)ONE;
 			for ( j = 0, k = i; j < d1; j++, k++ )
 				if ( NBM_GET(b,k) ) NBM_SET(b1,j);
 				else NBM_CLR(b1,j);
@@ -2541,6 +2657,28 @@ void Pnbm_rest(NODE arg, NBP *rp)
 		separate_nbm((NBM)BDY(BDY(p)),0,0,rp);
 }
 
+void Pnbm_tv(NODE arg, NBP *rp)
+{
+	NBP p;
+	
+	p = (NBP)ARG0(arg);
+	if ( !p )
+		*rp = 0;
+	else
+		separate_tail_nbm((NBM)BDY(BDY(p)),0,0,rp);
+}
+
+void Pnbm_trest(NODE arg, NBP *rp)
+{
+	NBP p;
+	
+	p = (NBP)ARG0(arg);
+	if ( !p )
+		*rp = 0;
+	else
+		separate_tail_nbm((NBM)BDY(BDY(p)),0,rp,0);
+}
+
 NBP fnode_to_nbp(FNODE f)
 {
 	Q r;
@@ -2554,10 +2692,10 @@ NBP fnode_to_nbp(FNODE f)
 		r = eval(f);
 		NEWNBM(m);
 		if ( OID(r) == O_N ) {
-			m->d = 0; m->c = (Q)r; m->b = 0;
+			m->d = 0; m->c = (P)r; m->b = 0;
 		} else {
 			v = VR((P)r);
-			m->d = 1; m->c = ONE; NEWNBMBDY(m,1);
+			m->d = 1; m->c = (P)ONE; NEWNBMBDY(m,1);
 			if ( !strcmp(NAME(v),"x") ) NBM_SET(m->b,0);
 			else NBM_CLR(m->b,0);
 		}