===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.118
retrieving revision 1.121
diff -u -p -r1.118 -r1.121
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2007/04/15 11:01:01	1.118
+++ 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.117 2006/08/27 22:17:27 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"
@@ -470,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;
@@ -849,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);
 	}
@@ -1288,6 +1288,7 @@ NODE arg;
 Obj *rp;
 {
 	FNODE fnode;
+	SNODE snode;
 	char *cmd;
 #if defined(PARI)
 	void recover(int);
@@ -1301,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)
@@ -1324,6 +1330,7 @@ NODE arg;
 P *rp;
 {
 	char *p;
+	FUNC f;
 
 	p = BDY((STRING)ARG0(arg));
 #if 0
@@ -1337,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
 }
 
@@ -1425,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);