Improvement in universal_generator/cpp.toml (kyuridenamida#230)

naskya · web-flow · commit 4e250725c0f9 · 2021-05-19T20:35:16.000+09:00
* Fix typo

* Qualify scanf function with std namespace

* Use long double for float arguments for consistency

* Reflect the changes in universal_generator/cpp.toml

* Reflect the changes in universal_generator/cpp.toml
diff --git a/README.md b/README.md
@@ -317,7 +317,7 @@ str = '""'
 # 引数
 [arg]
 int = "long long {name}"
-float = "double {name}"
+float = "long double {name}"
 str = "std::string {name}"
 seq = "std::vector<{type}> {name}"
 2d_seq = "std::vector<std::vector<{type}>> {name}"
@@ -337,7 +337,7 @@ seq = "{name}[{index}]"
 int = "long long {name};"
 float = "long double {name};"
 str = "std::string {name};"
-seq = "std::std::vector<{type}> {name};"
+seq = "std::vector<{type}> {name};"
 2d_seq = "std::vector<std::vector<{type}>> {name};"
 
 # 確保
@@ -353,9 +353,9 @@ seq = "std::vector<{type}> {name}({length});"
 # 入力
 [input]
 #int = "std::cin >> {name};"
-int = "scanf(\"%lld\", &{name});"
+int = "std::scanf(\"%lld\", &{name});"
 #float = "std::cin >> {name};"
-float = "scanf(\"%Lf\", &{name});"
+float = "std::scanf(\"%Lf\", &{name});"
 str = "std::cin >> {name};"
 ```
 
diff --git a/atcodertools/codegen/code_generators/universal_generator/cpp.toml b/atcodertools/codegen/code_generators/universal_generator/cpp.toml
@@ -24,7 +24,7 @@ str = '""'
 # 引数
 [arg]
 int = "long long {name}"
-float = "double {name}"
+float = "long double {name}"
 str = "std::string {name}"
 seq = "std::vector<{type}> {name}"
 2d_seq = "std::vector<std::vector<{type}>> {name}"
@@ -44,7 +44,7 @@ seq = "{name}[{index}]"
 int = "long long {name};"
 float = "long double {name};"
 str = "std::string {name};"
-seq = "std::std::vector<{type}> {name};"
+seq = "std::vector<{type}> {name};"
 2d_seq = "std::vector<std::vector<{type}>> {name};"
 
 # 確保
@@ -60,9 +60,9 @@ seq = "std::vector<{type}> {name}({length});"
 # 入力
 [input]
 #int = "std::cin >> {name};"
-int = "scanf(\"%lld\", &{name});"
+int = "std::scanf(\"%lld\", &{name});"
 #float = "std::cin >> {name};"
-float = "scanf(\"%Lf\", &{name});"
+float = "std::scanf(\"%Lf\", &{name});"
 str = "std::cin >> {name};"
 
 
diff --git a/tests/resources/test_atc_env/test_backup/agc029/B/main.cpp b/tests/resources/test_atc_env/test_backup/agc029/B/main.cpp
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/B/main.cpp.1 b/tests/resources/test_atc_env/test_backup/agc029/B/main.cpp.1
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/C/main.cpp b/tests/resources/test_atc_env/test_backup/agc029/C/main.cpp
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/C/main.cpp.1 b/tests/resources/test_atc_env/test_backup/agc029/C/main.cpp.1
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/D/main.cpp b/tests/resources/test_atc_env/test_backup/agc029/D/main.cpp
@@ -25,16 +25,16 @@ void solve(long long H, long long W, long long N, std::vector<long long> X, std:
 
 int main(){
     long long H;
-    scanf("%lld", &H);
+    std::scanf("%lld", &H);
     long long W;
-    scanf("%lld", &W);
+    std::scanf("%lld", &W);
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> X(N);
     std::vector<long long> Y(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &X[i]);
-        scanf("%lld", &Y[i]);
+        std::scanf("%lld", &X[i]);
+        std::scanf("%lld", &Y[i]);
     }
     solve(H, W, N, std::move(X), std::move(Y));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/D/main.cpp.1 b/tests/resources/test_atc_env/test_backup/agc029/D/main.cpp.1
@@ -25,16 +25,16 @@ void solve(long long H, long long W, long long N, std::vector<long long> X, std:
 
 int main(){
     long long H;
-    scanf("%lld", &H);
+    std::scanf("%lld", &H);
     long long W;
-    scanf("%lld", &W);
+    std::scanf("%lld", &W);
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> X(N);
     std::vector<long long> Y(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &X[i]);
-        scanf("%lld", &Y[i]);
+        std::scanf("%lld", &X[i]);
+        std::scanf("%lld", &Y[i]);
     }
     solve(H, W, N, std::move(X), std::move(Y));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/E/main.cpp b/tests/resources/test_atc_env/test_backup/agc029/E/main.cpp
@@ -25,12 +25,12 @@ void solve(long long N, std::vector<long long> a, std::vector<long long> b){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> a(N-1);
     std::vector<long long> b(N-1);
     for(int i = 0 ; i < N-1 ; i++){
-        scanf("%lld", &a[i]);
-        scanf("%lld", &b[i]);
+        std::scanf("%lld", &a[i]);
+        std::scanf("%lld", &b[i]);
     }
     solve(N, std::move(a), std::move(b));
     return 0;
diff --git a/tests/resources/test_atc_env/test_backup/agc029/E/main.cpp.1 b/tests/resources/test_atc_env/test_backup/agc029/E/main.cpp.1
@@ -25,12 +25,12 @@ void solve(long long N, std::vector<long long> a, std::vector<long long> b){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> a(N-1);
     std::vector<long long> b(N-1);
     for(int i = 0 ; i < N-1 ; i++){
-        scanf("%lld", &a[i]);
-        scanf("%lld", &b[i]);
+        std::scanf("%lld", &a[i]);
+        std::scanf("%lld", &b[i]);
     }
     solve(N, std::move(a), std::move(b));
     return 0;
diff --git a/tests/resources/test_atc_env/test_prepare_workspace/agc029/B/main.cpp b/tests/resources/test_atc_env/test_prepare_workspace/agc029/B/main.cpp
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_prepare_workspace/agc029/C/main.cpp b/tests/resources/test_atc_env/test_prepare_workspace/agc029/C/main.cpp
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_prepare_workspace/agc029/D/main.cpp b/tests/resources/test_atc_env/test_prepare_workspace/agc029/D/main.cpp
@@ -25,16 +25,16 @@ void solve(long long H, long long W, long long N, std::vector<long long> X, std:
 
 int main(){
     long long H;
-    scanf("%lld", &H);
+    std::scanf("%lld", &H);
     long long W;
-    scanf("%lld", &W);
+    std::scanf("%lld", &W);
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> X(N);
     std::vector<long long> Y(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &X[i]);
-        scanf("%lld", &Y[i]);
+        std::scanf("%lld", &X[i]);
+        std::scanf("%lld", &Y[i]);
     }
     solve(H, W, N, std::move(X), std::move(Y));
     return 0;
diff --git a/tests/resources/test_atc_env/test_prepare_workspace/agc029/E/main.cpp b/tests/resources/test_atc_env/test_prepare_workspace/agc029/E/main.cpp
@@ -25,12 +25,12 @@ void solve(long long N, std::vector<long long> a, std::vector<long long> b){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> a(N-1);
     std::vector<long long> b(N-1);
     for(int i = 0 ; i < N-1 ; i++){
-        scanf("%lld", &a[i]);
-        scanf("%lld", &b[i]);
+        std::scanf("%lld", &a[i]);
+        std::scanf("%lld", &b[i]);
     }
     solve(N, std::move(a), std::move(b));
     return 0;
diff --git a/tests/resources/test_atc_env/test_skip_existing_problems/agc029/B/main.cpp b/tests/resources/test_atc_env/test_skip_existing_problems/agc029/B/main.cpp
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_skip_existing_problems/agc029/C/main.cpp b/tests/resources/test_atc_env/test_skip_existing_problems/agc029/C/main.cpp
@@ -25,10 +25,10 @@ void solve(long long N, std::vector<long long> A){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &A[i]);
+        std::scanf("%lld", &A[i]);
     }
     solve(N, std::move(A));
     return 0;
diff --git a/tests/resources/test_atc_env/test_skip_existing_problems/agc029/D/main.cpp b/tests/resources/test_atc_env/test_skip_existing_problems/agc029/D/main.cpp
@@ -25,16 +25,16 @@ void solve(long long H, long long W, long long N, std::vector<long long> X, std:
 
 int main(){
     long long H;
-    scanf("%lld", &H);
+    std::scanf("%lld", &H);
     long long W;
-    scanf("%lld", &W);
+    std::scanf("%lld", &W);
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> X(N);
     std::vector<long long> Y(N);
     for(int i = 0 ; i < N ; i++){
-        scanf("%lld", &X[i]);
-        scanf("%lld", &Y[i]);
+        std::scanf("%lld", &X[i]);
+        std::scanf("%lld", &Y[i]);
     }
     solve(H, W, N, std::move(X), std::move(Y));
     return 0;
diff --git a/tests/resources/test_atc_env/test_skip_existing_problems/agc029/E/main.cpp b/tests/resources/test_atc_env/test_skip_existing_problems/agc029/E/main.cpp
@@ -25,12 +25,12 @@ void solve(long long N, std::vector<long long> a, std::vector<long long> b){
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     std::vector<long long> a(N-1);
     std::vector<long long> b(N-1);
     for(int i = 0 ; i < N-1 ; i++){
-        scanf("%lld", &a[i]);
-        scanf("%lld", &b[i]);
+        std::scanf("%lld", &a[i]);
+        std::scanf("%lld", &b[i]);
     }
     solve(N, std::move(a), std::move(b));
     return 0;
diff --git a/tests/resources/test_codegen/test_default_code_generators_and_templates/cpp/expected_default_generated_code.cpp b/tests/resources/test_codegen/test_default_code_generators_and_templates/cpp/expected_default_generated_code.cpp
@@ -30,9 +30,9 @@ void solve(long long N, long long M, std::vector<std::vector<std::string>> H, st
 // Generated by x.y.z https://github.com/kyuridenamida/atcoder-tools  (tips: You use the default template now. You can remove this line by using your custom template)
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     long long M;
-    scanf("%lld", &M);
+    std::scanf("%lld", &M);
     std::vector<std::vector<std::string>> H(N-2+1, std::vector<std::string>(M-1-2+1));
     for(int i = 0 ; i < N-2+1 ; i++){
         for(int j = 0 ; j < M-1-2+1 ; j++){
@@ -42,14 +42,14 @@ int main(){
     std::vector<long long> A(N-2+1);
     std::vector<long double> B(N-2+1);
     for(int i = 0 ; i < N-2+1 ; i++){
-        scanf("%lld", &A[i]);
-        scanf("%Lf", &B[i]);
+        std::scanf("%lld", &A[i]);
+        std::scanf("%Lf", &B[i]);
     }
     long long Q;
-    scanf("%lld", &Q);
+    std::scanf("%lld", &Q);
     std::vector<long long> X(M+Q);
     for(int i = 0 ; i < M+Q ; i++){
-        scanf("%lld", &X[i]);
+        std::scanf("%lld", &X[i]);
     }
     solve(N, M, std::move(H), std::move(A), std::move(B), Q, std::move(X));
     return 0;
diff --git a/tests/resources/test_codegen/test_default_code_generators_and_templates/cpp/expected_echo_generated_code.cpp b/tests/resources/test_codegen/test_default_code_generators_and_templates/cpp/expected_echo_generated_code.cpp
@@ -51,9 +51,9 @@ void solve(long long N, long long M, std::vector<std::vector<std::string>> H, st
 
 int main(){
     long long N;
-    scanf("%lld", &N);
+    std::scanf("%lld", &N);
     long long M;
-    scanf("%lld", &M);
+    std::scanf("%lld", &M);
     std::vector<std::vector<std::string>> H(N-2+1, std::vector<std::string>(M-1-2+1));
     for(int i = 0 ; i < N-2+1 ; i++){
         for(int j = 0 ; j < M-1-2+1 ; j++){
@@ -63,14 +63,14 @@ int main(){
     std::vector<long long> A(N-2+1);
     std::vector<long double> B(N-2+1);
     for(int i = 0 ; i < N-2+1 ; i++){
-        scanf("%lld", &A[i]);
-        scanf("%Lf", &B[i]);
+        std::scanf("%lld", &A[i]);
+        std::scanf("%Lf", &B[i]);
     }
     long long Q;
-    scanf("%lld", &Q);
+    std::scanf("%lld", &Q);
     std::vector<long long> X(M+Q);
     for(int i = 0 ; i < M+Q ; i++){
-        scanf("%lld", &X[i]);
+        std::scanf("%lld", &X[i]);
     }
     solve(N, M, std::move(H), std::move(A), std::move(B), Q, std::move(X));
     return 0;
diff --git a/tests/resources/test_codegen/test_float_case/cpp/generated_code.txt b/tests/resources/test_codegen/test_float_case/cpp/generated_code.txt
diff --git a/tests/resources/test_codegen/test_long_case/cpp/generated_code.txt b/tests/resources/test_codegen/test_long_case/cpp/generated_code.txt
diff --git a/tests/resources/test_codegen/test_two_dimensional_case/cpp/generated_code.txt b/tests/resources/test_codegen/test_two_dimensional_case/cpp/generated_code.txt
diff --git a/tests/resources/test_codegen/test_yes_no_case/cpp/generated_code.txt b/tests/resources/test_codegen/test_yes_no_case/cpp/generated_code.txt
diff --git a/tests/resources/test_codegen_command/generated_code.cpp b/tests/resources/test_codegen_command/generated_code.cpp
