mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#123936 Formatting files in module idl with clang-format

Browse Source 
Change-Id: I0a2681218773288c14b6faf98dd0bb8a7dbac56d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105679
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer
2020-11-12 13:00:40 +01:00
committed by Christian Lohmaier
parent 7721e7a797
commit 9c9a822920
15 changed files with 107 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
idl/source/objects/module.cxx
View File

@@ -22,10 +22,7 @@
#include <database.hxx> #include <database.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
SvMetaModule::SvMetaModule() {}
SvMetaModule::SvMetaModule()
{
}
void SvMetaModule::WriteSfx(SvIdlDataBase& rBase, SvStream& rOutStm) void SvMetaModule::WriteSfx(SvIdlDataBase& rBase, SvStream& rOutStm)
{ {

3
idlc/inc/astconstants.hxx
View File

@@ -26,7 +26,8 @@ class AstConstants final : public AstModule
public: public:
AstConstants(const OString& name, AstScope* pScope) AstConstants(const OString& name, AstScope* pScope)
: AstModule(NT_constants, name, pScope) : AstModule(NT_constants, name, pScope)
{} {
}
}; };
#endif // INCLUDED_IDLC_INC_ASTCONSTANTS_HXX #endif // INCLUDED_IDLC_INC_ASTCONSTANTS_HXX

6
idlc/inc/astenum.hxx
View File

@@ -23,16 +23,14 @@
#include "astscope.hxx" #include "astscope.hxx"
#include "astconstant.hxx" #include "astconstant.hxx"
class AstEnum final : public AstType class AstEnum final : public AstType, public AstScope
, public AstScope
{ {
public: public:
AstEnum(const OString& name, AstScope* pScope); AstEnum(const OString& name, AstScope* pScope);
virtual ~AstEnum() override; virtual ~AstEnum() override;
sal_Int32 getEnumValueCount() sal_Int32 getEnumValueCount() { return m_enumValueCount++; }
{ return m_enumValueCount++; }
AstConstant* checkValue(AstExpression* pExpr); AstConstant* checkValue(AstExpression* pExpr);

3
idlc/inc/astexception.hxx
View File

@@ -26,7 +26,8 @@ class AstException final : public AstStruct
public: public:
AstException(const OString& name, AstException const* pBaseType, AstScope* pScope) AstException(const OString& name, AstException const* pBaseType, AstScope* pScope)
: AstStruct(NT_exception, name, pBaseType, pScope) : AstStruct(NT_exception, name, pBaseType, pScope)
{} {
}
}; };
#endif // INCLUDED_IDLC_INC_ASTEXCEPTION_HXX #endif // INCLUDED_IDLC_INC_ASTEXCEPTION_HXX

9
idlc/inc/astmodule.hxx
View File

@@ -22,18 +22,19 @@
#include "astdeclaration.hxx" #include "astdeclaration.hxx"
#include "astscope.hxx" #include "astscope.hxx"
class AstModule : public AstDeclaration class AstModule : public AstDeclaration, public AstScope
, public AstScope
{ {
public: public:
AstModule(const OString& name, AstScope* pScope) AstModule(const OString& name, AstScope* pScope)
: AstDeclaration(NT_module, name, pScope) : AstDeclaration(NT_module, name, pScope)
, AstScope(NT_module) , AstScope(NT_module)
{} {
}
AstModule(NodeType type, const OString& name, AstScope* pScope) AstModule(NodeType type, const OString& name, AstScope* pScope)
: AstDeclaration(type, name, pScope) : AstDeclaration(type, name, pScope)
, AstScope(type) , AstScope(type)
{} {
}
virtual bool dump(RegistryKey& rKey) override; virtual bool dump(RegistryKey& rKey) override;
}; };

7
idlc/inc/astneeds.hxx
View File

@@ -27,10 +27,11 @@ public:
AstNeeds(AstService* pRealService, const OString& name, AstScope* pScope) AstNeeds(AstService* pRealService, const OString& name, AstScope* pScope)
: AstDeclaration(NT_needs, name, pScope) : AstDeclaration(NT_needs, name, pScope)
, m_pRealService(pRealService) , m_pRealService(pRealService)
{} {
}
AstService* getRealService() { return m_pRealService; }
AstService* getRealService()
{ return m_pRealService; }
private: private:
AstService* m_pRealService; AstService* m_pRealService;
}; };

7
idlc/inc/astobserves.hxx
View File

@@ -27,10 +27,11 @@ public:
AstObserves(AstInterface* pRealInterface, const OString& name, AstScope* pScope) AstObserves(AstInterface* pRealInterface, const OString& name, AstScope* pScope)
: AstDeclaration(NT_observes, name, pScope) : AstDeclaration(NT_observes, name, pScope)
, m_pRealInterface(pRealInterface) , m_pRealInterface(pRealInterface)
{} {
}
AstInterface* getRealInterface() { return m_pRealInterface; }
AstInterface* getRealInterface()
{ return m_pRealInterface; }
private: private:
AstInterface* m_pRealInterface; AstInterface* m_pRealInterface;
}; };

15
idlc/inc/astscope.hxx
View File

@@ -31,17 +31,13 @@ public:
AstScope(NodeType nodeType); AstScope(NodeType nodeType);
virtual ~AstScope(); virtual ~AstScope();
NodeType getScopeNodeType() const NodeType getScopeNodeType() const { return m_nodeType; }
{ return m_nodeType; }
AstDeclaration* addDeclaration(AstDeclaration* pDecl); AstDeclaration* addDeclaration(AstDeclaration* pDecl);
sal_uInt32 nMembers() const sal_uInt32 nMembers() const { return static_cast<sal_uInt32>(m_declarations.size()); }
{ return static_cast<sal_uInt32>(m_declarations.size()); } DeclList::const_iterator getIteratorBegin() const { return m_declarations.begin(); }
DeclList::const_iterator getIteratorBegin() const DeclList::const_iterator getIteratorEnd() const { return m_declarations.end(); }
{ return m_declarations.begin(); }
DeclList::const_iterator getIteratorEnd() const
{ return m_declarations.end(); }
sal_uInt16 getNodeCount(NodeType nType) const; sal_uInt16 getNodeCount(NodeType nType) const;
// Name look up mechanism // Name look up mechanism
@@ -57,8 +53,7 @@ public:
AstDeclaration* lookupForAdd(AstDeclaration const* pDecl) const; AstDeclaration* lookupForAdd(AstDeclaration const* pDecl) const;
protected: protected:
AstDeclaration const * getLast() const AstDeclaration const* getLast() const { return m_declarations.back(); }
{ return m_declarations.back(); }
private: private:
DeclList m_declarations; DeclList m_declarations;

11
idlc/inc/astsequence.hxx
View File

@@ -27,15 +27,18 @@ public:
AstSequence(AstType const* pMemberType, AstScope* pScope) AstSequence(AstType const* pMemberType, AstScope* pScope)
: AstType(NT_sequence, OStringLiteral("[]") + pMemberType->getScopedName(), pScope) : AstType(NT_sequence, OStringLiteral("[]") + pMemberType->getScopedName(), pScope)
, m_pMemberType(pMemberType) , m_pMemberType(pMemberType)
{} {
}
AstType const * getMemberType() const AstType const* getMemberType() const { return m_pMemberType; }
{ return m_pMemberType; }
virtual bool isUnsigned() const override virtual bool isUnsigned() const override
{ return m_pMemberType != nullptr && m_pMemberType->isUnsigned(); } {
return m_pMemberType != nullptr && m_pMemberType->isUnsigned();
}
virtual const char* getRelativName() const override; virtual const char* getRelativName() const override;
private: private:
AstType const* m_pMemberType; AstType const* m_pMemberType;
mutable std::optional<OString> m_xRelativName; mutable std::optional<OString> m_xRelativName;

3
idlc/inc/asttype.hxx
View File

@@ -26,7 +26,8 @@ class AstType : public AstDeclaration
public: public:
AstType(const NodeType type, const OString& name, AstScope* pScope) AstType(const NodeType type, const OString& name, AstScope* pScope)
: AstDeclaration(type, name, pScope) : AstDeclaration(type, name, pScope)
{} {
}
virtual bool isUnsigned() const { return false; } virtual bool isUnsigned() const { return false; }
}; };

44
idlc/source/astexpression.cxx
View File

@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <astexpression.hxx> #include <astexpression.hxx>
#include <astconstant.hxx> #include <astconstant.hxx>
#include <astscope.hxx> #include <astscope.hxx>
@@ -84,17 +83,14 @@ AstExpression::AstExpression(OString* scopedName)
m_xSymbolicName = *scopedName; m_xSymbolicName = *scopedName;
} }
AstExpression::~AstExpression() AstExpression::~AstExpression() {}
{
}
/* /*
* Perform the coercion from the given AstExprValue to the requested * Perform the coercion from the given AstExprValue to the requested
* ExprType. Return an AstExprValue if successful, NULL if failed. * ExprType. Return an AstExprValue if successful, NULL if failed.
* must be done for hyper, uhyper * must be done for hyper, uhyper
*/ */
static bool static bool coerce_value(AstExprValue* ev, ExprType t)
coerce_value(AstExprValue *ev, ExprType t)
{ {
if (ev == nullptr) if (ev == nullptr)
return false; return false;
@@ -735,7 +731,8 @@ coerce_value(AstExprValue *ev, ExprType t)
return true; return true;
case ET_double: case ET_double:
{ {
if (static_cast<float>(ev->u.dval) > FLT_MAX || static_cast<float>(ev->u.dval) < -FLT_MAX) if (static_cast<float>(ev->u.dval) > FLT_MAX
|| static_cast<float>(ev->u.dval) < -FLT_MAX)
return false; return false;
auto tmp = static_cast<float>(ev->u.dval); auto tmp = static_cast<float>(ev->u.dval);
ev->u.fval = tmp; ev->u.fval = tmp;
@@ -1034,21 +1031,26 @@ std::unique_ptr<AstExprValue> AstExpression::eval_bin_op()
case ExprComb::Mod: case ExprComb::Mod:
if (m_subExpr2->getExprValue()->u.hval == 0) if (m_subExpr2->getExprValue()->u.hval == 0)
return nullptr; return nullptr;
retval->u.hval = m_subExpr1->getExprValue()->u.hval % m_subExpr2->getExprValue()->u.hval; retval->u.hval
= m_subExpr1->getExprValue()->u.hval % m_subExpr2->getExprValue()->u.hval;
break; break;
case ExprComb::Add: case ExprComb::Add:
retval->u.dval = m_subExpr1->getExprValue()->u.dval + m_subExpr2->getExprValue()->u.dval; retval->u.dval
= m_subExpr1->getExprValue()->u.dval + m_subExpr2->getExprValue()->u.dval;
break; break;
case ExprComb::Minus: case ExprComb::Minus:
retval->u.dval = m_subExpr1->getExprValue()->u.dval - m_subExpr2->getExprValue()->u.dval; retval->u.dval
= m_subExpr1->getExprValue()->u.dval - m_subExpr2->getExprValue()->u.dval;
break; break;
case ExprComb::Mul: case ExprComb::Mul:
retval->u.dval = m_subExpr1->getExprValue()->u.dval * m_subExpr2->getExprValue()->u.dval; retval->u.dval
= m_subExpr1->getExprValue()->u.dval * m_subExpr2->getExprValue()->u.dval;
break; break;
case ExprComb::Div: case ExprComb::Div:
if (m_subExpr2->getExprValue()->u.dval == 0.0) if (m_subExpr2->getExprValue()->u.dval == 0.0)
return nullptr; return nullptr;
retval->u.dval = m_subExpr1->getExprValue()->u.dval / m_subExpr2->getExprValue()->u.dval; retval->u.dval
= m_subExpr1->getExprValue()->u.dval / m_subExpr2->getExprValue()->u.dval;
break; break;
default: default:
return nullptr; return nullptr;
@@ -1078,19 +1080,24 @@ std::unique_ptr<AstExprValue> AstExpression::eval_bit_op()
switch (m_combOperator) switch (m_combOperator)
{ {
case ExprComb::Or: case ExprComb::Or:
retval->u.lval = m_subExpr1->getExprValue()->u.lval | m_subExpr2->getExprValue()->u.lval; retval->u.lval
= m_subExpr1->getExprValue()->u.lval | m_subExpr2->getExprValue()->u.lval;
break; break;
case ExprComb::Xor: case ExprComb::Xor:
retval->u.lval = m_subExpr1->getExprValue()->u.lval ^ m_subExpr2->getExprValue()->u.lval; retval->u.lval
= m_subExpr1->getExprValue()->u.lval ^ m_subExpr2->getExprValue()->u.lval;
break; break;
case ExprComb::And: case ExprComb::And:
retval->u.lval = m_subExpr1->getExprValue()->u.lval & m_subExpr2->getExprValue()->u.lval; retval->u.lval
= m_subExpr1->getExprValue()->u.lval & m_subExpr2->getExprValue()->u.lval;
break; break;
case ExprComb::Left: case ExprComb::Left:
retval->u.lval = m_subExpr1->getExprValue()->u.lval << m_subExpr2->getExprValue()->u.lval; retval->u.lval = m_subExpr1->getExprValue()->u.lval
<< m_subExpr2->getExprValue()->u.lval;
break; break;
case ExprComb::Right: case ExprComb::Right:
retval->u.lval = m_subExpr1->getExprValue()->u.lval >> m_subExpr2->getExprValue()->u.lval; retval->u.lval
= m_subExpr1->getExprValue()->u.lval >> m_subExpr2->getExprValue()->u.lval;
break; break;
default: default:
return nullptr; return nullptr;
@@ -1163,8 +1170,7 @@ std::unique_ptr<AstExprValue> AstExpression::eval_symbol()
/* /*
* Is it a constant? * Is it a constant?
*/ */
if (pDecl->getNodeType() != NT_const && if (pDecl->getNodeType() != NT_const && pDecl->getNodeType() != NT_enum_val)
pDecl->getNodeType() != NT_enum_val)
{ {
ErrorHandler::constantExpected(pDecl, *m_xSymbolicName); ErrorHandler::constantExpected(pDecl, *m_xSymbolicName);
return nullptr; return nullptr;

10
idlc/source/aststack.cxx
View File

@@ -21,9 +21,7 @@
#include <aststack.hxx> #include <aststack.hxx>
#include <astscope.hxx> #include <astscope.hxx>
AstStack::AstStack() AstStack::AstStack() {}
{
}
AstStack::~AstStack() AstStack::~AstStack()
{ {
@@ -31,7 +29,6 @@ AstStack::~AstStack()
delete p; delete p;
} }
AstScope* AstStack::top() AstScope* AstStack::top()
{ {
if (m_stack.empty()) if (m_stack.empty())
@@ -77,9 +74,6 @@ void AstStack::pop()
m_stack.pop_back(); m_stack.pop_back();
} }
void AstStack::clear() void AstStack::clear() { m_stack.clear(); }
{
m_stack.clear();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
idlc/source/attributeexceptions.hxx
View File

@@ -22,8 +22,10 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
struct AttributeExceptions { struct AttributeExceptions
struct Part { {
struct Part
{
OUString const* documentation; OUString const* documentation;
DeclList const* exceptions; DeclList const* exceptions;
}; };

14
solenv/clang-format/excludelist
View File

@@ -5020,7 +5020,6 @@ idl/source/cmptools/hash.cxx
idl/source/cmptools/lex.cxx idl/source/cmptools/lex.cxx
idl/source/objects/basobj.cxx idl/source/objects/basobj.cxx
idl/source/objects/bastype.cxx idl/source/objects/bastype.cxx
idl/source/objects/module.cxx
idl/source/objects/object.cxx idl/source/objects/object.cxx
idl/source/objects/slot.cxx idl/source/objects/slot.cxx
idl/source/objects/types.cxx idl/source/objects/types.cxx
@@ -5032,27 +5031,17 @@ idl/source/prj/svidl.cxx
idlc/inc/astattribute.hxx idlc/inc/astattribute.hxx
idlc/inc/astbasetype.hxx idlc/inc/astbasetype.hxx
idlc/inc/astconstant.hxx idlc/inc/astconstant.hxx
idlc/inc/astconstants.hxx
idlc/inc/astdeclaration.hxx idlc/inc/astdeclaration.hxx
idlc/inc/astenum.hxx
idlc/inc/astexception.hxx
idlc/inc/astexpression.hxx idlc/inc/astexpression.hxx
idlc/inc/astinterface.hxx idlc/inc/astinterface.hxx
idlc/inc/astinterfacemember.hxx idlc/inc/astinterfacemember.hxx
idlc/inc/astmember.hxx idlc/inc/astmember.hxx
idlc/inc/astmodule.hxx
idlc/inc/astneeds.hxx
idlc/inc/astobserves.hxx
idlc/inc/astoperation.hxx idlc/inc/astoperation.hxx
idlc/inc/astparameter.hxx idlc/inc/astparameter.hxx
idlc/inc/astscope.hxx
idlc/inc/astsequence.hxx
idlc/inc/astservice.hxx idlc/inc/astservice.hxx
idlc/inc/astservicemember.hxx idlc/inc/astservicemember.hxx
idlc/inc/aststack.hxx
idlc/inc/aststruct.hxx idlc/inc/aststruct.hxx
idlc/inc/aststructinstance.hxx idlc/inc/aststructinstance.hxx
idlc/inc/asttype.hxx
idlc/inc/asttypedef.hxx idlc/inc/asttypedef.hxx
idlc/inc/errorhandler.hxx idlc/inc/errorhandler.hxx
idlc/inc/fehelper.hxx idlc/inc/fehelper.hxx
@@ -5064,15 +5053,12 @@ idlc/source/astconstant.cxx
idlc/source/astdeclaration.cxx idlc/source/astdeclaration.cxx
idlc/source/astdump.cxx idlc/source/astdump.cxx
idlc/source/astenum.cxx idlc/source/astenum.cxx
idlc/source/astexpression.cxx
idlc/source/astinterface.cxx idlc/source/astinterface.cxx
idlc/source/astoperation.cxx idlc/source/astoperation.cxx
idlc/source/astscope.cxx idlc/source/astscope.cxx
idlc/source/astservice.cxx idlc/source/astservice.cxx
idlc/source/aststack.cxx
idlc/source/aststruct.cxx idlc/source/aststruct.cxx
idlc/source/aststructinstance.cxx idlc/source/aststructinstance.cxx
idlc/source/attributeexceptions.hxx
idlc/source/errorhandler.cxx idlc/source/errorhandler.cxx
idlc/source/fehelper.cxx idlc/source/fehelper.cxx
idlc/source/idlc.cxx idlc/source/idlc.cxx