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

User-defined literal suffixes: Parsing and grammar

Browse Source
This commit is contained in:
Kamil Śliwak 2023-02-24 19:49:42 +01:00
parent e06e2c72ce
commit fda86c21f8
4 changed files with 91 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
libsolidity/parsing/Parser.cpp
View File

@ -36,10 +36,12 @@
#include <boost/algorithm/string/trim.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <cctype>
#include <vector>
#include <memory>
#include <regex>
#include <tuple>
#include <vector>
using namespace std;
using namespace solidity::langutil;
@ -2000,6 +2002,84 @@ ASTPointer<Expression> Parser::parseLeftHandSideExpression(
}
}
ASTPointer<Expression> Parser::parseLiteral()
{
RecursionGuard recursionGuard(*this);
ASTNodeFactory nodeFactory(*this);
Token initialToken = m_scanner->currentToken();
ASTPointer<ASTString> value = make_shared<string>(m_scanner->currentLiteral());
Literal::Suffix suffix = Literal::SubDenomination::None;
switch (initialToken)
{
case Token::TrueLiteral:
case Token::FalseLiteral:
case Token::Number:
{
nodeFactory.markEndPosition();
advance();
break;
}
case Token::StringLiteral:
case Token::UnicodeStringLiteral:
case Token::HexStringLiteral:
{
while (m_scanner->peekNextToken() == initialToken)
{
advance();
*value += m_scanner->currentLiteral();
}
nodeFactory.markEndPosition();
advance();
if (m_scanner->currentToken() == Token::Illegal)
fatalParserError(5428_error, to_string(m_scanner->currentError()));
break;
}
default:
solAssert(false);
break;
}
if (initialToken == Token::Number && (
TokenTraits::isEtherSubdenomination(m_scanner->currentToken()) ||
TokenTraits::isTimeSubdenomination(m_scanner->currentToken())
))
{
nodeFactory.markEndPosition();
suffix = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
advance();
}
else if (m_scanner->currentToken() == Token::Identifier)
{
// TODO: Make sure locations are set correctly
ASTPointer<ASTString> suffixName = make_shared<ASTString>(m_scanner->currentLiteral());
nodeFactory.markEndPosition();
ASTPointer<Identifier> identifier = nodeFactory.createNode<Identifier>(suffixName);
advance();
if (m_scanner->currentToken() != Token::Period)
suffix = identifier;
else
{
ASTPointer<Expression> memberAccess = identifier;
do
{
// FIXME: This grabs the semicolon
advance();
nodeFactory.markEndPosition();
SourceLocation memberLocation = currentLocation();
ASTPointer<ASTString> memberName = expectIdentifierToken();
memberAccess = nodeFactory.createNode<MemberAccess>(memberAccess, std::move(memberName), std::move(memberLocation));
}
while (m_scanner->currentToken() == Token::Period);
suffix = dynamic_pointer_cast<MemberAccess>(memberAccess);
}
}
return nodeFactory.createNode<Literal>(initialToken, std::move(value), std::move(suffix));
}
ASTPointer<Expression> Parser::parsePrimaryExpression()
{
RecursionGuard recursionGuard(*this);
@ -2011,50 +2091,12 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
{
case Token::TrueLiteral:
case Token::FalseLiteral:
nodeFactory.markEndPosition();
expression = nodeFactory.createNode<Literal>(token, getLiteralAndAdvance());
break;
case Token::Number:
if (TokenTraits::isEtherSubdenomination(m_scanner->peekNextToken()))
{
ASTPointer<ASTString> literal = getLiteralAndAdvance();
nodeFactory.markEndPosition();
Literal::SubDenomination subdenomination = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
advance();
expression = nodeFactory.createNode<Literal>(token, literal, subdenomination);
}
else if (TokenTraits::isTimeSubdenomination(m_scanner->peekNextToken()))
{
ASTPointer<ASTString> literal = getLiteralAndAdvance();
nodeFactory.markEndPosition();
Literal::SubDenomination subdenomination = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
advance();
expression = nodeFactory.createNode<Literal>(token, literal, subdenomination);
}
else
{
nodeFactory.markEndPosition();
expression = nodeFactory.createNode<Literal>(token, getLiteralAndAdvance());
}
break;
case Token::StringLiteral:
case Token::UnicodeStringLiteral:
case Token::HexStringLiteral:
{
string literal = m_scanner->currentLiteral();
Token firstToken = m_scanner->currentToken();
while (m_scanner->peekNextToken() == firstToken)
{
advance();
literal += m_scanner->currentLiteral();
}
nodeFactory.markEndPosition();
advance();
if (m_scanner->currentToken() == Token::Illegal)
fatalParserError(5428_error, to_string(m_scanner->currentError()));
expression = nodeFactory.createNode<Literal>(token, make_shared<ASTString>(literal));
expression = parseLiteral();
break;
}
case Token::Identifier:
nodeFactory.markEndPosition();
expression = nodeFactory.createNode<Identifier>(getLiteralAndAdvance());

1
libsolidity/parsing/Parser.h
View File

@ -160,6 +160,7 @@ private:
ASTPointer<Expression> parseLeftHandSideExpression(
ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
);
ASTPointer<Expression> parseLiteral();
ASTPointer<Expression> parsePrimaryExpression();
std::vector<ASTPointer<Expression>> parseFunctionCallListArguments();

8
test/libsolidity/syntaxTests/denominations/finney_invalid.sol
View File

@ -1,7 +1,7 @@
contract C {
function f() {
uint x = 1 finney;
}
function f() public {
uint x = 1 finney;
}
}
// ----
// ParserError 2314: (45-51): Expected ';' but got identifier
// DeclarationError 7576: (56-64): Undeclared identifier.

8
test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
View File

@ -1,7 +1,7 @@
contract C {
function f() {
uint x = 1 szabo;
}
function f() public {
uint x = 1 szabo;
}
}
// ----
// ParserError 2314: (45-50): Expected ';' but got identifier
// DeclarationError 7576: (56-63): Undeclared identifier.