<fix>(v2,v3): fix struct[][], struct[2][], struct[2][3] cases bug. (#31)

FISCO-BCOS · Mar 4, 2024 · 6325a1b · 6325a1b
1 parent 9cc1b17
commit 6325a1b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/org/fisco/bcos/codegen/v2/wrapper/SolidityContractWrapper.java b/src/main/java/org/fisco/bcos/codegen/v2/wrapper/SolidityContractWrapper.java
@@ -1648,13 +1648,11 @@ private List<TypeSpec> buildStructTypes(List<ABIDefinition> functionDefinitions)
             if (internalType == null || internalType.isEmpty()) {
                 structName = "Struct" + structCounter;
             } else {
-                if (namedType.getType().equals("tuple[]") && internalType.endsWith("[]")) {
-                    internalType = internalType.substring(0, internalType.lastIndexOf("["));
-                }
-                if (namedType.getType().matches("tuple\\[\\d+\\]")
+                // struct array, such as struct[2], struct[], struct[][], struct[2][]
+                if (namedType.getType().matches("tuple(\\[\\d*\\])+")
                         && internalType.endsWith("]")
-                        && internalType.matches(".*\\[\\d+\\]")) {
-                    internalType = internalType.substring(0, internalType.lastIndexOf("["));
+                        && internalType.matches(".*(\\[\\d*\\])+")) {
+                    internalType = internalType.substring(0, internalType.indexOf("["));
                 }
                 if (internalType.contains(".")) {
                     structName = internalType.substring(internalType.lastIndexOf(".") + 1);

diff --git a/src/main/java/org/fisco/bcos/codegen/v3/wrapper/ContractWrapper.java b/src/main/java/org/fisco/bcos/codegen/v3/wrapper/ContractWrapper.java
@@ -413,13 +413,11 @@ private List<TypeSpec> buildStructTypes(List<ABIDefinition> functionDefinitions)
             if (internalType == null || internalType.isEmpty()) {
                 structName = "Struct" + structCounter;
             } else {
-                if (namedType.getType().equals("tuple[]") && internalType.endsWith("[]")) {
-                    internalType = internalType.substring(0, internalType.lastIndexOf("["));
-                }
-                if (namedType.getType().matches("tuple\\[\\d+\\]")
+                // struct array, such as struct[2], struct[], struct[][], struct[2][]
+                if (namedType.getType().matches("tuple(\\[\\d*\\])+")
                         && internalType.endsWith("]")
-                        && internalType.matches(".*\\[\\d+\\]")) {
-                    internalType = internalType.substring(0, internalType.lastIndexOf("["));
+                        && internalType.matches(".*(\\[\\d*\\])+")) {
+                    internalType = internalType.substring(0, internalType.indexOf("["));
                 }
                 if (isWasm) {
                     structName = internalType.substring(internalType.lastIndexOf(".") + 1);