=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/print.c,v retrieving revision 1.15 retrieving revision 1.17 diff -u -p -r1.15 -r1.17 --- OpenXM_contrib2/asir2000/builtin/print.c 2003/11/08 01:12:02 1.15 +++ OpenXM_contrib2/asir2000/builtin/print.c 2004/05/14 09:20:56 1.17 @@ -45,18 +45,20 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.14 2001/10/09 01:36:07 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.16 2004/03/03 01:16:28 noro Exp $ */ #include "ca.h" #include "parse.h" void Pprint(); void Pquotetolist(); +void Pobjtoquote(); void Peval_variables_in_quote(); void Pset_print_function(); struct ftab print_tab[] = { {"print",Pprint,-2}, + {"objtoquote",Pobjtoquote,1}, {"quotetolist",Pquotetolist,1}, {"eval_variables_in_quote",Peval_variables_in_quote,1}, {"set_print_function",Pset_print_function,-1}, @@ -66,15 +68,15 @@ struct ftab print_tab[] = { void Pprint(NODE arg,pointer *rp) { Obj obj; - OPTLIST opt; + Q opt; if ( arg ) { obj = (Obj)ARG0(arg); if ( NEXT(arg) ) { - opt = (OPTLIST)ARG1(arg); + opt = (Q)ARG1(arg); if ( INT(opt) ) { printexpr(CO,obj); - switch ( QTOS((Q)opt) ) { + switch ( QTOS(opt) ) { case 0: break; case 2: @@ -83,7 +85,6 @@ void Pprint(NODE arg,pointer *rp) case 1: default: putc('\n',asir_out); break; } - } else if ( OID(opt) == O_OPTLIST ) { } else error("print : invalid argument"); } else { @@ -92,6 +93,11 @@ void Pprint(NODE arg,pointer *rp) } } *rp = 0; +} + +void Pobjtoquote(NODE arg,QUOTE *rp) +{ + objtoquote(ARG0(arg),rp); } void Pquotetolist(NODE arg,LIST *rp)