From 3102b98e821313fdb9496b1cc8e7e0cf09ae4823 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 6 Oct 2020 15:08:57 +0200 Subject: [PATCH] Var is reserved keyword. --- liblangutil/Token.h | 2 +- test/libsolidity/SolidityParser.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/liblangutil/Token.h b/liblangutil/Token.h index 3d9c71ab3..8e61b84d4 100644 --- a/liblangutil/Token.h +++ b/liblangutil/Token.h @@ -318,7 +318,7 @@ namespace TokenTraits constexpr bool isEtherSubdenomination(Token op) { return op >= Token::SubWei && op <= Token::SubEther; } constexpr bool isTimeSubdenomination(Token op) { return op == Token::SubSecond || op == Token::SubMinute || op == Token::SubHour || op == Token::SubDay || op == Token::SubWeek || op == Token::SubYear; } - constexpr bool isReservedKeyword(Token op) { return (Token::After <= op && op <= Token::Unchecked); } + constexpr bool isReservedKeyword(Token op) { return (Token::After <= op && op <= Token::Var); } constexpr bool isYulKeyword(Token tok) { diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index 2393ceeca..c5f483355 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -121,6 +121,7 @@ BOOST_AUTO_TEST_CASE(reserved_keywords) BOOST_CHECK(!TokenTraits::isReservedKeyword(Token::Identifier)); BOOST_CHECK(TokenTraits::isReservedKeyword(Token::After)); BOOST_CHECK(TokenTraits::isReservedKeyword(Token::Unchecked)); + BOOST_CHECK(TokenTraits::isReservedKeyword(Token::Var)); BOOST_CHECK(!TokenTraits::isReservedKeyword(Token::Illegal)); } @@ -514,10 +515,11 @@ BOOST_AUTO_TEST_CASE(keyword_is_reserved) "switch", "typedef", "typeof", - "unchecked" + "unchecked", + "var" }; - BOOST_CHECK_EQUAL(std::size(keywords), static_cast(Token::Unchecked) - static_cast(Token::After) + 1); + BOOST_CHECK_EQUAL(std::size(keywords), static_cast(Token::Var) - static_cast(Token::After) + 1); for (auto const& keyword: keywords) {