diff options
author | Lefteris Karapetsas <lefteris@refu.co> | 2015-02-25 00:31:06 +0800 |
---|---|---|
committer | Lefteris Karapetsas <lefteris@refu.co> | 2015-02-25 00:31:06 +0800 |
commit | fb328b778cdd0c6022ce072689cb3d8b333232f8 (patch) | |
tree | 37fa70e738e2df43d1f912ff5cc4b02af39472fd /Parser.cpp | |
parent | 12c32392abc4af2f7da0793e178705c55c742e79 (diff) | |
download | dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.tar dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.tar.gz dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.tar.bz2 dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.tar.lz dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.tar.xz dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.tar.zst dexon-solidity-fb328b778cdd0c6022ce072689cb3d8b333232f8.zip |
Changes after rebase on top of Array Parsing
Diffstat (limited to 'Parser.cpp')
-rw-r--r-- | Parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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); |