|
|
80bdf67 |
--- src/basemath/mftrace.c
|
|
|
80bdf67 |
+++ src/basemath/mftrace.c
|
|
|
80bdf67 |
@@ -579,7 +579,7 @@ mfcharGL(GEN G, GEN L)
|
|
|
80bdf67 |
return mkvec4(G, L, o, polcyclo(ord,vt));
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
static GEN
|
|
|
80bdf67 |
-mfchartrivial()
|
|
|
80bdf67 |
+mfchartrivial(void)
|
|
|
80bdf67 |
{ return mfcharGL(znstar0(gen_1,1), cgetg(1,t_COL)); }
|
|
|
80bdf67 |
/* convert a generic character into an 'mfchar' */
|
|
|
80bdf67 |
static GEN
|
|
|
1bdc51c |
@@ -1593,7 +1593,7 @@ mfcoef(GEN F, long n)
|
|
|
80bdf67 |
}
|
|
|
80bdf67 |
|
|
|
80bdf67 |
static GEN
|
|
|
80bdf67 |
-paramconst() { return tagparams(t_MF_CONST, mkNK(1,0,mfchartrivial())); }
|
|
|
80bdf67 |
+paramconst(void) { return tagparams(t_MF_CONST, mkNK(1,0,mfchartrivial())); }
|
|
|
80bdf67 |
static GEN
|
|
|
80bdf67 |
mftrivial(void) { retmkvec2(paramconst(), cgetg(1,t_VEC)); }
|
|
|
80bdf67 |
static GEN
|
|
|
80bdf67 |
--- src/basemath/modsym.c
|
|
|
80bdf67 |
+++ src/basemath/modsym.c
|
|
|
80bdf67 |
@@ -1442,11 +1442,11 @@ indices_backward(GEN W, GEN C)
|
|
|
80bdf67 |
|
|
|
80bdf67 |
/*[0,-1;1,-1]*/
|
|
|
80bdf67 |
static GEN
|
|
|
80bdf67 |
-mkTAU()
|
|
|
80bdf67 |
+mkTAU(void)
|
|
|
80bdf67 |
{ return mkmat22(gen_0,gen_m1, gen_1,gen_m1); }
|
|
|
80bdf67 |
/* S */
|
|
|
80bdf67 |
static GEN
|
|
|
80bdf67 |
-mkS()
|
|
|
80bdf67 |
+mkS(void)
|
|
|
80bdf67 |
{ return mkmat22(gen_0,gen_1, gen_m1,gen_0); }
|
|
|
80bdf67 |
/* N = integer > 1. Returns data describing Delta_0 = Z[P^1(Q)]_0 seen as
|
|
|
80bdf67 |
* a Gamma_0(N) - module. */
|
|
|
d87f6c9 |
--- src/language/eval.c
|
|
|
d87f6c9 |
+++ src/language/eval.c
|
|
|
80bdf67 |
@@ -1262,11 +1262,11 @@ closure_eval(GEN C)
|
|
|
d87f6c9 |
break;
|
|
|
d87f6c9 |
}
|
|
|
d87f6c9 |
|
|
|
d87f6c9 |
-#define EVAL_f(f) \
|
|
|
d87f6c9 |
+#define EVAL_f0(f) f()
|
|
|
d87f6c9 |
+#define EVAL_f1(f) sp--; f(st[sp])
|
|
|
d87f6c9 |
+#define EVAL_fn(f) \
|
|
|
d87f6c9 |
switch (ep->arity) \
|
|
|
d87f6c9 |
{ \
|
|
|
d87f6c9 |
- case 0: f(); break; \
|
|
|
d87f6c9 |
- case 1: sp--; f(st[sp]); break; \
|
|
|
d87f6c9 |
case 2: sp-=2; f(st[sp],st[sp+1]); break; \
|
|
|
d87f6c9 |
case 3: sp-=3; f(st[sp],st[sp+1],st[sp+2]); break; \
|
|
|
d87f6c9 |
case 4: sp-=4; f(st[sp],st[sp+1],st[sp+2],st[sp+3]); break; \
|
|
|
80bdf67 |
@@ -1297,7 +1297,12 @@ closure_eval(GEN C)
|
|
|
d87f6c9 |
GEN res;
|
|
|
d87f6c9 |
/* Macro Madness : evaluate function ep->value on arguments
|
|
|
d87f6c9 |
* st[sp-ep->arity .. sp]. Set res = result. */
|
|
|
d87f6c9 |
- EVAL_f(res = ((GEN (*)(ANYARG))ep->value));
|
|
|
d87f6c9 |
+ switch (ep->arity)
|
|
|
d87f6c9 |
+ {
|
|
|
d87f6c9 |
+ case 0: EVAL_f0(res = ((GEN (*)(void))ep->value)); break;
|
|
|
d87f6c9 |
+ case 1: EVAL_f1(res = ((GEN (*)(long))ep->value)); break;
|
|
|
d87f6c9 |
+ default: EVAL_fn(res = ((GEN (*)(long, ...))ep->value));
|
|
|
d87f6c9 |
+ }
|
|
|
d87f6c9 |
if (br_status) goto endeval;
|
|
|
d87f6c9 |
gel(st,sp++)=res;
|
|
|
d87f6c9 |
break;
|
|
|
80bdf67 |
@@ -1316,7 +1321,12 @@ closure_eval(GEN C)
|
|
|
d87f6c9 |
{
|
|
|
d87f6c9 |
entree *ep = (entree *)operand;
|
|
|
d87f6c9 |
long res;
|
|
|
d87f6c9 |
- EVAL_f(res = ((long (*)(ANYARG))ep->value));
|
|
|
d87f6c9 |
+ switch (ep->arity)
|
|
|
d87f6c9 |
+ {
|
|
|
d87f6c9 |
+ case 0: EVAL_f0(res = ((long (*)(void))ep->value)); break;
|
|
|
d87f6c9 |
+ case 1: EVAL_f1(res = ((long (*)(long))ep->value)); break;
|
|
|
d87f6c9 |
+ default: EVAL_fn(res = ((long (*)(long, ...))ep->value));
|
|
|
d87f6c9 |
+ }
|
|
|
d87f6c9 |
if (br_status) goto endeval;
|
|
|
d87f6c9 |
st[sp++] = res;
|
|
|
d87f6c9 |
break;
|
|
|
80bdf67 |
@@ -1325,7 +1335,12 @@ closure_eval(GEN C)
|
|
|
d87f6c9 |
{
|
|
|
d87f6c9 |
entree *ep = (entree *)operand;
|
|
|
d87f6c9 |
long res;
|
|
|
d87f6c9 |
- EVAL_f(res = ((int (*)(ANYARG))ep->value));
|
|
|
d87f6c9 |
+ switch (ep->arity)
|
|
|
d87f6c9 |
+ {
|
|
|
d87f6c9 |
+ case 0: EVAL_f0(res = ((int (*)(void))ep->value)); break;
|
|
|
d87f6c9 |
+ case 1: EVAL_f1(res = ((int (*)(long))ep->value)); break;
|
|
|
d87f6c9 |
+ default: EVAL_fn(res = ((int (*)(long, ...))ep->value));
|
|
|
d87f6c9 |
+ }
|
|
|
d87f6c9 |
if (br_status) goto endeval;
|
|
|
d87f6c9 |
st[sp++] = res;
|
|
|
d87f6c9 |
break;
|
|
|
80bdf67 |
@@ -1333,11 +1348,18 @@ closure_eval(GEN C)
|
|
|
d87f6c9 |
case OCcallvoid:
|
|
|
d87f6c9 |
{
|
|
|
d87f6c9 |
entree *ep = (entree *)operand;
|
|
|
d87f6c9 |
- EVAL_f(((void (*)(ANYARG))ep->value));
|
|
|
d87f6c9 |
+ switch (ep->arity)
|
|
|
d87f6c9 |
+ {
|
|
|
d87f6c9 |
+ case 0: EVAL_f0(((void (*)(void))ep->value)); break;
|
|
|
d87f6c9 |
+ case 1: EVAL_f1(((void (*)(long))ep->value)); break;
|
|
|
d87f6c9 |
+ default: EVAL_fn(((void (*)(long, ...))ep->value));
|
|
|
d87f6c9 |
+ }
|
|
|
d87f6c9 |
if (br_status) goto endeval;
|
|
|
d87f6c9 |
break;
|
|
|
d87f6c9 |
}
|
|
|
d87f6c9 |
-#undef EVAL_f
|
|
|
d87f6c9 |
+#undef EVAL_f0
|
|
|
d87f6c9 |
+#undef EVAL_f1
|
|
|
d87f6c9 |
+#undef EVAL_fn
|
|
|
d87f6c9 |
|
|
|
d87f6c9 |
case OCcalluser:
|
|
|
d87f6c9 |
{
|
|
|
06e7417 |
--- src/language/init.c
|
|
|
06e7417 |
+++ src/language/init.c
|
|
|
1bdc51c |
@@ -120,7 +120,7 @@ void (*cb_pari_pre_recover)(long);
|
|
|
06e7417 |
void (*cb_pari_err_recover)(long);
|
|
|
06e7417 |
int (*cb_pari_break_loop)(int);
|
|
|
06e7417 |
int (*cb_pari_is_interactive)(void);
|
|
|
06e7417 |
-void (*cb_pari_start_output)();
|
|
|
06e7417 |
+void (*cb_pari_start_output)(void);
|
|
|
06e7417 |
|
|
|
06e7417 |
const char * pari_library_path = NULL;
|
|
|
06e7417 |
|