Changes after rebase on top of Array Parsing

4 files changed, 9 insertions, 9 deletions

diff --git a/AST.h b/AST.h
index 27dc008a..e2f464ac 100644
--- a/AST.h
+++ b/AST.h
@@ -662,7 +662,7 @@ private:
 class ArrayTypeName: public TypeName
 {
 public:
-	ArrayTypeName(Location const& _location, ASTPointer<TypeName> const& _baseType,
+	ArrayTypeName(SourceLocation const& _location, ASTPointer<TypeName> const& _baseType,
 			ASTPointer<Expression> const& _length):
 		TypeName(_location), m_baseType(_baseType), m_length(_length) {}
 	virtual void accept(ASTVisitor& _visitor) override;
diff --git a/Compiler.cpp b/Compiler.cpp
index e4a5c4f0..9cef1f2a 100644
--- a/Compiler.cpp
+++ b/Compiler.cpp
@@ -473,7 +473,7 @@ bool Compiler::visit(Return const& _return)
 bool Compiler::visit(VariableDeclarationStatement const& _variableDeclarationStatement)
 {
 	StackHeightChecker checker(m_context);
-    CompilerContext::LocationSetter locationSetter(m_context, &_variableDefinition);
+    CompilerContext::LocationSetter locationSetter(m_context, &_variableDeclarationStatement);
 	if (Expression const* expression = _variableDeclarationStatement.getExpression())
 	{
 		compileExpression(*expression, _variableDeclarationStatement.getDeclaration().getType());
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);
diff --git a/Parser.h b/Parser.h
index 9e4c7bb2..87eb2f8f 100644
--- a/Parser.h
+++ b/Parser.h
@@ -114,11 +114,11 @@ private:
 	/// Returns a typename parsed in look-ahead fashion from something like "a[8][2**70]".
 	ASTPointer<TypeName> typeNameIndexAccessStructure(
 		ASTPointer<PrimaryExpression> const& _primary,
-		std::vector<std::pair<ASTPointer<Expression>, Location>> const& _indices);
+		std::vector<std::pair<ASTPointer<Expression>, SourceLocation>> const& _indices);
 	/// Returns an expression parsed in look-ahead fashion from something like "a[8][2**70]".
 	ASTPointer<Expression> expressionFromIndexAccessStructure(
 		ASTPointer<PrimaryExpression> const& _primary,
-		std::vector<std::pair<ASTPointer<Expression>, Location>> const& _indices);
+		std::vector<std::pair<ASTPointer<Expression>, SourceLocation>> const& _indices);
 	/// If current token value is not _value, throw exception otherwise advance token.
 	void expectToken(Token::Value _value);
 	Token::Value expectAssignmentOperator();