Skip to content

Commit a181f46

Browse files
authored
2025/10のジャッジアップデートに追従 (#306)
* judge update 2025-10 https://atcoder.jp/posts/1593 * update test
1 parent 1430664 commit a181f46

File tree

2 files changed

+24
-23
lines changed

2 files changed

+24
-23
lines changed

atcodertools/common/language.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ def from_name(cls, name: str):
8787
name="cpp",
8888
display_name="C++",
8989
extension="cpp",
90-
submission_lang_pattern=re.compile(".*C\\+\\+ \\(GCC 9.*|.*C\\+\\+ 20 "),
90+
submission_lang_pattern=re.compile(".*C\\+\\+\\s?23 .*"),
9191
default_code_generator=cpp.main,
9292
default_template_path=get_default_template_path('cpp'),
93-
compile_command="g++ {filename}.cpp -o {filename} -std=c++20",
93+
compile_command="g++ {filename}.cpp -o {filename} -std=c++23",
9494
test_command="{exec_filename}",
9595
exec_filename="{filename}{exec_extension}"
9696
)
@@ -99,7 +99,7 @@ def from_name(cls, name: str):
9999
name="java",
100100
display_name="Java",
101101
extension="java",
102-
submission_lang_pattern=re.compile(".*Java \\(OpenJDK .*"),
102+
submission_lang_pattern=re.compile(".*Java\\d* \\(OpenJDK .*"),
103103
default_code_generator=java.main,
104104
default_template_path=get_default_template_path('java'),
105105
compile_command="javac {filename}.java",
@@ -161,7 +161,7 @@ def from_name(cls, name: str):
161161
name="cs",
162162
display_name="C#",
163163
extension="cs",
164-
submission_lang_pattern=re.compile(".*C# \\(Mono.*|.*C# 11.0 "),
164+
submission_lang_pattern=re.compile(".*C# .*"),
165165
default_code_generator=cs.main,
166166
default_template_path=get_default_template_path('cs'),
167167
compile_command="mcs {filename}.cs -o {filename}",
@@ -173,7 +173,7 @@ def from_name(cls, name: str):
173173
name="swift",
174174
display_name="Swift",
175175
extension="swift",
176-
submission_lang_pattern=re.compile(".*Swift \\(5.*|.*Swift \\(swift 5.*"),
176+
submission_lang_pattern=re.compile(".*Swift .*"),
177177
default_code_generator=swift.main,
178178
default_template_path=get_default_template_path('swift'),
179179
compile_command="swiftc {filename}.swift -o {filename}",

tests/test_language.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,25 @@
66
class TestLanguage(unittest.TestCase):
77
def test_compilers(self):
88
language_compiler_map = {
9-
CPP: 'C++ 20 (gcc 12.2)',
9+
CPP: 'C++23 (GCC 15.2.0)',
10+
JAVA: 'Java24 (OpenJDK 24.0.2)',
11+
RUST: 'Rust (rustc 1.89.0)',
12+
PYTHON: 'Python (CPython 3.13.7)',
13+
DLANG: 'D (DMD 2.111.0)',
14+
NIM: 'Nim (Nim 1.6.20)',
15+
CSHARP: 'C# 13.0 (.NET 9.0.8)',
16+
SWIFT: 'Swift 6.2',
17+
GO: 'Go (go 1.25.1)',
18+
JULIA: 'Julia (Julia 1.11.6)',
19+
}
20+
for language, compiler in language_compiler_map.items():
21+
self.assertRegex(compiler, language.submission_lang_pattern)
22+
23+
# ABC429以前
24+
# TODO: 新ジャッジのみになったら消す
25+
def test_previous_compilers(self):
26+
language_compiler_map = {
27+
CPP: 'C++ 23 (gcc 12.2)',
1028
JAVA: 'Java (OpenJDK 17)',
1129
RUST: 'Rust (rustc 1.70.0)',
1230
PYTHON: 'Python (CPython 3.11.4)',
@@ -20,23 +38,6 @@ def test_compilers(self):
2038
for language, compiler in language_compiler_map.items():
2139
self.assertRegex(compiler, language.submission_lang_pattern)
2240

23-
# TODO: 新ジャッジのみになったら消す
24-
def test_previous_compilers(self):
25-
language_compiler_map = {
26-
CPP: 'C++ (GCC 9.2.1)',
27-
JAVA: 'Java (OpenJDK 11.0.6)',
28-
RUST: 'Rust (1.42.0)',
29-
PYTHON: 'Python (3.8.2)',
30-
DLANG: 'D (DMD 2.091.0)',
31-
NIM: 'Nim (1.0.6)',
32-
CSHARP: 'C# (Mono-mcs 6.8.0.105)',
33-
SWIFT: 'Swift (5.2.1)',
34-
GO: 'Go (1.14.1)',
35-
JULIA: 'Julia (1.4.0)',
36-
}
37-
for language, compiler in language_compiler_map.items():
38-
self.assertRegex(compiler, language.submission_lang_pattern)
39-
4041

4142
if __name__ == '__main__':
4243
unittest.main()

0 commit comments

Comments
 (0)