===================================================================
RCS file: /home/cvs/OpenXM/src/ox_pari/ox_pari.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- OpenXM/src/ox_pari/ox_pari.c	2015/08/17 05:18:35	1.3
+++ OpenXM/src/ox_pari/ox_pari.c	2015/08/17 06:14:37	1.4
@@ -1,4 +1,4 @@
-/*	$OpenXM: OpenXM/src/ox_pari/ox_pari.c,v 1.2 2015/08/06 09:15:32 noro Exp $	*/
+/*  $OpenXM: OpenXM/src/ox_pari/ox_pari.c,v 1.3 2015/08/17 05:18:35 noro Exp $  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,7 +47,7 @@ void gc_free(void *p,size_t size)
 
 void init_gc()
 {
-	GC_INIT();
+  GC_INIT();
   mp_set_memory_functions(GC_malloc,gc_realloc,gc_free);
 }
 
@@ -58,48 +58,48 @@ void init_pari()
 
 int initialize_stack()
 {
-	stack_pointer = 0;
- 	stack_size = INIT_S_SIZE;
-	stack = MALLOC(stack_size*sizeof(cmo*));
-	return 0;
+  stack_pointer = 0;
+   stack_size = INIT_S_SIZE;
+  stack = MALLOC(stack_size*sizeof(cmo*));
+  return 0;
 }
 
 static int extend_stack()
 {
-	int size2 = stack_size + EXT_S_SIZE;
-	cmo **stack2 = MALLOC(size2*sizeof(cmo*));
-	memcpy(stack2, stack, stack_size*sizeof(cmo *));
-	free(stack);
-	stack = stack2;
-	stack_size = size2;
-	return 0;
+  int size2 = stack_size + EXT_S_SIZE;
+  cmo **stack2 = MALLOC(size2*sizeof(cmo*));
+  memcpy(stack2, stack, stack_size*sizeof(cmo *));
+  free(stack);
+  stack = stack2;
+  stack_size = size2;
+  return 0;
 }
 
 int push(cmo* m)
 {
- 	stack[stack_pointer] = m;
-	stack_pointer++;
-	if(stack_pointer >= stack_size) {
-		extend_stack();
-	}
-	return 0;
+  stack[stack_pointer] = m;
+  stack_pointer++;
+  if(stack_pointer >= stack_size) {
+    extend_stack();
+  }
+  return 0;
 }
 
 cmo* pop()
 {
-	if(stack_pointer > 0) {
-		stack_pointer--;
-		return stack[stack_pointer];
-	}
-	return new_cmo_null();
+  if(stack_pointer > 0) {
+    stack_pointer--;
+    return stack[stack_pointer];
+  }
+  return new_cmo_null();
 }
 
 void pops(int n)
 {
-	stack_pointer -= n;
-	if(stack_pointer < 0) {
-		stack_pointer = 0;
-	}
+  stack_pointer -= n;
+  if(stack_pointer < 0) {
+    stack_pointer = 0;
+  }
 }
 
 #define OX_PARI_VERSION 20150731
@@ -107,60 +107,60 @@ void pops(int n)
 
 int sm_mathcap()
 {
-	mathcap_init(OX_PARI_VERSION, ID_STRING, "ox_pari", NULL, NULL);
-	push((cmo*)oxf_cmo_mathcap(fd_rw));
-	return 0;
+  mathcap_init(OX_PARI_VERSION, ID_STRING, "ox_pari", NULL, NULL);
+  push((cmo*)oxf_cmo_mathcap(fd_rw));
+  return 0;
 }
 
 int sm_popCMO()
 {
-	cmo* m = pop();
+  cmo* m = pop();
 
-	if(m != NULL) {
-		send_ox_cmo(fd_rw, m);
-		return 0;
-	}
-	return SM_popCMO;
+  if(m != NULL) {
+    send_ox_cmo(fd_rw, m);
+    return 0;
+  }
+  return SM_popCMO;
 }
 
 cmo_error2 *make_error2(int code)
 {
-	return (cmo_error2 *) new_cmo_int32(code);
+  return (cmo_error2 *) new_cmo_int32(code);
 }
 
 int get_i()
 {
-	cmo *c = pop();
-	if(c->tag == CMO_INT32) {
-		return ((cmo_int32 *)c)->i;
-	}else if(c->tag == CMO_ZZ) {
-		return mpz_get_si(((cmo_zz *)c)->mpz);
-	}
-	make_error2(-1);
-	return 0;
+  cmo *c = pop();
+  if(c->tag == CMO_INT32) {
+    return ((cmo_int32 *)c)->i;
+  }else if(c->tag == CMO_ZZ) {
+    return mpz_get_si(((cmo_zz *)c)->mpz);
+  }
+  make_error2(-1);
+  return 0;
 }
 
 char *get_str()
 {
-	cmo *c = pop();
-	if(c->tag == CMO_STRING) {
-		return ((cmo_string *)c)->s;
-	}
-	make_error2(-1);
-	return "";
+  cmo *c = pop();
+  if(c->tag == CMO_STRING) {
+    return ((cmo_string *)c)->s;
+  }
+  make_error2(-1);
+  return "";
 }
 
 int cmo2int(cmo *c)
 {
-	if(c->tag == CMO_INT32) {
-		return ((cmo_int32 *)c)->i;
-	}else if(c->tag == CMO_ZZ) {
-		return mpz_get_si(((cmo_zz *)c)->mpz);
-	} else if(c->tag == CMO_NULL){
-		return 0;
-	}
+  if(c->tag == CMO_INT32) {
+    return ((cmo_int32 *)c)->i;
+  }else if(c->tag == CMO_ZZ) {
+    return mpz_get_si(((cmo_zz *)c)->mpz);
+  } else if(c->tag == CMO_NULL){
+    return 0;
+  }
 
-	return 0;
+  return 0;
 }
 
 GEN cmo_zz_to_GEN(cmo_zz *c)
@@ -283,15 +283,82 @@ cmo *GEN_to_cmo(GEN z)
 
 struct parif {
   char *name;
-  int type;
   GEN (*f)();
+  int type;
 } parif_tab[] = {
-  {"erfc",1,gerfc},
-  {"factor",1,Z_factor},
-  {"isqrt",1,racine},
-  {"nextprime",1,nextprime},
-  {"det",1,det},
-  {"allocatemem",0,(GEN (*)())allocatemoremem},
+/* (ulong)allocatemoremem(ulong) */
+  {"allocatemem",(GEN (*)())allocatemoremem,0},
+/* num/num */
+  {"abs",gabs,1},
+  {"erfc",gerfc,1},
+  {"arg",garg,1},
+  {"isqrt",racine,1},
+  {"gamma",ggamma,1},
+  {"zeta",gzeta,1},
+  {"floor",gfloor,1},
+  {"frac",gfrac,1},
+  {"imag",gimag,1},
+  {"conj",gconj,1},
+  {"ceil",gceil,1},
+  {"isprime",gisprime,2},
+  {"bigomega",gbigomega,1},
+  {"denom",denom,1},
+  {"numer",numer,1},
+  {"lngamma",glngamma,1},
+  {"logagm",glogagm,1},
+  {"classno",classno,1},
+  {"classno2",classno2,1},
+  {"dilog",dilog,1},
+  {"disc",discsr,1},
+  {"discf",discf,1},
+  {"nextprime",nextprime,1},
+  {"eintg1",eint1,1},
+  {"eta",eta,1},
+  {"issqfree",gissquarefree,1},
+  {"issquare",gcarreparfait,1},
+  {"gamh",ggamd,1},
+  {"hclassno",classno3,1},
+
+  /* num/array */
+  {"binary",binaire,1},
+  {"factorint",factorint,2},
+  {"factor",Z_factor,1},
+  {"cf",gcf,1},
+  {"divisors",divisors,1},
+  {"smallfact",smallfact,1},
+
+  /* mat/mat */
+  {"adj",adj,1},
+  {"lll",lll,1},
+  {"lllgen",lllgen,1},
+  {"lllgram",lllgram,1},
+  {"lllgramgen",lllgramgen,1},
+  {"lllgramint",lllgramint,1},
+  {"lllgramkerim",lllgramkerim,1},
+  {"lllgramkerimgen",lllgramkerimgen,1},
+  {"lllint",lllint,1},
+  {"lllkerim",lllkerim,1},
+  {"lllkerimgen",lllkerimgen,1},
+  {"trans",gtrans,1},
+  {"eigen",eigen,1},
+  {"hermite",hnf,1},
+  {"mat",gtomat,1},
+  {"matrixqz2",matrixqz2,1},
+  {"matrixqz3",matrixqz3,1},
+  {"hess",hess,1},
+
+  /* mat/poly */
+  {"det",det,1},
+  {"det2",det2,1},
+
+  /* poly/poly */
+  {"centerlift",centerlift,1},
+  {"content",content,1},
+
+  /* poly/array */
+  {"galois",galois,1},
+  {"roots",roots,1},
+
 };
 
 #define PARI_MAX_AC 64
@@ -319,22 +386,22 @@ int sm_executeFunction()
   struct parif *parif;
 
   if ( setjmp(GP_DATA->env) ) {
-		printf("sm_executeFunction : an error occured.\n");fflush(stdout);
-		push((cmo*)make_error2(0));
-		return -1;
+    printf("sm_executeFunction : an error occured.\n");fflush(stdout);
+    push((cmo*)make_error2(0));
+    return -1;
   }
-	cmo_string *func = (cmo_string *)pop();
-	if(func->tag != CMO_STRING) {
-		printf("sm_executeFunction : func->tag is not CMO_STRING");fflush(stdout);
-		push((cmo*)make_error2(0));
-		return -1;
-	}
+  cmo_string *func = (cmo_string *)pop();
+  if(func->tag != CMO_STRING) {
+    printf("sm_executeFunction : func->tag is not CMO_STRING");fflush(stdout);
+    push((cmo*)make_error2(0));
+    return -1;
+  }
 
-	c = (cmo_int32 *)pop();
+  c = (cmo_int32 *)pop();
   ac = c->i;
   if ( ac > PARI_MAX_AC ) {
-		push((cmo*)make_error2(0));
-		return -1;
+    push((cmo*)make_error2(0));
+    return -1;
   }
   for ( i = 0; i < ac; i++ ) {
     av[i] = (cmo *)pop();
@@ -342,20 +409,20 @@ int sm_executeFunction()
     print_cmo(av[i]);
     fprintf(stderr,"\n");
   }
-	if( strcmp( func->s, "exit" ) == 0 )
-		exit(0);
+  if( strcmp( func->s, "exit" ) == 0 )
+    exit(0);
 
   parif =search_parif(func->s);
   if ( !parif ) {
-		push((cmo*)make_error2(0));
-		return -1;
+    push((cmo*)make_error2(0));
+    return -1;
  } else if ( parif->type == 0 ) {
     /* one long int variable */ 
     int a = cmo_to_int(av[0]);
-    a = (int)(*parif->f)(a);
+    a = (int)(parif->f)(a);
     ret = (cmo *)new_cmo_int32(a);
     push(ret);
-		return 0;
+    return 0;
   } else if ( parif->type == 1 ) {
     /* one variable possibly with prec */ 
     unsigned long prec;
@@ -369,71 +436,71 @@ int sm_executeFunction()
     m = (*parif->f)(z,prec);
     lbot = avma;
     ret = GEN_to_cmo(m);
-   // gerepile(ltop,lbot,0);
+//    gerepile(ltop,lbot,0);
     push(ret);
-		return 0;
+    return 0;
   } else {
-		push((cmo*)make_error2(0));
-		return -1;
+    push((cmo*)make_error2(0));
+    return -1;
   }
 }
 
 int receive_and_execute_sm_command()
 {
-	int code = receive_int32(fd_rw);
-	switch(code) {
-	case SM_popCMO:
-		sm_popCMO();
-		break;
-	case SM_executeFunction:
-		sm_executeFunction();
-		break;
-	case SM_mathcap:
-		sm_mathcap();
-		break;
-	case SM_setMathCap:
-		pop();
-		break;
-	default:
-		printf("receive_and_execute_sm_command : code=%d\n",code);fflush(stdout);
-		break;
-	}
-	return 0;
+  int code = receive_int32(fd_rw);
+  switch(code) {
+  case SM_popCMO:
+    sm_popCMO();
+    break;
+  case SM_executeFunction:
+    sm_executeFunction();
+    break;
+  case SM_mathcap:
+    sm_mathcap();
+    break;
+  case SM_setMathCap:
+    pop();
+    break;
+  default:
+    printf("receive_and_execute_sm_command : code=%d\n",code);fflush(stdout);
+    break;
+  }
+  return 0;
 }
 
 int receive()
 {
-	int tag;
+  int tag;
 
-	tag = receive_ox_tag(fd_rw);
-	switch(tag) {
-	case OX_DATA:
-		printf("receive : ox_data %d\n",tag);fflush(stdout);
-		push(receive_cmo(fd_rw));
-		break;
-	case OX_COMMAND:
-		printf("receive : ox_command %d\n",tag);fflush(stdout);
-		receive_and_execute_sm_command();
-		break;
-	default:
-		printf("receive : tag=%d\n",tag);fflush(stdout);
-	}
-	return 0;
+  tag = receive_ox_tag(fd_rw);
+  switch(tag) {
+  case OX_DATA:
+    printf("receive : ox_data %d\n",tag);fflush(stdout);
+    push(receive_cmo(fd_rw));
+    break;
+  case OX_COMMAND:
+    printf("receive : ox_command %d\n",tag);fflush(stdout);
+    receive_and_execute_sm_command();
+    break;
+  default:
+    printf("receive : tag=%d\n",tag);fflush(stdout);
+  }
+  return 0;
 }
 
 int main()
 {
   init_gc();
-	ox_stderr_init(stderr);
-	initialize_stack();
-	init_pari();
+  ox_stderr_init(stderr);
+  initialize_stack();
+  init_pari();
 
-	fprintf(stderr,"ox_pari\n");
+  fprintf(stderr,"ox_pari\n");
 
-	fd_rw = oxf_open(3);
-	oxf_determine_byteorder_server(fd_rw);
+  fd_rw = oxf_open(3);
+  oxf_determine_byteorder_server(fd_rw);
 
-	while(1){
-		receive();
-	}
+  while(1){
+    receive();
+  }
 }