cerc-io/solidity
11
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

Bytes Tokens properly named and NameAndTypeResolution tests work

Browse Source
This commit is contained in:
Lefteris Karapetsas
2015-03-12 12:53:00 +01:00
parent 3ca37caddd
commit 2bddebc3d5
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Types.cpp
+5 -2
View File
@@ -39,7 +39,7 @@ TypePointer Type::fromElementaryTypeName(Token::Value _typeToken)
{
solAssert(Token::isElementaryTypeName(_typeToken), "Elementary type name expected.");
if (Token::Int <= _typeToken && _typeToken <= Token::Bytes256)
if (Token::Int <= _typeToken && _typeToken <= Token::Bytes32)
{
int offset = _typeToken - Token::Int;
int bytes = offset % 33;
@@ -226,8 +226,11 @@ TypePointer IntegerType::binaryOperatorResult(Token::Value _operator, TypePointe
// All integer types can be compared
if (Token::isCompareOp(_operator))
return commonType;
// Nothing else can be done with addresses, but hashes can receive bit operators
if (commonType->isAddress())
return TypePointer();
return TypePointer();
return commonType;
}
const MemberList IntegerType::AddressMemberList =