No longer exposing retrieveValueFromStorage() as a public function

- plus small fix in EndToEndTests

1 files changed, 6 insertions, 4 deletions

diff --git a/ExpressionCompiler.h b/ExpressionCompiler.h
index b4a64594..748cc6c6 100644
--- a/ExpressionCompiler.h
+++ b/ExpressionCompiler.h
@@ -130,10 +130,9 @@ private:
 
 		/// Copies the value of the current lvalue to the top of the stack and, if @a _remove is true,
 		/// also removes the reference from the stack (note that is does not reset the type to @a NONE).
-		/// @a _expression is the current expression, used for error reporting.
-		void retrieveValue(Expression const& _expression, bool _remove = false) const;
-		/// Convenience function to retrieve Value from Storage. Specific version of @ref retrieveValue
-		void retrieveValueFromStorage(TypePointer const& _type, bool _remove = false) const;
+		/// @a _type is the type of the current expression and @ _location its location, used for error reporting.
+		/// @a _location can be a nullptr for expressions that don't have an actual ASTNode equivalent
+		void retrieveValue(TypePointer const& _type, Location const& _location, bool _remove = false) const;
 		/// Stores a value (from the stack directly beneath the reference, which is assumed to
 		/// be on the top of the stack, if any) in the lvalue and removes the reference.
 		/// Also removes the stored value from the stack if @a _move is
@@ -147,6 +146,9 @@ private:
 		void retrieveValueIfLValueNotRequested(Expression const& _expression);
 
 	private:
+		/// Convenience function to retrieve Value from Storage. Specific version of @ref retrieveValue
+		void retrieveValueFromStorage(TypePointer const& _type, bool _remove = false) const;
+
 		CompilerContext* m_context;
 		LValueType m_type = NONE;
 		/// If m_type is STACK, this is base stack offset (@see