=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v retrieving revision 1.59 retrieving revision 1.61 diff -u -p -r1.59 -r1.61 --- OpenXM_contrib2/asir2000/builtin/strobj.c 2005/09/21 23:39:32 1.59 +++ OpenXM_contrib2/asir2000/builtin/strobj.c 2005/09/27 03:00:21 1.61 @@ -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.58 2005/09/18 08:14:22 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.60 2005/09/22 00:23:18 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -105,11 +105,11 @@ struct ftab str_tab[] = { {"clear_tb",Pclear_tb,1}, {"tb_to_string",Ptb_to_string,1}, {"string_to_tb",Pstring_to_tb,1}, - {"quotetotex_tb",Pquotetotex_tb,2,0x1}, - {"quotetotex",Pquotetotex,1,0x1}, - {"quotetotex_env",Pquotetotex_env,-99999999,0x1}, - {"flatten_quote",Pflatten_quote,2,0x1}, - {"quote_to_funargs",Pquote_to_funargs,1,0x1}, + {"quotetotex_tb",Pquotetotex_tb,2}, + {"quotetotex",Pquotetotex,1}, + {"quotetotex_env",Pquotetotex_env,-99999999}, + {"flatten_quote",Pflatten_quote,2}, + {"quote_to_funargs",Pquote_to_funargs,1}, {"quote_unify",Pquote_unify,2,0x3}, {"funargs_to_quote",Pfunargs_to_quote,1}, {"get_function_name",Pget_function_name,1}, @@ -508,12 +508,18 @@ void Pwrite_to_tb(NODE arg,Q *rp) *rp = 0; } +FNODE partial_eval(FNODE); + void Pquote_unify(NODE arg,Q *rp) { + FNODE f,g; + QUOTE q; NODE r; int ret; - ret = quote_unify((Obj)ARG0(arg),(Obj)ARG1(arg),&r); + g = partial_eval(BDY(((QUOTE)ARG0(arg)))); + MKQUOTE(q,g); + ret = quote_unify((Obj)q,(Obj)ARG1(arg),&r); if ( ret ) { do_assign(r); *rp = ONE;