From fb328b778cdd0c6022ce072689cb3d8b333232f8 Mon Sep 17 00:00:00 2001
From: Lefteris Karapetsas <lefteris@refu.co>
Date: Tue, 24 Feb 2015 17:31:06 +0100
Subject: Changes after rebase on top of Array Parsing

---
 Parser.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Parser.cpp')

diff --git a/Parser.cpp b/Parser.cpp
index ea56d68f..4edcab12 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -45,7 +45,7 @@ public:
 		m_parser(_parser), m_location(_childNode->getLocation()) {}
 
 	void markEndPosition() { m_location.end = m_parser.getEndPosition(); }
-	void setLocation(Location const& _location) { m_location = _location; }
+	void setLocation(SourceLocation const& _location) { m_location = _location; }
 	void setLocationEmpty() { m_location.end = m_location.start; }
 	/// Set the end position to the one of the given node.
 	void setEndPositionFromNode(ASTPointer<ASTNode> const& _node) { m_location.end = _node->getLocation().end; }
@@ -646,9 +646,9 @@ ASTPointer<Statement> Parser::parseSimpleStatement()
 		primary = ASTNodeFactory(*this).createNode<ElementaryTypeNameExpression>(m_scanner->getCurrentToken());
 		m_scanner->next();
 	}
-	vector<pair<ASTPointer<Expression>, Location>> indices;
+	vector<pair<ASTPointer<Expression>, SourceLocation>> indices;
 	solAssert(m_scanner->getCurrentToken() == Token::LBrack, "");
-	Location indexLocation = primary->getLocation();
+	SourceLocation indexLocation = primary->getLocation();
 	do
 	{
 		expectToken(Token::LBrack);
@@ -913,7 +913,7 @@ Parser::LookAheadInfo Parser::peekStatementType() const
 }
 
 ASTPointer<TypeName> Parser::typeNameIndexAccessStructure(
-	ASTPointer<PrimaryExpression> const& _primary, vector<pair<ASTPointer<Expression>, Location>> const& _indices)
+	ASTPointer<PrimaryExpression> const& _primary, vector<pair<ASTPointer<Expression>, SourceLocation>> const& _indices)
 {
 	ASTNodeFactory nodeFactory(*this, _primary);
 	ASTPointer<TypeName> type;
@@ -932,7 +932,7 @@ ASTPointer<TypeName> Parser::typeNameIndexAccessStructure(
 }
 
 ASTPointer<Expression> Parser::expressionFromIndexAccessStructure(
-	ASTPointer<PrimaryExpression> const& _primary, vector<pair<ASTPointer<Expression>, Location>> const& _indices)
+	ASTPointer<PrimaryExpression> const& _primary, vector<pair<ASTPointer<Expression>, SourceLocation>> const& _indices)
 {
 	ASTNodeFactory nodeFactory(*this, _primary);
 	ASTPointer<Expression> expression(_primary);
-- 
cgit v1.2.3