Browse Source

start of cleanup

cl-refactor
Lefteris Karapetsas 10 years ago
parent
commit
440edfd244
  1. 99
      libsolidity/Token.h
  2. 2
      libsolidity/Types.cpp

99
libsolidity/Token.h

@ -253,75 +253,42 @@ namespace solidity
K(UInt248, "uint248", 0) \
K(UInt256, "uint256", 0) \
K(Hash, "hash", 0) \
K(Hash8, "hash8", 0) \
K(Hash16, "hash16", 0) \
K(Hash24, "hash24", 0) \
K(Hash32, "hash32", 0) \
K(Hash40, "hash40", 0) \
K(Hash48, "hash48", 0) \
K(Hash56, "hash56", 0) \
K(Hash64, "hash64", 0) \
K(Hash72, "hash72", 0) \
K(Hash80, "hash80", 0) \
K(Hash88, "hash88", 0) \
K(Hash96, "hash96", 0) \
K(Hash104, "hash104", 0) \
K(Hash112, "hash112", 0) \
K(Hash120, "hash120", 0) \
K(Hash128, "hash128", 0) \
K(Hash136, "hash136", 0) \
K(Hash144, "hash144", 0) \
K(Hash152, "hash152", 0) \
K(Hash160, "hash160", 0) \
K(Hash168, "hash168", 0) \
K(Hash176, "hash178", 0) \
K(Hash184, "hash184", 0) \
K(Hash192, "hash192", 0) \
K(Hash200, "hash200", 0) \
K(Hash208, "hash208", 0) \
K(Hash216, "hash216", 0) \
K(Hash224, "hash224", 0) \
K(Hash232, "hash232", 0) \
K(Hash240, "hash240", 0) \
K(Hash248, "hash248", 0) \
K(Hash256, "hash256", 0) \
K(Bytes, "bytes", 0) \
K(Bytes8, "bytes8", 0) \
K(Bytes16, "bytes16", 0) \
K(Bytes24, "bytes24", 0) \
K(Bytes32, "bytes32", 0) \
K(Bytes40, "bytes40", 0) \
K(Bytes48, "bytes48", 0) \
K(Bytes56, "bytes56", 0) \
K(Bytes64, "bytes64", 0) \
K(Bytes72, "bytes72", 0) \
K(Bytes80, "bytes80", 0) \
K(Bytes88, "bytes88", 0) \
K(Bytes96, "bytes96", 0) \
K(Bytes104, "bytes104", 0) \
K(Bytes112, "bytes112", 0) \
K(Bytes120, "bytes120", 0) \
K(Bytes128, "bytes128", 0) \
K(Bytes136, "bytes136", 0) \
K(Bytes144, "bytes144", 0) \
K(Bytes152, "bytes152", 0) \
K(Bytes160, "bytes160", 0) \
K(Bytes168, "bytes168", 0) \
K(Bytes176, "bytes178", 0) \
K(Bytes184, "bytes184", 0) \
K(Bytes192, "bytes192", 0) \
K(Bytes200, "bytes200", 0) \
K(Bytes208, "bytes208", 0) \
K(Bytes216, "bytes216", 0) \
K(Bytes224, "bytes224", 0) \
K(Bytes232, "bytes232", 0) \
K(Bytes240, "bytes240", 0) \
K(Bytes248, "bytes248", 0) \
K(Bytes256, "bytes256", 0) \
K(Address, "address", 0) \
K(Bool, "bool", 0) \
K(Bytes, "bytes", 0) \
K(StringType, "string", 0) \
K(String0, "string0", 0) \
K(String1, "string1", 0) \
K(String2, "string2", 0) \
K(String3, "string3", 0) \
K(String4, "string4", 0) \
K(String5, "string5", 0) \
K(String6, "string6", 0) \
K(String7, "string7", 0) \
K(String8, "string8", 0) \
K(String9, "string9", 0) \
K(String10, "string10", 0) \
K(String11, "string11", 0) \
K(String12, "string12", 0) \
K(String13, "string13", 0) \
K(String14, "string14", 0) \
K(String15, "string15", 0) \
K(String16, "string16", 0) \
K(String17, "string17", 0) \
K(String18, "string18", 0) \
K(String19, "string19", 0) \
K(String20, "string20", 0) \
K(String21, "string21", 0) \
K(String22, "string22", 0) \
K(String23, "string23", 0) \
K(String24, "string24", 0) \
K(String25, "string25", 0) \
K(String26, "string26", 0) \
K(String27, "string27", 0) \
K(String28, "string28", 0) \
K(String29, "string29", 0) \
K(String30, "string30", 0) \
K(String31, "string31", 0) \
K(String32, "string32", 0) \
K(Text, "text", 0) \
K(Real, "real", 0) \
K(UReal, "ureal", 0) \

2
libsolidity/Types.cpp

@ -39,7 +39,7 @@ TypePointer Type::fromElementaryTypeName(Token::Value _typeToken)
{
solAssert(Token::isElementaryTypeName(_typeToken), "Elementary type name expected.");
if (Token::Int <= _typeToken && _typeToken <= Token::Hash256)
if (Token::Int <= _typeToken && _typeToken <= Token::Bytes256)
{
int offset = _typeToken - Token::Int;
int bytes = offset % 33;

Loading…
Cancel
Save