From 00509830d5d93e117a75a7b34ab947dc210b0870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Apr 2023 22:58:40 +0200
Subject: [PATCH] User-defined literal suffixes: Parsing

---
 libsolidity/parsing/Parser.cpp                | 39 ++++++++++++++++++-
 libsolidity/parsing/Parser.h                  |  1 +
 .../denominations/finney_invalid.sol          |  2 +-
 .../denominations/szabo_invalid.sol           |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 84ecec329..4486a01ba 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -2050,7 +2050,44 @@ ASTPointer<Expression> Parser::parseLiteral()
 		return nodeFactory.createNode<Literal>(initialToken, std::move(value), subDenomination);
 	}
 
-	return nodeFactory.createNode<Literal>(initialToken, std::move(value), Literal::SubDenomination::None);
+	ASTPointer<Literal> literal = nodeFactory.createNode<Literal>(initialToken, std::move(value), Literal::SubDenomination::None);
+
+	if (m_scanner->currentToken() != Token::Identifier)
+		return literal;
+
+	ASTPointer<Expression> suffix = parseLiteralSuffix();
+	nodeFactory.setEndPositionFromNode(suffix);
+
+	return nodeFactory.createNode<FunctionCall>(
+		std::move(suffix),
+		std::vector<ASTPointer<Expression>>{std::move(literal)},
+		vector<ASTPointer<ASTString>>{},
+		vector<SourceLocation>{},
+		true /* _isSuffixCall */
+	);
+}
+
+ASTPointer<Expression> Parser::parseLiteralSuffix()
+{
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+
+	nodeFactory.markEndPosition();
+	ASTPointer<Expression> suffix = nodeFactory.createNode<Identifier>(expectIdentifierToken());
+
+	while (m_scanner->currentToken() == Token::Period)
+	{
+		advance();
+		SourceLocation memberLocation = currentLocation();
+		nodeFactory.markEndPosition();
+		suffix = nodeFactory.createNode<MemberAccess>(
+			std::move(suffix),
+			expectIdentifierToken(),
+			std::move(memberLocation)
+		);
+	}
+
+	return suffix;
 }
 
 ASTPointer<Expression> Parser::parsePrimaryExpression()
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index f967ea38a..b6702977e 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -161,6 +161,7 @@ private:
 		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
 	);
 	ASTPointer<Expression> parseLiteral();
+	ASTPointer<Expression> parseLiteralSuffix();
 	ASTPointer<Expression> parsePrimaryExpression();
 	std::vector<ASTPointer<Expression>> parseFunctionCallListArguments();
 
diff --git a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
index 0974cde13..9ecbb3e66 100644
--- a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
+++ b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (58-64): Expected ';' but got identifier
+// DeclarationError 7576: (58-64): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
index d0e3eb3ff..e5fba8364 100644
--- a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
+++ b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (58-63): Expected ';' but got identifier
+// DeclarationError 7576: (58-63): Undeclared identifier.