===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/spexpr.c,v
retrieving revision 1.32
retrieving revision 1.38
diff -u -p -r1.32 -r1.38
--- OpenXM_contrib2/asir2000/io/spexpr.c	2004/03/17 03:22:47	1.32
+++ OpenXM_contrib2/asir2000/io/spexpr.c	2015/08/07 09:19:43	1.38
@@ -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/spexpr.c,v 1.31 2004/03/17 02:23:45 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/spexpr.c,v 1.37 2015/08/04 06:20:45 noro Exp $
 */
 #include "ca.h"
 #include "al.h"
@@ -56,10 +56,6 @@
 #define SPRINT
 #endif
 
-#if defined(PARI)
-#include "genpari.h"
-#endif
-
 extern int outputstyle;
 
 static char *buf;
@@ -90,6 +86,7 @@ extern int hideargs;
 #define PRINTLIST sprintlist
 #define PRINTVECT sprintvect
 #define PRINTMAT sprintmat
+#define PRINTIMAT sprintimat
 #define PRINTSTR sprintstr
 #define PRINTCOMP sprintcomp
 #define PRINTDP sprintdp
@@ -98,6 +95,8 @@ extern int hideargs;
 #define PRINTGFMMAT sprintgfmmat
 #define PRINTBYTEARRAY sprintbytearray
 #define PRINTQUOTE sprintquote
+#define PRINTQUOTEARG sprintquotearg
+#define PRINTNBP sprintnbp
 #define PRINTERR sprinterr
 #define PRINTLF sprintlf
 #define PRINTLOP sprintlop
@@ -110,6 +109,7 @@ extern int hideargs;
 #define PRINTSYMBOL sprintsymbol
 #define PRINTRANGE sprintrange
 #define PRINTTB sprinttb
+#define PRINTDPV sprintdpv
 #define PRINTFNODE sprintfnode
 #define PRINTFNODENODE sprintfnodenode
 #define PRINTFARGS sprintfargs
@@ -124,29 +124,11 @@ char *s;
 	s[0] = 0; buf = s;
 }
 
-#if defined(PARI)
-void myoutbrute(g)
-GEN g;
-{
-# if PARI_VERSION_CODE > 131588
-	brute(g, 'f', -1);
-# else
-	bruteall(g,'f',-1,1);
-# endif
-}
-
 void sprintbf(BF a)
 {
-	char *str;
-	char *GENtostr0();
-
-	if ( double_output ) {
-		str = GENtostr0(a->body,myoutbrute);
-	} else {
-		str = GENtostr(a->body);
-	}
-	TAIL PRINTF(OUT,"%s",str);
-	free(str);
+	int dprec;
+	char fbuf[BUFSIZ];
+	dprec = a->body->_mpfr_prec*0.30103;
+	sprintf(fbuf,"%%.%dR%c",dprec,double_output?'f':'g');
+	TAIL mpfr_sprintf(OUT,fbuf,a->body);
 }
-#endif
-