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 #5578 from ethereum/yulStringRefactor

Browse Source 
Use YulString also in expectAsmIdentifier.
This commit is contained in:
chriseth 2018-12-03 21:05:48 +01:00 committed by GitHub
commit 336287821a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libyul/AsmParser.cpp
View File

@ -348,23 +348,23 @@ Parser::ElementaryOperation Parser::parseElementaryOperation()
case Token::Byte: case Token::Byte:
case Token::Address: case Token::Address:
{ {
string literal; YulString literal;
if (currentToken() == Token::Return) if (currentToken() == Token::Return)
literal = "return"; literal = YulString{"return"};
else if (currentToken() == Token::Byte) else if (currentToken() == Token::Byte)
literal = "byte"; literal = YulString{"byte"};
else if (currentToken() == Token::Address) else if (currentToken() == Token::Address)
literal = "address"; literal = YulString{"address"};
else else
literal = currentLiteral(); literal = YulString{currentLiteral()};
// first search the set of instructions. // first search the set of instructions.
if (m_flavour != AsmFlavour::Yul && instructions().count(literal)) if (m_flavour != AsmFlavour::Yul && instructions().count(literal.str()))
{ {
dev::solidity::Instruction const& instr = instructions().at(literal); dev::solidity::Instruction const& instr = instructions().at(literal.str());
ret = Instruction{location(), instr}; ret = Instruction{location(), instr};
} }
else else
ret = Identifier{location(), YulString{literal}}; ret = Identifier{location(), literal};
advance(); advance();
break; break;
} }
@ -403,7 +403,7 @@ Parser::ElementaryOperation Parser::parseElementaryOperation()
{ {
expectToken(Token::Colon); expectToken(Token::Colon);
literal.location.end = endPosition(); literal.location.end = endPosition();
literal.type = YulString{expectAsmIdentifier()}; literal.type = expectAsmIdentifier();
} }
else if (kind == LiteralKind::Boolean) else if (kind == LiteralKind::Boolean)
fatalParserError("True and false are not valid literals."); fatalParserError("True and false are not valid literals.");
@ -450,7 +450,7 @@ FunctionDefinition Parser::parseFunctionDefinition()
RecursionGuard recursionGuard(*this); RecursionGuard recursionGuard(*this);
FunctionDefinition funDef = createWithLocation<FunctionDefinition>(); FunctionDefinition funDef = createWithLocation<FunctionDefinition>();
expectToken(Token::Function); expectToken(Token::Function);
funDef.name = YulString{expectAsmIdentifier()}; funDef.name = expectAsmIdentifier();
expectToken(Token::LParen); expectToken(Token::LParen);
while (currentToken() != Token::RParen) while (currentToken() != Token::RParen)
{ {
@ -565,19 +565,19 @@ TypedName Parser::parseTypedName()
{ {
RecursionGuard recursionGuard(*this); RecursionGuard recursionGuard(*this);
TypedName typedName = createWithLocation<TypedName>(); TypedName typedName = createWithLocation<TypedName>();
typedName.name = YulString{expectAsmIdentifier()}; typedName.name = expectAsmIdentifier();
if (m_flavour == AsmFlavour::Yul) if (m_flavour == AsmFlavour::Yul)
{ {
expectToken(Token::Colon); expectToken(Token::Colon);
typedName.location.end = endPosition(); typedName.location.end = endPosition();
typedName.type = YulString{expectAsmIdentifier()}; typedName.type = expectAsmIdentifier();
} }
return typedName; return typedName;
} }
string Parser::expectAsmIdentifier() YulString Parser::expectAsmIdentifier()
{ {
string name = currentLiteral(); YulString name = YulString{currentLiteral()};
if (m_flavour == AsmFlavour::Yul) if (m_flavour == AsmFlavour::Yul)
{ {
switch (currentToken()) switch (currentToken())
@ -592,7 +592,7 @@ string Parser::expectAsmIdentifier()
break; break;
} }
} }
else if (instructions().count(name)) else if (instructions().count(name.str()))
fatalParserError("Cannot use instruction names for identifier names."); fatalParserError("Cannot use instruction names for identifier names.");
expectToken(Token::Identifier); expectToken(Token::Identifier);
return name; return name;

2
libyul/AsmParser.h
View File

@ -78,7 +78,7 @@ protected:
FunctionDefinition parseFunctionDefinition(); FunctionDefinition parseFunctionDefinition();
Expression parseCall(ElementaryOperation&& _initialOp); Expression parseCall(ElementaryOperation&& _initialOp);
TypedName parseTypedName(); TypedName parseTypedName();
std::string expectAsmIdentifier(); YulString expectAsmIdentifier();
static bool isValidNumberLiteral(std::string const& _literal); static bool isValidNumberLiteral(std::string const& _literal);