Skip to content

Commit

Permalink
Merge pull request #596 from agarny/issue595
Browse files Browse the repository at this point in the history 
Make Clang-Tidy happy. Closes #595.
  • Loading branch information
@nickerso
nickerso committed May 13, 2020
2 parents b3316b1 + 0d33897 commit 2e34152
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 67 deletions.
3 changes: 3 additions & 0 deletions cmake/common.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ function(CONFIGURE_CLANG_AND_CLANG_TIDY_SETTINGS _TARGET)
-cert-err58-cpp
cppcoreguidelines-*
-cppcoreguidelines-avoid-magic-numbers
-cppcoreguidelines-init-variables
-cppcoreguidelines-owning-memory
-cppcoreguidelines-pro-type-reinterpret-cast
${_NO_CPPCOREGUIDELINES_PRO_TYPE_VARARG}
Expand All @@ -159,6 +160,7 @@ function(CONFIGURE_CLANG_AND_CLANG_TIDY_SETTINGS _TARGET)
-hicpp-special-member-functions
${_NO_HICPP_VARARG}
llvm-*
-llvm-qualified-auto
-llvm-header-guard
misc-*
-misc-non-private-member-variables-in-classes
Expand All @@ -172,6 +174,7 @@ function(CONFIGURE_CLANG_AND_CLANG_TIDY_SETTINGS _TARGET)
readability-*
-readability-convert-member-functions-to-static
-readability-magic-numbers
-readability-qualified-auto
)
string(REPLACE ";" ","
_CLANG_TIDY_CHECKS "${_CLANG_TIDY_CHECKS}")
Expand Down
45 changes: 23 additions & 22 deletions src/generator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ struct Generator::GeneratorImpl

void addOriginCommentCode(std::string &code);

void addInterfaceHeaderCode(std::string &code);
void addInterfaceHeaderCode(std::string &code) const;
void addImplementationHeaderCode(std::string &code);

void addVersionAndLibcellmlVersionCode(std::string &code,
Expand All @@ -650,7 +650,7 @@ struct Generator::GeneratorImpl
void addStateAndVariableCountCode(std::string &code,
bool interface = false);

void addVariableTypeObjectCode(std::string &code);
void addVariableTypeObjectCode(std::string &code) const;

std::string generateVariableInfoObjectCode(const std::string &objectString);

Expand All @@ -661,20 +661,20 @@ struct Generator::GeneratorImpl
const std::string &units,
const std::string &component);

void addInterfaceVoiStateAndVariableInfoCode(std::string &code);
void addInterfaceVoiStateAndVariableInfoCode(std::string &code) const;
void addImplementationVoiInfoCode(std::string &code);
void addImplementationStateInfoCode(std::string &code);
void addImplementationVariableInfoCode(std::string &code);

void addArithmeticFunctionsCode(std::string &code);
void addTrigonometricFunctionsCode(std::string &code);
void addArithmeticFunctionsCode(std::string &code) const;
void addTrigonometricFunctionsCode(std::string &code) const;

void addInterfaceCreateDeleteArrayMethodsCode(std::string &code);
void addImplementationCreateStatesArrayMethodCode(std::string &code);
void addImplementationCreateVariablesArrayMethodCode(std::string &code);
void addImplementationDeleteArrayMethodCode(std::string &code);
void addInterfaceCreateDeleteArrayMethodsCode(std::string &code) const;
void addImplementationCreateStatesArrayMethodCode(std::string &code) const;
void addImplementationCreateVariablesArrayMethodCode(std::string &code) const;
void addImplementationDeleteArrayMethodCode(std::string &code) const;

std::string generateMethodBodyCode(const std::string &methodBody);
std::string generateMethodBodyCode(const std::string &methodBody) const;

std::string generateDoubleCode(const std::string &value);
std::string generateVariableNameCode(const VariablePtr &variable,
Expand All @@ -697,7 +697,7 @@ struct Generator::GeneratorImpl
std::vector<GeneratorEquationPtr> &remainingEquations,
bool onlyStateRateBasedEquations = false);

void addInterfaceComputeModelMethodsCode(std::string &code);
void addInterfaceComputeModelMethodsCode(std::string &code) const;
void addImplementationInitializeStatesAndConstantsMethodCode(std::string &code,
std::vector<GeneratorEquationPtr> &remainingEquations);
void addImplementationComputeComputedConstantsMethodCode(std::string &code,
Expand Down Expand Up @@ -1987,7 +1987,7 @@ void Generator::GeneratorImpl::addOriginCommentCode(std::string &code)
}
}

void Generator::GeneratorImpl::addInterfaceHeaderCode(std::string &code)
void Generator::GeneratorImpl::addInterfaceHeaderCode(std::string &code) const
{
if (!mProfile->interfaceHeaderString().empty()) {
if (!code.empty()) {
Expand Down Expand Up @@ -2073,7 +2073,7 @@ void Generator::GeneratorImpl::addStateAndVariableCountCode(std::string &code,
code += stateAndVariableCountCode;
}

void Generator::GeneratorImpl::addVariableTypeObjectCode(std::string &code)
void Generator::GeneratorImpl::addVariableTypeObjectCode(std::string &code) const
{
if (!mProfile->variableTypeObjectString().empty()) {
if (!code.empty()) {
Expand Down Expand Up @@ -2140,7 +2140,7 @@ std::string Generator::GeneratorImpl::generateVariableInfoEntryCode(const std::s
"<COMPONENT>", component);
}

void Generator::GeneratorImpl::addInterfaceVoiStateAndVariableInfoCode(std::string &code)
void Generator::GeneratorImpl::addInterfaceVoiStateAndVariableInfoCode(std::string &code) const
{
std::string interfaceVoiStateAndVariableInfoCode;

Expand Down Expand Up @@ -2257,7 +2257,7 @@ void Generator::GeneratorImpl::addImplementationVariableInfoCode(std::string &co
}
}

void Generator::GeneratorImpl::addArithmeticFunctionsCode(std::string &code)
void Generator::GeneratorImpl::addArithmeticFunctionsCode(std::string &code) const
{
if (mNeedEq && !mProfile->hasEqOperator()
&& !mProfile->eqFunctionString().empty()) {
Expand Down Expand Up @@ -2368,7 +2368,7 @@ void Generator::GeneratorImpl::addArithmeticFunctionsCode(std::string &code)
}
}

void Generator::GeneratorImpl::addTrigonometricFunctionsCode(std::string &code)
void Generator::GeneratorImpl::addTrigonometricFunctionsCode(std::string &code) const
{
if (mNeedSec
&& !mProfile->secFunctionString().empty()) {
Expand Down Expand Up @@ -2479,7 +2479,7 @@ void Generator::GeneratorImpl::addTrigonometricFunctionsCode(std::string &code)
}
}

void Generator::GeneratorImpl::addInterfaceCreateDeleteArrayMethodsCode(std::string &code)
void Generator::GeneratorImpl::addInterfaceCreateDeleteArrayMethodsCode(std::string &code) const
{
std::string interfaceCreateDeleteArraysCode;

Expand All @@ -2502,7 +2502,7 @@ void Generator::GeneratorImpl::addInterfaceCreateDeleteArrayMethodsCode(std::str
code += interfaceCreateDeleteArraysCode;
}

void Generator::GeneratorImpl::addImplementationCreateStatesArrayMethodCode(std::string &code)
void Generator::GeneratorImpl::addImplementationCreateStatesArrayMethodCode(std::string &code) const
{
if (!mProfile->implementationCreateStatesArrayMethodString().empty()) {
if (!code.empty()) {
Expand All @@ -2513,7 +2513,7 @@ void Generator::GeneratorImpl::addImplementationCreateStatesArrayMethodCode(std:
}
}

void Generator::GeneratorImpl::addImplementationCreateVariablesArrayMethodCode(std::string &code)
void Generator::GeneratorImpl::addImplementationCreateVariablesArrayMethodCode(std::string &code) const
{
if (!mProfile->implementationCreateVariablesArrayMethodString().empty()) {
if (!code.empty()) {
Expand All @@ -2524,7 +2524,7 @@ void Generator::GeneratorImpl::addImplementationCreateVariablesArrayMethodCode(s
}
}

void Generator::GeneratorImpl::addImplementationDeleteArrayMethodCode(std::string &code)
void Generator::GeneratorImpl::addImplementationDeleteArrayMethodCode(std::string &code) const
{
if (!mProfile->implementationDeleteArrayMethodString().empty()) {
if (!code.empty()) {
Expand All @@ -2535,7 +2535,7 @@ void Generator::GeneratorImpl::addImplementationDeleteArrayMethodCode(std::strin
}
}

std::string Generator::GeneratorImpl::generateMethodBodyCode(const std::string &methodBody)
std::string Generator::GeneratorImpl::generateMethodBodyCode(const std::string &methodBody) const
{
return methodBody.empty() ?
mProfile->emptyMethodString().empty() ?
Expand Down Expand Up @@ -3327,7 +3327,8 @@ std::string Generator::GeneratorImpl::generateEquationCode(const GeneratorEquati

return res;
}
void Generator::GeneratorImpl::addInterfaceComputeModelMethodsCode(std::string &code)

void Generator::GeneratorImpl::addInterfaceComputeModelMethodsCode(std::string &code) const
{
std::string interfaceComputeModelMethodsCode;

Expand Down
36 changes: 18 additions & 18 deletions src/parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct Parser::ParserImpl
* @param component The @c ComponentPtr to update.
* @param node The @c XmlNodePtr to parse and update the @p component with.
*/
void loadComponent(const ComponentPtr &component, const XmlNodePtr &node);
void loadComponent(const ComponentPtr &component, const XmlNodePtr &node) const;

/**
* @brief Update the @p model with a connection parsed from @p node.
Expand All @@ -92,7 +92,7 @@ struct Parser::ParserImpl
* @param model The @c ModelPtr to update.
* @param node The @c XmlNodePtr to parse and update the model with.
*/
void loadConnection(const ModelPtr &model, const XmlNodePtr &node);
void loadConnection(const ModelPtr &model, const XmlNodePtr &node) const;

/**
* @brief Update the @p model with an encapsulation parsed from @p node.
Expand Down Expand Up @@ -132,7 +132,7 @@ struct Parser::ParserImpl
* @param model The @c ModelPtr to add imported components/units to.
* @param node The @c XmlNodePtr to parse and update the @p import source with.
*/
void loadImport(const ImportSourcePtr &importSource, const ModelPtr &model, const XmlNodePtr &node);
void loadImport(const ImportSourcePtr &importSource, const ModelPtr &model, const XmlNodePtr &node) const;

/**
* @brief Update the @p units with attributes parsed from @p node.
Expand All @@ -144,7 +144,7 @@ struct Parser::ParserImpl
* @param units The @c UnitsPtr to update.
* @param node The @c XmlNodePtr to parse and update the @p units with.
*/
void loadUnits(const UnitsPtr &units, const XmlNodePtr &node);
void loadUnits(const UnitsPtr &units, const XmlNodePtr &node) const;

/**
* @brief Update the @p units with a unit parsed from @p node.
Expand All @@ -156,7 +156,7 @@ struct Parser::ParserImpl
* @param units The @c UnitsPtr to update.
* @param node The unit @c XmlNodePtr to parse and update the @p units with.
*/
void loadUnit(const UnitsPtr &units, const XmlNodePtr &node);
void loadUnit(const UnitsPtr &units, const XmlNodePtr &node) const;

/**
* @brief Update the @p variable with attributes parsed from @p node.
Expand All @@ -168,7 +168,7 @@ struct Parser::ParserImpl
* @param variable The @c VariablePtr to update.
* @param node The @c XmlNodePtr to parse and update the @p variable with.
*/
void loadVariable(const VariablePtr &variable, const XmlNodePtr &node);
void loadVariable(const VariablePtr &variable, const XmlNodePtr &node) const;

/**
* @brief Update the @p reset with attributes parsed from the @p node.
Expand All @@ -181,7 +181,7 @@ struct Parser::ParserImpl
* @param component The @c ComponentPtr the reset belongs to.
* @param node The @c XmlNodePtr to parse and update the @p variable with.
*/
void loadReset(const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node);
void loadReset(const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node) const;

/**
* @brief Update the @p reset with the child parsed from the @p node.
Expand All @@ -195,7 +195,7 @@ struct Parser::ParserImpl
* @param component The @c ComponentPtr the reset belongs to.
* @param node The @c XmlNodePtr to parse and update the @p variable with.
*/
void loadResetChild(const std::string &childType, const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node);
void loadResetChild(const std::string &childType, const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node) const;

/**
* @brief Checks the multiplicity of the @p childType.
Expand All @@ -209,7 +209,7 @@ struct Parser::ParserImpl
* @param reset The @c ResetPtr to update.
* @param component The @c ComponentPtr the reset belongs to.
*/
void checkResetChildMultiplicity(size_t count, const std::string &childType, const ResetPtr &reset, const ComponentPtr &component);
void checkResetChildMultiplicity(size_t count, const std::string &childType, const ResetPtr &reset, const ComponentPtr &component) const;
};

Parser::Parser()
Expand Down Expand Up @@ -481,7 +481,7 @@ std::string cleanMath(const std::string &math)
return cleanMath;
}

void Parser::ParserImpl::loadComponent(const ComponentPtr &component, const XmlNodePtr &node)
void Parser::ParserImpl::loadComponent(const ComponentPtr &component, const XmlNodePtr &node) const
{
XmlAttributePtr attribute = node->firstAttribute();
while (attribute) {
Expand Down Expand Up @@ -544,7 +544,7 @@ void Parser::ParserImpl::loadComponent(const ComponentPtr &component, const XmlN
}
}

void Parser::ParserImpl::loadUnits(const UnitsPtr &units, const XmlNodePtr &node)
void Parser::ParserImpl::loadUnits(const UnitsPtr &units, const XmlNodePtr &node) const
{
XmlAttributePtr attribute = node->firstAttribute();
while (attribute) {
Expand Down Expand Up @@ -587,7 +587,7 @@ void Parser::ParserImpl::loadUnits(const UnitsPtr &units, const XmlNodePtr &node
}
}

void Parser::ParserImpl::loadUnit(const UnitsPtr &units, const XmlNodePtr &node)
void Parser::ParserImpl::loadUnit(const UnitsPtr &units, const XmlNodePtr &node) const
{
std::string reference;
std::string prefix;
Expand Down Expand Up @@ -674,7 +674,7 @@ void Parser::ParserImpl::loadUnit(const UnitsPtr &units, const XmlNodePtr &node)
units->addUnit(reference, prefix, exponent, multiplier, id);
}

void Parser::ParserImpl::loadVariable(const VariablePtr &variable, const XmlNodePtr &node)
void Parser::ParserImpl::loadVariable(const VariablePtr &variable, const XmlNodePtr &node) const
{
// A variable should not have any children.
XmlNodePtr childNode = node->firstChild();
Expand Down Expand Up @@ -720,7 +720,7 @@ void Parser::ParserImpl::loadVariable(const VariablePtr &variable, const XmlNode
}
}

void Parser::ParserImpl::loadConnection(const ModelPtr &model, const XmlNodePtr &node)
void Parser::ParserImpl::loadConnection(const ModelPtr &model, const XmlNodePtr &node) const
{
// Define types for variable and component pairs.
using NamePair = std::pair<std::string, std::string>;
Expand Down Expand Up @@ -1128,7 +1128,7 @@ void Parser::ParserImpl::loadEncapsulation(const ModelPtr &model, const XmlNodeP
}
}

void Parser::ParserImpl::loadImport(const ImportSourcePtr &importSource, const ModelPtr &model, const XmlNodePtr &node)
void Parser::ParserImpl::loadImport(const ImportSourcePtr &importSource, const ModelPtr &model, const XmlNodePtr &node) const
{
XmlAttributePtr attribute = node->firstAttribute();
while (attribute) {
Expand Down Expand Up @@ -1217,7 +1217,7 @@ void Parser::ParserImpl::loadImport(const ImportSourcePtr &importSource, const M
}
}

void Parser::ParserImpl::loadResetChild(const std::string &childType, const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node)
void Parser::ParserImpl::loadResetChild(const std::string &childType, const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node) const
{
// TODO The spec. has not yet defined the test_value and reset_value specification elements.
std::string variableName;
Expand Down Expand Up @@ -1275,7 +1275,7 @@ void Parser::ParserImpl::loadResetChild(const std::string &childType, const Rese
}
}

void Parser::ParserImpl::checkResetChildMultiplicity(size_t count, const std::string &childType, const ResetPtr &reset, const ComponentPtr &component)
void Parser::ParserImpl::checkResetChildMultiplicity(size_t count, const std::string &childType, const ResetPtr &reset, const ComponentPtr &component) const
{
std::string variableName;
std::string testVariableName;
Expand Down Expand Up @@ -1306,7 +1306,7 @@ void Parser::ParserImpl::checkResetChildMultiplicity(size_t count, const std::st
}
}

void Parser::ParserImpl::loadReset(const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node)
void Parser::ParserImpl::loadReset(const ResetPtr &reset, const ComponentPtr &component, const XmlNodePtr &node) const
{
int order = 0;
bool orderValid = false;
Expand Down

0 comments on commit 2e34152

Please sign in to comment.