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

Add helpers escapeIdentifier to Types

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-02-23 18:27:27 +01:00
parent 272262ea99
commit 751705978e
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsolidity/ast/Types.cpp
View File

@ -170,6 +170,26 @@ string parenthesizeUserIdentifier(string const& _internal)
} }
string Type::escapeIdentifier(string const& _identifier)
{
string ret = _identifier;
boost::algorithm::replace_all(ret, "$", "_$$$_");
boost::algorithm::replace_all(ret, ",", "_$_");
boost::algorithm::replace_all(ret, "(", "$_");
boost::algorithm::replace_all(ret, ")", "_$");
return ret;
}
string Type::unescapeIdentifier(string const& _identifier)
{
string ret = _identifier;
boost::algorithm::replace_all(ret, "_$_", ",");
boost::algorithm::replace_all(ret, "_$$$_", "$");
boost::algorithm::replace_all(ret, "$_", "(");
boost::algorithm::replace_all(ret, "_$", ")");
return ret;
}
TypePointer Type::fromElementaryTypeName(ElementaryTypeNameToken const& _type) TypePointer Type::fromElementaryTypeName(ElementaryTypeNameToken const& _type)
{ {
solAssert(Token::isElementaryTypeName(_type.token()), solAssert(Token::isElementaryTypeName(_type.token()),

8
libsolidity/ast/Types.h
View File

@ -163,10 +163,16 @@ public:
/// @returns a valid solidity identifier such that two types should compare equal if and /// @returns a valid solidity identifier such that two types should compare equal if and
/// only if they have the same identifier. /// only if they have the same identifier.
/// The identifier should start with "t_". /// The identifier should start with "t_".
virtual std::string identifier() const = 0;
/// More complex identifier strings use "parentheses", where $_ is interpreted as as /// More complex identifier strings use "parentheses", where $_ is interpreted as as
/// "opening parenthesis", _$ as "closing parenthesis", _$_ as "comma" and any $ that /// "opening parenthesis", _$ as "closing parenthesis", _$_ as "comma" and any $ that
/// appears as part of a user-supplied identifier is escaped as _$$$_. /// appears as part of a user-supplied identifier is escaped as _$$$_.
virtual std::string identifier() const = 0; /// @returns an escaped identifier (will not contain any parenthesis or commas)
static std::string escapeIdentifier(std::string const& _identifier);
/// @returns an unescaped identifier
static std::string unescapeIdentifier(std::string const& _identifier);
virtual bool isImplicitlyConvertibleTo(Type const& _other) const { return *this == _other; } virtual bool isImplicitlyConvertibleTo(Type const& _other) const { return *this == _other; }
virtual bool isExplicitlyConvertibleTo(Type const& _convertTo) const virtual bool isExplicitlyConvertibleTo(Type const& _convertTo) const
{ {