=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/cpexpr.c,v retrieving revision 1.7 retrieving revision 1.11 diff -u -p -r1.7 -r1.11 --- OpenXM_contrib2/asir2000/io/cpexpr.c 2000/12/16 06:16:10 1.7 +++ OpenXM_contrib2/asir2000/io/cpexpr.c 2001/04/20 02:34:23 1.11 @@ -44,14 +44,14 @@ * 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.6 2000/11/10 08:28:53 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/cpexpr.c,v 1.10 2001/03/15 05:52:12 noro Exp $ */ #include "ca.h" #include "parse.h" #include "al.h" #include "base.h" -extern int hex_output,fortran_output,double_output; +extern int hex_output,fortran_output,double_output,real_digit; #define PRINTHAT (fortran_output?PUTS("**"):PUTS("^")) @@ -77,6 +77,7 @@ extern int hex_output,fortran_output,double_output; #define PRINTGF2MAT length_gf2mat #define PRINTGFMMAT length_gfmmat #define PRINTBYTEARRAY length_bytearray +#define PRINTQUOTE length_QUOTE #define PRINTERR length_err #define PRINTLF length_lf #define PRINTLOP length_lop @@ -101,6 +102,7 @@ void PRINTUI(); void PRINTGF2MAT(); void PRINTGFMMAT(); void PRINTBYTEARRAY(); +void PRINTQUOTE(); void PRINTERR(); void PRINTCPLX(); void PRINTLM(); @@ -179,6 +181,8 @@ pointer p; PRINTGFMMAT(vl,(GFMMAT)p); break; case O_BYTEARRAY: PRINTBYTEARRAY(vl,(BYTEARRAY)p); break; + case O_QUOTE: + PRINTQUOTE(vl,(QUOTE)p); break; default: break; } @@ -215,9 +219,9 @@ Num q; break; case N_R: if ( double_output ) - total_length += 400; /* XXX */ + total_length += 400+real_digit; /* XXX */ else - total_length += 20; /* XXX */ + total_length += 20+real_digit; /* XXX */ break; case N_A: PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")"); @@ -242,6 +246,9 @@ Num q; case N_GFPN: PRINTUP((UP)(((GFPN)q)->body)); break; + case N_GFS: + total_length += 13; /* XXX */ + break; default: break; } @@ -547,6 +554,14 @@ BYTEARRAY array; { /* |xx xx ... xx| */ total_length += 1+3*array->len; +} + +void PRINTQUOTE(vl,quote) +VL vl; +QUOTE quote; +{ + /* <...quoted...> */ + total_length += 20; } void PRINTERR(vl,e)