Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package CastXML for openSUSE:Factory checked in at 2022-12-15 19:25:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CastXML (Old) and /work/SRC/openSUSE:Factory/.CastXML.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CastXML" Thu Dec 15 19:25:19 2022 rev:11 rq:1042987 version:0.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/CastXML/CastXML.changes 2022-11-28 11:07:01.843746781 +0100 +++ /work/SRC/openSUSE:Factory/.CastXML.new.1835/CastXML.changes 2022-12-15 19:25:45.184243334 +0100 @@ -1,0 +2,13 @@ +Wed Dec 14 17:53:30 UTC 2022 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 0.5.1: + * Bug fix: tests fail on 32-bit architectures + (gh#CastXML/CastXML#232). + +------------------------------------------------------------------- +Wed Dec 7 21:47:07 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to version 0.5.0: + * No release notes + +------------------------------------------------------------------- Old: ---- CastXML-0.4.8.tar.gz New: ---- CastXML-0.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CastXML.spec ++++++ --- /var/tmp/diff_new_pack.cXCkmp/_old 2022-12-15 19:25:46.092248500 +0100 +++ /var/tmp/diff_new_pack.cXCkmp/_new 2022-12-15 19:25:46.100248546 +0100 @@ -17,7 +17,7 @@ Name: CastXML -Version: 0.4.8 +Version: 0.5.1 Release: 0 Summary: C-family Abstract Syntax Tree XML Output License: Apache-2.0 ++++++ CastXML-0.4.8.tar.gz -> CastXML-0.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/NOTICE new/CastXML-0.5.1/NOTICE --- old/CastXML-0.4.8/NOTICE 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/NOTICE 2022-12-14 18:39:06.000000000 +0100 @@ -1,5 +1,5 @@ CastXML -Copyright 2013-2021 Kitware, Inc. +Copyright 2013-2022 Kitware, Inc. This product includes software developed at Kitware, Inc. (https://www.kitware.com/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/README.rst new/CastXML-0.5.1/README.rst --- old/CastXML-0.4.8/README.rst 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/README.rst 2022-12-14 18:39:06.000000000 +0100 @@ -54,6 +54,7 @@ * `LLVM/Clang`_ compiler SDK install tree built using the C++ compiler. This version of CastXML has been tested with LLVM/Clang + - Release ``15.0`` - Git ``main`` as of 2022-05-27 (``5cd690ad9c``) - Release ``14.0`` - Release ``13.0`` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/doc/manual/castxml.1.rst new/CastXML-0.5.1/doc/manual/castxml.1.rst --- old/CastXML-0.4.8/doc/manual/castxml.1.rst 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/doc/manual/castxml.1.rst 2022-12-14 18:39:06.000000000 +0100 @@ -105,7 +105,7 @@ .. code-block:: xml - <CastXML format="1.2.0"> + <CastXML format="1.3.0"> * The first component is the ``epic`` format version number given to the ``--castxml-output=<v>`` flag, and currently must always be ``1``. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/doc/manual/castxml.xsd new/CastXML-0.5.1/doc/manual/castxml.xsd --- old/CastXML-0.4.8/doc/manual/castxml.xsd 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/doc/manual/castxml.xsd 2022-12-14 18:39:06.000000000 +0100 @@ -277,6 +277,7 @@ <!-- Fields of anonymous record types might have an empty name. --> <xs:attribute name="name" type="nameOrEmpty" /> <xs:attribute name="type" type="xs:IDREF" /> + <xs:attribute name="init" type="expression" use="optional" /> <xs:attribute name="bits" type="xs:unsignedInt" use="optional" /> <xs:attribute name="context" type="xs:IDREF" /> <xs:attribute name="access" type="access" /> @@ -338,6 +339,14 @@ </xs:complexType> </xs:element> + <xs:element name="AtomicType"> + <xs:complexType> + <xs:attribute name="id" type="xs:ID" /> + <xs:attribute name="type" type="xs:IDREF" /> + <xs:attributeGroup ref="abi" /> + </xs:complexType> + </xs:element> + <xs:element name="PointerType"> <xs:complexType> <xs:attribute name="id" type="xs:ID" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/src/Output.cxx new/CastXML-0.5.1/src/Output.cxx --- old/CastXML-0.4.8/src/Output.cxx 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/src/Output.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -421,6 +421,9 @@ void PrintABIAttributes(clang::TypeInfo const& t); void PrintABIAttributes(clang::TypeDecl const* d); + /** Print init="..." attribute. */ + void PrintInitAttribute(clang::Expr const* init); + /** Print a basetype="..." attribute with the XML IDREF for the given type. Also queues the given type for later output. */ void PrintBaseTypeAttribute(clang::Type const* c, bool complete); @@ -551,6 +554,7 @@ DumpNode const* dn); // Type node output methods. + void OutputAtomicType(clang::AtomicType const* t, DumpNode const* dn); void OutputBuiltinType(clang::BuiltinType const* t, DumpNode const* dn); void OutputConstantArrayType(clang::ConstantArrayType const* t, DumpNode const* dn); @@ -1310,6 +1314,20 @@ this->OS << " align=\"" << t.Align << "\""; } +void ASTVisitor::PrintInitAttribute(clang::Expr const* init) +{ + if (!init) { + return; + } + this->OS << " init=\""; + std::string s; + llvm::raw_string_ostream rso(s); + PrinterHelper ph(*this); + init->printPretty(rso, &ph, this->PrintingPolicy); + this->OS << encodeXML(rso.str()); + this->OS << "\""; +} + void ASTVisitor::PrintBaseTypeAttribute(clang::Type const* c, bool complete) { this->OS << " basetype=\""; @@ -1719,7 +1737,8 @@ d->getType()->getAs<clang::FunctionProtoType>()) { this->PrintThrowsAttribute(fpt, dn->Complete); if (!clang::isa<clang::CXXConstructorDecl>(d) && - !clang::isa<clang::CXXDestructorDecl>(d)) { + !clang::isa<clang::CXXDestructorDecl>(d) && + d->getLanguageLinkage() == clang::CXXLanguageLinkage) { this->PrintMangledAttribute(d); } this->GetFunctionTypeAttributes(fpt, attributes); @@ -2052,6 +2071,9 @@ unsigned bits = d->getBitWidthValue(this->CTX); this->OS << " bits=\"" << bits << "\""; } + if (this->Opts.CastXml) { + this->PrintInitAttribute(d->getInClassInitializer()); + } this->PrintContextAttribute(d); this->PrintLocationAttribute(d); this->PrintOffsetAttribute(this->CTX.getFieldOffset(d)); @@ -2070,15 +2092,7 @@ this->PrintIdAttribute(dn); this->PrintNameAttribute(d->getName().str()); this->PrintTypeAttribute(d->getType(), dn->Complete); - if (clang::Expr const* init = d->getInit()) { - this->OS << " init=\""; - std::string s; - llvm::raw_string_ostream rso(s); - PrinterHelper ph(*this); - init->printPretty(rso, &ph, this->PrintingPolicy); - this->OS << encodeXML(rso.str()); - this->OS << "\""; - } + this->PrintInitAttribute(d->getInit()); this->PrintContextAttribute(d); this->PrintLocationAttribute(d); if (d->getStorageClass() == clang::SC_Static) { @@ -2087,7 +2101,13 @@ if (d->getStorageClass() == clang::SC_Extern) { this->OS << " extern=\"1\""; } - this->PrintMangledAttribute(d); + + bool const isTranslationUnit = + clang::isa<clang::TranslationUnitDecl>(d->getDeclContext()); + if (!isTranslationUnit) { + // FIXME: Recognize 'extern "C" int var;' inside a namespace. + this->PrintMangledAttribute(d); + } this->PrintAttributesAttribute(d); this->PrintCommentAttribute(d, dn); @@ -2210,6 +2230,20 @@ this->GetContextName(d)); } +void ASTVisitor::OutputAtomicType(clang::AtomicType const* t, + DumpNode const* dn) +{ + if (this->Opts.GccXml) { + this->OutputUnimplementedType(t, dn); + return; + } + this->OS << " <AtomicType"; + this->PrintIdAttribute(dn); + this->PrintTypeAttribute(t->getValueType(), false); + this->PrintABIAttributes(this->CTX.getTypeInfo(t)); + this->OS << "/>\n"; +} + void ASTVisitor::OutputBuiltinType(clang::BuiltinType const* t, DumpNode const* dn) { @@ -2347,7 +2381,7 @@ // Start dump with castxml-compatible format. /* clang-format off */ this->OS << - "<CastXML format=\"" << Opts.CastXmlEpicFormatVersion << ".2.1\">\n" + "<CastXML format=\"" << Opts.CastXmlEpicFormatVersion << ".3.1\">\n" ; /* clang-format on */ } else if (this->Opts.GccXml) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/src/Version.cmake new/CastXML-0.5.1/src/Version.cmake --- old/CastXML-0.4.8/src/Version.cmake 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/src/Version.cmake 2022-12-14 18:39:06.000000000 +0100 @@ -1,19 +1,19 @@ # CastXML version number components. set(CastXML_VERSION_MAJOR 0) -set(CastXML_VERSION_MINOR 4) -set(CastXML_VERSION_PATCH 8) -set(CastXML_VERSION_RC 0) +set(CastXML_VERSION_MINOR 5) +set(CastXML_VERSION_PATCH 1) +#set(CastXML_VERSION_RC 0) set(CastXML_VERSION_IS_DIRTY 0) # Start with the full version number used in tags. It has no dev info. set(CastXML_VERSION "${CastXML_VERSION_MAJOR}.${CastXML_VERSION_MINOR}.${CastXML_VERSION_PATCH}") -if(CastXML_VERSION_RC) +if(DEFINED CastXML_VERSION_RC) set(CastXML_VERSION "${CastXML_VERSION}-rc${CastXML_VERSION_RC}") endif() # If this source was exported by 'git archive', use its commit info. -set(git_info "b8005d0 CastXML 0.4.8") +set(git_info "d1523f24 CastXML 0.5.1") # Otherwise, try to identify the current development source version. if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/src/clang-format.bash new/CastXML-0.5.1/src/clang-format.bash --- old/CastXML-0.4.8/src/clang-format.bash 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/src/clang-format.bash 2022-12-14 18:39:06.000000000 +0100 @@ -107,7 +107,7 @@ esac # Filter sources to which our style should apply. -$git_ls -z -- '*.h' '*.cxx' | +$git_ls -z -- '*.h' '*.c' '*.cxx' | egrep -z -v '^share/castxml/' | egrep -z -v '^src/kwsys/' | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/CMakeLists.txt new/CastXML-0.5.1/test/CMakeLists.txt --- old/CastXML-0.4.8/test/CMakeLists.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/CMakeLists.txt 2022-12-14 18:39:06.000000000 +0100 @@ -421,6 +421,14 @@ castxml_test_output(ArrayType) castxml_test_output(ArrayType-incomplete) +castxml_test_output(Atomic-int) +castxml_test_output(Atomic-int-const) +castxml_test_output(Atomic-ptr) +castxml_test_output(Atomic-struct) +castxml_test_output_c(Atomic-int) +castxml_test_output_c(Atomic-int-const) +castxml_test_output_c(Atomic-ptr) +castxml_test_output_c(Atomic-struct) castxml_test_output(Class) castxml_test_output(Class-abstract) castxml_test_output(Class-annotate) @@ -491,10 +499,13 @@ castxml_test_output(Field) castxml_test_output(Field-annotate) castxml_test_output(Field-deprecated) +castxml_test_output_11(Field-init) castxml_test_output(Function) +castxml_test_output_c(Function) castxml_test_output_14(Function-auto) castxml_test_output(Function-annotate) castxml_test_output(Function-deprecated) +castxml_test_output(Function-extern-C) castxml_test_output(Function-Argument-annotate) castxml_test_output(Function-Argument-deprecated) castxml_test_output(Function-Argument-decay) @@ -560,8 +571,10 @@ castxml_test_output(Typedef-to-Struct-anonymous) castxml_test_output(Typedef-to-Union-anonymous) castxml_test_output(Variable) +castxml_test_output_c(Variable) castxml_test_output(Variable-annotate) castxml_test_output(Variable-deprecated) +castxml_test_output(Variable-extern-C) castxml_test_output(Variable-in-Class) castxml_test_output(Variable-init) castxml_test_output(Variable-init-cast) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/cc-gnu.c new/CastXML-0.5.1/test/cc-gnu.c --- old/CastXML-0.4.8/test/cc-gnu.c 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/cc-gnu.c 2022-12-14 18:39:06.000000000 +0100 @@ -8,9 +8,9 @@ int i; for (i = 1; i < argc; ++i) { if (strncmp(argv[i], "--cc-define=", 12) == 0) { - fprintf(stdout, "#define %s 1\n", argv[i]+12); + fprintf(stdout, "#define %s 1\n", argv[i] + 12); } else if (strncmp(argv[i], "-std=", 5) == 0) { - std_date = argv[i]+5; + std_date = argv[i] + 5; } else if (strcmp(argv[i], "-ansi") == 0) { fprintf(stdout, "#define __STRICT_ANSI__ 1\n"); } else if (strcmp(argv[i], "-tgt-armv7") == 0) { @@ -24,35 +24,30 @@ } } if (cpp) { - fprintf(stdout, - "#define __cplusplus %s\n", std_date? std_date : "199711L" - ); - } else if(std_date) { - fprintf(stdout, - "#define __STDC_VERSION__ %s\n", std_date - ); + fprintf(stdout, "#define __cplusplus %s\n", + std_date ? std_date : "199711L"); + } else if (std_date) { + fprintf(stdout, "#define __STDC_VERSION__ %s\n", std_date); } fprintf(stdout, #ifdef _WIN32 - "#define _WIN32 1\n" - "#define __MINGW32__ 1\n" + "#define _WIN32 1\n" + "#define __MINGW32__ 1\n" #endif - "#define __GNUC__ 1\n" - "#define __has_include(x) x\n" - "#define __has_include_next(x) x\n" - "#define __GNUC_MINOR__ 1\n" - "#define __bool __bool\n" - "#define __builtin_vsx_foo __builtin_vsx_foo\n" - "#define __pixel __pixel\n" - "#define __vector __vector\n" - "#define __has_last(x) x" - ); + "#define __GNUC__ 1\n" + "#define __has_include(x) x\n" + "#define __has_include_next(x) x\n" + "#define __GNUC_MINOR__ 1\n" + "#define __bool __bool\n" + "#define __builtin_vsx_foo __builtin_vsx_foo\n" + "#define __pixel __pixel\n" + "#define __vector __vector\n" + "#define __has_last(x) x"); fprintf(stderr, - "#include <...> search starts here:\n" - " /some/include\n" - " " TEST_DIR "/cc-gnu-builtin\n" - " /some/Frameworks\n" - " /some/CustomFW (framework directory)\n" - ); + "#include <...> search starts here:\n" + " /some/include\n" + " " TEST_DIR "/cc-gnu-builtin\n" + " /some/Frameworks\n" + " /some/CustomFW (framework directory)\n"); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/cc-msvc.c new/CastXML-0.5.1/test/cc-msvc.c --- old/CastXML-0.4.8/test/cc-msvc.c 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/cc-msvc.c 2022-12-14 18:39:06.000000000 +0100 @@ -10,43 +10,33 @@ int i; for (i = 1; i < argc; ++i) { if (strncmp(argv[i], "--cc-define=", 12) == 0) { - fprintf(stdout, "\n#define %s 1", argv[i]+12); + fprintf(stdout, "\n#define %s 1", argv[i] + 12); } else if (strncmp(argv[i], "-msc=", 5) == 0) { - msc_ver = argv[i]+5; + msc_ver = argv[i] + 5; } else if (strncmp(argv[i], "-msvc_lang=", 11) == 0) { - msvc_lang = argv[i]+11; + msvc_lang = argv[i] + 11; } else if (strncmp(argv[i], "-stdcpp_default_new_alignment=", 30) == 0) { - stdcpp_default_new_alignment = argv[i]+30; + stdcpp_default_new_alignment = argv[i] + 30; } else if (strstr(argv[i], ".cpp")) { cpp = 1; } } - fprintf(stdout, - "\n" - ); + fprintf(stdout, "\n"); if (cpp) { - fprintf(stdout, - "#define __cplusplus 199711L\n" - ); + fprintf(stdout, "#define __cplusplus 199711L\n"); } - fprintf(stdout, - "#define _MSC_VER %s\n", msc_ver - ); - if(msvc_lang) { - fprintf(stdout, - "#define _MSVC_LANG %s\n", msvc_lang - ); + fprintf(stdout, "#define _MSC_VER %s\n", msc_ver); + if (msvc_lang) { + fprintf(stdout, "#define _MSVC_LANG %s\n", msvc_lang); } - if(stdcpp_default_new_alignment) { - fprintf(stdout, - "#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ %s\n", - stdcpp_default_new_alignment); + if (stdcpp_default_new_alignment) { + fprintf(stdout, "#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ %s\n", + stdcpp_default_new_alignment); } fprintf(stdout, - "#define __has_include(x) x\n" - "#define __has_include_next(x) x\n" - "#define _WIN32 1\n" - "#define __has_last(x) x" - ); + "#define __has_include(x) x\n" + "#define __has_include_next(x) x\n" + "#define _WIN32 1\n" + "#define __has_last(x) x"); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-int-const.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-int-const.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-int-const.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-int-const.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2c" context="_3" location="f1:1" file="f1" line="1"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_2c" type="_2" const="1"/> + <Namespace id="_3" name="::"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-int-const.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-int.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-int.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-int.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-int.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-int.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-ptr.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-ptr.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-ptr.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-ptr.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <PointerType id="_4" type="_5" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-ptr.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-struct.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-struct.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Atomic-struct.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Atomic-struct.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <ElaboratedType id="_4" type="_5"/> + <Struct id="_5" name="" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-struct.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Class-template-recurse.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Class-template-recurse.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Class-template-recurse.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Class-template-recurse.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" init="" context="_3" location="f1:20" file="f1" line="20" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" init="" context="_3" location="f1:20" file="f1" line="20"/> <Struct id="_2" name="C<void>" context="_3" location="f1:11" file="f1" line="11" members="_4 _5 _6 _7" size="[0-9]+" align="[0-9]+"/> <Constructor id="_4" name="C" context="_2" access="public" location="f1:13" file="f1" line="13" inline="1"/> <Constructor id="_5" name="C" context="_2" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Comment-Variable.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Comment-Variable.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Comment-Variable.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Comment-Variable.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3" mangled="[^"]+" comment="c1"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3" comment="c1"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <Comment id="c1" attached="_1" file="f1" begin_line="1" begin_column="1" begin_offset="0" end_line="2" end_column="27" end_offset="47"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Field-init.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Field-init.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Field-init.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Field-init.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,23 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6 _7 _8" size="[0-9]+" align="[0-9]+"/> + <Field id="_3" name="field_int" type="_9" init="123" context="_1" access="private" location="f1:3" file="f1" line="3" offset="0"/> + <Field id="_4" name="field_str" type="_10" init=""abc"" context="_1" access="private" location="f1:4" file="f1" line="4" offset="[0-9]+"/> + <Constructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> + <Constructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> + <Argument type="_11" location="f1:1" file="f1" line="1"/> + </Constructor> + <OperatorMethod id="_7" name="=" returns="_12" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> + <Argument type="_11" location="f1:1" file="f1" line="1"/> + </OperatorMethod> + <Destructor id="_8" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> + <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_10" type="_13c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_1c" type="_1" const="1"/> + <ReferenceType id="_12" type="_1" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_13c" type="_13" const="1"/> + <Namespace id="_2" name="::"/> + <FundamentalType id="_13" name="char" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Field-init.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Field.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Field.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Field.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Field.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -2,16 +2,16 @@ <CastXML[^>]*> <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6 _7 _8 _9" size="[0-9]+" align="[0-9]+"/> <Field id="_3" name="field" type="_10" context="_1" access="private" location="f1:3" file="f1" line="3" offset="0"/> - <Field id="_4" name="bit_field" type="_11" bits="2" context="_1" access="private" location="f1:4" file="f1" line="4" offset="32"/> + <Field id="_4" name="bit_field" type="_11" bits="2" context="_1" access="private" location="f1:4" file="f1" line="4" offset="[0-9]+"/> <Field id="_5" name="mutable_field" type="_10" context="_1" access="private" location="f1:5" file="f1" line="5" offset="64" mutable="1"/> - <Constructor id="_6" name="start" context="_1" access="public" location="f1:7" file="f1" line="7"> - <Argument type="_12" location="f1:7" file="f1" line="7"/> - </Constructor> - <OperatorMethod id="_7" name="=" returns="_13" context="_1" access="public" location="f1:8" file="f1" line="8" mangled="[^"]+"> + <Constructor id="_6" name="start" context="_1" access="public" location="f1:8" file="f1" line="8"> <Argument type="_12" location="f1:8" file="f1" line="8"/> + </Constructor> + <OperatorMethod id="_7" name="=" returns="_13" context="_1" access="public" location="f1:9" file="f1" line="9" mangled="[^"]+"> + <Argument type="_12" location="f1:9" file="f1" line="9"/> </OperatorMethod> - <Constructor id="_8" name="start" context="_1" access="public" location="f1:9" file="f1" line="9"/> - <Destructor id="_9" name="start" context="_1" access="public" location="f1:10" file="f1" line="10"/> + <Constructor id="_8" name="start" context="_1" access="public" location="f1:10" file="f1" line="10"/> + <Destructor id="_9" name="start" context="_1" access="public" location="f1:11" file="f1" line="11"/> <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_11" name="unsigned int" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Function-extern-C.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Function-extern-C.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Function-extern-C.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Function-extern-C.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,10 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1"> + <Argument type="_4" location="f1:1" file="f1" line="1"/> + </Function> + <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Function-extern-C.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Namespace-extern-C-members.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Namespace-extern-C-members.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Namespace-extern-C-members.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Namespace-extern-C-members.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -2,7 +2,7 @@ <CastXML[^>]*> <Namespace id="_1" name="start" context="_2" members="_3 _4"/> <Typedef id="_3" name="Int" type="_5" context="_1" location="f1:3" file="f1" line="3"/> - <Function id="_4" name="function" returns="_3" context="_1" location="f1:4" file="f1" line="4" mangled="[^"]+"> + <Function id="_4" name="function" returns="_3" context="_1" location="f1:4" file="f1" line="4"> <Argument type="_3" location="f1:4" file="f1" line="4"/> </Function> <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable-annotate.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable-annotate.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable-annotate.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable-annotate.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+" annotation="an annotation" attributes="annotate\(an annotation\)"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" annotation="an annotation" attributes="annotate\(an annotation\)"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-annotate.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable-deprecated.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable-deprecated.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable-deprecated.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable-deprecated.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+" deprecation="Variable Deprecated" attributes="deprecated"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" deprecation="Variable Deprecated" attributes="deprecated"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-deprecated.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable-extern-C.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable-extern-C.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable-extern-C.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable-extern-C.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Namespace id="_1" name="start" context="_2" members="_3"/> + <Variable id="_3" name="variable" type="_4" context="_1" location="f1:2" file="f1" line="2" mangled="[^"]+"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_2" name="::"/> + <File id="f1" name=".*/test/input/Variable-extern-C.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable-lambda.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable-lambda.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable-lambda.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable-lambda.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" init="\[\] ?\(\) [^"]*" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" init="\[\] ?\(\) [^"]*" context="_3" location="f1:1" file="f1" line="1"/> <Class id="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-lambda.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable-ms-dllexport.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable-ms-dllexport.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable-ms-dllexport.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable-ms-dllexport.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+" attributes="dllexport"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" attributes="dllexport"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-ms-dllexport.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable-ms-dllimport.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable-ms-dllimport.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable-ms-dllimport.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable-ms-dllimport.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" extern="1" mangled="[^"]+" attributes="dllimport"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" extern="1" attributes="dllimport"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-ms-dllimport.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.any.Variable.xml.txt new/CastXML-0.5.1/test/expect/castxml1.any.Variable.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.any.Variable.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.any.Variable.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-int-const.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-int-const.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-int-const.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-int-const.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2c" context="_3" location="f1:1" file="f1" line="1"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_2c" type="_2" const="1"/> + <Namespace id="_3" name="::"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-int-const.c"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-int.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-int.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-int.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-int.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-int.c"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-ptr.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-ptr.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-ptr.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-ptr.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <PointerType id="_4" type="_5" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-ptr.c"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-struct.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-struct.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.Atomic-struct.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.Atomic-struct.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> + <AtomicType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <ElaboratedType id="_4" type="_5"/> + <Struct id="_5" name="" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Atomic-struct.c"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.Function.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.Function.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.Function.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.Function.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,10 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1"> + <Argument type="_4" location="f1:1" file="f1" line="1"/> + </Function> + <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Function.c"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.GNU-attr-malloc-args.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.GNU-attr-malloc-args.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.GNU-attr-malloc-args.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.GNU-attr-malloc-args.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Function id="_1" name="start" returns="_2" context="_3" location="f1:7" file="f1" line="7" mangled="[^"]+"/> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:7" file="f1" line="7"/> <PointerType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <Typedef id="_4" name="foo" type="_5" context="_3" location="f1:3" file="f1" line="3"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.GNU-float128.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.GNU-float128.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.GNU-float128.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.GNU-float128.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]*start[^"]*"> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1"> <Argument type="_2" location="f1:1" file="f1" line="1"/> </Function> <FundamentalType id="_2" name="__float128" size="128" align="128"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.GNU-va_arg_pack.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.GNU-va_arg_pack.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.GNU-va_arg_pack.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.GNU-va_arg_pack.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1" inline="1" mangled="[^"]+"> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1" inline="1"> <Argument name="n" type="_2" location="f1:1" file="f1" line="1"/> <Ellipsis/> </Function> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/castxml1.c.Variable.xml.txt new/CastXML-0.5.1/test/expect/castxml1.c.Variable.xml.txt --- old/CastXML-0.4.8/test/expect/castxml1.c.Variable.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/castxml1.c.Variable.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Variable.c"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-int-const.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-int-const.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-int-const.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-int-const.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2c" context="_3" location="f1:1" file="f1" line="1"/> + <Unimplemented id="_2" type_class="Atomic"/> + <CvQualifiedType id="_2c" type="_2" const="1"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-int-const.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-int.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-int.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-int.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-int.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <Unimplemented id="_2" type_class="Atomic"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-int.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-ptr.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-ptr.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-ptr.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-ptr.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <Unimplemented id="_2" type_class="Atomic"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-ptr.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-struct.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-struct.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Atomic-struct.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Atomic-struct.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> + <Unimplemented id="_2" type_class="Atomic"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-struct.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Class-template-recurse.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Class-template-recurse.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Class-template-recurse.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Class-template-recurse.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" init="" context="_3" location="f1:20" file="f1" line="20" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" init="" context="_3" location="f1:20" file="f1" line="20"/> <Struct id="_2" name="C<void>" context="_3" location="f1:11" file="f1" line="11" members="_4 _5 _6 _7" size="[0-9]+" align="[0-9]+"/> <Constructor id="_4" name="C" context="_2" access="public" location="f1:13" file="f1" line="13" inline="1"/> <Constructor id="_5" name="C" context="_2" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Comment-Field.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Comment-Field.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Comment-Field.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Comment-Field.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -2,7 +2,7 @@ <GCC_XML[^>]*> <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6 _7 _8 _9" size="[0-9]+" align="[0-9]+"/> <Field id="_3" name="field" type="_10" context="_1" access="private" location="f1:4" file="f1" line="4" offset="0"/> - <Field id="_4" name="bit_field" type="_11" bits="2" context="_1" access="private" location="f1:6" file="f1" line="6" offset="32"/> + <Field id="_4" name="bit_field" type="_11" bits="2" context="_1" access="private" location="f1:6" file="f1" line="6" offset="[0-9]+"/> <Field id="_5" name="mutable_field" type="_10" context="_1" access="private" location="f1:8" file="f1" line="8" offset="64" mutable="1"/> <Constructor id="_6" name="start" context="_1" access="public" location="f1:11" file="f1" line="11"> <Argument type="_12" location="f1:11" file="f1" line="11"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Comment-Variable.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Comment-Variable.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Comment-Variable.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Comment-Variable.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Comment-Variable.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Field-init.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Field-init.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Field-init.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Field-init.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,23 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6 _7 _8" size="[0-9]+" align="[0-9]+"/> + <Field id="_3" name="field_int" type="_9" context="_1" access="private" location="f1:3" file="f1" line="3" offset="0"/> + <Field id="_4" name="field_str" type="_10" context="_1" access="private" location="f1:4" file="f1" line="4" offset="[0-9]+"/> + <Constructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> + <Constructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> + <Argument type="_11" location="f1:1" file="f1" line="1"/> + </Constructor> + <OperatorMethod id="_7" name="=" returns="_12" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> + <Argument type="_11" location="f1:1" file="f1" line="1"/> + </OperatorMethod> + <Destructor id="_8" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> + <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_10" type="_13c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_1c" type="_1" const="1"/> + <ReferenceType id="_12" type="_1" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_13c" type="_13" const="1"/> + <Namespace id="_2" name="::"/> + <FundamentalType id="_13" name="char" size="[0-9]+" align="[0-9]+"/> + <File id="f1" name=".*/test/input/Field-init.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Field.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Field.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Field.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Field.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -2,16 +2,16 @@ <GCC_XML[^>]*> <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6 _7 _8 _9" size="[0-9]+" align="[0-9]+"/> <Field id="_3" name="field" type="_10" context="_1" access="private" location="f1:3" file="f1" line="3" offset="0"/> - <Field id="_4" name="bit_field" type="_11" bits="2" context="_1" access="private" location="f1:4" file="f1" line="4" offset="32"/> + <Field id="_4" name="bit_field" type="_11" bits="2" context="_1" access="private" location="f1:4" file="f1" line="4" offset="[0-9]+"/> <Field id="_5" name="mutable_field" type="_10" context="_1" access="private" location="f1:5" file="f1" line="5" offset="64" mutable="1"/> - <Constructor id="_6" name="start" context="_1" access="public" location="f1:7" file="f1" line="7"> - <Argument type="_12" location="f1:7" file="f1" line="7"/> - </Constructor> - <OperatorMethod id="_7" name="=" returns="_13" context="_1" access="public" location="f1:8" file="f1" line="8" mangled="[^"]+"> + <Constructor id="_6" name="start" context="_1" access="public" location="f1:8" file="f1" line="8"> <Argument type="_12" location="f1:8" file="f1" line="8"/> + </Constructor> + <OperatorMethod id="_7" name="=" returns="_13" context="_1" access="public" location="f1:9" file="f1" line="9" mangled="[^"]+"> + <Argument type="_12" location="f1:9" file="f1" line="9"/> </OperatorMethod> - <Constructor id="_8" name="start" context="_1" access="public" location="f1:9" file="f1" line="9"/> - <Destructor id="_9" name="start" context="_1" access="public" location="f1:10" file="f1" line="10"/> + <Constructor id="_8" name="start" context="_1" access="public" location="f1:10" file="f1" line="10"/> + <Destructor id="_9" name="start" context="_1" access="public" location="f1:11" file="f1" line="11"/> <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_11" name="unsigned int" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Function-extern-C.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Function-extern-C.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Function-extern-C.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Function-extern-C.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,10 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1"> + <Argument type="_4" location="f1:1" file="f1" line="1"/> + </Function> + <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Function-extern-C.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Namespace-extern-C-members.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Namespace-extern-C-members.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Namespace-extern-C-members.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Namespace-extern-C-members.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -2,7 +2,7 @@ <GCC_XML[^>]*> <Namespace id="_1" name="start" context="_2" members="_3 _4"/> <Typedef id="_3" name="Int" type="_5" context="_1" location="f1:3" file="f1" line="3"/> - <Function id="_4" name="function" returns="_3" context="_1" location="f1:4" file="f1" line="4" mangled="[^"]+"> + <Function id="_4" name="function" returns="_3" context="_1" location="f1:4" file="f1" line="4"> <Argument type="_3" location="f1:4" file="f1" line="4"/> </Function> <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable-annotate.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable-annotate.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable-annotate.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable-annotate.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+" attributes="annotate\(an annotation\)"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" attributes="annotate\(an annotation\)"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-annotate.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable-deprecated.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable-deprecated.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable-deprecated.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable-deprecated.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+" attributes="deprecated"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" attributes="deprecated"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-deprecated.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable-extern-C.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable-extern-C.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable-extern-C.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable-extern-C.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Namespace id="_1" name="start" context="_2" members="_3"/> + <Variable id="_3" name="variable" type="_4" context="_1" location="f1:2" file="f1" line="2" mangled="[^"]+"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_2" name="::"/> + <File id="f1" name=".*/test/input/Variable-extern-C.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable-lambda.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable-lambda.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable-lambda.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable-lambda.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" init="\[\] ?\(\) [^"]*" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" init="\[\] ?\(\) [^"]*" context="_3" location="f1:1" file="f1" line="1"/> <Class id="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-lambda.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable-ms-dllexport.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable-ms-dllexport.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable-ms-dllexport.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable-ms-dllexport.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+" attributes="dllexport"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" attributes="dllexport"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-ms-dllexport.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable-ms-dllimport.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable-ms-dllimport.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable-ms-dllimport.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable-ms-dllimport.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" extern="1" mangled="[^"]+" attributes="dllimport"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" extern="1" attributes="dllimport"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable-ms-dllimport.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.any.Variable.xml.txt new/CastXML-0.5.1/test/expect/gccxml.any.Variable.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.any.Variable.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.any.Variable.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]+"/> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Variable.cxx"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-int-const.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-int-const.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-int-const.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-int-const.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2c" context="_3" location="f1:1" file="f1" line="1"/> + <Unimplemented id="_2" type_class="Atomic"/> + <CvQualifiedType id="_2c" type="_2" const="1"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-int-const.c"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-int.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-int.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-int.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-int.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <Unimplemented id="_2" type_class="Atomic"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-int.c"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-ptr.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-ptr.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-ptr.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-ptr.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <Unimplemented id="_2" type_class="Atomic"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-ptr.c"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-struct.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-struct.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.Atomic-struct.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.Atomic-struct.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> + <Unimplemented id="_2" type_class="Atomic"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Atomic-struct.c"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.Function.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.Function.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.Function.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.Function.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,10 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1"> + <Argument type="_4" location="f1:1" file="f1" line="1"/> + </Function> + <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Function.c"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.GNU-attr-malloc-args.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.GNU-attr-malloc-args.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.GNU-attr-malloc-args.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.GNU-attr-malloc-args.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Function id="_1" name="start" returns="_2" context="_3" location="f1:7" file="f1" line="7" mangled="[^"]+"/> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:7" file="f1" line="7"/> <PointerType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <Typedef id="_4" name="foo" type="_5" context="_3" location="f1:3" file="f1" line="3"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.GNU-float128.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.GNU-float128.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.GNU-float128.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.GNU-float128.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1" mangled="[^"]*start[^"]*"> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1"> <Argument type="_2" location="f1:1" file="f1" line="1"/> </Function> <FundamentalType id="_2" name="__float128" size="128" align="128"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.GNU-va_arg_pack.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.GNU-va_arg_pack.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.GNU-va_arg_pack.xml.txt 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.GNU-va_arg_pack.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1" inline="1" mangled="[^"]+"> + <Function id="_1" name="start" returns="_2" context="_3" location="f1:1" file="f1" line="1" inline="1"> <Argument name="n" type="_2" location="f1:1" file="f1" line="1"/> <Ellipsis/> </Function> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/expect/gccxml.c.Variable.xml.txt new/CastXML-0.5.1/test/expect/gccxml.c.Variable.xml.txt --- old/CastXML-0.4.8/test/expect/gccxml.c.Variable.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/expect/gccxml.c.Variable.xml.txt 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,7 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Variable id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Variable.c"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-int-const.c new/CastXML-0.5.1/test/input/Atomic-int-const.c --- old/CastXML-0.4.8/test/input/Atomic-int-const.c 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-int-const.c 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +typedef _Atomic int const start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-int-const.cxx new/CastXML-0.5.1/test/input/Atomic-int-const.cxx --- old/CastXML-0.4.8/test/input/Atomic-int-const.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-int-const.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +typedef _Atomic int const start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-int.c new/CastXML-0.5.1/test/input/Atomic-int.c --- old/CastXML-0.4.8/test/input/Atomic-int.c 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-int.c 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +typedef _Atomic int start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-int.cxx new/CastXML-0.5.1/test/input/Atomic-int.cxx --- old/CastXML-0.4.8/test/input/Atomic-int.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-int.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +typedef _Atomic int start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-ptr.c new/CastXML-0.5.1/test/input/Atomic-ptr.c --- old/CastXML-0.4.8/test/input/Atomic-ptr.c 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-ptr.c 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +typedef int* _Atomic start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-ptr.cxx new/CastXML-0.5.1/test/input/Atomic-ptr.cxx --- old/CastXML-0.4.8/test/input/Atomic-ptr.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-ptr.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +typedef int* _Atomic start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-struct.c new/CastXML-0.5.1/test/input/Atomic-struct.c --- old/CastXML-0.4.8/test/input/Atomic-struct.c 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-struct.c 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,3 @@ +typedef _Atomic struct +{ +} start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Atomic-struct.cxx new/CastXML-0.5.1/test/input/Atomic-struct.cxx --- old/CastXML-0.4.8/test/input/Atomic-struct.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Atomic-struct.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,3 @@ +typedef _Atomic struct +{ +} start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Enumeration-type.cxx new/CastXML-0.5.1/test/input/Enumeration-type.cxx --- old/CastXML-0.4.8/test/input/Enumeration-type.cxx 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Enumeration-type.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -1,4 +1,4 @@ -enum class start: short +enum class start : short { value = 1 }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Field-init.cxx new/CastXML-0.5.1/test/input/Field-init.cxx --- old/CastXML-0.4.8/test/input/Field-init.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Field-init.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,5 @@ +class start +{ + int field_int = 123; + const char* field_str = "abc"; +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Field.cxx new/CastXML-0.5.1/test/input/Field.cxx --- old/CastXML-0.4.8/test/input/Field.cxx 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Field.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -3,6 +3,7 @@ int field; unsigned bit_field : 2; mutable int mutable_field; + public: start(start const&); start& operator=(start const&); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Function-extern-C.cxx new/CastXML-0.5.1/test/input/Function-extern-C.cxx --- old/CastXML-0.4.8/test/input/Function-extern-C.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Function-extern-C.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +extern "C" void start(int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Function.c new/CastXML-0.5.1/test/input/Function.c --- old/CastXML-0.4.8/test/input/Function.c 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Function.c 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +void start(int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/GNU-va_arg_pack.c new/CastXML-0.5.1/test/input/GNU-va_arg_pack.c --- old/CastXML-0.4.8/test/input/GNU-va_arg_pack.c 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/input/GNU-va_arg_pack.c 2022-12-14 18:39:06.000000000 +0100 @@ -1,3 +1,4 @@ -__inline int start(int n, ...) { +__inline int start(int n, ...) +{ return start(n + __builtin_va_arg_pack_len(), __builtin_va_arg_pack()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Variable-extern-C.cxx new/CastXML-0.5.1/test/input/Variable-extern-C.cxx --- old/CastXML-0.4.8/test/input/Variable-extern-C.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Variable-extern-C.cxx 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1,3 @@ +namespace start { +extern "C" int variable; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/input/Variable.c new/CastXML-0.5.1/test/input/Variable.c --- old/CastXML-0.4.8/test/input/Variable.c 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.5.1/test/input/Variable.c 2022-12-14 18:39:06.000000000 +0100 @@ -0,0 +1 @@ +int start; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.8/test/run.cmake new/CastXML-0.5.1/test/run.cmake --- old/CastXML-0.4.8/test/run.cmake 2022-11-22 15:17:30.000000000 +0100 +++ new/CastXML-0.5.1/test/run.cmake 2022-12-14 18:39:06.000000000 +0100 @@ -97,6 +97,7 @@ string(REGEX REPLACE "artificial=\"1\"( throw=\"\")?" "artificial=\"1\"( throw=\"\")?" update_xml "${update_xml}") string(REGEX REPLACE "size=\"[0-9]+\" align=\"[0-9]+\"" "size=\"[0-9]+\" align=\"[0-9]+\"" update_xml "${update_xml}") string(REGEX REPLACE "<File id=\"(f[0-9]+)\" name=\"[^\"]*/test/input/([^\"]*)\"/>" "<File id=\"\\1\" name=\".*/test/input/\\2\"/>" update_xml "${update_xml}") + string(REGEX REPLACE "<Field([^>]*) offset=\"[1-9][0-9]*\"/>" "<Field\\1 offset=\"[0-9]+\"/>" update_xml "${update_xml}") if(update_xml MATCHES "<Base.*<Base") # multiple inheritance has ABI-specific offsets string(REGEX REPLACE "<Base type=\"([^\"]*)\" access=\"([^\"]*)\" virtual=\"0\" offset=\"[0-9]+\"/>" "<Base type=\"\\1\" access=\"\\2\" virtual=\"0\" offset=\"[0-9]+\"/>" update_xml "${update_xml}") endif()
