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

Contract compiler and also add ExpressionStatement to AST.

Browse Source 
ExpressionStatement functions as glue between Statements and Expressions.

This way it is possible to detect when the border between statements and
expressions is crossed while walking the AST. Note that ExpressionStatement is
not the only border, almost every statement can contains expressions.
This commit is contained in:
Christian 2014-10-30 01:20:32 +01:00
parent 03a6cf0e81
commit 877aa91c57
1 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
main.cpp
View File

@ -55,35 +55,6 @@ void version()
exit(0); exit(0);
} }
/// Helper class that extracts the first expression in an AST.
class FirstExpressionExtractor: private ASTVisitor
{
public:
FirstExpressionExtractor(ASTNode& _node): m_expression(nullptr) { _node.accept(*this); }
Expression* getExpression() const { return m_expression; }
private:
virtual bool visit(Expression& _expression) override { return checkExpression(_expression); }
virtual bool visit(Assignment& _expression) override { return checkExpression(_expression); }
virtual bool visit(UnaryOperation& _expression) override { return checkExpression(_expression); }
virtual bool visit(BinaryOperation& _expression) override { return checkExpression(_expression); }
virtual bool visit(FunctionCall& _expression) override { return checkExpression(_expression); }
virtual bool visit(MemberAccess& _expression) override { return checkExpression(_expression); }
virtual bool visit(IndexAccess& _expression) override { return checkExpression(_expression); }
virtual bool visit(PrimaryExpression& _expression) override { return checkExpression(_expression); }
virtual bool visit(Identifier& _expression) override { return checkExpression(_expression); }
virtual bool visit(ElementaryTypeNameExpression& _expression) override { return checkExpression(_expression); }
virtual bool visit(Literal& _expression) override { return checkExpression(_expression); }
bool checkExpression(Expression& _expression)
{
if (m_expression == nullptr)
m_expression = &_expression;
return false;
}
private:
Expression* m_expression;
};
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
string infile; string infile;
@ -143,13 +114,10 @@ int main(int argc, char** argv)
dev::solidity::ASTPrinter printer(ast, sourceCode); dev::solidity::ASTPrinter printer(ast, sourceCode);
printer.print(cout); printer.print(cout);
FirstExpressionExtractor extractor(*ast); bytes instructions;
CompilerContext context;
ExpressionCompiler compiler(context);
try try
{ {
compiler.compile(*extractor.getExpression()); instructions = Compiler::compile(*ast);
} }
catch (CompilerError const& exception) catch (CompilerError const& exception)
{ {
@ -157,10 +125,9 @@ int main(int argc, char** argv)
return -1; return -1;
} }
bytes instructions = compiler.getAssembledBytecode(); cout << "EVM assembly: " << endl;
cout << "Bytecode for the first expression: " << endl;
cout << eth::disassemble(instructions) << endl; cout << eth::disassemble(instructions) << endl;
cout << "Binary: " << toHex(instructions) << endl;
return 0; return 0;
} }