===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/spexpr.c,v
retrieving revision 1.34
retrieving revision 1.41
diff -u -p -r1.34 -r1.41
--- OpenXM_contrib2/asir2000/io/spexpr.c	2004/07/13 07:59:54	1.34
+++ OpenXM_contrib2/asir2000/io/spexpr.c	2018/03/29 01:32:53	1.41
@@ -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.33 2004/05/14 06:02:54 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/spexpr.c,v 1.40 2017/08/31 02:36:21 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,15 +86,18 @@ extern int hideargs;
 #define PRINTLIST sprintlist
 #define PRINTVECT sprintvect
 #define PRINTMAT sprintmat
+#define PRINTIMAT sprintimat
 #define PRINTSTR sprintstr
 #define PRINTCOMP sprintcomp
 #define PRINTDP sprintdp
+#define PRINTDPM sprintdpm
 #define PRINTUI sprintui
 #define PRINTGF2MAT sprintgf2mat
 #define PRINTGFMMAT sprintgfmmat
 #define PRINTBYTEARRAY sprintbytearray
 #define PRINTQUOTE sprintquote
 #define PRINTQUOTEARG sprintquotearg
+#define PRINTNBP sprintnbp
 #define PRINTERR sprinterr
 #define PRINTLF sprintlf
 #define PRINTLOP sprintlop
@@ -123,32 +122,17 @@ extern int hideargs;
 void soutput_init(s)
 char *s;
 {
-	s[0] = 0; buf = 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];
+  char *s;
+  dprec = a->body->_mpfr_prec*0.30103;
+  sprintf(fbuf,"%%.%dR%c",dprec,double_output?'f':'g');
+  mpfr_asprintf(&s,fbuf,a->body);
+  TAIL PUTS(s);
+  mpfr_free_str(s);
 }
-#endif
-