===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- OpenXM_contrib2/asir2000/parse/eval.c	2005/10/05 09:39:13	1.50
+++ OpenXM_contrib2/asir2000/parse/eval.c	2005/10/12 03:31:04	1.51
@@ -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/parse/eval.c,v 1.49 2005/10/05 07:38:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.50 2005/10/05 09:39:13 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -351,10 +351,10 @@ pointer eval(FNODE f)
 	return ( val );
 }
 
-NODE quote_to_nary_node(NODE);
-NODE quote_to_bin_node(NODE,int);
+NODE fnode_to_nary_node(NODE);
+NODE fnode_to_bin_node(NODE,int);
 
-FNODE quote_to_nary(FNODE f)
+FNODE fnode_to_nary(FNODE f)
 {
 	FNODE a0,a1,a2;
 	NODE n,t,t0;
@@ -365,12 +365,12 @@ FNODE quote_to_nary(FNODE f)
 		return f;
 	switch ( f->id ) {
 		case I_NARYOP:
-				n = quote_to_nary_node((NODE)FA1(f));
+				n = fnode_to_nary_node((NODE)FA1(f));
 				return mkfnode(2,I_NARYOP,FA0(f),n);
 
 		case I_BOP: 
-			a1 = quote_to_nary((FNODE)FA1(f));
-			a2 = quote_to_nary((FNODE)FA2(f));
+			a1 = fnode_to_nary((FNODE)FA1(f));
+			a2 = fnode_to_nary((FNODE)FA2(f));
 			op = ((ARF)FA0(f))->name;
 			if ( !strcmp(op,"+") || !strcmp(op,"*") ) {
 				if ( a1->id == I_NARYOP && !strcmp(op,((ARF)FA0(a1))->name) ) {
@@ -392,45 +392,45 @@ FNODE quote_to_nary(FNODE f)
 
 		case I_NOT: case I_PAREN: case I_MINUS:
 		case I_CAR: case I_CDR:
-			a0 = quote_to_nary((FNODE)FA0(f));
+			a0 = fnode_to_nary((FNODE)FA0(f));
 			return mkfnode(1,f->id,a0);
 
 		case I_COP: case I_LOP:
-			a1 = quote_to_nary((FNODE)FA1(f));
-			a2 = quote_to_nary((FNODE)FA2(f));
+			a1 = fnode_to_nary((FNODE)FA1(f));
+			a2 = fnode_to_nary((FNODE)FA2(f));
 			return mkfnode(3,f->id,FA0(f),a1,a2);
 
 		case I_AND: case I_OR:
-			a0 = quote_to_nary((FNODE)FA0(f));
-			a1 = quote_to_nary((FNODE)FA1(f));
+			a0 = fnode_to_nary((FNODE)FA0(f));
+			a1 = fnode_to_nary((FNODE)FA1(f));
 			return mkfnode(2,f->id,a0,a1);
 
 		/* ternary operators */
 		case I_CE:
-			a0 = quote_to_nary((FNODE)FA0(f));
-			a1 = quote_to_nary((FNODE)FA1(f));
-			a2 = quote_to_nary((FNODE)FA2(f));
+			a0 = fnode_to_nary((FNODE)FA0(f));
+			a1 = fnode_to_nary((FNODE)FA1(f));
+			a2 = fnode_to_nary((FNODE)FA2(f));
 			return mkfnode(3,f->id,a0,a1,a2);
 			break;
 
 		/* function */
 		case I_FUNC:
-			a1 = quote_to_nary((FNODE)FA1(f));
+			a1 = fnode_to_nary((FNODE)FA1(f));
 			return mkfnode(2,f->id,FA0(f),a1);
 
 		case I_LIST: case I_EV:
-			n = quote_to_nary_node((NODE)FA0(f));
+			n = fnode_to_nary_node((NODE)FA0(f));
 			return mkfnode(1,f->id,n);
 
 		case I_STR: case I_FORMULA: case I_PVAR:
 			return f;
 
 		default:
-			error("quote_to_nary : not implemented yet");
+			error("fnode_to_nary : not implemented yet");
 	}
 }
 
-FNODE quote_to_bin(FNODE f,int dir)
+FNODE fnode_to_bin(FNODE f,int dir)
 {
 	FNODE a0,a1,a2;
 	NODE n,t;
@@ -447,7 +447,7 @@ FNODE quote_to_bin(FNODE f,int dir)
 			len = length((NODE)FA1(f));
 			arg = (FNODE *)ALLOCA(len*sizeof(FNODE));
 			for ( i = 0, t = (NODE)FA1(f); i < len; i++, t = NEXT(t) )
-				arg[i] = quote_to_bin((FNODE)BDY(t),dir);
+				arg[i] = fnode_to_bin((FNODE)BDY(t),dir);
 			if ( dir ) {
 				a2 = mkfnode(3,I_BOP,fun,arg[len-2],arg[len-1]);
 				for ( i = len-3; i >= 0; i-- )
@@ -461,41 +461,41 @@ FNODE quote_to_bin(FNODE f,int dir)
 
 		case I_NOT: case I_PAREN: case I_MINUS:
 		case I_CAR: case I_CDR:
-			a0 = quote_to_bin((FNODE)FA0(f),dir);
+			a0 = fnode_to_bin((FNODE)FA0(f),dir);
 			return mkfnode(1,f->id,a0);
 
 		case I_BOP: case I_COP: case I_LOP:
-			a1 = quote_to_bin((FNODE)FA1(f),dir);
-			a2 = quote_to_bin((FNODE)FA2(f),dir);
+			a1 = fnode_to_bin((FNODE)FA1(f),dir);
+			a2 = fnode_to_bin((FNODE)FA2(f),dir);
 			return mkfnode(3,f->id,FA0(f),a1,a2);
 
 		case I_AND: case I_OR:
-			a0 = quote_to_bin((FNODE)FA0(f),dir);
-			a1 = quote_to_bin((FNODE)FA1(f),dir);
+			a0 = fnode_to_bin((FNODE)FA0(f),dir);
+			a1 = fnode_to_bin((FNODE)FA1(f),dir);
 			return mkfnode(2,f->id,a0,a1);
 
 		/* ternary operators */
 		case I_CE:
-			a0 = quote_to_bin((FNODE)FA0(f),dir);
-			a1 = quote_to_bin((FNODE)FA1(f),dir);
-			a2 = quote_to_bin((FNODE)FA2(f),dir);
+			a0 = fnode_to_bin((FNODE)FA0(f),dir);
+			a1 = fnode_to_bin((FNODE)FA1(f),dir);
+			a2 = fnode_to_bin((FNODE)FA2(f),dir);
 			return mkfnode(3,f->id,a0,a1,a2);
 			break;
 
 		/* function */
 		case I_FUNC:
-			a1 = quote_to_bin((FNODE)FA1(f),dir);
+			a1 = fnode_to_bin((FNODE)FA1(f),dir);
 			return mkfnode(2,f->id,FA0(f),a1);
 
 		case I_LIST: case I_EV:
-			n = quote_to_bin_node((NODE)FA0(f),dir);
+			n = fnode_to_bin_node((NODE)FA0(f),dir);
 			return mkfnode(1,f->id,n);
 
 		case I_STR: case I_FORMULA: case I_PVAR:
 			return f;
 
 		default:
-			error("quote_to_bin : not implemented yet");
+			error("fnode_to_bin : not implemented yet");
 	}
 }
 
@@ -652,25 +652,25 @@ NODE rewrite_fnode_node(NODE n,NODE arg)
 	return r0;
 }
 
-NODE quote_to_nary_node(NODE n)
+NODE fnode_to_nary_node(NODE n)
 {
 	NODE r0,r,t;
 
 	for ( r0 = 0, t = n; t; t = NEXT(t) ) {
 		NEXTNODE(r0,r);
-		BDY(r) = quote_to_nary((FNODE)BDY(t));
+		BDY(r) = fnode_to_nary((FNODE)BDY(t));
 	}
 	if ( r0 ) NEXT(r) = 0;
 	return r0;
 }
 
-NODE quote_to_bin_node(NODE n,int dir)
+NODE fnode_to_bin_node(NODE n,int dir)
 {
 	NODE r0,r,t;
 
 	for ( r0 = 0, t = n; t; t = NEXT(t) ) {
 		NEXTNODE(r0,r);
-		BDY(r) = quote_to_bin((FNODE)BDY(t),dir);
+		BDY(r) = fnode_to_bin((FNODE)BDY(t),dir);
 	}
 	if ( r0 ) NEXT(r) = 0;
 	return r0;