diff options
| author | RJ <catalanor0220@gmail.com> | 2016-01-11 11:37:47 +0800 |
|---|---|---|
| committer | RJ <catalanor0220@gmail.com> | 2016-01-11 11:37:47 +0800 |
| commit | 72a641fe9f4f040586c7f563601ddda987df4f0b (patch) | |
| tree | bce7e6c86585516d5b5ce0226f5a621263b4dc37 /libsolidity/codegen/ExpressionCompiler.cpp | |
| parent | 5a3b40f802612b3fe18eac2c76fb2c849318807a (diff) | |
| download | dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.tar dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.tar.gz dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.tar.bz2 dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.tar.lz dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.tar.xz dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.tar.zst dexon-solidity-72a641fe9f4f040586c7f563601ddda987df4f0b.zip | |
Update ExpressionCompiler.cpp
Diffstat (limited to 'libsolidity/codegen/ExpressionCompiler.cpp')
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index c7e2a997..c930c468 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -231,9 +231,7 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple) { components[i]->accept(*this); utils().convertType(*components[i]->annotation().type, *arrayType.baseType(), true); - cout << components[i]->annotation().type->toString(true) << endl; components[i]->annotation().type = arrayType.baseType(); //force conversion - cout << components[i]->annotation().type->toString(true) << endl; utils().storeInMemoryDynamic(*components[i]->annotation().type, true); } m_context << eth::Instruction::POP; @@ -796,7 +794,6 @@ bool ExpressionCompiler::visit(NewExpression const&) void ExpressionCompiler::endVisit(MemberAccess const& _memberAccess) { CompilerContext::LocationSetter locationSetter(m_context, _memberAccess); - // Check whether the member is a bound function. ASTString const& member = _memberAccess.memberName(); if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get())) @@ -1145,6 +1142,7 @@ void ExpressionCompiler::endVisit(Literal const& _literal) { CompilerContext::LocationSetter locationSetter(m_context, _literal); TypePointer type = _literal.annotation().type; + switch (type->category()) { case Type::Category::IntegerConstant: @@ -1155,7 +1153,7 @@ void ExpressionCompiler::endVisit(Literal const& _literal) break; // will be done during conversion default: BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Only integer, boolean and string literals implemented for now.")); - } + } } void ExpressionCompiler::appendAndOrOperatorCode(BinaryOperation const& _binaryOperation) |