From b480b76015cff5c1b64747e2930b34e2aeb65a79 Mon Sep 17 00:00:00 2001
From: Lefteris Karapetsas <lefteris@refu.co>
Date: Wed, 25 Feb 2015 10:40:14 +0100
Subject: [PATCH] LocationSetter in some extra places during Compiling

- Also adjusted the test, and fixed its error reporting
---
 Assembly.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Assembly.cpp b/Assembly.cpp
index 021463e4b..60f10d08f 100644
--- a/Assembly.cpp
+++ b/Assembly.cpp
@@ -76,7 +76,8 @@ void checkAssemblyLocations(AssemblyItems const& _items, std::vector<SourceLocat
 	BOOST_CHECK_EQUAL(_items.size(), _locations.size());
 	for (auto const& it: _items)
 	{
-		BOOST_CHECK_MESSAGE(it.getLocation() == _locations[i], std::string("Location mismatch for item" + i));
+		BOOST_CHECK_MESSAGE(it.getLocation() == _locations[i],
+							std::string("Location mismatch for assembly item ") + std::to_string(i));
 		++i;
 	}
 
@@ -108,7 +109,7 @@ BOOST_AUTO_TEST_CASE(location_test)
 		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
 		SourceLocation(0, 77, n), SourceLocation(0, 77, n),
 		SourceLocation(0, 77, n),
-		SourceLocation(18, 75, n), SourceLocation(18, 75, n),
+		SourceLocation(18, 75, n), SourceLocation(40, 49, n),
 		SourceLocation(61, 70, n), SourceLocation(61, 70, n), SourceLocation(61, 70, n),
 		SourceLocation(), SourceLocation(),
 		SourceLocation(61, 70, n), SourceLocation(61, 70, n), SourceLocation(61, 70, n)