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

Merge pull request #14143 from ethereum/remove-type-categoryname

Browse Source 
Remove the inaccurate `Type::categoryName()`
This commit is contained in:
Daniel
2023-04-23 22:05:35 +02:00
committed by GitHub
parent d0043d6753 34da6c8811
commit cd5ae26e34
16 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/TypeChecker.cpp
+1 -5
View File
@@ -2847,11 +2847,7 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
}
default:
m_errorReporter.fatalTypeError(
5704_error,
_functionCall.location(),
capitalized(Type::categoryName(expressionType->category())) + " is not callable."
);
m_errorReporter.fatalTypeError(5704_error, _functionCall.location(), "This expression is not callable.");
// Unreachable, because fatalTypeError throws. We don't set kind, but that's okay because the switch below
// is never reached. And, even if it was, SetOnce would trigger an assertion violation and not UB.
funcCallAnno.isPure = argumentsArePure;
libsolidity/ast/Types.cpp
-29
View File
@@ -294,35 +294,6 @@ Type const* Type::commonType(Type const* _a, Type const* _b)
return nullptr;
}
char const* Type::categoryName(Type::Category _category)
{
switch (_category)
{
case Category::Address: return "address";
case Category::Integer: return "integer";
case Category::RationalNumber: return "rational number literal";
case Category::StringLiteral: return "string literal";
case Category::Bool: return "boolean";
case Category::FixedPoint: return "fixed-point number";
case Category::Array: return "array";
case Category::ArraySlice: return "array slice";
case Category::FixedBytes: return "fixed-size byte array";
case Category::Contract: return "contract";
case Category::Struct: return "struct";
case Category::Function: return "function";
case Category::Enum: return "enum";
case Category::UserDefinedValueType: return "user-defined value type";
case Category::Tuple: return "tuple";
case Category::Mapping: return "mapping";
case Category::TypeType: return "type of a type";
case Category::Modifier: return "modifier";
case Category::Magic: return "magic variable";
case Category::Module: return "module";
case Category::InaccessibleDynamic: return "inaccessible dynamic value";
}
util::unreachable();
}
MemberList const& Type::members(ASTNode const* _currentScope) const
{
if (!m_members[_currentScope])
libsolidity/ast/Types.h
-2
View File
@@ -201,8 +201,6 @@ public:
static Type const* commonType(Type const* _a, Type const* _b);
virtual Category category() const = 0;
static char const* categoryName(Type::Category _category);
/// @returns a valid solidity identifier such that two types should compare equal if and
/// only if they have the same identifier.
/// The identifier should start with "t_".