===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.117
retrieving revision 1.124
diff -u -p -r1.117 -r1.124
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2006/08/27 22:17:27	1.117
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2015/08/14 13:51:54	1.124
@@ -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.116 2006/08/19 05:35:07 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.123 2015/08/06 10:01:52 fujimoto Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -60,7 +60,7 @@ extern jmp_buf environnement;
 
 #if defined(__GNUC__)
 #define INLINE inline
-#elif defined(VISUAL)
+#elif defined(VISUAL) || defined(__MINGW32__)
 #define INLINE __inline
 #else
 #define INLINE
@@ -105,7 +105,7 @@ void Pqt_to_nbp();
 void Pshuffle_mul(), Pharmonic_mul();
 void Pnbp_hm(), Pnbp_ht(), Pnbp_hc(), Pnbp_rest();
 void Pnbp_tm(), Pnbp_tt(), Pnbp_tc(), Pnbp_trest();
-void Pnbm_deg();
+void Pnbm_deg(), Pnbm_index();
 void Pnbm_hp_rest();
 void Pnbm_hxky(), Pnbm_xky_rest();
 void Pnbm_hv(), Pnbm_tv(), Pnbm_rest(),Pnbm_trest();
@@ -188,6 +188,7 @@ struct ftab str_tab[] = {
 	{"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},
@@ -469,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;
@@ -848,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);
 	}
@@ -1287,6 +1288,7 @@ NODE arg;
 Obj *rp;
 {
 	FNODE fnode;
+	SNODE snode;
 	char *cmd;
 #if defined(PARI)
 	void recover(int);
@@ -1300,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)
@@ -1323,6 +1330,7 @@ NODE arg;
 P *rp;
 {
 	char *p;
+	FUNC f;
 
 	p = BDY((STRING)ARG0(arg));
 #if 0
@@ -1336,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
 }
 
@@ -1424,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);
@@ -2535,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;
@@ -3067,7 +3106,7 @@ FNODE fnode_node_to_nary(ARF op,NODE n)
 {
 	if ( !n ) {
 		if ( op->name[0] == '+' )
-			return mkfnode(1,I_FORMULA,0);
+			return mkfnode(1,I_FORMULA,NULLP);
 		else
 			return mkfnode(1,I_FORMULA,ONE);
 	} else if ( !NEXT(n) ) return BDY(n);
@@ -3083,14 +3122,14 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 	Obj c1,c2,c,e;
 	int l1,l,i,j;
 
-	if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,0);
+	if ( IS_ZERO(f1) || IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,NULLP);
 	else if ( fnode_is_coef(f1) ) 
 		return nfnode_mul_coef((Obj)eval(f1),f2,expand);
 	else if ( fnode_is_coef(f2) ) 
 		return nfnode_mul_coef((Obj)eval(f2),f1,expand);
 
 	if ( expand && IS_NARYADD(f1) ) {
-		t = mkfnode(1,I_FORMULA,0);
+		t = mkfnode(1,I_FORMULA,NULLP);
 		for ( n1 = (NODE)FA1(f1); n1; n1 = NEXT(n1) ) {
 			t1 = nfnode_mul(BDY(n1),f2,expand);
 			t = nfnode_add(t,t1,expand);
@@ -3098,7 +3137,7 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 		return t;
 	}
 	if ( expand && IS_NARYADD(f2) ) {
-		t = mkfnode(1,I_FORMULA,0);
+		t = mkfnode(1,I_FORMULA,NULLP);
 		for ( n2 = (NODE)FA1(f2); n2; n2 = NEXT(n2) ) {
 			t1 = nfnode_mul(f1,BDY(n2),expand);
 			t = nfnode_add(t,t1,expand);
@@ -3108,7 +3147,7 @@ FNODE nfnode_mul(FNODE f1,FNODE f2,int expand)
 
 	fnode_coef_body(f1,&c1,&b1); fnode_coef_body(f2,&c2,&b2);
 	arf_mul(CO,c1,c2,&c);
-	if ( !c ) return mkfnode(1,I_FORMULA,0);
+	if ( !c ) return mkfnode(1,I_FORMULA,NULLP);
 
 
 	n1 = (NODE)FA1(to_narymul(b1)); n2 = (NODE)FA1(to_narymul(b2));
@@ -3158,7 +3197,7 @@ FNODE nfnode_pwr(FNODE f1,FNODE f2,int expand)
 	Q q;
 
 	if ( IS_ZERO(f2) ) return mkfnode(1,I_FORMULA,ONE);
-	else if ( IS_ZERO(f1) ) return mkfnode(1,I_FORMULA,0);
+	else if ( IS_ZERO(f1) ) return mkfnode(1,I_FORMULA,NULLP);
 	else if ( fnode_is_coef(f1) ) {
 		if ( fnode_is_integer(f2) ) {
 			if ( fnode_is_one(f2) ) return f1;
@@ -3217,7 +3256,7 @@ FNODE fnode_expand_pwr(FNODE f,int n,int expand)
 	Q q;
 
 	if ( !n ) return mkfnode(1,I_FORMULA,ONE);
-	else if ( IS_ZERO(f) ) return mkfnode(1,I_FORMULA,0);
+	else if ( IS_ZERO(f) ) return mkfnode(1,I_FORMULA,NULLP);
 	else if ( n == 1 ) return f;
 	else {
 		switch ( expand ) {
@@ -3280,7 +3319,7 @@ FNODE nfnode_mul_coef(Obj c,FNODE f,int expand)
 	NODE n,r,r0;
 
 	if ( !c )
-		return mkfnode(I_FORMULA,0);
+		return mkfnode(1,I_FORMULA,NULLP);
 	else {
 		fnode_coef_body(f,&c1,&b1);
 		arf_mul(CO,c,c1,&c2);
@@ -3413,8 +3452,8 @@ int nfnode_comp_lex(FNODE f1,FNODE f2)
 			if ( r ) return r;
 		}
 		if ( !n1 && !n2 ) return 0;
-		h1 = n1 ? (FNODE)BDY(n1) : mkfnode(1,I_FORMULA,0);
-		h2 = n2 ? (FNODE)BDY(n2) : mkfnode(1,I_FORMULA,0);
+		h1 = n1 ? (FNODE)BDY(n1) : mkfnode(1,I_FORMULA,NULLP);
+		h2 = n2 ? (FNODE)BDY(n2) : mkfnode(1,I_FORMULA,NULLP);
 		return nfnode_comp_lex(h1,h2);
 	}
 	if ( IS_NARYMUL(f1) || IS_NARYMUL(f2) ) {
@@ -3437,9 +3476,9 @@ int nfnode_comp_lex(FNODE f1,FNODE f2)
 		fnode_base_exp(f2,&b2,&e2);
 		if ( r = nfnode_comp_lex(b1,b2) ) {
 			if ( r > 0 )
-				return nfnode_comp_lex(e1,mkfnode(1,I_FORMULA,0));
+				return nfnode_comp_lex(e1,mkfnode(1,I_FORMULA,NULLP));
 			else if ( r < 0 )
-				return nfnode_comp_lex(mkfnode(1,I_FORMULA,0),e2);
+				return nfnode_comp_lex(mkfnode(1,I_FORMULA,NULLP),e2);
 		} else return nfnode_comp_lex(e1,e2);
 	}
 				
@@ -3598,7 +3637,7 @@ int nfnode_match(FNODE f,FNODE pat,NODE *rp)
 			} else {
 				/* XXX : I_FUNC_HEAD is a dummy id to pass FUNC */
 				fh = mkfnode(1,I_FUNC_HEAD,FA0(f));
-				m = mknode(1,mknode(2,FA0((FNODE)FA0(pat)),fh),0);
+				m = mknode(1,mknode(2,FA0((FNODE)FA0(pat)),fh),NULLP);
 			}
 			/* FA1(f) and FA1(pat) are I_LIST */
 			fa = (NODE)FA0((FNODE)FA1(f));