restored some deleted code

Author: firewave

lib/forwardanalyzer.cpp

@@ -89,6 +89,10 @@ struct ForwardTraversal {
         return evalCond(tok, ctx).first;
     }
 
+    bool isConditionFalse(const Token* tok, const Token* ctx = nullptr) const {
+        return evalCond(tok, ctx).second;
+    }
+
     template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
     Progress traverseTok(T* tok, F f, bool traverseUnknown, T** out = nullptr) {
         if (Token::Match(tok, "asm|goto|setjmp|longjmp"))

lib/importproject.h

@@ -104,7 +104,6 @@ class CPPCHECKLIB ImportProject {
     void ignorePaths(const std::vector<std::string> &ipaths);
     void ignoreOtherConfigs(const std::string &cfg);
 
-
     Type import(const std::string &filename, Settings *settings=nullptr);
 protected:
     bool importCompileCommands(std::istream &istr);

lib/library.cpp

@@ -1577,6 +1577,28 @@ const Token* Library::getContainerFromYield(const Token* tok, Library::Container
     }
     return nullptr;
 }
+const Token* Library::getContainerFromAction(const Token* tok, Library::Container::Action action) const
+{
+    if (!tok)
+        return nullptr;
+    if (Token::Match(tok->tokAt(-2), ". %name% (")) {
+        const Token* containerTok = tok->tokAt(-2)->astOperand1();
+        if (!astIsContainer(containerTok))
+            return nullptr;
+        if (containerTok->valueType()->container &&
+            containerTok->valueType()->container->getAction(tok->strAt(-1)) == action)
+            return containerTok;
+        if (Token::simpleMatch(tok->tokAt(-1), "empty ( )"))
+            return containerTok;
+    } else if (Token::Match(tok->previous(), "%name% (")) {
+        if (const Library::Function* f = this->getFunction(tok->previous())) {
+            if (f->containerAction == action) {
+                return tok->astOperand2();
+            }
+        }
+    }
+    return nullptr;
+}
 
 bool Library::isSmartPointer(const Token* tok) const
 {

lib/library.h

@@ -459,6 +459,7 @@ class CPPCHECKLIB Library {
     bool isimporter(const std::string& file, const std::string &importer) const;
 
     const Token* getContainerFromYield(const Token* tok, Container::Yield yield) const;
+    const Token* getContainerFromAction(const Token* tok, Container::Action action) const;
 
     bool isreflection(const std::string &token) const {
         return mReflection.find(token) != mReflection.end();

lib/programmemory.cpp

@@ -28,6 +28,16 @@ const ValueFlow::Value* ProgramMemory::getValue(nonneg int exprid, bool impossib
         return nullptr;
 }
 
+bool ProgramMemory::getIntValue(nonneg int exprid, MathLib::bigint* result) const
+{
+    const ValueFlow::Value* value = getValue(exprid);
+    if (value && value->isIntValue()) {
+        *result = value->intvalue;
+        return true;
+    }
+    return false;
+}
+
 void ProgramMemory::setIntValue(nonneg int exprid, MathLib::bigint value, bool impossible)
 {
     ValueFlow::Value v(value);
@@ -46,6 +56,15 @@ bool ProgramMemory::getTokValue(nonneg int exprid, const Token** result) const
     return false;
 }
 
+bool ProgramMemory::getContainerSizeValue(nonneg int exprid, MathLib::bigint* result) const
+{
+    const ValueFlow::Value* value = getValue(exprid);
+    if (value && value->isContainerSizeValue()) {
+        *result = value->intvalue;
+        return true;
+    }
+    return false;
+}
 bool ProgramMemory::getContainerEmptyValue(nonneg int exprid, MathLib::bigint* result) const
 {
     const ValueFlow::Value* value = getValue(exprid, true);

lib/programmemory.h

@@ -17,8 +17,10 @@ struct ProgramMemory {
     void setValue(nonneg int exprid, const ValueFlow::Value& value);
     const ValueFlow::Value* getValue(nonneg int exprid, bool impossible = false) const;
 
+    bool getIntValue(nonneg int exprid, MathLib::bigint* result) const;
     void setIntValue(nonneg int exprid, MathLib::bigint value, bool impossible = false);
 
+    bool getContainerSizeValue(nonneg int exprid, MathLib::bigint* result) const;
     bool getContainerEmptyValue(nonneg int exprid, MathLib::bigint* result) const;
     void setContainerSizeValue(nonneg int exprid, MathLib::bigint value, bool isEqual = true);
 

lib/token.cpp

@@ -1185,6 +1185,14 @@ void Token::printOut(const char *title, const std::vector<std::string> &fileName
     std::cout << stringifyList(stringifyOptions::forPrintOut(), &fileNames, nullptr) << std::endl;
 }
 
+void Token::printLines(int lines) const
+{
+    const Token *end = this;
+    while (end && end->linenr() < lines + linenr())
+        end = end->next();
+    std::cout << stringifyList(stringifyOptions::forDebugExprId(), nullptr, end) << std::endl;
+}
+
 std::string Token::stringify(const stringifyOptions& options) const
 {
     std::string ret;

lib/token.h

@@ -862,6 +862,11 @@ class CPPCHECKLIB Token {
      */
     void printOut(const char *title, const std::vector<std::string> &fileNames) const;
 
+    /**
+     * print out tokens - used for debugging
+     */
+    void printLines(int lines=5) const;
+
     /**
      * Replace token replaceThis with tokens between start and end,
      * including start and end. The replaceThis token is deleted.