===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/init.c,v
retrieving revision 1.29
retrieving revision 1.35
diff -u -p -r1.29 -r1.35
--- OpenXM_contrib2/asir2000/engine/init.c	2012/12/17 07:20:44	1.29
+++ OpenXM_contrib2/asir2000/engine/init.c	2019/06/04 07:11:22	1.35
@@ -45,9 +45,10 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.28 2009/02/06 08:58:28 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.34 2018/03/29 01:32:52 noro Exp $ 
 */
 #include "ca.h"
+#include "parse.h"
 #include "version.h"
 #include "prime.h"
 
@@ -81,6 +82,7 @@ C IU = &oIU;
 USINT VOIDobj = &oVOID;
 
 int bigfloat;
+int evalef = 0;
 int nez = 1;
 int current_mod = 0;
 int StrassenSize = 0;
@@ -90,8 +92,6 @@ int Itvplot = 33;
 static int *lprime;
 static int lprime_size;
 
-#if defined(PARI)
-int paristack = 1<<16;
 #define ADDBF addbf
 #define SUBBF subbf
 #define MULBF mulbf
@@ -99,18 +99,11 @@ int paristack = 1<<16;
 #define PWRBF pwrbf
 #define CHSGNBF chsgnbf
 #define CMPBF cmpbf
-# else
-#define ADDBF 0
-#define SUBBF 0
-#define MULBF 0
-#define DIVBF 0
-#define PWRBF 0
-#define CHSGNBF 0
-#define CMPBF 0
-#endif
 
 #if defined(INTERVAL)
 int zerorewrite = 0;
+int zerorewriteCount = 0;
+//			N_Q,  N_R,	N_A,	N_B, N4, N_IP,	N_IDouble,N_IQ, N_IBF, N_C,     N_M    N_LM, N_GF2N,   N_GFPN, N_GFS,  N_GFSN,  N_DA, 	N_GZ, N_GQ, N_PARIB
 void (*addnumt[])() = { addq, addreal, addalg, ADDBF, 0, additvp, additvd, 0, additvf, addcplx, addmi, addlm, addgf2n, addgfpn, addgfs, addgfsn, adddalg };
 void (*subnumt[])() = { subq, subreal, subalg, SUBBF, 0, subitvp, subitvd, 0, subitvf, subcplx, submi, sublm, subgf2n, subgfpn, subgfs, subgfsn, subdalg };
 void (*mulnumt[])() = { mulq, mulreal, mulalg, MULBF, 0, mulitvp, mulitvd, 0, mulitvf, mulcplx, mulmi, mullm, mulgf2n, mulgfpn, mulgfs, mulgfsn, muldalg };
@@ -119,6 +112,7 @@ void (*pwrnumt[])() = { pwrq, pwrreal, pwralg, PWRBF, 
 void (*chsgnnumt[])() = { chsgnq, chsgnreal, chsgnalg, CHSGNBF, 0, chsgnitvp, chsgnitvd, 0, chsgnitvf, chsgncplx, chsgnmi, chsgnlm, chsgngf2n, chsgngfpn, chsgngfs , chsgngfsn, chsgndalg};
 int (*cmpnumt[])() = { cmpq, cmpreal, cmpalg, CMPBF, 0, cmpitvp, cmpitvd, 0, cmpitvf, cmpcplx, cmpmi, cmplm, cmpgf2n, cmpgfpn, cmpgfs, cmpgfsn, cmpdalg };
 #else
+//			N_Q,  N_R,	N_A,	N_B,   N_C,     N_M,   N_LM, N_GF2N,   N_GFPN, N_GFS,  N_GFSN,  N_DA, 	N_GZ, N_GQ, N_PARIB
 void (*addnumt[])() = { addq, addreal, addalg, ADDBF, addcplx, addmi, addlm, addgf2n, addgfpn, addgfs, addgfsn, adddalg };
 void (*subnumt[])() = { subq, subreal, subalg, SUBBF, subcplx, submi, sublm, subgf2n, subgfpn, subgfs, subgfsn, subdalg };
 void (*mulnumt[])() = { mulq, mulreal, mulalg, MULBF, mulcplx, mulmi, mullm, mulgf2n, mulgfpn, mulgfs, mulgfsn, muldalg };
@@ -132,62 +126,63 @@ double get_current_time();
 void init_lprime();
 
 void nglob_init() {
-	PL(&oUNIN) = 1; BD(&oUNIN)[0] = 1;
-	PL(&oTWON) = 1; BD(&oTWON)[0] = 2;
-	PL(&oTHREEN) = 1; BD(&oTHREEN)[0] = 3;
-	PL(&oFOURN) = 1; BD(&oFOURN)[0] = 4;
-	PL(&oFIVEN) = 1; BD(&oFIVEN)[0] = 5;
-	PL(&oSIXN) = 1; BD(&oSIXN)[0] = 6;
-	PL(&oSEVENN) = 1; BD(&oSEVENN)[0] = 7;
-	PL(&oEIGHTN) = 1; BD(&oEIGHTN)[0] = 8;
+  PL(&oUNIN) = 1; BD(&oUNIN)[0] = 1;
+  PL(&oTWON) = 1; BD(&oTWON)[0] = 2;
+  PL(&oTHREEN) = 1; BD(&oTHREEN)[0] = 3;
+  PL(&oFOURN) = 1; BD(&oFOURN)[0] = 4;
+  PL(&oFIVEN) = 1; BD(&oFIVEN)[0] = 5;
+  PL(&oSIXN) = 1; BD(&oSIXN)[0] = 6;
+  PL(&oSEVENN) = 1; BD(&oSEVENN)[0] = 7;
+  PL(&oEIGHTN) = 1; BD(&oEIGHTN)[0] = 8;
 
-	oONEUP2.w = 1; oONEUP2.b[0] = 1;
+  oONEUP2.w = 1; oONEUP2.b[0] = 1;
 
-	OID(&oUNIQ) = O_N; NID(&oUNIQ) = N_Q;
-	SGN(&oUNIQ) = 1; NM(&oUNIQ) = &oUNIN; DN(&oUNIQ) = 0;
+  OID(&oUNIQ) = O_N; NID(&oUNIQ) = N_Q;
+  SGN(&oUNIQ) = 1; NM(&oUNIQ) = &oUNIN; DN(&oUNIQ) = 0;
 
-	OID(&oTWOQ) = O_N; NID(&oTWOQ) = N_Q;
-	SGN(&oTWOQ) = 1; NM(&oTWOQ) = &oTWON; DN(&oTWOQ) = 0;
+  OID(&oTWOQ) = O_N; NID(&oTWOQ) = N_Q;
+  SGN(&oTWOQ) = 1; NM(&oTWOQ) = &oTWON; DN(&oTWOQ) = 0;
 
-	OID(&oTHREEQ) = O_N; NID(&oTHREEQ) = N_Q;
-	SGN(&oTHREEQ) = 1; NM(&oTHREEQ) = &oTHREEN; DN(&oTHREEQ) = 0;
+  OID(&oTHREEQ) = O_N; NID(&oTHREEQ) = N_Q;
+  SGN(&oTHREEQ) = 1; NM(&oTHREEQ) = &oTHREEN; DN(&oTHREEQ) = 0;
 
-	OID(&oFOURQ) = O_N; NID(&oFOURQ) = N_Q;
-	SGN(&oFOURQ) = 1; NM(&oFOURQ) = &oFOURN; DN(&oFOURQ) = 0;
+  OID(&oFOURQ) = O_N; NID(&oFOURQ) = N_Q;
+  SGN(&oFOURQ) = 1; NM(&oFOURQ) = &oFOURN; DN(&oFOURQ) = 0;
 
-	OID(&oFIVEQ) = O_N; NID(&oFIVEQ) = N_Q;
-	SGN(&oFIVEQ) = 1; NM(&oFIVEQ) = &oFIVEN; DN(&oFIVEQ) = 0;
+  OID(&oFIVEQ) = O_N; NID(&oFIVEQ) = N_Q;
+  SGN(&oFIVEQ) = 1; NM(&oFIVEQ) = &oFIVEN; DN(&oFIVEQ) = 0;
 
-	OID(&oSIXQ) = O_N; NID(&oSIXQ) = N_Q;
-	SGN(&oSIXQ) = 1; NM(&oSIXQ) = &oSIXN; DN(&oSIXQ) = 0;
+  OID(&oSIXQ) = O_N; NID(&oSIXQ) = N_Q;
+  SGN(&oSIXQ) = 1; NM(&oSIXQ) = &oSIXN; DN(&oSIXQ) = 0;
 
-	OID(&oSEVENQ) = O_N; NID(&oSEVENQ) = N_Q;
-	SGN(&oSEVENQ) = 1; NM(&oSEVENQ) = &oSEVENN; DN(&oSEVENQ) = 0;
+  OID(&oSEVENQ) = O_N; NID(&oSEVENQ) = N_Q;
+  SGN(&oSEVENQ) = 1; NM(&oSEVENQ) = &oSEVENN; DN(&oSEVENQ) = 0;
 
-	OID(&oEIGHTQ) = O_N; NID(&oEIGHTQ) = N_Q;
-	SGN(&oEIGHTQ) = 1; NM(&oEIGHTQ) = &oEIGHTN; DN(&oEIGHTQ) = 0;
+  OID(&oEIGHTQ) = O_N; NID(&oEIGHTQ) = N_Q;
+  SGN(&oEIGHTQ) = 1; NM(&oEIGHTQ) = &oEIGHTN; DN(&oEIGHTQ) = 0;
 
-	OID(&oUNIR) = O_R; NM(&oUNIR) = (P)&oUNIQ; DN(&oUNIR) = (P)&oUNIQ; oUNIR.reduced = 1;
-	OID(&oUNIMQ) = O_N; NID(&oUNIMQ) = N_M; CONT(&oUNIMQ) = 1;
-	OID(&oUNILM) = O_N; NID(&oUNILM) = N_LM; BDY(&oUNILM) = ONEN;
-	OID(&oIU) = O_N; NID(&oIU) = N_C; oIU.r = 0; oIU.i = (Num)ONE;
+  OID(&oUNIR) = O_R; NM(&oUNIR) = (P)&oUNIQ; DN(&oUNIR) = (P)&oUNIQ; oUNIR.reduced = 1;
+  OID(&oUNIMQ) = O_N; NID(&oUNIMQ) = N_M; CONT(&oUNIMQ) = 1;
+  OID(&oUNILM) = O_N; NID(&oUNILM) = N_LM; BDY(&oUNILM) = ONEN;
+  OID(&oIU) = O_N; NID(&oIU) = N_C; oIU.r = 0; oIU.i = (Num)ONE;
 
-	MKLM(&oTHREEN,THREE_LM);
-	MKLM(&oFOURN,FOUR_LM);
-	MKLM(&oEIGHTN,EIGHT_LM);
+  MKLM(&oTHREEN,THREE_LM);
+  MKLM(&oFOURN,FOUR_LM);
+  MKLM(&oEIGHTN,EIGHT_LM);
 
-	OID(&oVOID) = O_VOID;
+  OID(&oVOID) = O_VOID;
 
 /* moved to parse/main.c */
 #if 0
 #if defined(PARI)
-	risa_pari_init();
+  risa_pari_init();
 #endif
-	srandom((int)get_current_time());
+  srandom((int)get_current_time());
 #endif
-	init_up2_tab();
+  init_up2_tab();
 
-	init_lprime();
+  init_lprime();
+  init_gmpq();
 }
 
 extern double GC_get_gctime();
@@ -196,48 +191,48 @@ double suspended_time=0;
 
 void get_eg(struct oEGT *p)
 {
-	double gctime = GC_get_gctime();
-	p->exectime = get_clock() - gctime - suspended_time; p->gctime = gctime;
+  double gctime = GC_get_gctime();
+  p->exectime = get_clock() - gctime - suspended_time; p->gctime = gctime;
 }
 
 void init_eg(struct oEGT *eg)
 {
-	bzero((char *)eg,sizeof(struct oEGT));
+  bzero((char *)eg,sizeof(struct oEGT));
 }
 
 void add_eg(struct oEGT *base,struct oEGT *start,struct oEGT *end)
 {
-	base->exectime += end->exectime - start->exectime;
-	base->gctime += end->gctime - start->gctime;
+  base->exectime += end->exectime - start->exectime;
+  base->gctime += end->gctime - start->gctime;
 }
 
 void print_eg(char *item,struct oEGT *eg)
 {
-	printf("%s=(%.4g,%.4g)",item,eg->exectime,eg->gctime);
+  printf("%s=(%.4g,%.4g)",item,eg->exectime,eg->gctime);
 }
 
 void print_split_eg(struct oEGT *start,struct oEGT *end)
 {
-	struct oEGT base;
+  struct oEGT base;
 
-	init_eg(&base); add_eg(&base,start,end);
-	printf("(%.4g,%.4g)",base.exectime,base.gctime);
+  init_eg(&base); add_eg(&base,start,end);
+  printf("(%.4g,%.4g)",base.exectime,base.gctime);
 }
 
 void print_split_e(struct oEGT *start,struct oEGT *end)
 {
-	struct oEGT base;
+  struct oEGT base;
 
-	init_eg(&base); add_eg(&base,start,end);
-	printf("(%.4g)",base.exectime);
+  init_eg(&base); add_eg(&base,start,end);
+  printf("(%.4g)",base.exectime);
 }
 
 void suspend_timer() {
-	suspend_start = get_clock();
+  suspend_start = get_clock();
 }
 
 void resume_timer() {
-	suspended_time += get_clock()-suspend_start;
+  suspended_time += get_clock()-suspend_start;
 }
 
 extern int lm_lazy, up_lazy;
@@ -246,84 +241,84 @@ extern int do_weyl;
 extern int dp_fcoeffs;
 
 void reset_engine() {
-	lm_lazy = 0;
-	up_lazy = 0;
-	do_weyl = 0;
-	dp_fcoeffs = 0;
-	GC_dont_gc = 0;
+  lm_lazy = 0;
+  up_lazy = 0;
+  do_weyl = 0;
+  dp_fcoeffs = 0;
+  GC_dont_gc = 0;
 }
 
 unsigned int get_asir_version() {
-	return ASIR_VERSION;
+  return ASIR_VERSION;
 }
 
 char *get_asir_distribution() {
-	return ASIR_DISTRIBUTION;
+  return ASIR_DISTRIBUTION;
 }
 
 
 void create_error(ERR *err,unsigned int serial,char *msg,LIST trace)
 {
-	int len;
-	USINT ui,notsupp;
-	NODE n,n1;
-	LIST list;
-	char *msg1;
-	STRING errmsg;
+  int len;
+  USINT ui,notsupp;
+  NODE n,n1;
+  LIST list;
+  char *msg1;
+  STRING errmsg;
 
-	MKUSINT(ui,serial);
-	MKUSINT(notsupp,-1);
-	len = strlen(msg);
-	msg1 = (char *)MALLOC(len+1);
-	strcpy(msg1,msg);
-	MKSTR(errmsg,msg1);
-	if ( !trace )
-		MKLIST(trace,0);
-	n = mknode(4,ui,notsupp,errmsg,trace); MKLIST(list,n);
-	MKERR(*err,list);
+  MKUSINT(ui,serial);
+  MKUSINT(notsupp,-1);
+  len = strlen(msg);
+  msg1 = (char *)MALLOC(len+1);
+  strcpy(msg1,msg);
+  MKSTR(errmsg,msg1);
+  if ( !trace )
+    MKLIST(trace,0);
+  n = mknode(4,ui,notsupp,errmsg,trace); MKLIST(list,n);
+  MKERR(*err,list);
 }
 
 void init_lprime()
 {
-	int s,i;
+  int s,i;
 
-	s = sizeof(lprime_init);
-	lprime = (int *)MALLOC_ATOMIC(s);
-	lprime_size = s/sizeof(int);	
-	for ( i = 0; i < lprime_size; i++ )
-		lprime[i] = lprime_init[lprime_size-i-1];
+  s = sizeof(lprime_init);
+  lprime = (int *)MALLOC_ATOMIC(s);
+  lprime_size = s/sizeof(int);  
+  for ( i = 0; i < lprime_size; i++ )
+    lprime[i] = lprime_init[lprime_size-i-1];
 }
 
 void create_new_lprimes(int);
 
 int get_lprime(index)
 {
-	if ( index >= lprime_size )
-		create_new_lprimes(index);
-	return lprime[index];
+  if ( index >= lprime_size )
+    create_new_lprimes(index);
+  return lprime[index];
 }
 
 void create_new_lprimes(int index)
 {
-	int count,p,i,j,d;
+  int count,p,i,j,d;
 
-	if ( index < lprime_size )
-		return;
-	count = index-lprime_size+1;
-	if ( count < 256 )
-		count = 256;
-	lprime = (int *)GC_realloc(lprime,(lprime_size+count)*sizeof(int));
-	p = lprime[lprime_size-1]+2;
-	for ( i = 0; i < count; p += 2 ) {
-		for ( j = 0; d = sprime[j]; j++ ) {
-			if ( d*d > p ) {
-				lprime[i+lprime_size] = p;
-				i++;
-				break;
-			}
-			if ( !(p%d) )
-				break;
-		}
-	}
-	lprime_size += count;
+  if ( index < lprime_size )
+    return;
+  count = index-lprime_size+1;
+  if ( count < 256 )
+    count = 256;
+  lprime = (int *)GC_realloc(lprime,(lprime_size+count)*sizeof(int));
+  p = lprime[lprime_size-1]+2;
+  for ( i = 0; i < count; p += 2 ) {
+    for ( j = 0; d = sprime[j]; j++ ) {
+      if ( d*d > p ) {
+        lprime[i+lprime_size] = p;
+        i++;
+        break;
+      }
+      if ( !(p%d) )
+        break;
+    }
+  }
+  lprime_size += count;
 }