commit d6799939f0848ab82bc6260ba124e0aa193e3382
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 15 23:24:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 15 23:24:41 2024 +0000
tree 9a219fe87e9e9178cde0b86bdab200cdec41897c
parent a40b0c23899d998d51009f52f5cc7cd4de283476
parent 7f0153d0937c6045f3f0e1adc4b4e886037fe143

Merge "Fix simpleContent with extension" into main

src/main/java/com/android/xsdc/cpp/CppCodeGenerator.java

diff --git a/src/main/java/com/android/xsdc/cpp/CppCodeGenerator.java b/src/main/java/com/android/xsdc/cpp/CppCodeGenerator.java
index 9bfbe56..a58647d 100644
--- a/src/main/java/com/android/xsdc/cpp/CppCodeGenerator.java
+++ b/src/main/java/com/android/xsdc/cpp/CppCodeGenerator.java
@@ -449,7 +449,7 @@
             }
         }
         if (valueType != null) {
-            parserHeaderFile.printf("const std::optional<%s> _value;\n", valueType.getName());
+            parserHeaderFile.printf("const std::optional<%s> value_;\n", valueType.getName());
         }
 
         parserHeaderFile.printf("public:\n");
@@ -556,12 +556,7 @@
             parserCppFile.printf("%s = _value;\n}\n", variableName);
         }
 
-        if (baseValueType != null) {
-            printSetRawWithElementText("root");
-            parserCppFile.print(baseValueType.getParsingExpression());
-            parserCppFile.printf("instance.setValue(_value);\n");
-            parserCppFile.printf("}\n");
-        } else if (!allElements.isEmpty()) {
+        if (!allElements.isEmpty()) {
             for (int i = 0; i < allElements.size(); ++i) {
                 CppType type = allElementTypes.get(i);
                 XsdElement element = allElements.get(i);
@@ -609,6 +604,10 @@
             }
             parserCppFile.printf("}\n}\n");
         }
+        if (baseValueType != null) {
+            printSetRawWithElementText("root");
+            parserCppFile.print(baseValueType.getParsingExpression());
+        }
         parserCppFile.printf("%s instance%s;\n",
                 fullName, args.length() > 0 ? "(" + args + ")" : "");
         parserCppFile.print("return instance;\n}\n");
@@ -905,6 +904,16 @@
             }
         }
 
+        CppSimpleType valueType = (complexType instanceof XsdSimpleContent) ?
+                getValueType((XsdSimpleContent) complexType, false) : null;
+        if (valueType != null) {
+            constructorArgs.append(String.format(", %s %s", valueType.getName(), "value"));
+            boolean isMultipleType = (valueType.isList() ? true : false);
+            constructor.append(String.format(", %s_(%s)", "value", "value"));
+            // getParsingExpression prepends with underscore, so set args for instantiation
+            args.append(String.format(", %s", "_value"));
+        }
+
         String constructorArgsString = constructorArgs.toString();
         String constructorString = constructor.toString();
         if (constructorArgsString.length() > 0) {