diff options
| author | Christian <c@ethdev.com> | 2015-02-25 23:00:23 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2015-02-25 23:22:30 +0800 |
| commit | 66b6860eb88c027244abd75393f59b6b68268f6e (patch) | |
| tree | dbcd3d8d6d988bc42f90f3ea97791143b439d39b | |
| parent | 29c614ebaf551006bc6c028592917e8f0dd5cf96 (diff) | |
| download | dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.tar dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.tar.gz dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.tar.bz2 dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.tar.lz dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.tar.xz dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.tar.zst dexon-solidity-66b6860eb88c027244abd75393f59b6b68268f6e.zip | |
Stylistic changes.
| -rw-r--r-- | ExpressionCompiler.cpp | 5 | ||||
| -rw-r--r-- | ExpressionCompiler.h | 3 | ||||
| -rw-r--r-- | LValue.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ExpressionCompiler.cpp b/ExpressionCompiler.cpp index 67686df1..430e46b0 100644 --- a/ExpressionCompiler.cpp +++ b/ExpressionCompiler.cpp @@ -153,8 +153,9 @@ void ExpressionCompiler::appendTypeConversion(Type const& _typeOnStack, Type con else if (stackTypeCategory == Type::Category::Enum) solAssert(targetTypeCategory == Type::Category::Integer || targetTypeCategory == Type::Category::Enum, ""); - else if (stackTypeCategory == Type::Category::Integer || stackTypeCategory == Type::Category::Contract || - stackTypeCategory == Type::Category::IntegerConstant) + else if (stackTypeCategory == Type::Category::Integer || + stackTypeCategory == Type::Category::Contract || + stackTypeCategory == Type::Category::IntegerConstant) { if (targetTypeCategory == Type::Category::String && stackTypeCategory == Type::Category::Integer) { diff --git a/ExpressionCompiler.h b/ExpressionCompiler.h index c3ecabbd..9cab757e 100644 --- a/ExpressionCompiler.h +++ b/ExpressionCompiler.h @@ -26,6 +26,7 @@ #include <boost/noncopyable.hpp> #include <libdevcore/Common.h> #include <libevmcore/SourceLocation.h> +#include <libsolidity/Utils.h> #include <libsolidity/ASTVisitor.h> #include <libsolidity/LValue.h> @@ -133,7 +134,7 @@ private: template <class _LValueType, class... _Arguments> void ExpressionCompiler::setLValue(Expression const& _expression, _Arguments const&... _arguments) { - solAssert(!m_currentLValue, "Current LValue not reset when trying to set to new one."); + solAssert(!m_currentLValue, "Current LValue not reset before trying to set new one."); std::unique_ptr<_LValueType> lvalue(new _LValueType(m_context, _arguments...)); if (_expression.lvalueRequested()) m_currentLValue = move(lvalue); @@ -53,7 +53,7 @@ public: /// Moves a value from the stack to the lvalue. Removes the value if @a _move is true. /// @a _location is the source location of the expression that caused this operation. /// Stack pre: value [lvalue_ref] - /// Stack post if !_move: value_of(lvalue_ref) + /// Stack post: if !_move: value_of(lvalue_ref) virtual void storeValue(Type const& _sourceType, SourceLocation const& _location = SourceLocation(), bool _move = false) const = 0; /// Stores zero in the lvalue. |