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

Merge pull request #5613 from ethereum/yulStringLiterals

Browse Source 
[Yul] Use C++ user-defined literals for creating YulString constants.
This commit is contained in:
chriseth 2018-12-17 14:07:24 +01:00 committed by GitHub
commit bf7d71d6b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libyul/AsmAnalysis.cpp
View File

@ -102,7 +102,7 @@ bool AsmAnalyzer::operator()(Literal const& _literal)
else if (_literal.kind == LiteralKind::Boolean)
{
solAssert(m_dialect->flavour == AsmFlavour::Yul, "");
solAssert(_literal.value == YulString{string("true")} || _literal.value == YulString{string("false")}, "");
solAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "");
}
m_info.stackHeightInfo[&_literal] = m_stackHeight;
return true;

6
libyul/AsmParser.cpp
View File

@ -354,11 +354,11 @@ Parser::ElementaryOperation Parser::parseElementaryOperation()
{
YulString literal;
if (currentToken() == Token::Return)
literal = YulString{"return"};
literal = "return"_yulstring;
else if (currentToken() == Token::Byte)
literal = YulString{"byte"};
literal = "byte"_yulstring;
else if (currentToken() == Token::Address)
literal = YulString{"address"};
literal = "address"_yulstring;
else
literal = YulString{currentLiteral()};
// first search the set of builtins, then the instructions.

4
libyul/AsmPrinter.cpp
View File

@ -55,8 +55,8 @@ string AsmPrinter::operator()(Literal const& _literal) const
solAssert(isValidDecimal(_literal.value.str()) || isValidHex(_literal.value.str()), "Invalid number literal");
return _literal.value.str() + appendTypeName(_literal.type);
case LiteralKind::Boolean:
solAssert(_literal.value.str() == "true" || _literal.value.str() == "false", "Invalid bool literal.");
return ((_literal.value.str() == "true") ? "true" : "false") + appendTypeName(_literal.type);
solAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "Invalid bool literal.");
return ((_literal.value == "true"_yulstring) ? "true" : "false") + appendTypeName(_literal.type);
case LiteralKind::String:
break;
}

2
libyul/ObjectParser.cpp
View File

@ -42,7 +42,7 @@ shared_ptr<Object> ObjectParser::parse(shared_ptr<Scanner> const& _scanner, bool
{
// Special case: Code-only form.
object = make_shared<Object>();
object->name = YulString{"object"};
object->name = "object"_yulstring;
object->code = parseBlock();
if (!object->code)
return nullptr;

5
libyul/YulString.h
View File

@ -127,4 +127,9 @@ private:
YulStringRepository::Handle m_handle{ 0, YulStringRepository::emptyHash() };
};
inline YulString operator "" _yulstring(const char *_string, std::size_t _size)
{
return YulString(std::string(_string, _size));
}
}

2
libyul/backends/evm/EVMCodeTransform.cpp
View File

@ -387,7 +387,7 @@ void CodeTransform::operator()(Literal const& _literal)
m_assembly.appendConstant(u256(_literal.value.str()));
else if (_literal.kind == LiteralKind::Boolean)
{
if (_literal.value.str() == "true")
if (_literal.value == "true"_yulstring)
m_assembly.appendConstant(u256(1));
else
m_assembly.appendConstant(u256(0));

4
libyul/optimiser/MainFunction.cpp
View File

@ -40,12 +40,12 @@ void MainFunction::operator()(Block& _block)
for (size_t i = 1; i < _block.statements.size(); ++i)
assertThrow(_block.statements.at(i).type() == typeid(FunctionDefinition), OptimizerException, "");
/// @todo this should handle scopes properly and instead of an assertion it should rename the conflicting function
assertThrow(NameCollector(_block).names().count(YulString{"main"}) == 0, OptimizerException, "");
assertThrow(NameCollector(_block).names().count("main"_yulstring) == 0, OptimizerException, "");
Block& block = boost::get<Block>(_block.statements[0]);
FunctionDefinition main{
block.location,
YulString{"main"},
"main"_yulstring,
{},
{},
std::move(block)

6
test/libyul/Parser.cpp
View File

@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE(builtins_parser)
SimpleDialect(): Dialect(AsmFlavour::Strict) {}
BuiltinFunction const* builtin(YulString _name) const override
{
return _name == YulString{"builtin"} ? &f : nullptr;
return _name == "builtin"_yulstring ? &f : nullptr;
}
BuiltinFunction f;
};
@ -329,9 +329,9 @@ BOOST_AUTO_TEST_CASE(builtins_analysis)
SimpleDialect(): Dialect(AsmFlavour::Strict) {}
BuiltinFunction const* builtin(YulString _name) const override
{
return _name == YulString{"builtin"} ? &f : nullptr;
return _name == "builtin"_yulstring ? &f : nullptr;
}
BuiltinFunction f{YulString{"builtin"}, vector<Type>(2), vector<Type>(3), false};
BuiltinFunction f{"builtin"_yulstring, vector<Type>(2), vector<Type>(3), false};
};
shared_ptr<Dialect> dialect = make_shared<SimpleDialect>();