=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v retrieving revision 1.18 retrieving revision 1.21 diff -u -p -r1.18 -r1.21 --- OpenXM_contrib2/asir2000/io/pexpr.c 2002/01/08 04:14:39 1.18 +++ OpenXM_contrib2/asir2000/io/pexpr.c 2003/02/14 22:29:15 1.21 @@ -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/pexpr.c,v 1.17 2001/10/09 01:36:21 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.20 2002/09/11 07:23:27 noro Exp $ */ #include "ca.h" #include "al.h" @@ -79,7 +79,7 @@ int print_quote; #define PRINTV printv #define PRINTEXPR printexpr #define PRINTNUM printnum -#define PRINTP printp +#define PRINTP asir_printp #define PRINTR printr #define PRINTLIST printlist #define PRINTVECT printvect @@ -124,7 +124,7 @@ extern int print_quote; #define PRINTV sprintv #define PRINTEXPR sprintexpr #define PRINTNUM sprintnum -#define PRINTP sprintp +#define PRINTP asir_sprintp #define PRINTR sprintr #define PRINTLIST sprintlist #define PRINTVECT sprintvect @@ -203,7 +203,7 @@ P p; return (mmono(COEF(DC(p)))); } -#if PARI +#if defined(PARI) void printbf(a) BF a; { @@ -221,7 +221,7 @@ char *s; s[0] = 0; buf = s; } -#if PARI +#if defined(PARI) #include "genpari.h" void myoutbrute(g) @@ -406,7 +406,7 @@ Num q; case N_A: PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")"); break; -#if PARI +#if defined(PARI) case N_B: PRINTBF((BF)q); break; #endif @@ -555,8 +555,8 @@ V v; else if ( (vid)v->attr == V_PF ) { pf = ((PFINS)v->priv)->pf; ad = ((PFINS)v->priv)->ad; if ( !strcmp(NAME(pf),"pow") ) { - PUTS("("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("("); - PRINTR(vl,(R)ad[1].arg); PUTS(")"); + PUTS("(("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("("); + PRINTR(vl,(R)ad[1].arg); PUTS("))"); } else if ( !pf->argc ) { TAIL PRINTF(OUT,"%s",NAME(pf)); } else {