diff --git a/src/Expr.cc b/src/Expr.cc
index 1d991dd6eb..ff81ed77b1 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -3375,9 +3375,21 @@ bool RecordConstructorExpr::IsPure() const
void RecordConstructorExpr::ExprDescribe(ODesc* d) const
{
- d->Add("[");
- op->Describe(d);
- d->Add("]");
+ auto& tn = type->GetName();
+
+ if ( tn.size() > 0 )
+ {
+ d->Add(tn);
+ d->Add("(");
+ op->Describe(d);
+ d->Add(")");
+ }
+ else
+ {
+ d->Add("[");
+ op->Describe(d);
+ d->Add("]");
+ }
}
TraversalCode RecordConstructorExpr::Traverse(TraversalCallback* cb) const
diff --git a/testing/btest/Baseline.opt/plugins.hooks/output b/testing/btest/Baseline.opt/plugins.hooks/output
index b3a8deac02..0f9f2208f0 100644
--- a/testing/btest/Baseline.opt/plugins.hooks/output
+++ b/testing/btest/Baseline.opt/plugins.hooks/output
@@ -472,91 +472,91 @@
0.000000 MetaHookPost CallFunction(NetControl::check_plugins, , ()) ->
0.000000 MetaHookPost CallFunction(NetControl::init, , ()) ->
0.000000 MetaHookPost CallFunction(Notice::want_pp, , ()) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (ActiveHTTP::default_max_time, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (ActiveHTTP::default_method, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Broker::peer_counts_as_iosource, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::analyzer_inactivity_timeouts, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::default_extract, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::extraction_prefix, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Conn::port_inactivity_timeouts, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DCE_RPC::ignored_operations, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DHCP::max_txid_watch_time, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DNS::max_pending_msgs, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DNS::max_pending_query_ids, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DPD::ignore_violations, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DPD::ignore_violations_after, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (DPD::max_violations, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Dir::polling_interval, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (FTP::cmd_reply_code, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (FTP::default_capture_password, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (FTP::guest_ids, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (FTP::logged_commands, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (FileExtract::default_limit, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (Files::enable_reassembler, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (GridFTP::max_time, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location::#4 = to_any_coerceConfig::logLog::write(Config::LOG, ::#4)return (Config::new_value)}, -100)) ->
-0.000000 MetaHookPost CallFunction(Option::set_change_handler, , (GridFTP::size_threshold, Config::config_option_changed{ ::#0 = network_time()::#1 = lookup_ID(Config::ID)::#2 = Config::format_value(::#1)::#3 = Config::format_value(Config::new_value)Config::log = [$ts=::#0, $id=Config::ID, $old_value=::#2, $new_value=::#3]if ( != Config::location) Config::log$location $= Config::location