diff options
Diffstat (limited to 'Types.cpp')
| -rw-r--r-- | Types.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -32,7 +32,7 @@ namespace dev namespace solidity { -shared_ptr<Type> Type::fromElementaryTypeName(Token::Value _typeToken) +shared_ptr<Type const> Type::fromElementaryTypeName(Token::Value _typeToken) { if (asserts(Token::isElementaryTypeName(_typeToken))) BOOST_THROW_EXCEPTION(InternalCompilerError()); @@ -44,35 +44,35 @@ shared_ptr<Type> Type::fromElementaryTypeName(Token::Value _typeToken) if (bytes == 0) bytes = 32; int modifier = offset / 33; - return make_shared<IntegerType>(bytes * 8, + return make_shared<IntegerType const>(bytes * 8, modifier == 0 ? IntegerType::Modifier::SIGNED : modifier == 1 ? IntegerType::Modifier::UNSIGNED : IntegerType::Modifier::HASH); } else if (_typeToken == Token::ADDRESS) - return make_shared<IntegerType>(0, IntegerType::Modifier::ADDRESS); + return make_shared<IntegerType const>(0, IntegerType::Modifier::ADDRESS); else if (_typeToken == Token::BOOL) - return make_shared<BoolType>(); + return make_shared<BoolType const>(); else if (Token::STRING1 <= _typeToken && _typeToken <= Token::STRING32) - return make_shared<StaticStringType>(int(_typeToken) - int(Token::STRING1) + 1); + return make_shared<StaticStringType const>(int(_typeToken) - int(Token::STRING1) + 1); else BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Unable to convert elementary typename " + std::string(Token::toString(_typeToken)) + " to type.")); } -shared_ptr<Type> Type::fromUserDefinedTypeName(UserDefinedTypeName const& _typeName) +shared_ptr<Type const> Type::fromUserDefinedTypeName(UserDefinedTypeName const& _typeName) { Declaration const* declaration = _typeName.getReferencedDeclaration(); if (StructDefinition const* structDef = dynamic_cast<StructDefinition const*>(declaration)) - return make_shared<StructType>(*structDef); + return make_shared<StructType const>(*structDef); else if (FunctionDefinition const* function = dynamic_cast<FunctionDefinition const*>(declaration)) - return make_shared<FunctionType>(*function); + return make_shared<FunctionType const>(*function); else if (ContractDefinition const* contract = dynamic_cast<ContractDefinition const*>(declaration)) - return make_shared<ContractType>(*contract); - return shared_ptr<Type>(); + return make_shared<ContractType const>(*contract); + return shared_ptr<Type const>(); } -shared_ptr<Type> Type::fromMapping(Mapping const& _typeName) +shared_ptr<Type const> Type::fromMapping(Mapping const& _typeName) { shared_ptr<Type const> keyType = _typeName.getKeyType().toType(); if (!keyType) @@ -80,29 +80,29 @@ shared_ptr<Type> Type::fromMapping(Mapping const& _typeName) shared_ptr<Type const> valueType = _typeName.getValueType().toType(); if (!valueType) BOOST_THROW_EXCEPTION(_typeName.getValueType().createTypeError("Invalid type name")); - return make_shared<MappingType>(keyType, valueType); + return make_shared<MappingType const>(keyType, valueType); } -shared_ptr<Type> Type::forLiteral(Literal const& _literal) +shared_ptr<Type const> Type::forLiteral(Literal const& _literal) { switch (_literal.getToken()) { case Token::TRUE_LITERAL: case Token::FALSE_LITERAL: - return make_shared<BoolType>(); + return make_shared<BoolType const>(); case Token::NUMBER: return IntegerType::smallestTypeForLiteral(_literal.getValue()); case Token::STRING_LITERAL: //@todo put larger strings into dynamic strings return StaticStringType::smallestTypeForLiteral(_literal.getValue()); default: - return shared_ptr<Type>(); + return shared_ptr<Type const>(); } } const MemberList Type::EmptyMemberList = MemberList(); -shared_ptr<IntegerType> IntegerType::smallestTypeForLiteral(string const& _literal) +shared_ptr<IntegerType const> IntegerType::smallestTypeForLiteral(string const& _literal) { bigint value(_literal); bool isSigned = value < 0 || (!_literal.empty() && _literal.front() == '-'); @@ -111,8 +111,8 @@ shared_ptr<IntegerType> IntegerType::smallestTypeForLiteral(string const& _liter value = ((-value) - 1) << 1; unsigned bytes = max(bytesRequired(value), 1u); if (bytes > 32) - return shared_ptr<IntegerType>(); - return make_shared<IntegerType>(bytes * 8, isSigned ? Modifier::SIGNED : Modifier::UNSIGNED); + return shared_ptr<IntegerType const>(); + return make_shared<IntegerType const>(bytes * 8, isSigned ? Modifier::SIGNED : Modifier::UNSIGNED); } IntegerType::IntegerType(int _bits, IntegerType::Modifier _modifier): |