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

Do not validate identifiers against EVM instructions in JULIA

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-04-27 09:58:52 +01:00
parent b48bc81d40
commit 8b79517d47
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsolidity/inlineasm/AsmParser.cpp
View File

@ -24,6 +24,7 @@
#include <ctype.h> #include <ctype.h>
#include <algorithm> #include <algorithm>
#include <libsolidity/parsing/Scanner.h> #include <libsolidity/parsing/Scanner.h>
#include <libsolidity/interface/Exceptions.h>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
@ -73,7 +74,7 @@ assembly::Statement Parser::parseStatement()
expectToken(Token::Colon); expectToken(Token::Colon);
assignment.variableName.location = location(); assignment.variableName.location = location();
assignment.variableName.name = m_scanner->currentLiteral(); assignment.variableName.name = m_scanner->currentLiteral();
if (instructions().count(assignment.variableName.name)) if (!m_julia && instructions().count(assignment.variableName.name))
fatalParserError("Identifier expected, got instruction name."); fatalParserError("Identifier expected, got instruction name.");
assignment.location.end = endPosition(); assignment.location.end = endPosition();
expectToken(Token::Identifier); expectToken(Token::Identifier);
@ -105,7 +106,7 @@ assembly::Statement Parser::parseStatement()
{ {
// functional assignment // functional assignment
FunctionalAssignment funAss = createWithLocation<FunctionalAssignment>(identifier.location); FunctionalAssignment funAss = createWithLocation<FunctionalAssignment>(identifier.location);
if (instructions().count(identifier.name)) if (!m_julia && instructions().count(identifier.name))
fatalParserError("Cannot use instruction names for identifier names."); fatalParserError("Cannot use instruction names for identifier names.");
m_scanner->next(); m_scanner->next();
funAss.variableName = identifier; funAss.variableName = identifier;
@ -180,7 +181,7 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
else else
literal = m_scanner->currentLiteral(); literal = m_scanner->currentLiteral();
// first search the set of instructions. // first search the set of instructions.
if (instructions().count(literal)) if (!m_julia && instructions().count(literal))
{ {
dev::solidity::Instruction const& instr = instructions().at(literal); dev::solidity::Instruction const& instr = instructions().at(literal);
if (_onlySinglePusher) if (_onlySinglePusher)
@ -259,6 +260,7 @@ assembly::Statement Parser::parseFunctionalInstruction(assembly::Statement&& _in
{ {
if (_instruction.type() == typeid(Instruction)) if (_instruction.type() == typeid(Instruction))
{ {
solAssert(!m_julia, "Instructions are invalid in JULIA");
FunctionalInstruction ret; FunctionalInstruction ret;
ret.instruction = std::move(boost::get<Instruction>(_instruction)); ret.instruction = std::move(boost::get<Instruction>(_instruction));
ret.location = ret.instruction.location; ret.location = ret.instruction.location;
@ -321,7 +323,7 @@ assembly::Statement Parser::parseFunctionalInstruction(assembly::Statement&& _in
string Parser::expectAsmIdentifier() string Parser::expectAsmIdentifier()
{ {
string name = m_scanner->currentLiteral(); string name = m_scanner->currentLiteral();
if (instructions().count(name)) if (!m_julia && instructions().count(name))
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;