diff options
19 files changed, 80 insertions, 70 deletions
diff --git a/src/Detect.cxx b/src/Detect.cxx index 21bfef2..2ef5ae8 100644 --- a/src/Detect.cxx +++ b/src/Detect.cxx @@ -40,8 +40,8 @@ static bool failedCC(const char* id, std::vector<const char*> const& args, { std::cerr << "error: '--castxml-cc-" << id << "' compiler command failed:\n\n"; - for (std::vector<const char *>::const_iterator i = args.begin(), - e = args.end(); + for (std::vector<const char*>::const_iterator i = args.begin(), + e = args.end(); i != e; ++i) { std::cerr << " '" << *i << "'"; } diff --git a/src/Output.cxx b/src/Output.cxx index 9047921..2c4c25e 100644 --- a/src/Output.cxx +++ b/src/Output.cxx @@ -65,6 +65,7 @@ protected: private: typedef void (DumpQual::*bool_type)() const; void bool_true() const {} + public: bool IsConst; bool IsVolatile; @@ -113,6 +114,7 @@ protected: private: typedef void (DumpId::*bool_type)() const; void bool_true() const {} + public: unsigned int Id; DumpQual Qual; diff --git a/src/RunClang.cxx b/src/RunClang.cxx index edf18a5..cf1e674 100644 --- a/src/RunClang.cxx +++ b/src/RunClang.cxx @@ -53,7 +53,7 @@ #if LLVM_VERSION_MAJOR > 3 || \ LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 9 -#define CASTXML_OWNS_OSTREAM +# define CASTXML_OWNS_OSTREAM #endif class ASTConsumer : public clang::ASTConsumer diff --git a/src/Utils.cxx b/src/Utils.cxx index a7b5245..7846b0b 100644 --- a/src/Utils.cxx +++ b/src/Utils.cxx @@ -230,7 +230,7 @@ std::string stringReplace(std::string str, std::string const& in, } #if defined(_WIN32) -#include <windows.h> +# include <windows.h> #endif void suppressInteractiveErrors() diff --git a/src/castxml.cxx b/src/castxml.cxx index 4989857..c15804a 100644 --- a/src/castxml.cxx +++ b/src/castxml.cxx @@ -29,7 +29,7 @@ #include "llvm/Support/raw_ostream.h" #if LLVM_VERSION_MAJOR >= 7 -#include "llvm/Support/InitLLVM.h" +# include "llvm/Support/InitLLVM.h" #endif #include <iostream> @@ -41,7 +41,7 @@ #if LLVM_VERSION_MAJOR > 3 || \ LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 7 -#include "llvm/Support/StringSaver.h" +# include "llvm/Support/StringSaver.h" #else class StringSaver : public llvm::cl::StringSaver { diff --git a/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt b/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt index 9a316e2..53b887f 100644 --- a/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt +++ b/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> <ElaboratedType id="_2" type="_4"/> <Namespace id="_3" name="::"/> <Enumeration id="_4" name="start" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/castxml1.c++11.Class-template-bases.xml.txt b/test/expect/castxml1.c++11.Class-template-bases.xml.txt index 72b4cac..da4642f 100644 --- a/test/expect/castxml1.c++11.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++11.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/castxml1.c++14.Class-template-bases.xml.txt b/test/expect/castxml1.c++14.Class-template-bases.xml.txt index 72b4cac..da4642f 100644 --- a/test/expect/castxml1.c++14.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++14.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/castxml1.c++17.Class-template-bases.xml.txt b/test/expect/castxml1.c++17.Class-template-bases.xml.txt index 72b4cac..da4642f 100644 --- a/test/expect/castxml1.c++17.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++17.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/castxml1.c++98.Class-template-bases.xml.txt b/test/expect/castxml1.c++98.Class-template-bases.xml.txt index f1a527c..a4c7d2f 100644 --- a/test/expect/castxml1.c++98.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++98.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" throw=""> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"( throw="")?/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" throw=""> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" throw="" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" throw="" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"( throw="")?/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.any.Typedef-to-Enumeration-anonymous.xml.txt b/test/expect/gccxml.any.Typedef-to-Enumeration-anonymous.xml.txt index 2a382b2..df57362 100644 --- a/test/expect/gccxml.any.Typedef-to-Enumeration-anonymous.xml.txt +++ b/test/expect/gccxml.any.Typedef-to-Enumeration-anonymous.xml.txt @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/> + <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> <Enumeration id="_2" name="start" 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/Typedef-to-Enumeration-anonymous.cxx"/> diff --git a/test/expect/gccxml.c++11.Class-template-bases.xml.txt b/test/expect/gccxml.c++11.Class-template-bases.xml.txt index e09f577..73162cd 100644 --- a/test/expect/gccxml.c++11.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++11.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.c++14.Class-template-bases.xml.txt b/test/expect/gccxml.c++14.Class-template-bases.xml.txt index e09f577..73162cd 100644 --- a/test/expect/gccxml.c++14.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++14.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.c++17.Class-template-bases.xml.txt b/test/expect/gccxml.c++17.Class-template-bases.xml.txt index e09f577..73162cd 100644 --- a/test/expect/gccxml.c++17.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++17.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.c++98.Class-template-bases.xml.txt b/test/expect/gccxml.c++98.Class-template-bases.xml.txt index aefed78..28f3eb8 100644 --- a/test/expect/gccxml.c++98.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++98.Class-template-bases.xml.txt @@ -1,17 +1,17 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Class id="_1" name="start<int>" context="_2" location="f1:12" file="f1" line="12" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> + <Class id="_1" name="start<int>" context="_2" location="f1:14" file="f1" line="14" members="_3 _4 _5 _6" bases="_7 _8" size="[0-9]+" align="[0-9]+"> <Base type="_7" access="public" virtual="0" offset="[0-9]+"/> <Base type="_8" access="public" virtual="0" offset="[0-9]+"/> </Class> - <Constructor id="_3" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> - <Constructor id="_4" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" throw=""> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <Constructor id="_3" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"( throw="")?/> + <Constructor id="_4" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" throw=""> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </Constructor> - <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1" throw="" mangled="[^"]+"> - <Argument type="_9" location="f1:12" file="f1" line="12"/> + <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1" throw="" mangled="[^"]+"> + <Argument type="_9" location="f1:14" file="f1" line="14"/> </OperatorMethod> - <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> + <Destructor id="_6" name="start" context="_1" access="public" location="f1:14" file="f1" line="14" inline="1" artificial="1"( throw="")?/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> diff --git a/test/input/Class-base-offset.cxx b/test/input/Class-base-offset.cxx index 255130d..13f547d 100644 --- a/test/input/Class-base-offset.cxx +++ b/test/input/Class-base-offset.cxx @@ -10,6 +10,9 @@ class base_3 { char b3; }; -class start : public base_1, public base_2, public base_3 +class start + : public base_1 + , public base_2 + , public base_3 { }; diff --git a/test/input/Class-bases.cxx b/test/input/Class-bases.cxx index b38bd8a..3ce6ab3 100644 --- a/test/input/Class-bases.cxx +++ b/test/input/Class-bases.cxx @@ -7,8 +7,9 @@ class base_private class base_protected { }; -class start : public base_public, - private base_private, - virtual protected base_protected +class start + : public base_public + , private base_private + , virtual protected base_protected { }; diff --git a/test/input/Class-template-bases.cxx b/test/input/Class-template-bases.cxx index b446021..d10ad59 100644 --- a/test/input/Class-template-bases.cxx +++ b/test/input/Class-template-bases.cxx @@ -6,7 +6,9 @@ class dependent_base { }; template <typename T> -class start : public non_dependent_base, public dependent_base<T> +class start + : public non_dependent_base + , public dependent_base<T> { }; template class start<int>; // instantiation diff --git a/test/input/Typedef-to-Enumeration-anonymous.cxx b/test/input/Typedef-to-Enumeration-anonymous.cxx index efcbc45..a31bca3 100644 --- a/test/input/Typedef-to-Enumeration-anonymous.cxx +++ b/test/input/Typedef-to-Enumeration-anonymous.cxx @@ -1 +1,3 @@ -typedef enum {} start; +typedef enum +{ +} start; |