cerc-io/solidity
16
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

Implemented parsing for UserDefinedValueType

Browse Source 
Also added parsing tests.
This commit is contained in:
hrkrshnn 2021-07-28 10:33:19 +02:00
parent d3ae9cf71b
commit 9f7426b4a9
5 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsolidity/parsing/Parser.cpp
View File

@ -113,6 +113,9 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
case Token::Enum: case Token::Enum:
nodes.push_back(parseEnumDefinition()); nodes.push_back(parseEnumDefinition());
break; break;
case Token::Type:
nodes.push_back(parseUserDefinedValueTypeDefinition());
break;
case Token::Function: case Token::Function:
nodes.push_back(parseFunctionDefinition(true)); nodes.push_back(parseFunctionDefinition(true));
break; break;
@ -364,6 +367,8 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
subNodes.push_back(parseStructDefinition()); subNodes.push_back(parseStructDefinition());
else if (currentTokenValue == Token::Enum) else if (currentTokenValue == Token::Enum)
subNodes.push_back(parseEnumDefinition()); subNodes.push_back(parseEnumDefinition());
else if (currentTokenValue == Token::Type)
subNodes.push_back(parseUserDefinedValueTypeDefinition());
else if ( else if (
// Workaround because `error` is not a keyword. // Workaround because `error` is not a keyword.
currentTokenValue == Token::Identifier && currentTokenValue == Token::Identifier &&
@ -1010,6 +1015,22 @@ ASTPointer<UserDefinedTypeName> Parser::parseUserDefinedTypeName()
return nodeFactory.createNode<UserDefinedTypeName>(identifierPath); return nodeFactory.createNode<UserDefinedTypeName>(identifierPath);
} }
ASTPointer<UserDefinedValueTypeDefinition> Parser::parseUserDefinedValueTypeDefinition()
{
ASTNodeFactory nodeFactory(*this);
expectToken(Token::Type);
auto&& [name, nameLocation] = expectIdentifierWithLocation();
expectToken(Token::Is);
ASTPointer<TypeName> typeName = parseTypeName();
nodeFactory.markEndPosition();
expectToken(Token::Semicolon);
return nodeFactory.createNode<UserDefinedValueTypeDefinition>(
name,
move(nameLocation),
typeName
);
}
ASTPointer<IdentifierPath> Parser::parseIdentifierPath() ASTPointer<IdentifierPath> Parser::parseIdentifierPath()
{ {
RecursionGuard recursionGuard(*this); RecursionGuard recursionGuard(*this);

1
libsolidity/parsing/Parser.h
View File

@ -95,6 +95,7 @@ private:
ASTPointer<ASTNode> parseFunctionDefinition(bool _freeFunction = false); ASTPointer<ASTNode> parseFunctionDefinition(bool _freeFunction = false);
ASTPointer<StructDefinition> parseStructDefinition(); ASTPointer<StructDefinition> parseStructDefinition();
ASTPointer<EnumDefinition> parseEnumDefinition(); ASTPointer<EnumDefinition> parseEnumDefinition();
ASTPointer<UserDefinedValueTypeDefinition> parseUserDefinedValueTypeDefinition();
ASTPointer<EnumValue> parseEnumValue(); ASTPointer<EnumValue> parseEnumValue();
ASTPointer<VariableDeclaration> parseVariableDeclaration( ASTPointer<VariableDeclaration> parseVariableDeclaration(
VarDeclParserOptions const& _options = {}, VarDeclParserOptions const& _options = {},

5
test/libsolidity/syntaxTests/parsing/user_defined_value_type.sol Normal file
View File

@ -0,0 +1,5 @@
type MyInt is uint;
contract C {
type MyAddress is address;
}

3
test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol Normal file
View File

@ -0,0 +1,3 @@
type(MyInt) is uint256;
// ----
// ParserError 2314: (4-5): Expected identifier but got '('

6
test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol Normal file
View File

@ -0,0 +1,6 @@
function f() {
type(uint).max;
type MyInt is int;
}
// ----
// ParserError 2314: (44-49): Expected ';' but got identifier