Better default C++ template with move semantics (#78)

* Refactor code_generators/cpp.py

* Fix java code generator

* Fix testcases

* Replace two dimensional test case

* fix typo

Author: asi1024

atcodertools/codegen/code_generators/cpp.py

@@ -48,30 +48,27 @@ def _convert_type(self, type_: Type) -> str:
         elif type_ == Type.int:
             return "long long"
         elif type_ == Type.str:
-            return "string"
+            return "std::string"
         else:
             raise NotImplementedError
 
     def _get_declaration_type(self, var: Variable):
-        if var.dim_num() == 0:
-            template = "{type}"
-        elif var.dim_num() == 1:
-            template = "vector<{type}>"
-        elif var.dim_num() == 2:
-            template = "vector<vector<{type}>>"
-        else:
-            raise NotImplementedError
-        return template.format(type=self._convert_type(var.type))
+        ctype = self._convert_type(var.type)
+        for _ in range(var.dim_num()):
+            ctype = 'std::vector<{}>'.format(ctype)
+        return ctype
 
     def _actual_arguments(self) -> str:
         """
             :return the string form of actual arguments e.g. "N, K, a"
         """
-        return ", ".join([v.name for v in self._format.all_vars()])
+        return ", ".join([
+            v.name if v.dim_num() == 0 else 'std::move({})'.format(v.name)
+            for v in self._format.all_vars()])
 
     def _formal_arguments(self):
         """
-            :return the string form of formal arguments e.g. "int N, int K, vector<int> a"
+            :return the string form of formal arguments e.g. "int N, int K, std::vector<int> a"
         """
         return ", ".join([
             "{decl_type} {name}".format(
@@ -82,26 +79,33 @@ def _formal_arguments(self):
 
     def _generate_declaration(self, var: Variable):
         """
-        :return: Create declaration part E.g. array[1..n] → vector<int> array = vector<int>(n-1+1);
+        :return: Create declaration part E.g. array[1..n] -> std::vector<int> array = std::vector<int>(n-1+1);
         """
         if var.dim_num() == 0:
-            constructor = ""
+            dims = []
         elif var.dim_num() == 1:
-            constructor = "({size})".format(
-                size=var.first_index.get_length())
+            dims = [var.first_index.get_length()]
         elif var.dim_num() == 2:
-            constructor = "({row_size}, vector<{type}>({col_size}))".format(
-                type=self._convert_type(var.type),
-                row_size=var.first_index.get_length(),
-                col_size=var.second_index.get_length()
-            )
+            dims = [var.first_index.get_length(),
+                    var.second_index.get_length()]
         else:
             raise NotImplementedError
 
+        if len(dims) == 0:
+            ctor = ''
+        elif len(dims) == 1:
+            ctor = '({})'.format(dims[0])
+        else:
+            ctor = '({})'.format(dims[-1])
+            ctype = self._convert_type(var.type)
+            for dim in dims[-2::-1]:
+                ctype = 'std::vector<{}>'.format(ctype)
+                ctor = '({}, {}{})'.format(dim, ctype, ctor)
+
         line = "{decl_type} {name}{constructor};".format(
             name=var.name,
             decl_type=self._get_declaration_type(var),
-            constructor=constructor
+            constructor=ctor
         )
         return line
 
@@ -112,7 +116,7 @@ def _input_code_for_var(self, var: Variable) -> str:
         elif var.type == Type.int:
             return 'scanf("%lld",&{name});'.format(name=name)
         elif var.type == Type.str:
-            return 'cin >> {name};'.format(name=name)
+            return 'std::cin >> {name};'.format(name=name)
         else:
             raise NotImplementedError
 

atcodertools/codegen/code_generators/java.py

@@ -30,6 +30,9 @@ def _get_declaration_type(self, var: Variable):
             raise NotImplementedError
         return template.format(type=self._convert_type(var.type))
 
+    def _actual_arguments(self) -> str:
+        return ", ".join([v.name for v in self._format.all_vars()])
+
     def _generate_declaration(self, var: Variable):
         if var.dim_num() == 0:
             constructor = ""

tests/resources/test_atc_env/test_backup/agc029/A/main.cpp

@@ -5,13 +5,13 @@ using namespace std;
 
 
 
-void solve(string S){
+void solve(std::string S){
 
 }
 
 int main(){
-    string S;
-    cin >> S;
+    std::string S;
+    std::cin >> S;
     solve(S);
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/A/main.cpp.1

@@ -5,13 +5,13 @@ using namespace std;
 
 
 
-void solve(string S){
+void solve(std::string S){
 
 }
 
 int main(){
-    string S;
-    cin >> S;
+    std::string S;
+    std::cin >> S;
     solve(S);
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/B/main.cpp

@@ -5,17 +5,17 @@ using namespace std;
 
 
 
-void solve(long long N, vector<long long> A){
+void solve(long long N, std::vector<long long> A){
 
 }
 
 int main(){
     long long N;
     scanf("%lld",&N);
-    vector<long long> A(N);
+    std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
         scanf("%lld",&A[i]);
     }
-    solve(N, A);
+    solve(N, std::move(A));
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/B/main.cpp.1

@@ -5,17 +5,17 @@ using namespace std;
 
 
 
-void solve(long long N, vector<long long> A){
+void solve(long long N, std::vector<long long> A){
 
 }
 
 int main(){
     long long N;
     scanf("%lld",&N);
-    vector<long long> A(N);
+    std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
         scanf("%lld",&A[i]);
     }
-    solve(N, A);
+    solve(N, std::move(A));
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/C/main.cpp

@@ -5,17 +5,17 @@ using namespace std;
 
 
 
-void solve(long long N, vector<long long> A){
+void solve(long long N, std::vector<long long> A){
 
 }
 
 int main(){
     long long N;
     scanf("%lld",&N);
-    vector<long long> A(N);
+    std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
         scanf("%lld",&A[i]);
     }
-    solve(N, A);
+    solve(N, std::move(A));
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/C/main.cpp.1

@@ -5,17 +5,17 @@ using namespace std;
 
 
 
-void solve(long long N, vector<long long> A){
+void solve(long long N, std::vector<long long> A){
 
 }
 
 int main(){
     long long N;
     scanf("%lld",&N);
-    vector<long long> A(N);
+    std::vector<long long> A(N);
     for(int i = 0 ; i < N ; i++){
         scanf("%lld",&A[i]);
     }
-    solve(N, A);
+    solve(N, std::move(A));
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/D/main.cpp

@@ -5,7 +5,7 @@ using namespace std;
 
 
 
-void solve(long long H, long long W, long long N, vector<long long> X, vector<long long> Y){
+void solve(long long H, long long W, long long N, std::vector<long long> X, std::vector<long long> Y){
 
 }
 
@@ -16,12 +16,12 @@ int main(){
     scanf("%lld",&W);
     long long N;
     scanf("%lld",&N);
-    vector<long long> X(N);
-    vector<long long> Y(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]);
     }
-    solve(H, W, N, X, Y);
+    solve(H, W, N, std::move(X), std::move(Y));
     return 0;
 }

tests/resources/test_atc_env/test_backup/agc029/D/main.cpp.1

@@ -5,7 +5,7 @@ using namespace std;
 
 
 
-void solve(long long H, long long W, long long N, vector<long long> X, vector<long long> Y){
+void solve(long long H, long long W, long long N, std::vector<long long> X, std::vector<long long> Y){
 
 }
 
@@ -16,12 +16,12 @@ int main(){
     scanf("%lld",&W);
     long long N;
     scanf("%lld",&N);
-    vector<long long> X(N);
-    vector<long long> Y(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]);
     }
-    solve(H, W, N, X, Y);
+    solve(H, W, N, std::move(X), std::move(Y));
     return 0;
 }