use input_part_prefix to generate code properly (kyuridenamida#242)

kotet · web-flow · commit 949428c10c1d · 2021-08-20T02:01:08.000+09:00
diff --git a/atcodertools/codegen/code_generators/universal_generator/d.toml b/atcodertools/codegen/code_generators/universal_generator/d.toml
@@ -3,7 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
-#input_part_prefix = "auto input = stdin.byLine.map!split.joiner;"
+input_part_prefix = "auto input = stdin.byLine.map!split.joiner;"
 newline_after_input = true
 
 # ループ
diff --git a/atcodertools/codegen/code_generators/universal_generator/java.toml b/atcodertools/codegen/code_generators/universal_generator/java.toml
@@ -3,7 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = "static "
-#input_part_prefix = "final Scanner sc = new Scanner(System.in);"
+input_part_prefix = "final Scanner sc = new Scanner(System.in);"
 
 # ループ
 [loop]
diff --git a/atcodertools/codegen/code_generators/universal_generator/rust.toml b/atcodertools/codegen/code_generators/universal_generator/rust.toml
@@ -3,7 +3,7 @@ insert_space_around_operators = false
 
 # global変数宣言時の接頭辞
 global_prefix = ""
-#input_part_prefix = "let con = read_string();\nlet mut scanner = Scanner::new(&con);"
+input_part_prefix = "let con = read_string();\nlet mut scanner = Scanner::new(&con);"
 
 # ループ
 [loop]
diff --git a/atcodertools/tools/templates/default_template.d b/atcodertools/tools/templates/default_template.d
@@ -25,8 +25,6 @@ void solve({{ formal_arguments }}){
 {% endif %}
 // Generated by {{ atcodertools.version }} {{ atcodertools.url }}  (tips: You use the default template now. You can remove this line by using your custom template)
 int main(){
-    auto input = stdin.byLine.map!split.joiner;
-
     {% if prediction_success %}
     {{ input_part }}
     solve({{ actual_arguments }});
diff --git a/atcodertools/tools/templates/default_template.java b/atcodertools/tools/templates/default_template.java
@@ -14,7 +14,6 @@ class Main {
 
     // Generated by {{ atcodertools.version }} {{ atcodertools.url }}  (tips: You use the default template now. You can remove this line by using your custom template)
     public static void main(String[] args) throws Exception {
-        final Scanner sc = new Scanner(System.in);
         {% if prediction_success %}
         {{ input_part }}
         solve({{ actual_arguments }});
diff --git a/atcodertools/tools/templates/default_template.rs b/atcodertools/tools/templates/default_template.rs
@@ -18,8 +18,6 @@ fn solve({{ formal_arguments }}) {
 
 // Generated by {{ atcodertools.version }} {{ atcodertools.url }}  (tips: You use the default template now. You can remove this line by using your custom template)
 fn main() {
-    let con = read_string();
-    let mut scanner = Scanner::new(&con);
     {% if prediction_success %}
     {{input_part}}
     // In order to avoid potential stack overflow, spawn a new thread.
diff --git a/tests/resources/test_codegen/template.d b/tests/resources/test_codegen/template.d
@@ -8,8 +8,6 @@ void solve(${formal_arguments}){
 }
 
 int main(){
-    auto input = stdin.byLine.map!split.joiner;
-
     ${input_part}
     solve(${actual_arguments});
     return 0;
diff --git a/tests/resources/test_codegen/template.java b/tests/resources/test_codegen/template.java
@@ -3,7 +3,6 @@
 
 class Main {
     public static void main(String[] args) throws Exception {
-        final Scanner sc = new Scanner(System.in);
         ${input_part}
         solve(${actual_arguments});
     }
diff --git a/tests/resources/test_codegen/template.rust b/tests/resources/test_codegen/template.rust
@@ -5,8 +5,6 @@ fn solve(${formal_arguments}) {
 }
 
 fn main() {
-    let con = read_string();
-    let mut scanner = Scanner::new(&con);
     ${input_part}
     solve(${actual_arguments});
 }
diff --git a/tests/resources/test_codegen/template_jinja.d b/tests/resources/test_codegen/template_jinja.d
@@ -24,8 +24,6 @@ void solve({{ formal_arguments }}){
 
 {% endif %}
 int main(){
-    auto input = stdin.byLine.map!split.joiner;
-
     {% if prediction_success %}
     {{ input_part }}
     solve({{ actual_arguments }});
diff --git a/tests/resources/test_codegen/template_jinja.java b/tests/resources/test_codegen/template_jinja.java
@@ -12,7 +12,6 @@ class Main {
     static final String NO = "{{ no_str }}";
     {% endif %}
     public static void main(String[] args) throws Exception {
-        final Scanner sc = new Scanner(System.in);
         {{ input_part }}
         solve({{ actual_arguments }});
     }
diff --git a/tests/resources/test_codegen/template_jinja.rust b/tests/resources/test_codegen/template_jinja.rust
@@ -16,8 +16,6 @@ fn solve({{ formal_arguments }}) {
 {% endif %}
 
 fn main() {
-    let con = read_string();
-    let mut scanner = Scanner::new(&con);
     {% if prediction_success %}
     {{input_part}}
     solve({{ actual_arguments }});
diff --git a/tests/resources/test_codegen/test_default_code_generators_and_templates/d/echo_template.d b/tests/resources/test_codegen/test_default_code_generators_and_templates/d/echo_template.d
@@ -41,8 +41,6 @@ void solve({{ formal_arguments }}){
 
 {% endif %}
 int main(){
-    auto input = stdin.byLine.map!split.joiner;
-
     {% if prediction_success %}
     {{ input_part }}
     solve({{ actual_arguments }});
diff --git a/tests/resources/test_codegen/test_default_code_generators_and_templates/java/echo_template.java b/tests/resources/test_codegen/test_default_code_generators_and_templates/java/echo_template.java
@@ -13,7 +13,6 @@ class Main {
     {% endif %}
 
     public static void main(String[] args) throws Exception {
-        final Scanner sc = new Scanner(System.in);
         {% if prediction_success %}
         {{ input_part }}
         solve({{ actual_arguments }});
diff --git a/tests/resources/test_codegen/test_default_code_generators_and_templates/rust/echo_template.rs b/tests/resources/test_codegen/test_default_code_generators_and_templates/rust/echo_template.rs
@@ -42,8 +42,6 @@ fn solve({{ formal_arguments }}) {
 {% endif %}
 
 fn main() {
-    let con = read_string();
-    let mut scanner = Scanner::new(&con);
     {% if prediction_success %}
     {{input_part}}
     // In order to avoid potential stack overflow, spawn a new thread.

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ void solve(${formal_arguments}){`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`int main(){`
`11`		`- auto input = stdin.byLine.map!split.joiner;`
`12`		`-`
`13`	`11`	`${input_part}`
`14`	`12`	`solve(${actual_arguments});`
`15`	`13`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`class Main {`
`5`	`5`	`public static void main(String[] args) throws Exception {`
`6`		`- final Scanner sc = new Scanner(System.in);`
`7`	`6`	`${input_part}`
`8`	`7`	`solve(${actual_arguments});`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ fn solve(${formal_arguments}) {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`fn main() {`
`8`		`- let con = read_string();`
`9`		`- let mut scanner = Scanner::new(&con);`
`10`	`8`	`${input_part}`
`11`	`9`	`solve(${actual_arguments});`
`12`	`10`	`}`