From 184a1a0319a2a132d163d18d7458980330b7fd49 Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Thu, 19 Jan 2017 13:44:14 +0100 Subject: [PATCH] logic: fixed refreshing bug * fixed bug where coati didn't recognize file dependencies because each file actually had two different nodes. --- src/lib/utility/scheduling/TaskReturnSuccessWhile.h | 6 ++++++ src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h b/src/lib/utility/scheduling/TaskReturnSuccessWhile.h index 26b23421..f0522283 100644 --- a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h +++ b/src/lib/utility/scheduling/TaskReturnSuccessWhile.h @@ -60,6 +60,12 @@ Task::TaskState TaskReturnSuccessWhile::doUpdate(std::shared_ptr return STATE_SUCCESS; } break; + case CONDITION_EQUALS: + if (lhsValue == m_rhsValue) + { + return STATE_SUCCESS; + } + break; default: return STATE_FAILURE; } diff --git a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp index b228f092..2fb4df67 100644 --- a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp +++ b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp @@ -61,10 +61,10 @@ void PreprocessorCallbacks::InclusionDirective( { NameHierarchy referencedNameHierarchy; - referencedNameHierarchy.push(std::make_shared(includedFilePath.fileName())); + referencedNameHierarchy.push(std::make_shared(includedFilePath.str())); NameHierarchy contextNameHierarchy; - contextNameHierarchy.push(std::make_shared(m_currentPath.fileName())); + contextNameHierarchy.push(std::make_shared(m_currentPath.str())); m_client->recordReference( REFERENCE_INCLUDE,