Skip to content

Commit a049aef

Browse files
lucioleKibjorngjhogberg
committed
erts: Add guard BIF erlang:is_between/3
Add guard BIF `erlang:is_between/3` according to EEP-16. This BIF takes in 3 parameters, `Term`, `LowerBound`, and `UpperBound`. It returns `true` if `Term`, `LowerBound`, and `UpperBound` are all integers, and `LowerBound =< Term =< UpperBound`; otherwise, it returns false. Failure: `badarg` if `LowerBound` or `UpperBound` does not evaluate to an integer. Example: ```` 1> is_between(2, 1, 10). true 2> is_between(11, 1, 10). false 3> is_between(1, 1.0, 10.0). ** exception error: bad argument in function is_between/3 called as is_between(1,1.0,10.0) ```` Co-authored-by: Björn Gustavsson <[email protected]> Co-authored-by: John Högberg <[email protected]>
1 parent 381854b commit a049aef

36 files changed

+468
-135
lines changed

bootstrap/bin/no_dot_erlang.boot

-4 Bytes
Binary file not shown.

bootstrap/bin/start.boot

-4 Bytes
Binary file not shown.

bootstrap/bin/start_clean.boot

-4 Bytes
Binary file not shown.
-4 Bytes
Binary file not shown.

bootstrap/lib/compiler/ebin/compiler.app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
{application, compiler,
2323
[{description, "ERTS CXC 138 10"},
24-
{vsn, "8.5.4"},
24+
{vsn, "9.0"},
2525
{modules, [
2626
beam_a,
2727
beam_asm,

bootstrap/lib/compiler/ebin/compiler.appup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
%% limitations under the License.
1919
%%
2020
%% %CopyrightEnd%
21-
{"8.2",
21+
{"9.0",
2222
[{<<".*">>,[{restart_application, compiler}]}],
2323
[{<<".*">>,[{restart_application, compiler}]}]
2424
}.
16 Bytes
Binary file not shown.

bootstrap/lib/kernel/ebin/kernel.app

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
%% %CopyrightBegin%
33
%%
44
%% SPDX-License-Identifier: Apache-2.0
5-
%%
5+
%%
66
%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
7-
%%
7+
%%
88
%% Licensed under the Apache License, Version 2.0 (the "License");
99
%% you may not use this file except in compliance with the License.
1010
%% You may obtain a copy of the License at
@@ -16,15 +16,15 @@
1616
%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1717
%% See the License for the specific language governing permissions and
1818
%% limitations under the License.
19-
%%
19+
%%
2020
%% %CopyrightEnd%
2121
%%
2222
%% This is an -*- erlang -*- file.
2323
%%
2424
{application, kernel,
2525
[
2626
{description, "ERTS CXC 138 10"},
27-
{vsn, "10.2.1"},
27+
{vsn, "10.3"},
2828
{modules, [application,
2929
application_controller,
3030
application_master,
@@ -35,6 +35,7 @@
3535
dist_util,
3636
erl_boot_server,
3737
erl_compile_server,
38+
erl_debugger,
3839
erl_distribution,
3940
erl_erts_errors,
4041
erl_reply,
@@ -167,7 +168,7 @@
167168
{shell_history_drop,[]}
168169
]},
169170
{mod, {kernel, []}},
170-
{runtime_dependencies, ["erts-15.1", "stdlib-6.0",
171+
{runtime_dependencies, ["erts-15.2.5", "stdlib-6.0",
171172
"sasl-3.0", "crypto-5.0"]}
172173
]
173174
}.

bootstrap/lib/kernel/ebin/kernel.appup

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -21,66 +21,68 @@
2121
%%
2222
%% We allow upgrade from, and downgrade to all previous
2323
%% versions from the following OTP releases:
24-
%% - OTP 23
25-
%% - OTP 24
26-
%% - OTP 25
24+
%% - OTP 26
25+
%% - OTP 27
26+
%% - OTP 28
2727
%%
2828
%% We also allow upgrade from, and downgrade to all
2929
%% versions that have branched off from the above
3030
%% stated previous versions.
3131
%%
32-
{"8.4.1",
33-
[{<<"^7\\.0$">>,[restart_new_emulator]},
34-
{<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
35-
{<<"^7\\.1$">>,[restart_new_emulator]},
36-
{<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
37-
{<<"^7\\.2$">>,[restart_new_emulator]},
38-
{<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
39-
{<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
40-
{<<"^7\\.3$">>,[restart_new_emulator]},
41-
{<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
42-
{<<"^7\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
43-
{<<"^8\\.0$">>,[restart_new_emulator]},
44-
{<<"^8\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
45-
{<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
46-
{<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
47-
{<<"^8\\.1$">>,[restart_new_emulator]},
48-
{<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
49-
{<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
50-
{<<"^8\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
51-
{<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
52-
{<<"^8\\.2$">>,[restart_new_emulator]},
53-
{<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
54-
{<<"^8\\.3$">>,[restart_new_emulator]},
55-
{<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
56-
{<<"^8\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
57-
{<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
58-
{<<"^8\\.4$">>,[restart_new_emulator]},
59-
{<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
60-
[{<<"^7\\.0$">>,[restart_new_emulator]},
61-
{<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
62-
{<<"^7\\.1$">>,[restart_new_emulator]},
63-
{<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
64-
{<<"^7\\.2$">>,[restart_new_emulator]},
65-
{<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
66-
{<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
67-
{<<"^7\\.3$">>,[restart_new_emulator]},
68-
{<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
69-
{<<"^7\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
70-
{<<"^8\\.0$">>,[restart_new_emulator]},
71-
{<<"^8\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
72-
{<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
73-
{<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
74-
{<<"^8\\.1$">>,[restart_new_emulator]},
75-
{<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
76-
{<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
77-
{<<"^8\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
78-
{<<"^8\\.1\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
79-
{<<"^8\\.2$">>,[restart_new_emulator]},
80-
{<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
81-
{<<"^8\\.3$">>,[restart_new_emulator]},
82-
{<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
83-
{<<"^8\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
84-
{<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
85-
{<<"^8\\.4$">>,[restart_new_emulator]},
86-
{<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
32+
{"10.3",
33+
[{<<"^10\\.0$">>,[restart_new_emulator]},
34+
{<<"^10\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
35+
{<<"^10\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
36+
{<<"^10\\.1$">>,[restart_new_emulator]},
37+
{<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
38+
{<<"^10\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
39+
{<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
40+
{<<"^10\\.2$">>,[restart_new_emulator]},
41+
{<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
42+
{<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
43+
{<<"^10\\.2\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
44+
{<<"^10\\.2\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
45+
{<<"^10\\.2\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
46+
{<<"^10\\.2\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
47+
{<<"^10\\.2\\.6(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
48+
{<<"^10\\.2\\.7(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
49+
{<<"^9\\.0$">>,[restart_new_emulator]},
50+
{<<"^9\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
51+
{<<"^9\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
52+
{<<"^9\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
53+
{<<"^9\\.1$">>,[restart_new_emulator]},
54+
{<<"^9\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
55+
{<<"^9\\.2$">>,[restart_new_emulator]},
56+
{<<"^9\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
57+
{<<"^9\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
58+
{<<"^9\\.2\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
59+
{<<"^9\\.2\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
60+
{<<"^9\\.2\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
61+
[{<<"^10\\.0$">>,[restart_new_emulator]},
62+
{<<"^10\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
63+
{<<"^10\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
64+
{<<"^10\\.1$">>,[restart_new_emulator]},
65+
{<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
66+
{<<"^10\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
67+
{<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
68+
{<<"^10\\.2$">>,[restart_new_emulator]},
69+
{<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
70+
{<<"^10\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
71+
{<<"^10\\.2\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
72+
{<<"^10\\.2\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
73+
{<<"^10\\.2\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
74+
{<<"^10\\.2\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
75+
{<<"^10\\.2\\.6(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
76+
{<<"^10\\.2\\.7(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
77+
{<<"^9\\.0$">>,[restart_new_emulator]},
78+
{<<"^9\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
79+
{<<"^9\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
80+
{<<"^9\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
81+
{<<"^9\\.1$">>,[restart_new_emulator]},
82+
{<<"^9\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
83+
{<<"^9\\.2$">>,[restart_new_emulator]},
84+
{<<"^9\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
85+
{<<"^9\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
86+
{<<"^9\\.2\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
87+
{<<"^9\\.2\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
88+
{<<"^9\\.2\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
28 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)