Make ParseExpression not dependant on a BinaryView

2 files changed, 3 insertions, 3 deletions

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 2fde0526..18bc4b76 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -1495,7 +1495,7 @@ namespace BinaryNinja
 		static NameSpace GetInternalNameSpace();
 		static NameSpace GetExternalNameSpace();
 
-		bool ParseExpression(const std::string& expression, uint64_t &offset, uint64_t here, std::string& errorString);
+		static bool ParseExpression(Ref<BinaryView> view, const std::string& expression, uint64_t &offset, uint64_t here, std::string& errorString);
 	};
 
 
diff --git a/binaryview.cpp b/binaryview.cpp
index afcb4560..bc8f5050 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -2354,10 +2354,10 @@ NameSpace BinaryView::GetExternalNameSpace()
 }
 
 
-bool BinaryView::ParseExpression(const string& expression, uint64_t &offset, uint64_t here, string& errorString)
+bool BinaryView::ParseExpression(Ref<BinaryView> view, const string& expression, uint64_t &offset, uint64_t here, string& errorString)
 {
 	char* err = nullptr;
-	if (!BNParseExpression(m_object, expression.c_str(), &offset, here, &err))
+	if (!BNParseExpression(view ? view->GetObject() : nullptr, expression.c_str(), &offset, here, &err))
 	{
 		LogDebug("Failed to parse expression: '%s': Error: '%s'", expression.c_str(), err);
 		errorString = string(err);