mirror of
https://github.com/zeek/zeek.git
synced 2025-10-08 17:48:21 +00:00
Merge remote-tracking branch 'origin/topic/timw/159-coerce-counts'
* origin/topic/timw/159-coerce-counts: GHI-155: set the type of a vector based on the variable's type, not the value's type GH-159: Allow coercion of numeric values into other types Allow passing a location to BroObj::Warning and BroObj::Error. Add CLion directories to gitignore Move #define outside of max_type for clarity
This commit is contained in:
commit
43104565a4
15 changed files with 305 additions and 35 deletions
|
@ -367,6 +367,8 @@ public:
|
|||
}
|
||||
#endif
|
||||
|
||||
static bool WouldOverflow(const BroType* from_type, const BroType* to_type, const Val* val);
|
||||
|
||||
protected:
|
||||
|
||||
friend class EnumType;
|
||||
|
@ -1228,7 +1230,7 @@ protected:
|
|||
// Unref()'ing the original. If not a match, generates an error message
|
||||
// and returns nil, also Unref()'ing v. If is_init is true, then
|
||||
// the checking is done in the context of an initialization.
|
||||
extern Val* check_and_promote(Val* v, const BroType* t, int is_init);
|
||||
extern Val* check_and_promote(Val* v, const BroType* t, int is_init, const Location* expr_location = nullptr);
|
||||
|
||||
// Given a pointer to where a Val's core (i.e., its BRO value) resides,
|
||||
// returns a corresponding newly-created or Ref()'d Val. ptr must already
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue