cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Arrow to DoubleArrow

Browse Source
This commit is contained in:
Alex Beregszaszi 2020-08-27 11:42:00 +01:00
parent 4e5b403c37
commit 662f7d8fac
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/grammar/Solidity.g4
View File

@ -433,7 +433,7 @@ variableDeclarationTuple:
variableDeclarationStatement: ((variableDeclaration (Assign expression)?) | (variableDeclarationTuple Assign expression)) Semicolon; variableDeclarationStatement: ((variableDeclaration (Assign expression)?) | (variableDeclarationTuple Assign expression)) Semicolon;
expressionStatement: expression Semicolon; expressionStatement: expression Semicolon;
mappingType: Mapping LParen key=mappingKeyType Arrow value=typeName RParen; mappingType: Mapping LParen key=mappingKeyType DoubleArrow value=typeName RParen;
/** /**
* Only elementary types or user defined types are viable as mapping keys. * Only elementary types or user defined types are viable as mapping keys.
*/ */

2
docs/grammar/SolidityLexer.g4
View File

@ -111,7 +111,7 @@ Colon: ':';
Semicolon: ';'; Semicolon: ';';
Period: '.'; Period: '.';
Conditional: '?'; Conditional: '?';
Arrow: '=>'; DoubleArrow: '=>';
RightArrow: '->'; RightArrow: '->';
Assign: '='; Assign: '=';

2
liblangutil/Scanner.cpp
View File

@ -540,7 +540,7 @@ void Scanner::scanToken()
if (m_char == '=') if (m_char == '=')
token = selectToken(Token::Equal); token = selectToken(Token::Equal);
else if (m_char == '>') else if (m_char == '>')
token = selectToken(Token::Arrow); token = selectToken(Token::DoubleArrow);
else else
token = Token::Assign; token = Token::Assign;
break; break;

2
liblangutil/Token.h
View File

@ -83,7 +83,7 @@ namespace solidity::langutil
T(Semicolon, ";", 0) \ T(Semicolon, ";", 0) \
T(Period, ".", 0) \ T(Period, ".", 0) \
T(Conditional, "?", 3) \ T(Conditional, "?", 3) \
T(Arrow, "=>", 0) \ T(DoubleArrow, "=>", 0) \
T(RightArrow, "->", 0) \ T(RightArrow, "->", 0) \
\ \
/* Assignment operators. */ \ /* Assignment operators. */ \

2
libsolidity/parsing/Parser.cpp
View File

@ -1050,7 +1050,7 @@ ASTPointer<Mapping> Parser::parseMapping()
} }
else else
fatalParserError(1005_error, "Expected elementary type name or identifier for mapping key type"); fatalParserError(1005_error, "Expected elementary type name or identifier for mapping key type");
expectToken(Token::Arrow); expectToken(Token::DoubleArrow);
ASTPointer<TypeName> valueType = parseTypeName(); ASTPointer<TypeName> valueType = parseTypeName();
nodeFactory.markEndPosition(); nodeFactory.markEndPosition();
expectToken(Token::RParen); expectToken(Token::RParen);

2
test/liblangutil/Scanner.cpp
View File

@ -406,7 +406,7 @@ BOOST_AUTO_TEST_CASE(ambiguities)
BOOST_CHECK_EQUAL(scanner.next(), Token::AssignAdd); BOOST_CHECK_EQUAL(scanner.next(), Token::AssignAdd);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier); BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Inc); BOOST_CHECK_EQUAL(scanner.next(), Token::Inc);
BOOST_CHECK_EQUAL(scanner.next(), Token::Arrow); BOOST_CHECK_EQUAL(scanner.next(), Token::DoubleArrow);
BOOST_CHECK_EQUAL(scanner.next(), Token::SHL); BOOST_CHECK_EQUAL(scanner.next(), Token::SHL);
BOOST_CHECK_EQUAL(scanner.next(), Token::SAR); BOOST_CHECK_EQUAL(scanner.next(), Token::SAR);
BOOST_CHECK_EQUAL(scanner.next(), Token::AssignSar); BOOST_CHECK_EQUAL(scanner.next(), Token::AssignSar);