aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian <c@ethdev.com>2015-01-30 02:32:32 +0800
committerChristian <c@ethdev.com>2015-01-30 04:33:46 +0800
commit9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4 (patch)
treeb26db393d8e8ac2bbd1fc0e76d83c41323c05498
parent4e72a775469ea0e97475460997336de2e3af80df (diff)
downloaddexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.tar
dexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.tar.gz
dexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.tar.bz2
dexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.tar.lz
dexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.tar.xz
dexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.tar.zst
dexon-solidity-9f8c2620da10aa6dc3ab92de2b4aba7a9aa53be4.zip
Whitespace and error messages.
-rwxr-xr-xAST.h6
-rw-r--r--ExpressionCompiler.cpp4
-rw-r--r--ExpressionCompiler.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/AST.h b/AST.h
index fb046f19..ab9815f6 100755
--- a/AST.h
+++ b/AST.h
@@ -473,9 +473,9 @@ class EventDefinition: public Declaration, public Documented
{
public:
EventDefinition(Location const& _location,
- ASTPointer<ASTString> const& _name,
- ASTPointer<ASTString> const& _documentation,
- ASTPointer<ParameterList> const& _parameters):
+ ASTPointer<ASTString> const& _name,
+ ASTPointer<ASTString> const& _documentation,
+ ASTPointer<ParameterList> const& _parameters):
Declaration(_location, _name), Documented(_documentation), m_parameters(_parameters) {}
virtual void accept(ASTVisitor& _visitor) override;
diff --git a/ExpressionCompiler.cpp b/ExpressionCompiler.cpp
index 2b299011..db71b51d 100644
--- a/ExpressionCompiler.cpp
+++ b/ExpressionCompiler.cpp
@@ -322,7 +322,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
}
unsigned length = appendExpressionCopyToMemory(*function.getParameterTypes().front(),
*arguments.front());
- solAssert(length == 32, "Log data should have length 32.");
+ solAssert(length == 32, "Log data should be 32 bytes long (for now).");
m_context << u256(length) << u256(0) << eth::logInstruction(logNumber);
break;
}
@@ -487,7 +487,7 @@ bool ExpressionCompiler::visit(IndexAccess const& _indexAccess)
TypePointer const& keyType = dynamic_cast<MappingType const&>(*_indexAccess.getBaseExpression().getType()).getKeyType();
unsigned length = appendExpressionCopyToMemory(*keyType, _indexAccess.getIndexExpression());
- solAssert(length == 32, "Mapping key length in memory has to be 32.");
+ solAssert(length == 32, "Mapping key has to take 32 bytes in memory (for now).");
// @todo move this once we actually use memory
length += CompilerUtils(m_context).storeInMemory(length);
m_context << u256(length) << u256(0) << eth::Instruction::SHA3;
diff --git a/ExpressionCompiler.h b/ExpressionCompiler.h
index 18c3817a..caecbfe8 100644
--- a/ExpressionCompiler.h
+++ b/ExpressionCompiler.h
@@ -95,8 +95,8 @@ private:
/// Appends code that copies the given arguments to memory (with optional offset).
/// @returns the number of bytes copied to memory
unsigned appendArgumentCopyToMemory(TypePointers const& _types,
- std::vector<ASTPointer<Expression const>> const& _arguments,
- unsigned _memoryOffset = 0);
+ std::vector<ASTPointer<Expression const>> const& _arguments,
+ unsigned _memoryOffset = 0);
/// Appends code that evaluates a single expression and copies it to memory (with optional offset).
/// @returns the number of bytes copied to memory
unsigned appendExpressionCopyToMemory(Type const& _expectedType, Expression const& _expression,