=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v retrieving revision 1.22 retrieving revision 1.24 diff -u -p -r1.22 -r1.24 --- OpenXM_contrib2/asir2000/io/cpexpr.c 2004/05/14 06:02:54 1.22 +++ OpenXM_contrib2/asir2000/io/cpexpr.c 2004/12/10 07:36:35 1.24 @@ -44,7 +44,7 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.21 2004/03/17 03:22:47 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.23 2004/07/13 07:59:54 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -85,6 +85,7 @@ static int total_length; #define PRINTGFMMAT length_gfmmat #define PRINTBYTEARRAY length_bytearray #define PRINTQUOTE length_QUOTE +#define PRINTQUOTEARG length_QUOTEARG #define PRINTSYMBOL length_SYMBOL #define PRINTRANGE length_RANGE #define PRINTTB length_TB @@ -134,6 +135,10 @@ void PRINTBF(BF a) void PRINTNUM(Num q) { + DAlg d; + DP nm; + Q dn; + if ( !q ) { PUTS("0"); return; @@ -182,6 +187,19 @@ void PRINTNUM(Num q) 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; default: break; } @@ -329,6 +347,13 @@ void PRINTQUOTE(VL vl,QUOTE quote) /* <...quoted...> */ total_length += 20; } +} + +void PRINTQUOTEARG(VL vl,QUOTEARG quote) +{ + /* XXX */ + /* <...quoted...> */ + total_length += 20; } void PRINTSYMBOL(SYMBOL sym)