=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/print.c,v retrieving revision 1.14 retrieving revision 1.16 diff -u -p -r1.14 -r1.16 --- OpenXM_contrib2/asir2000/builtin/print.c 2001/10/09 01:36:07 1.14 +++ OpenXM_contrib2/asir2000/builtin/print.c 2004/03/03 01:16:28 1.16 @@ -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.13 2001/09/05 09:01:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/print.c,v 1.15 2003/11/08 01:12:02 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}, @@ -65,20 +67,38 @@ struct ftab print_tab[] = { void Pprint(NODE arg,pointer *rp) { - printexpr(CO,ARG0(arg)); - if ( argc(arg) == 2 ) - switch ( QTOS((Q)ARG1(arg)) ) { - case 0: - break; - case 2: - fflush(asir_out); break; - break; - case 1: default: - putc('\n',asir_out); break; + Obj obj; + OPTLIST opt; + + if ( arg ) { + obj = (Obj)ARG0(arg); + if ( NEXT(arg) ) { + opt = (OPTLIST)ARG1(arg); + if ( INT(opt) ) { + printexpr(CO,obj); + switch ( QTOS((Q)opt) ) { + case 0: + break; + case 2: + fflush(asir_out); break; + break; + case 1: default: + putc('\n',asir_out); break; + } + } else if ( OID(opt) == O_OPTLIST ) { + } else + error("print : invalid argument"); + } else { + printexpr(CO,obj); + putc('\n',asir_out); } - else - putc('\n',asir_out); + } *rp = 0; +} + +void Pobjtoquote(NODE arg,QUOTE *rp) +{ + objtoquote(ARG0(arg),rp); } void Pquotetolist(NODE arg,LIST *rp)