Browse Source

Silenced a couple of warnings triggered by cpphoafparser.

tempestpy_adaptions
Tim Quatmann 4 years ago
committed by Stefan Pranger
parent
commit
4fe4704f60
  1. 8
      resources/3rdparty/cpphoafparser-0.99.2/include/cpphoafparser/consumer/hoa_intermediate_check_validity.hh
  2. 16
      resources/3rdparty/cpphoafparser-0.99.2/include/cpphoafparser/parser/hoa_parser_exception.hh
  3. 2
      resources/3rdparty/cpphoafparser-0.99.2/include/cpphoafparser/util/int_or_string.hh

8
resources/3rdparty/cpphoafparser-0.99.2/include/cpphoafparser/consumer/hoa_intermediate_check_validity.hh

@ -118,7 +118,7 @@ public:
next->addAlias(name, labelExpr); next->addAlias(name, labelExpr);
} }
virtual void setAPs(const std::vector<std::string>& aps) {
virtual void setAPs(const std::vector<std::string>& aps) override {
headerAtMostOnce("AP"); headerAtMostOnce("AP");
numberOfAPs.reset(new unsigned int(aps.size())); numberOfAPs.reset(new unsigned int(aps.size()));
@ -162,7 +162,7 @@ public:
next->setTool(name, version); next->setTool(name, version);
} }
virtual void addProperties(const std::vector<std::string>& properties) {
virtual void addProperties(const std::vector<std::string>& properties) override {
usedHeaders.insert("properties"); usedHeaders.insert("properties");
for (const std::string& property : properties) { for (const std::string& property : properties) {
@ -207,7 +207,7 @@ public:
next->addMiscHeader(name, content); next->addMiscHeader(name, content);
} }
virtual void notifyBodyStart() {
virtual void notifyBodyStart() override {
// check for existence of mandatory headers // check for existence of mandatory headers
headerIsMandatory("Acceptance"); headerIsMandatory("Acceptance");
@ -418,7 +418,7 @@ public:
next->notifyEnd(); next->notifyEnd();
} }
virtual void notifyAbort() {
virtual void notifyAbort() override {
next->notifyAbort(); next->notifyAbort();
} }

16
resources/3rdparty/cpphoafparser-0.99.2/include/cpphoafparser/parser/hoa_parser_exception.hh

@ -44,6 +44,22 @@ public:
HOAParserException(const std::string& what, int line, int col) : HOAParserException(const std::string& what, int line, int col) :
std::runtime_error(what), hasLocation(true), line(line), col(col) {} std::runtime_error(what), hasLocation(true), line(line), col(col) {}
bool getHasLocation() const {
return hasLocation;
}
/** @pre getHasLocation returns true */
bool getLine() const {
assert(getHasLocation());
return line;
}
/** @pre getHasLocation returns true */
bool getCol() const {
assert(getHasLocation());
return col;
}
private: private:
/** True if we have location information */ /** True if we have location information */
bool hasLocation; bool hasLocation;

2
resources/3rdparty/cpphoafparser-0.99.2/include/cpphoafparser/util/int_or_string.hh

@ -50,7 +50,7 @@ public:
* @param vString the string to store * @param vString the string to store
* @param wasQuoted remember that the string was originally quoted * @param wasQuoted remember that the string was originally quoted
*/ */
IntOrString(const std::string& vString, bool wasQuoted = false) : vInteger(0), vString(new std::string(vString)), wasQuoted(false) {}
IntOrString(const std::string& vString, bool wasQuoted = false) : vInteger(0), vString(new std::string(vString)), wasQuoted(wasQuoted) {}
/** Returns true if the stored value is a string */ /** Returns true if the stored value is a string */
bool isString() const {return (bool)vString;} bool isString() const {return (bool)vString;}

Loading…
Cancel
Save