From 4237239325c215a94bcf93e3370ded8cd1d99b70 Mon Sep 17 00:00:00 2001 From: Evan Typanski Date: Fri, 7 Mar 2025 10:30:21 -0500 Subject: [PATCH] Fix printing type constants like `double` Fixes #4268 --- src/Val.cc | 2 +- testing/btest/Baseline/language.type-expr/.stdout | 2 ++ testing/btest/language/type-expr.zeek | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Val.cc b/src/Val.cc index d62b486464..18c2f7335c 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -3202,7 +3202,7 @@ ValPtr EnumVal::DoClone(CloneState* state) { return {NewRef{}, this}; } -void TypeVal::ValDescribe(ODesc* d) const { d->Add(type->AsTypeType()->GetType()->GetName()); } +void TypeVal::ValDescribe(ODesc* d) const { type->AsTypeType()->GetType()->Describe(d); } ValPtr TypeVal::DoClone(CloneState* state) { // Immutable. diff --git a/testing/btest/Baseline/language.type-expr/.stdout b/testing/btest/Baseline/language.type-expr/.stdout index 893a7b5d8f..9202868d09 100644 --- a/testing/btest/Baseline/language.type-expr/.stdout +++ b/testing/btest/Baseline/language.type-expr/.stdout @@ -1,3 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [v=aoeu, valid=T] type +double +vector of int diff --git a/testing/btest/language/type-expr.zeek b/testing/btest/language/type-expr.zeek index bf95e4b2df..a4178801d9 100644 --- a/testing/btest/language/type-expr.zeek +++ b/testing/btest/language/type-expr.zeek @@ -7,4 +7,7 @@ event zeek_init() # Try a couple of functions that take types print from_json("\"aoeu\"", string); print type_name(string); + + print double; + print vector of int; }