=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v retrieving revision 1.56 retrieving revision 1.62 diff -u -p -r1.56 -r1.62 --- OpenXM_contrib2/asir2000/builtin/strobj.c 2005/09/13 06:40:45 1.56 +++ OpenXM_contrib2/asir2000/builtin/strobj.c 2005/09/27 09:32:22 1.62 @@ -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.55 2005/07/26 01:33:46 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.61 2005/09/27 03:00:21 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -79,6 +79,7 @@ void Pquotetotex_env(); void Pflatten_quote(); void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name(); void Pquote_unify(); +void do_assign(NODE arg); void fnodetotex_tb(FNODE f,TB tb); char *symbol_name(char *name); char *conv_rule(char *name); @@ -507,15 +508,26 @@ void Pwrite_to_tb(NODE arg,Q *rp) *rp = 0; } -void Pquote_unify(NODE arg,LIST *rp) +FNODE partial_eval(FNODE); + +void Pquote_unify(NODE arg,Q *rp) { + FNODE f,g; + QUOTE q; NODE r; int ret; +#if 0 + g = partial_eval(BDY(((QUOTE)ARG0(arg)))); + MKQUOTE(q,g); + ret = quote_unify((Obj)q,(Obj)ARG1(arg),&r); +#else ret = quote_unify((Obj)ARG0(arg),(Obj)ARG1(arg),&r); - if ( ret ) - MKLIST(*rp,r); - else +#endif + if ( ret ) { + do_assign(r); + *rp = ONE; + } else *rp = 0; }