=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr_body.c,v retrieving revision 1.4 retrieving revision 1.6 diff -u -p -r1.4 -r1.6 --- OpenXM_contrib2/asir2000/io/pexpr_body.c 2004/07/13 07:59:54 1.4 +++ OpenXM_contrib2/asir2000/io/pexpr_body.c 2004/12/17 03:09:08 1.6 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/pexpr_body.c,v 1.3 2004/05/14 06:02:54 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/io/pexpr_body.c,v 1.5 2004/12/02 13:48:43 noro Exp $ */ #define PRINTHAT (fortran_output?PUTS("**"):PUTS("^")) @@ -38,14 +38,12 @@ void PRINTTB(); void PRINTDPV(); void PRINTFNODE(); void PRINTBF(); +void PRINTDAlg(); void PRINTEXPR(vl,p) VL vl; Obj p; { -#if defined(FPRINT) - if ( asir_texmacs && !user_print_function ) printf("\2verbatim:"); -#endif if ( !p ) { PRINTR(vl,(R)p); } else @@ -97,10 +95,6 @@ Obj p; default: break; } -#if defined(FPRINT) - if ( asir_texmacs && !user_print_function ) - { putchar('\5'); fflush(stdout); } -#endif } #if defined(FPRINT) @@ -600,6 +594,9 @@ void PRINTNUM(q) Num q; { char real_format[20]; + DAlg d; + DP nm; + Q dn; if ( !q ) { PUTS("0"); @@ -820,6 +817,19 @@ Num q; break; case N_GFSN: PRINTUM(BDY((GFSN)q)); + break; + case N_DA: + d = (DAlg)q; + nm = d->nm; + dn = d->dn; + if ( SGN((Q)dn) == -1 ) PUTS("-"); + PUTS("("); + PRINTDP(CO,((DAlg)q)->nm); + PUTS(")"); + if ( !UNIN(NM(dn)) ) { + PUTS("/"); + PRINTN(NM(dn)); + } break; } }