Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

keep merge_types() externally available; address reviewing suggestion

Browse source
This commit is contained in:
Vern Paxson 2022-11-23 11:32:27 -08:00
parent 47152e38c4
commit c4973706e0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Type.cc
View file

@ -63,11 +63,6 @@ const char* type_name(TypeTag t)
return type_names[int(t)];
}
// Given two types, returns the "merge", in which promotable types
// are promoted to the maximum of the two. Returns nil (and generates
// an error message) if the types are incompatible.
static TypePtr merge_types(const TypePtr& t1, const TypePtr& t2);
Type::Type(TypeTag t, bool arg_base_type)
: tag(t), internal_tag(to_internal_type_tag(tag)), is_network_order(zeek::is_network_order(t)),
base_type(arg_base_type)
@ -2696,7 +2691,7 @@ TypePtr maximal_type(detail::ListExpr* elements)
for ( size_t i = 1; t && i < tl.size(); ++i )
{
auto& tl_i = tl[i];
const auto& tl_i = tl[i];
if ( t == tl_i )
continue;

5
src/Type.h
View file

@ -923,6 +923,11 @@ extern Type* flatten_type(Type* t);
// Returns the "maximum" of two type tags, in a type-promotion sense.
extern TypeTag max_type(TypeTag t1, TypeTag t2);
// Given two types, returns the "merge", in which promotable types
// are promoted to the maximum of the two. Returns nil (and generates
// an error message) if the types are incompatible.
TypePtr merge_types(const TypePtr& t1, const TypePtr& t2);
// Given a list of expressions, returns the maximal type consistent across
// all of them, or nil if this cannot be done. "Maximal" incorporates
// notions of arithmetic coercion, but otherwise requires type-equivalence.