Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Add version check for GNU MP's prev_prime()

Browse Source
This commit is contained in:
Bruce Hill 2025-03-21 16:19:59 -04:00
parent 0ef96cb3c0
commit ac3a02b80b
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environment.c
View File

@ -120,7 +120,11 @@ env_t *global_env(void)
{"parse", "Int$parse", "func(text:Text -> Int?)"},
{"plus", "Int$plus", "func(x,y:Int -> Int)"},
{"power", "Int$power", "func(base:Int,exponent:Int -> Int)"},
#if __GNU_MP_VERSION >= 6
#if __GNU_MP_VERSION_MINOR >= 3
{"prev_prime", "Int$prev_prime", "func(x:Int -> Int)"},
#endif
#endif
{"right_shifted", "Int$right_shifted", "func(x,y:Int -> Int)"},
{"sqrt", "Int$sqrt", "func(x:Int -> Int?)"},
{"times", "Int$times", "func(x,y:Int -> Int)"},

4
stdlib/integers.c
View File

@ -409,6 +409,8 @@ public Int_t Int$next_prime(Int_t x)
return Int$from_mpz(p);
}
#if __GNU_MP_VERSION >= 6
#if __GNU_MP_VERSION_MINOR >= 3
public Int_t Int$prev_prime(Int_t x)
{
mpz_t p;
@ -417,6 +419,8 @@ public Int_t Int$prev_prime(Int_t x)
fail("There is no prime number before %k", (Text_t[1]){Int$as_text(&x, false, &Int$info)});
return Int$from_mpz(p);
}
#endif
#endif
public Int_t Int$choose(Int_t n, Int_t k)
{

4
stdlib/integers.h
View File

@ -142,7 +142,11 @@ Int_t Int$slow_negative(Int_t x);
Int_t Int$slow_negated(Int_t x);
bool Int$is_prime(Int_t x, Int_t reps);
Int_t Int$next_prime(Int_t x);
#if __GNU_MP_VERSION >= 6
#if __GNU_MP_VERSION_MINOR >= 3
Int_t Int$prev_prime(Int_t x);
#endif
#endif
Int_t Int$choose(Int_t n, Int_t k);
Int_t Int$factorial(Int_t n);

4
test/integers.tm
View File

@ -96,8 +96,8 @@ func main():
= 2
>> 7:next_prime()
= 11
>> 11:prev_prime()
= 7
#>> 11:prev_prime()
#= 7
>> (and: p:is_prime() for p in [
2, 3, 5, 7,
137372146048179869781170214707,