diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-18 02:10:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-18 02:10:42 +0000 |
| commit | bd872dec0b5435125b223f461751e67cb06f969f (patch) | |
| tree | c545684c00477cb581e5108bf7c1a68550970181 | |
| parent | 58e2ebc8295c7b1138f95563325f22ff58e962fe (diff) | |
| parent | 5313741bf922fe6e283e9e81ff5befd4f291cb9c (diff) | |
| download | xsdc-bd872dec0b5435125b223f461751e67cb06f969f.tar.gz | |
Snap for 7040294 from 5313741bf922fe6e283e9e81ff5befd4f291cb9c to sc-release
Change-Id: I4b88c306c109d32b1eb961c491981adef266b633
| -rw-r--r-- | src/com/android/xsdc/cpp/CppCodeGenerator.java | 3 | ||||
| -rw-r--r-- | tests/resources/group.xml | 4 | ||||
| -rw-r--r-- | tests/resources/group2.xml | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/xsdc/cpp/CppCodeGenerator.java b/src/com/android/xsdc/cpp/CppCodeGenerator.java index 489dc39..b867edb 100644 --- a/src/com/android/xsdc/cpp/CppCodeGenerator.java +++ b/src/com/android/xsdc/cpp/CppCodeGenerator.java @@ -756,6 +756,9 @@ public class CppCodeGenerator { + "xmlNodePtr child = xmlDocGetRootElement(doc.get());\n" + "if (child == NULL) {\n" + "return std::nullopt;\n" + + "}\n" + + "if (xmlXIncludeProcess(doc.get()) < 0) {\n" + + "return std::nullopt;\n" + "}\n\n" + "if (!xmlStrcmp(child->name, reinterpret_cast<const xmlChar*>" + "(\"%s\"))) {\n", diff --git a/tests/resources/group.xml b/tests/resources/group.xml index c68abd6..6e9f45d 100644 --- a/tests/resources/group.xml +++ b/tests/resources/group.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<Student> +<Student version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <State>CA</State> <city>Mountain View</city> - <road>Street 101</road> + <xi:include href="group2.xml"/> </Student> diff --git a/tests/resources/group2.xml b/tests/resources/group2.xml new file mode 100644 index 0000000..c7bc0d3 --- /dev/null +++ b/tests/resources/group2.xml @@ -0,0 +1 @@ +<road>Street 101</road> |