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

Rename FunctionalAssignment to Assignment

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-05-24 01:07:00 +01:00
parent f15d6ea45f
commit 187fa50751
9 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/inlineasm/AsmAnalysis.cpp
View File

@ -168,7 +168,7 @@ bool AsmAnalyzer::operator()(assembly::StackAssignment const& _assignment)
} }
bool AsmAnalyzer::operator()(FunctionalAssignment const& _assignment) bool AsmAnalyzer::operator()(assembly::Assignment const& _assignment)
{ {
int const stackHeight = m_stackHeight; int const stackHeight = m_stackHeight;
bool success = boost::apply_visitor(*this, *_assignment.value); bool success = boost::apply_visitor(*this, *_assignment.value);

4
libsolidity/inlineasm/AsmAnalysis.h
View File

@ -40,7 +40,7 @@ struct Literal;
struct Block; struct Block;
struct Label; struct Label;
struct FunctionalInstruction; struct FunctionalInstruction;
struct FunctionalAssignment; struct Assignment;
struct VariableDeclaration; struct VariableDeclaration;
struct Instruction; struct Instruction;
struct Identifier; struct Identifier;
@ -74,7 +74,7 @@ public:
bool operator()(assembly::FunctionalInstruction const& _functionalInstruction); bool operator()(assembly::FunctionalInstruction const& _functionalInstruction);
bool operator()(assembly::Label const& _label); bool operator()(assembly::Label const& _label);
bool operator()(assembly::StackAssignment const&); bool operator()(assembly::StackAssignment const&);
bool operator()(assembly::FunctionalAssignment const& _functionalAssignment); bool operator()(assembly::Assignment const& _assignment);
bool operator()(assembly::VariableDeclaration const& _variableDeclaration); bool operator()(assembly::VariableDeclaration const& _variableDeclaration);
bool operator()(assembly::FunctionDefinition const& _functionDefinition); bool operator()(assembly::FunctionDefinition const& _functionDefinition);
bool operator()(assembly::FunctionCall const& _functionCall); bool operator()(assembly::FunctionCall const& _functionCall);

4
libsolidity/inlineasm/AsmAnalysisInfo.h
View File

@ -36,7 +36,7 @@ struct Literal;
struct Block; struct Block;
struct Label; struct Label;
struct FunctionalInstruction; struct FunctionalInstruction;
struct FunctionalAssignment; struct Assignment;
struct VariableDeclaration; struct VariableDeclaration;
struct Instruction; struct Instruction;
struct Identifier; struct Identifier;
@ -46,7 +46,7 @@ struct FunctionCall;
struct Scope; struct Scope;
using Statement = boost::variant<Instruction, Literal, Label, StackAssignment, Identifier, FunctionalAssignment, FunctionCall, FunctionalInstruction, VariableDeclaration, FunctionDefinition, Block>; using Statement = boost::variant<Instruction, Literal, Label, StackAssignment, Identifier, Assignment, FunctionCall, FunctionalInstruction, VariableDeclaration, FunctionDefinition, Block>;
struct AsmAnalysisInfo struct AsmAnalysisInfo
{ {

2
libsolidity/inlineasm/AsmCodeGen.cpp
View File

@ -239,7 +239,7 @@ public:
generateAssignment(_assignment.variableName, _assignment.location); generateAssignment(_assignment.variableName, _assignment.location);
checkStackHeight(&_assignment); checkStackHeight(&_assignment);
} }
void operator()(FunctionalAssignment const& _assignment) void operator()(assembly::Assignment const& _assignment)
{ {
int height = m_assembly.stackHeight(); int height = m_assembly.stackHeight();
boost::apply_visitor(*this, *_assignment.value); boost::apply_visitor(*this, *_assignment.value);

8
libsolidity/inlineasm/AsmData.h
View File

@ -52,15 +52,15 @@ struct FunctionalInstruction;
struct Label { SourceLocation location; std::string name; }; struct Label { SourceLocation location; std::string name; };
/// Assignment from stack (":= x", moves stack top into x, potentially multiple slots) /// Assignment from stack (":= x", moves stack top into x, potentially multiple slots)
struct StackAssignment { SourceLocation location; Identifier variableName; }; struct StackAssignment { SourceLocation location; Identifier variableName; };
struct FunctionalAssignment; struct Assignment;
struct VariableDeclaration; struct VariableDeclaration;
struct FunctionDefinition; struct FunctionDefinition;
struct FunctionCall; struct FunctionCall;
struct Block; struct Block;
using Statement = boost::variant<Instruction, Literal, Label, StackAssignment, Identifier, FunctionalAssignment, FunctionCall, FunctionalInstruction, VariableDeclaration, FunctionDefinition, Block>; using Statement = boost::variant<Instruction, Literal, Label, StackAssignment, Identifier, Assignment, FunctionCall, FunctionalInstruction, VariableDeclaration, FunctionDefinition, Block>;
/// Functional assignment ("x := mload(20:u256)", expects push-1-expression on the right hand /// Assignment ("x := mload(20:u256)", expects push-1-expression on the right hand
/// side and requires x to occupy exactly one stack slot. /// side and requires x to occupy exactly one stack slot.
struct FunctionalAssignment { SourceLocation location; Identifier variableName; std::shared_ptr<Statement> value; }; struct Assignment { SourceLocation location; Identifier variableName; std::shared_ptr<Statement> value; };
/// Functional instruction, e.g. "mul(mload(20:u256), add(2:u256, x))" /// Functional instruction, e.g. "mul(mload(20:u256), add(2:u256, x))"
struct FunctionalInstruction { SourceLocation location; Instruction instruction; std::vector<Statement> arguments; }; struct FunctionalInstruction { SourceLocation location; Instruction instruction; std::vector<Statement> arguments; };
struct FunctionCall { SourceLocation location; Identifier functionName; std::vector<Statement> arguments; }; struct FunctionCall { SourceLocation location; Identifier functionName; std::vector<Statement> arguments; };

11
libsolidity/inlineasm/AsmParser.cpp
View File

@ -107,15 +107,14 @@ assembly::Statement Parser::parseStatement()
// while identifier:= (being followed by a non-colon) as identifier := (assignment). // while identifier:= (being followed by a non-colon) as identifier := (assignment).
if (m_scanner->currentToken() == Token::Assign && m_scanner->peekNextToken() != Token::Colon) if (m_scanner->currentToken() == Token::Assign && m_scanner->peekNextToken() != Token::Colon)
{ {
// functional assignment assembly::Assignment assignment = createWithLocation<assembly::Assignment>(identifier.location);
FunctionalAssignment funAss = createWithLocation<FunctionalAssignment>(identifier.location);
if (!m_julia && 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; assignment.variableName = identifier;
funAss.value.reset(new Statement(parseExpression())); assignment.value.reset(new Statement(parseExpression()));
funAss.location.end = locationOf(*funAss.value).end; assignment.location.end = locationOf(*assignment.value).end;
return funAss; return assignment;
} }
else else
{ {

4
libsolidity/inlineasm/AsmPrinter.cpp
View File

@ -114,9 +114,9 @@ string AsmPrinter::operator()(assembly::StackAssignment const& _assignment)
return "=: " + (*this)(_assignment.variableName); return "=: " + (*this)(_assignment.variableName);
} }
string AsmPrinter::operator()(assembly::FunctionalAssignment const& _functionalAssignment) string AsmPrinter::operator()(assembly::Assignment const& _assignment)
{ {
return (*this)(_functionalAssignment.variableName) + " := " + boost::apply_visitor(*this, *_functionalAssignment.value); return (*this)(_assignment.variableName) + " := " + boost::apply_visitor(*this, *_assignment.value);
} }
string AsmPrinter::operator()(assembly::VariableDeclaration const& _variableDeclaration) string AsmPrinter::operator()(assembly::VariableDeclaration const& _variableDeclaration)

4
libsolidity/inlineasm/AsmPrinter.h
View File

@ -36,7 +36,7 @@ struct Identifier;
struct FunctionalInstruction; struct FunctionalInstruction;
struct Label; struct Label;
struct StackAssignment; struct StackAssignment;
struct FunctionalAssignment; struct Assignment;
struct VariableDeclaration; struct VariableDeclaration;
struct FunctionDefinition; struct FunctionDefinition;
struct FunctionCall; struct FunctionCall;
@ -53,7 +53,7 @@ public:
std::string operator()(assembly::FunctionalInstruction const& _functionalInstruction); std::string operator()(assembly::FunctionalInstruction const& _functionalInstruction);
std::string operator()(assembly::Label const& _label); std::string operator()(assembly::Label const& _label);
std::string operator()(assembly::StackAssignment const& _assignment); std::string operator()(assembly::StackAssignment const& _assignment);
std::string operator()(assembly::FunctionalAssignment const& _functionalAssignment); std::string operator()(assembly::Assignment const& _assignment);
std::string operator()(assembly::VariableDeclaration const& _variableDeclaration); std::string operator()(assembly::VariableDeclaration const& _variableDeclaration);
std::string operator()(assembly::FunctionDefinition const& _functionDefinition); std::string operator()(assembly::FunctionDefinition const& _functionDefinition);
std::string operator()(assembly::FunctionCall const& _functionCall); std::string operator()(assembly::FunctionCall const& _functionCall);

4
libsolidity/inlineasm/AsmScopeFiller.h
View File

@ -39,7 +39,7 @@ struct Literal;
struct Block; struct Block;
struct Label; struct Label;
struct FunctionalInstruction; struct FunctionalInstruction;
struct FunctionalAssignment; struct Assignment;
struct VariableDeclaration; struct VariableDeclaration;
struct Instruction; struct Instruction;
struct Identifier; struct Identifier;
@ -65,7 +65,7 @@ public:
bool operator()(assembly::FunctionalInstruction const&) { return true; } bool operator()(assembly::FunctionalInstruction const&) { return true; }
bool operator()(assembly::Label const& _label); bool operator()(assembly::Label const& _label);
bool operator()(assembly::StackAssignment const&) { return true; } bool operator()(assembly::StackAssignment const&) { return true; }
bool operator()(assembly::FunctionalAssignment const&) { return true; } bool operator()(assembly::Assignment const&) { return true; }
bool operator()(assembly::VariableDeclaration const& _variableDeclaration); bool operator()(assembly::VariableDeclaration const& _variableDeclaration);
bool operator()(assembly::FunctionDefinition const& _functionDefinition); bool operator()(assembly::FunctionDefinition const& _functionDefinition);
bool operator()(assembly::FunctionCall const&) { return true; } bool operator()(assembly::FunctionCall const&) { return true; }