--- a/libinterp/parse-tree/pt-pr-code.cc	Thu Dec 01 14:23:45 2022 -0800
+++ b/libinterp/parse-tree/pt-pr-code.cc	Thu Dec 01 18:02:15 2022 -0800
@@ -37,1309 +37,1309 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  void
-  tree_print_code::visit_anon_fcn_handle (tree_anon_fcn_handle& afh)
-  {
-    indent ();
+void
+tree_print_code::visit_anon_fcn_handle (tree_anon_fcn_handle& afh)
+{
+  indent ();
 
-    print_parens (afh, "(");
+  print_parens (afh, "(");
 
-    m_os << "@";
+  m_os << "@";
 
-    tree_parameter_list *param_list = afh.parameter_list ();
+  tree_parameter_list *param_list = afh.parameter_list ();
 
-    if (param_list)
-      param_list->accept (*this);
+  if (param_list)
+    param_list->accept (*this);
 
-    print_fcn_handle_body (afh.expression ());
+  print_fcn_handle_body (afh.expression ());
 
-    print_parens (afh, ")");
-  }
+  print_parens (afh, ")");
+}
 
-  void
-  tree_print_code::visit_argument_list (tree_argument_list& lst)
-  {
-    auto p = lst.begin ();
+void
+tree_print_code::visit_argument_list (tree_argument_list& lst)
+{
+  auto p = lst.begin ();
 
-    while (p != lst.end ())
-      {
-        tree_expression *elt = *p++;
+  while (p != lst.end ())
+    {
+      tree_expression *elt = *p++;
 
-        if (elt)
-          {
-            elt->accept (*this);
+      if (elt)
+        {
+          elt->accept (*this);
 
-            if (p != lst.end ())
-              m_os << ", ";
-          }
-      }
-  }
+          if (p != lst.end ())
+            m_os << ", ";
+        }
+    }
+}
 
-  void
-  tree_print_code::visit_arguments_block (tree_arguments_block&)
-  {
-    indent ();
+void
+tree_print_code::visit_arguments_block (tree_arguments_block&)
+{
+  indent ();
 
-    // FIXME
-    m_os << "arguments ... endarguments";
-  }
+  // FIXME
+  m_os << "arguments ... endarguments";
+}
 
-  void
-  tree_print_code::visit_args_block_attribute_list (tree_args_block_attribute_list&)
-  {
-    panic_impossible ();
-  }
+void
+tree_print_code::visit_args_block_attribute_list (tree_args_block_attribute_list&)
+{
+  panic_impossible ();
+}
 
-  void
-  tree_print_code::visit_args_block_validation_list (tree_args_block_validation_list&)
-  {
-    panic_impossible ();
-  }
+void
+tree_print_code::visit_args_block_validation_list (tree_args_block_validation_list&)
+{
+  panic_impossible ();
+}
 
-  void
-  tree_print_code::visit_arg_validation (tree_arg_validation&)
-  {
-    panic_impossible ();
-  }
+void
+tree_print_code::visit_arg_validation (tree_arg_validation&)
+{
+  panic_impossible ();
+}
 
-  void
-  tree_print_code::visit_arg_size_spec (tree_arg_size_spec&)
-  {
-    panic_impossible ();
-  }
+void
+tree_print_code::visit_arg_size_spec (tree_arg_size_spec&)
+{
+  panic_impossible ();
+}
 
-  void
-  tree_print_code::visit_arg_validation_fcns (tree_arg_validation_fcns&)
-  {
-    panic_impossible ();
-  }
-
-  void
-  tree_print_code::visit_binary_expression (tree_binary_expression& expr)
-  {
-    indent ();
+void
+tree_print_code::visit_arg_validation_fcns (tree_arg_validation_fcns&)
+{
+  panic_impossible ();
+}
 
-    print_parens (expr, "(");
+void
+tree_print_code::visit_binary_expression (tree_binary_expression& expr)
+{
+  indent ();
 
-    tree_expression *op1 = expr.lhs ();
-
-    if (op1)
-      op1->accept (*this);
+  print_parens (expr, "(");
 
-    m_os << ' ' << expr.oper () << ' ';
+  tree_expression *op1 = expr.lhs ();
 
-    tree_expression *op2 = expr.rhs ();
+  if (op1)
+    op1->accept (*this);
 
-    if (op2)
-      op2->accept (*this);
+  m_os << ' ' << expr.oper () << ' ';
 
-    print_parens (expr, ")");
-  }
+  tree_expression *op2 = expr.rhs ();
 
-  void
-  tree_print_code::visit_break_command (tree_break_command&)
-  {
-    indent ();
+  if (op2)
+    op2->accept (*this);
+
+  print_parens (expr, ")");
+}
 
-    m_os << "break";
-  }
+void
+tree_print_code::visit_break_command (tree_break_command&)
+{
+  indent ();
 
-  void
-  tree_print_code::visit_colon_expression (tree_colon_expression& expr)
-  {
-    indent ();
+  m_os << "break";
+}
 
-    print_parens (expr, "(");
-
-    tree_expression *op1 = expr.base ();
+void
+tree_print_code::visit_colon_expression (tree_colon_expression& expr)
+{
+  indent ();
 
-    if (op1)
-      op1->accept (*this);
+  print_parens (expr, "(");
 
-    // Stupid syntax.
+  tree_expression *op1 = expr.base ();
 
-    tree_expression *op3 = expr.increment ();
+  if (op1)
+    op1->accept (*this);
 
-    if (op3)
-      {
-        m_os << ':';
-        op3->accept (*this);
-      }
+  // Stupid syntax.
+
+  tree_expression *op3 = expr.increment ();
 
-    tree_expression *op2 = expr.limit ();
+  if (op3)
+    {
+      m_os << ':';
+      op3->accept (*this);
+    }
 
-    if (op2)
-      {
-        m_os << ':';
-        op2->accept (*this);
-      }
+  tree_expression *op2 = expr.limit ();
 
-    print_parens (expr, ")");
-  }
+  if (op2)
+    {
+      m_os << ':';
+      op2->accept (*this);
+    }
 
-  void
-  tree_print_code::visit_continue_command (tree_continue_command&)
-  {
-    indent ();
+  print_parens (expr, ")");
+}
 
-    m_os << "continue";
-  }
+void
+tree_print_code::visit_continue_command (tree_continue_command&)
+{
+  indent ();
 
-  void
-  tree_print_code::visit_decl_command (tree_decl_command& cmd)
-  {
-    indent ();
+  m_os << "continue";
+}
 
-    m_os << cmd.name () << ' ';
-
-    tree_decl_init_list *init_list = cmd.initializer_list ();
+void
+tree_print_code::visit_decl_command (tree_decl_command& cmd)
+{
+  indent ();
 
-    if (init_list)
-      init_list->accept (*this);
-  }
+  m_os << cmd.name () << ' ';
+
+  tree_decl_init_list *init_list = cmd.initializer_list ();
 
-  void
-  tree_print_code::visit_decl_init_list (tree_decl_init_list& lst)
-  {
-    auto p = lst.begin ();
+  if (init_list)
+    init_list->accept (*this);
+}
 
-    while (p != lst.end ())
-      {
-        tree_decl_elt *elt = *p++;
+void
+tree_print_code::visit_decl_init_list (tree_decl_init_list& lst)
+{
+  auto p = lst.begin ();
 
-        if (elt)
-          {
-            elt->accept (*this);
+  while (p != lst.end ())
+    {
+      tree_decl_elt *elt = *p++;
 
-            if (p != lst.end ())
-              m_os << ", ";
-          }
-      }
-  }
+      if (elt)
+        {
+          elt->accept (*this);
 
-  void
-  tree_print_code::visit_decl_elt (tree_decl_elt& cmd)
-  {
-    tree_identifier *id = cmd.ident ();
+          if (p != lst.end ())
+            m_os << ", ";
+        }
+    }
+}
 
-    if (id)
-      id->accept (*this);
+void
+tree_print_code::visit_decl_elt (tree_decl_elt& cmd)
+{
+  tree_identifier *id = cmd.ident ();
 
-    tree_expression *expr = cmd.expression ();
+  if (id)
+    id->accept (*this);
 
-    if (expr)
-      {
-        m_os << " = ";
+  tree_expression *expr = cmd.expression ();
 
-        expr->accept (*this);
-      }
-  }
+  if (expr)
+    {
+      m_os << " = ";
 
-  void
-  tree_print_code::visit_simple_for_command (tree_simple_for_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+      expr->accept (*this);
+    }
+}
 
-    indent ();
-
-    m_os << (cmd.in_parallel () ? "parfor " : "for ");
-
-    tree_expression *lhs = cmd.left_hand_side ();
+void
+tree_print_code::visit_simple_for_command (tree_simple_for_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
 
-    tree_expression *maxproc = cmd.maxproc_expr ();
+  indent ();
+
+  m_os << (cmd.in_parallel () ? "parfor " : "for ");
 
-    if (maxproc)
-      m_os << '(';
+  tree_expression *lhs = cmd.left_hand_side ();
+
+  tree_expression *maxproc = cmd.maxproc_expr ();
 
-    if (lhs)
-      lhs->accept (*this);
-
-    m_os << " = ";
+  if (maxproc)
+    m_os << '(';
 
-    tree_expression *expr = cmd.control_expr ();
+  if (lhs)
+    lhs->accept (*this);
 
-    if (expr)
-      expr->accept (*this);
+  m_os << " = ";
 
-    if (maxproc)
-      {
-        m_os << ", ";
-        maxproc->accept (*this);
-        m_os << ')';
-      }
+  tree_expression *expr = cmd.control_expr ();
+
+  if (expr)
+    expr->accept (*this);
 
-    newline ();
-
-    tree_statement_list *list = cmd.body ();
+  if (maxproc)
+    {
+      m_os << ", ";
+      maxproc->accept (*this);
+      m_os << ')';
+    }
 
-    if (list)
-      {
-        increment_indent_level ();
+  newline ();
 
-        list->accept (*this);
+  tree_statement_list *list = cmd.body ();
 
-        decrement_indent_level ();
-      }
-
-    print_indented_comment (cmd.trailing_comment ());
+  if (list)
+    {
+      increment_indent_level ();
 
-    indent ();
+      list->accept (*this);
 
-    m_os << (cmd.in_parallel () ? "endparfor" : "endfor");
-  }
+      decrement_indent_level ();
+    }
+
+  print_indented_comment (cmd.trailing_comment ());
 
-  void
-  tree_print_code::visit_complex_for_command (tree_complex_for_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+  indent ();
 
-    indent ();
+  m_os << (cmd.in_parallel () ? "endparfor" : "endfor");
+}
 
-    m_os << "for [";
-    m_nesting.push ('[');
+void
+tree_print_code::visit_complex_for_command (tree_complex_for_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
 
-    tree_argument_list *lhs = cmd.left_hand_side ();
-
-    if (lhs)
-      lhs->accept (*this);
+  indent ();
 
-    m_nesting.pop ();
-    m_os << "] = ";
+  m_os << "for [";
+  m_nesting.push ('[');
 
-    tree_expression *expr = cmd.control_expr ();
+  tree_argument_list *lhs = cmd.left_hand_side ();
 
-    if (expr)
-      expr->accept (*this);
+  if (lhs)
+    lhs->accept (*this);
 
-    newline ();
-
-    tree_statement_list *list = cmd.body ();
+  m_nesting.pop ();
+  m_os << "] = ";
 
-    if (list)
-      {
-        increment_indent_level ();
+  tree_expression *expr = cmd.control_expr ();
+
+  if (expr)
+    expr->accept (*this);
 
-        list->accept (*this);
+  newline ();
 
-        decrement_indent_level ();
-      }
+  tree_statement_list *list = cmd.body ();
 
-    print_indented_comment (cmd.trailing_comment ());
+  if (list)
+    {
+      increment_indent_level ();
 
-    indent ();
+      list->accept (*this);
 
-    m_os << "endfor";
-  }
+      decrement_indent_level ();
+    }
 
-  void
-  tree_print_code::visit_spmd_command (tree_spmd_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+  print_indented_comment (cmd.trailing_comment ());
 
-    indent ();
+  indent ();
+
+  m_os << "endfor";
+}
 
-    m_os << "spmd";
-
-    newline ();
+void
+tree_print_code::visit_spmd_command (tree_spmd_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
 
-    tree_statement_list *list = cmd.body ();
-
-    if (list)
-      {
-        increment_indent_level ();
+  indent ();
 
-        list->accept (*this);
+  m_os << "spmd";
 
-        decrement_indent_level ();
-      }
+  newline ();
+
+  tree_statement_list *list = cmd.body ();
 
-    print_indented_comment (cmd.trailing_comment ());
+  if (list)
+    {
+      increment_indent_level ();
 
-    indent ();
-
-    m_os << "endspmd";
-  }
+      list->accept (*this);
 
-  void
-  tree_print_code::visit_octave_user_script (octave_user_script& fcn)
-  {
-    reset ();
+      decrement_indent_level ();
+    }
 
-    tree_statement_list *cmd_list = fcn.body ();
+  print_indented_comment (cmd.trailing_comment ());
+
+  indent ();
 
-    if (cmd_list)
-      cmd_list->accept (*this);
-  }
+  m_os << "endspmd";
+}
 
-  void
-  tree_print_code::visit_octave_user_function (octave_user_function& fcn)
-  {
-    reset ();
+void
+tree_print_code::visit_octave_user_script (octave_user_script& fcn)
+{
+  reset ();
 
-    visit_octave_user_function_header (fcn);
+  tree_statement_list *cmd_list = fcn.body ();
 
-    tree_statement_list *cmd_list = fcn.body ();
+  if (cmd_list)
+    cmd_list->accept (*this);
+}
 
-    if (cmd_list)
-      {
-        increment_indent_level ();
+void
+tree_print_code::visit_octave_user_function (octave_user_function& fcn)
+{
+  reset ();
 
-        cmd_list->accept (*this);
-
-        // endfunction will decrement the indent level.
-      }
+  visit_octave_user_function_header (fcn);
 
-    visit_octave_user_function_trailer (fcn);
-  }
+  tree_statement_list *cmd_list = fcn.body ();
 
-  void
-  tree_print_code::visit_octave_user_function_header (octave_user_function& fcn)
-  {
-    comment_list *leading_comment = fcn.leading_comment ();
+  if (cmd_list)
+    {
+      increment_indent_level ();
 
-    if (leading_comment)
-      {
-        print_comment_list (leading_comment);
-        newline ();
-      }
+      cmd_list->accept (*this);
 
-    indent ();
+      // endfunction will decrement the indent level.
+    }
+
+  visit_octave_user_function_trailer (fcn);
+}
 
-    m_os << "function ";
-
-    tree_parameter_list *ret_list = fcn.return_list ();
+void
+tree_print_code::visit_octave_user_function_header (octave_user_function& fcn)
+{
+  comment_list *leading_comment = fcn.leading_comment ();
 
-    if (ret_list)
-      {
-        ret_list->accept (*this);
+  if (leading_comment)
+    {
+      print_comment_list (leading_comment);
+      newline ();
+    }
 
-        m_os << " = ";
-      }
-    std::string fcn_name = fcn.name ();
-
-    m_os << (fcn_name.empty () ? "(empty)" : fcn_name) << ' ';
+  indent ();
 
-    tree_parameter_list *param_list = fcn.parameter_list ();
+  m_os << "function ";
+
+  tree_parameter_list *ret_list = fcn.return_list ();
 
-    if (param_list)
-      param_list->accept (*this);
-
-    newline ();
-  }
+  if (ret_list)
+    {
+      ret_list->accept (*this);
 
-  void
-  tree_print_code::visit_octave_user_function_trailer (octave_user_function& fcn)
-  {
-    print_indented_comment (fcn.trailing_comment ());
+      m_os << " = ";
+    }
+  std::string fcn_name = fcn.name ();
 
-    newline ();
-  }
+  m_os << (fcn_name.empty () ? "(empty)" : fcn_name) << ' ';
+
+  tree_parameter_list *param_list = fcn.parameter_list ();
 
-  void
-  tree_print_code::visit_function_def (tree_function_def& fdef)
-  {
-    indent ();
+  if (param_list)
+    param_list->accept (*this);
 
-    octave_value fcn = fdef.function ();
-
-    octave_function *f = fcn.function_value ();
+  newline ();
+}
 
-    if (f)
-      f->accept (*this);
-  }
+void
+tree_print_code::visit_octave_user_function_trailer (octave_user_function& fcn)
+{
+  print_indented_comment (fcn.trailing_comment ());
 
-  void
-  tree_print_code::visit_identifier (tree_identifier& id)
-  {
-    indent ();
+  newline ();
+}
+
+void
+tree_print_code::visit_function_def (tree_function_def& fdef)
+{
+  indent ();
 
-    print_parens (id, "(");
+  octave_value fcn = fdef.function ();
+
+  octave_function *f = fcn.function_value ();
 
-    std::string nm = id.name ();
-    m_os << (nm.empty () ? "(empty)" : nm);
-
-    print_parens (id, ")");
-  }
+  if (f)
+    f->accept (*this);
+}
 
-  void
-  tree_print_code::visit_if_clause (tree_if_clause& cmd)
-  {
-    tree_expression *expr = cmd.condition ();
-
-    if (expr)
-      expr->accept (*this);
+void
+tree_print_code::visit_identifier (tree_identifier& id)
+{
+  indent ();
 
-    newline ();
-
-    tree_statement_list *list = cmd.commands ();
+  print_parens (id, "(");
 
-    if (list)
-      {
-        increment_indent_level ();
+  std::string nm = id.name ();
+  m_os << (nm.empty () ? "(empty)" : nm);
+
+  print_parens (id, ")");
+}
 
-        list->accept (*this);
+void
+tree_print_code::visit_if_clause (tree_if_clause& cmd)
+{
+  tree_expression *expr = cmd.condition ();
 
-        decrement_indent_level ();
-      }
-  }
+  if (expr)
+    expr->accept (*this);
 
-  void
-  tree_print_code::visit_if_command (tree_if_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+  newline ();
+
+  tree_statement_list *list = cmd.commands ();
 
-    indent ();
-
-    m_os << "if ";
+  if (list)
+    {
+      increment_indent_level ();
 
-    tree_if_command_list *list = cmd.cmd_list ();
-
-    if (list)
       list->accept (*this);
 
-    print_indented_comment (cmd.trailing_comment ());
-
-    indent ();
-
-    m_os << "endif";
-  }
-
-  void
-  tree_print_code::visit_if_command_list (tree_if_command_list& lst)
-  {
-    auto p = lst.begin ();
-
-    bool first_elt = true;
-
-    while (p != lst.end ())
-      {
-        tree_if_clause *elt = *p++;
-
-        if (elt)
-          {
-            if (! first_elt)
-              {
-                print_indented_comment (elt->leading_comment ());
+      decrement_indent_level ();
+    }
+}
 
-                indent ();
-
-                if (elt->is_else_clause ())
-                  m_os << "else";
-                else
-                  m_os << "elseif ";
-              }
-
-            elt->accept (*this);
-          }
+void
+tree_print_code::visit_if_command (tree_if_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
 
-        first_elt = false;
-      }
-  }
+  indent ();
 
-  void
-  tree_print_code::visit_index_expression (tree_index_expression& expr)
-  {
-    indent ();
+  m_os << "if ";
 
-    print_parens (expr, "(");
-
-    tree_expression *e = expr.expression ();
-
-    if (e)
-      e->accept (*this);
+  tree_if_command_list *list = cmd.cmd_list ();
 
-    std::list<tree_argument_list *> arg_lists = expr.arg_lists ();
-    std::string type_tags = expr.type_tags ();
-    std::list<string_vector> arg_names = expr.arg_names ();
-    std::list<tree_expression *> dyn_fields = expr.dyn_fields ();
-
-    int n = type_tags.length ();
-
-    auto p_arg_lists = arg_lists.begin ();
-    auto p_arg_names = arg_names.begin ();
-    auto p_dyn_fields = dyn_fields.begin ();
+  if (list)
+    list->accept (*this);
 
-    for (int i = 0; i < n; i++)
-      {
-        switch (type_tags[i])
-          {
-          case '(':
-            {
-              char nc = m_nesting.top ();
-              if ((nc == '[' || nc == '{') && expr.paren_count () == 0)
-                m_os << '(';
-              else
-                m_os << " (";
-              m_nesting.push ('(');
+  print_indented_comment (cmd.trailing_comment ());
+
+  indent ();
 
-              tree_argument_list *l = *p_arg_lists;
-              if (l)
-                l->accept (*this);
-
-              m_nesting.pop ();
-              m_os << ')';
-            }
-            break;
+  m_os << "endif";
+}
 
-          case '{':
-            {
-              char nc = m_nesting.top ();
-              if ((nc == '[' || nc == '{') && expr.paren_count () == 0)
-                m_os << '{';
-              else
-                m_os << " {";
-              // We only care about whitespace inside [] and {} when we
-              // are defining matrix and cell objects, not when indexing.
-              m_nesting.push ('(');
+void
+tree_print_code::visit_if_command_list (tree_if_command_list& lst)
+{
+  auto p = lst.begin ();
 
-              tree_argument_list *l = *p_arg_lists;
-              if (l)
-                l->accept (*this);
-
-              m_nesting.pop ();
-              m_os << '}';
-            }
-            break;
+  bool first_elt = true;
 
-          case '.':
-            {
-              std::string fn = (*p_arg_names)(0);
-              if (fn.empty ())
-                {
-                  tree_expression *df = *p_dyn_fields;
-
-                  if (df)
-                    {
-                      m_nesting.push ('(');
-                      m_os << ".(";
-                      df->accept (*this);
-                      m_os << ")";
-                      m_nesting.pop ();
-                    }
-                }
-              else
-                m_os << '.' << fn;
-            }
-            break;
+  while (p != lst.end ())
+    {
+      tree_if_clause *elt = *p++;
 
-          default:
-            panic_impossible ();
-          }
-
-        p_arg_lists++;
-        p_arg_names++;
-        p_dyn_fields++;
-      }
-
-    print_parens (expr, ")");
-  }
+      if (elt)
+        {
+          if (! first_elt)
+            {
+              print_indented_comment (elt->leading_comment ());
 
-  void
-  tree_print_code::visit_matrix (tree_matrix& lst)
-  {
-    indent ();
-
-    print_parens (lst, "(");
+              indent ();
 
-    m_os << '[';
-    m_nesting.push ('[');
-
-    auto p = lst.begin ();
-
-    while (p != lst.end ())
-      {
-        tree_argument_list *elt = *p++;
+              if (elt->is_else_clause ())
+                m_os << "else";
+              else
+                m_os << "elseif ";
+            }
 
-        if (elt)
-          {
-            elt->accept (*this);
-
-            if (p != lst.end ())
-              m_os << "; ";
-          }
-      }
-
-    m_nesting.pop ();
-    m_os << ']';
+          elt->accept (*this);
+        }
 
-    print_parens (lst, ")");
-  }
-
-  void
-  tree_print_code::visit_cell (tree_cell& lst)
-  {
-    indent ();
-
-    print_parens (lst, "(");
-
-    m_os << '{';
-    m_nesting.push ('{');
-
-    auto p = lst.begin ();
+      first_elt = false;
+    }
+}
 
-    while (p != lst.end ())
-      {
-        tree_argument_list *elt = *p++;
-
-        if (elt)
-          {
-            elt->accept (*this);
-
-            if (p != lst.end ())
-              m_os << "; ";
-          }
-      }
+void
+tree_print_code::visit_index_expression (tree_index_expression& expr)
+{
+  indent ();
 
-    m_nesting.pop ();
-    m_os << '}';
-
-    print_parens (lst, ")");
-  }
+  print_parens (expr, "(");
 
-  void
-  tree_print_code::visit_multi_assignment (tree_multi_assignment& expr)
-  {
-    indent ();
+  tree_expression *e = expr.expression ();
 
-    print_parens (expr, "(");
-
-    tree_argument_list *lhs = expr.left_hand_side ();
+  if (e)
+    e->accept (*this);
 
-    if (lhs)
-      {
-        int len = lhs->length ();
-
-        if (len > 1)
-          {
-            m_os << '[';
-            m_nesting.push ('[');
-          }
-
-        lhs->accept (*this);
-
-        if (len > 1)
-          {
-            m_nesting.pop ();
-            m_os << ']';
-          }
-      }
-
-    m_os << ' ' << expr.oper () << ' ';
-
-    tree_expression *rhs = expr.right_hand_side ();
-
-    if (rhs)
-      rhs->accept (*this);
+  std::list<tree_argument_list *> arg_lists = expr.arg_lists ();
+  std::string type_tags = expr.type_tags ();
+  std::list<string_vector> arg_names = expr.arg_names ();
+  std::list<tree_expression *> dyn_fields = expr.dyn_fields ();
 
-    print_parens (expr, ")");
-  }
-
-  void
-  tree_print_code::visit_no_op_command (tree_no_op_command& cmd)
-  {
-    if (cmd.is_end_of_fcn_or_script () && m_curr_print_indent_level > 1)
-      decrement_indent_level ();
-
-    indent ();
+  int n = type_tags.length ();
 
-    m_os << cmd.original_command ();
-  }
-
-  void
-  tree_print_code::visit_constant (tree_constant& val)
-  {
-    indent ();
-
-    print_parens (val, "(");
-
-    val.print_raw (m_os, true, m_print_original_text);
-
-    print_parens (val, ")");
-  }
+  auto p_arg_lists = arg_lists.begin ();
+  auto p_arg_names = arg_names.begin ();
+  auto p_dyn_fields = dyn_fields.begin ();
 
-  void
-  tree_print_code::visit_fcn_handle (tree_fcn_handle& fh)
-  {
-    indent ();
-
-    print_parens (fh, "(");
-
-    fh.print_raw (m_os, true, m_print_original_text);
-
-    print_parens (fh, ")");
-  }
-
-  void
-  tree_print_code::visit_parameter_list (tree_parameter_list& lst)
-  {
-    bool is_input_list = lst.is_input_list ();
+  for (int i = 0; i < n; i++)
+    {
+      switch (type_tags[i])
+        {
+        case '(':
+          {
+            char nc = m_nesting.top ();
+            if ((nc == '[' || nc == '{') && expr.paren_count () == 0)
+              m_os << '(';
+            else
+              m_os << " (";
+            m_nesting.push ('(');
 
-    if (is_input_list)
-      {
-        m_os << '(';
-        m_nesting.push ('(');
-      }
-    else
-      {
-        int len = lst.length ();
-        if (lst.takes_varargs ())
-          len++;
-
-        if (len != 1)
-          {
-            m_os << '[';
-            m_nesting.push ('[');
-          }
-      }
+            tree_argument_list *l = *p_arg_lists;
+            if (l)
+              l->accept (*this);
 
-    auto p = lst.begin ();
-
-    while (p != lst.end ())
-      {
-        tree_decl_elt *elt = *p++;
-
-        if (elt)
-          {
-            elt->accept (*this);
-
-            if (p != lst.end () || lst.takes_varargs ())
-              m_os << ", ";
+            m_nesting.pop ();
+            m_os << ')';
           }
-      }
-
-    if (lst.takes_varargs ())
-      m_os << lst.varargs_symbol_name ();
+          break;
 
-    if (is_input_list)
-      {
-        m_nesting.pop ();
-        m_os << ')';
-      }
-    else
-      {
-        int len = lst.length ();
-        if (lst.takes_varargs ())
-          len++;
-
-        if (len != 1)
+        case '{':
           {
-            m_nesting.pop ();
-            m_os << ']';
-          }
-      }
-  }
-
-  void
-  tree_print_code::visit_postfix_expression (tree_postfix_expression& expr)
-  {
-    indent ();
-
-    print_parens (expr, "(");
+            char nc = m_nesting.top ();
+            if ((nc == '[' || nc == '{') && expr.paren_count () == 0)
+              m_os << '{';
+            else
+              m_os << " {";
+            // We only care about whitespace inside [] and {} when we
+            // are defining matrix and cell objects, not when indexing.
+            m_nesting.push ('(');
 
-    tree_expression *e = expr.operand ();
-
-    if (e)
-      e->accept (*this);
-
-    m_os << expr.oper ();
-
-    print_parens (expr, ")");
-  }
-
-  void
-  tree_print_code::visit_prefix_expression (tree_prefix_expression& expr)
-  {
-    indent ();
-
-    print_parens (expr, "(");
-
-    m_os << expr.oper ();
-
-    tree_expression *e = expr.operand ();
-
-    if (e)
-      e->accept (*this);
-
-    print_parens (expr, ")");
-  }
+            tree_argument_list *l = *p_arg_lists;
+            if (l)
+              l->accept (*this);
 
-  void
-  tree_print_code::visit_return_command (tree_return_command&)
-  {
-    indent ();
-
-    m_os << "return";
-  }
-
-  void
-  tree_print_code::visit_simple_assignment (tree_simple_assignment& expr)
-  {
-    indent ();
-
-    print_parens (expr, "(");
-
-    tree_expression *lhs = expr.left_hand_side ();
-
-    if (lhs)
-      lhs->accept (*this);
-
-    m_os << ' ' << expr.oper () << ' ';
-
-    tree_expression *rhs = expr.right_hand_side ();
-
-    if (rhs)
-      rhs->accept (*this);
+            m_nesting.pop ();
+            m_os << '}';
+          }
+          break;
 
-    print_parens (expr, ")");
-  }
-
-  void
-  tree_print_code::visit_statement (tree_statement& stmt)
-  {
-    print_comment_list (stmt.comment_text ());
-
-    tree_command *cmd = stmt.command ();
-
-    if (cmd)
-      {
-        cmd->accept (*this);
+        case '.':
+          {
+            std::string fn = (*p_arg_names)(0);
+            if (fn.empty ())
+              {
+                tree_expression *df = *p_dyn_fields;
 
-        newline ();
-      }
-    else
-      {
-        tree_expression *expr = stmt.expression ();
-
-        if (expr)
-          {
-            expr->accept (*this);
-
-            if (! stmt.print_result ())
-              {
-                m_os << ';';
-                newline (" ");
+                if (df)
+                  {
+                    m_nesting.push ('(');
+                    m_os << ".(";
+                    df->accept (*this);
+                    m_os << ")";
+                    m_nesting.pop ();
+                  }
               }
             else
-              newline ();
+              m_os << '.' << fn;
           }
-      }
-  }
+          break;
+
+        default:
+          panic_impossible ();
+        }
+
+      p_arg_lists++;
+      p_arg_names++;
+      p_dyn_fields++;
+    }
+
+  print_parens (expr, ")");
+}
 
-  void
-  tree_print_code::visit_statement_list (tree_statement_list& lst)
-  {
-    for (tree_statement *elt : lst)
-      {
-        if (elt)
+void
+tree_print_code::visit_matrix (tree_matrix& lst)
+{
+  indent ();
+
+  print_parens (lst, "(");
+
+  m_os << '[';
+  m_nesting.push ('[');
+
+  auto p = lst.begin ();
+
+  while (p != lst.end ())
+    {
+      tree_argument_list *elt = *p++;
+
+      if (elt)
+        {
           elt->accept (*this);
-      }
-  }
 
-  void
-  tree_print_code::visit_switch_case (tree_switch_case& cs)
-  {
-    print_comment_list (cs.leading_comment ());
-
-    indent ();
+          if (p != lst.end ())
+            m_os << "; ";
+        }
+    }
 
-    if (cs.is_default_case ())
-      m_os << "otherwise";
-    else
-      m_os << "case ";
+  m_nesting.pop ();
+  m_os << ']';
+
+  print_parens (lst, ")");
+}
+
+void
+tree_print_code::visit_cell (tree_cell& lst)
+{
+  indent ();
 
-    tree_expression *label = cs.case_label ();
+  print_parens (lst, "(");
+
+  m_os << '{';
+  m_nesting.push ('{');
 
-    if (label)
-      label->accept (*this);
+  auto p = lst.begin ();
 
-    newline ();
+  while (p != lst.end ())
+    {
+      tree_argument_list *elt = *p++;
 
-    tree_statement_list *list = cs.commands ();
+      if (elt)
+        {
+          elt->accept (*this);
 
-    if (list)
-      {
-        increment_indent_level ();
+          if (p != lst.end ())
+            m_os << "; ";
+        }
+    }
+
+  m_nesting.pop ();
+  m_os << '}';
 
-        list->accept (*this);
-
-        newline ();
+  print_parens (lst, ")");
+}
 
-        decrement_indent_level ();
-      }
-  }
+void
+tree_print_code::visit_multi_assignment (tree_multi_assignment& expr)
+{
+  indent ();
+
+  print_parens (expr, "(");
+
+  tree_argument_list *lhs = expr.left_hand_side ();
 
-  void
-  tree_print_code::visit_switch_command (tree_switch_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+  if (lhs)
+    {
+      int len = lhs->length ();
+
+      if (len > 1)
+        {
+          m_os << '[';
+          m_nesting.push ('[');
+        }
 
-    indent ();
+      lhs->accept (*this);
 
-    m_os << "switch ";
+      if (len > 1)
+        {
+          m_nesting.pop ();
+          m_os << ']';
+        }
+    }
 
-    tree_expression *expr = cmd.switch_value ();
+  m_os << ' ' << expr.oper () << ' ';
 
-    if (expr)
-      expr->accept (*this);
+  tree_expression *rhs = expr.right_hand_side ();
 
-    newline ();
+  if (rhs)
+    rhs->accept (*this);
 
-    tree_switch_case_list *list = cmd.case_list ();
+  print_parens (expr, ")");
+}
 
-    if (list)
-      {
-        increment_indent_level ();
+void
+tree_print_code::visit_no_op_command (tree_no_op_command& cmd)
+{
+  if (cmd.is_end_of_fcn_or_script () && m_curr_print_indent_level > 1)
+    decrement_indent_level ();
+
+  indent ();
 
-        list->accept (*this);
+  m_os << cmd.original_command ();
+}
 
-        decrement_indent_level ();
-      }
+void
+tree_print_code::visit_constant (tree_constant& val)
+{
+  indent ();
 
-    print_indented_comment (cmd.leading_comment ());
+  print_parens (val, "(");
+
+  val.print_raw (m_os, true, m_print_original_text);
 
-    indent ();
+  print_parens (val, ")");
+}
+
+void
+tree_print_code::visit_fcn_handle (tree_fcn_handle& fh)
+{
+  indent ();
 
-    m_os << "endswitch";
-  }
+  print_parens (fh, "(");
+
+  fh.print_raw (m_os, true, m_print_original_text);
 
-  void
-  tree_print_code::visit_try_catch_command (tree_try_catch_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+  print_parens (fh, ")");
+}
+
+void
+tree_print_code::visit_parameter_list (tree_parameter_list& lst)
+{
+  bool is_input_list = lst.is_input_list ();
 
-    indent ();
-
-    m_os << "try";
-
-    newline ();
+  if (is_input_list)
+    {
+      m_os << '(';
+      m_nesting.push ('(');
+    }
+  else
+    {
+      int len = lst.length ();
+      if (lst.takes_varargs ())
+        len++;
 
-    tree_statement_list *try_code = cmd.body ();
-    tree_identifier *expr_id = cmd.identifier ();
+      if (len != 1)
+        {
+          m_os << '[';
+          m_nesting.push ('[');
+        }
+    }
 
-    if (try_code)
-      {
-        increment_indent_level ();
+  auto p = lst.begin ();
 
-        try_code->accept (*this);
+  while (p != lst.end ())
+    {
+      tree_decl_elt *elt = *p++;
 
-        decrement_indent_level ();
-      }
+      if (elt)
+        {
+          elt->accept (*this);
 
-    print_indented_comment (cmd.middle_comment ());
+          if (p != lst.end () || lst.takes_varargs ())
+            m_os << ", ";
+        }
+    }
 
-    indent ();
-
-    m_os << "catch";
+  if (lst.takes_varargs ())
+    m_os << lst.varargs_symbol_name ();
 
-    if (expr_id)
-      {
-        m_os << ' ';
-        expr_id->accept (*this);
-      }
-
-    newline ();
+  if (is_input_list)
+    {
+      m_nesting.pop ();
+      m_os << ')';
+    }
+  else
+    {
+      int len = lst.length ();
+      if (lst.takes_varargs ())
+        len++;
 
-    tree_statement_list *catch_code = cmd.cleanup ();
+      if (len != 1)
+        {
+          m_nesting.pop ();
+          m_os << ']';
+        }
+    }
+}
 
-    if (catch_code)
-      {
-        increment_indent_level ();
+void
+tree_print_code::visit_postfix_expression (tree_postfix_expression& expr)
+{
+  indent ();
 
-        catch_code->accept (*this);
+  print_parens (expr, "(");
+
+  tree_expression *e = expr.operand ();
+
+  if (e)
+    e->accept (*this);
 
-        decrement_indent_level ();
-      }
+  m_os << expr.oper ();
+
+  print_parens (expr, ")");
+}
 
-    print_indented_comment (cmd.trailing_comment ());
+void
+tree_print_code::visit_prefix_expression (tree_prefix_expression& expr)
+{
+  indent ();
 
-    indent ();
+  print_parens (expr, "(");
+
+  m_os << expr.oper ();
+
+  tree_expression *e = expr.operand ();
 
-    m_os << "end_try_catch";
-  }
+  if (e)
+    e->accept (*this);
+
+  print_parens (expr, ")");
+}
 
-  void
-  tree_print_code::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+void
+tree_print_code::visit_return_command (tree_return_command&)
+{
+  indent ();
 
-    indent ();
+  m_os << "return";
+}
 
-    m_os << "unwind_protect";
+void
+tree_print_code::visit_simple_assignment (tree_simple_assignment& expr)
+{
+  indent ();
 
-    newline ();
+  print_parens (expr, "(");
 
-    tree_statement_list *unwind_protect_code = cmd.body ();
+  tree_expression *lhs = expr.left_hand_side ();
 
-    if (unwind_protect_code)
-      {
-        increment_indent_level ();
+  if (lhs)
+    lhs->accept (*this);
+
+  m_os << ' ' << expr.oper () << ' ';
+
+  tree_expression *rhs = expr.right_hand_side ();
 
-        unwind_protect_code->accept (*this);
+  if (rhs)
+    rhs->accept (*this);
 
-        decrement_indent_level ();
-      }
+  print_parens (expr, ")");
+}
 
-    print_indented_comment (cmd.middle_comment ());
-
-    indent ();
+void
+tree_print_code::visit_statement (tree_statement& stmt)
+{
+  print_comment_list (stmt.comment_text ());
 
-    m_os << "unwind_protect_cleanup";
+  tree_command *cmd = stmt.command ();
 
-    newline ();
+  if (cmd)
+    {
+      cmd->accept (*this);
 
-    tree_statement_list *cleanup_code = cmd.cleanup ();
+      newline ();
+    }
+  else
+    {
+      tree_expression *expr = stmt.expression ();
 
-    if (cleanup_code)
-      {
-        increment_indent_level ();
+      if (expr)
+        {
+          expr->accept (*this);
 
-        cleanup_code->accept (*this);
-
-        decrement_indent_level ();
-      }
-
-    print_indented_comment (cmd.trailing_comment ());
+          if (! stmt.print_result ())
+            {
+              m_os << ';';
+              newline (" ");
+            }
+          else
+            newline ();
+        }
+    }
+}
 
-    indent ();
-
-    m_os << "end_unwind_protect";
-  }
+void
+tree_print_code::visit_statement_list (tree_statement_list& lst)
+{
+  for (tree_statement *elt : lst)
+    {
+      if (elt)
+        elt->accept (*this);
+    }
+}
 
-  void
-  tree_print_code::visit_while_command (tree_while_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+void
+tree_print_code::visit_switch_case (tree_switch_case& cs)
+{
+  print_comment_list (cs.leading_comment ());
+
+  indent ();
 
-    indent ();
+  if (cs.is_default_case ())
+    m_os << "otherwise";
+  else
+    m_os << "case ";
 
-    m_os << "while ";
+  tree_expression *label = cs.case_label ();
+
+  if (label)
+    label->accept (*this);
 
-    tree_expression *expr = cmd.condition ();
+  newline ();
+
+  tree_statement_list *list = cs.commands ();
 
-    if (expr)
-      expr->accept (*this);
+  if (list)
+    {
+      increment_indent_level ();
 
-    newline ();
+      list->accept (*this);
+
+      newline ();
 
-    tree_statement_list *list = cmd.body ();
+      decrement_indent_level ();
+    }
+}
 
-    if (list)
-      {
-        increment_indent_level ();
+void
+tree_print_code::visit_switch_command (tree_switch_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
 
-        list->accept (*this);
+  indent ();
+
+  m_os << "switch ";
+
+  tree_expression *expr = cmd.switch_value ();
 
-        decrement_indent_level ();
-      }
+  if (expr)
+    expr->accept (*this);
 
-    print_indented_comment (cmd.trailing_comment ());
+  newline ();
+
+  tree_switch_case_list *list = cmd.case_list ();
 
-    indent ();
+  if (list)
+    {
+      increment_indent_level ();
+
+      list->accept (*this);
 
-    m_os << "endwhile";
-  }
+      decrement_indent_level ();
+    }
+
+  print_indented_comment (cmd.leading_comment ());
+
+  indent ();
 
-  void
-  tree_print_code::visit_do_until_command (tree_do_until_command& cmd)
-  {
-    print_comment_list (cmd.leading_comment ());
+  m_os << "endswitch";
+}
+
+void
+tree_print_code::visit_try_catch_command (tree_try_catch_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
+
+  indent ();
 
-    indent ();
+  m_os << "try";
 
-    m_os << "do";
+  newline ();
 
-    newline ();
+  tree_statement_list *try_code = cmd.body ();
+  tree_identifier *expr_id = cmd.identifier ();
 
-    tree_statement_list *list = cmd.body ();
+  if (try_code)
+    {
+      increment_indent_level ();
+
+      try_code->accept (*this);
 
-    if (list)
-      {
-        increment_indent_level ();
+      decrement_indent_level ();
+    }
 
-        list->accept (*this);
+  print_indented_comment (cmd.middle_comment ());
+
+  indent ();
+
+  m_os << "catch";
 
-        decrement_indent_level ();
-      }
+  if (expr_id)
+    {
+      m_os << ' ';
+      expr_id->accept (*this);
+    }
 
-    print_indented_comment (cmd.trailing_comment ());
+  newline ();
+
+  tree_statement_list *catch_code = cmd.cleanup ();
 
-    indent ();
+  if (catch_code)
+    {
+      increment_indent_level ();
 
-    m_os << "until ";
+      catch_code->accept (*this);
 
-    tree_expression *expr = cmd.condition ();
+      decrement_indent_level ();
+    }
 
-    if (expr)
-      expr->accept (*this);
+  print_indented_comment (cmd.trailing_comment ());
+
+  indent ();
 
-    newline ();
-  }
+  m_os << "end_try_catch";
+}
 
-  void
-  tree_print_code::visit_superclass_ref (tree_superclass_ref& scr)
-  {
-    m_os << scr.method_name () << "@" << scr.class_name ();
-  }
+void
+tree_print_code::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
+
+  indent ();
+
+  m_os << "unwind_protect";
+
+  newline ();
 
-  void
-  tree_print_code::visit_metaclass_query (tree_metaclass_query& mcq)
-  {
-    m_os << "?" << mcq.class_name ();
-  }
+  tree_statement_list *unwind_protect_code = cmd.body ();
+
+  if (unwind_protect_code)
+    {
+      increment_indent_level ();
+
+      unwind_protect_code->accept (*this);
+
+      decrement_indent_level ();
+    }
+
+  print_indented_comment (cmd.middle_comment ());
+
+  indent ();
+
+  m_os << "unwind_protect_cleanup";
+
+  newline ();
+
+  tree_statement_list *cleanup_code = cmd.cleanup ();
 
-  void
-  tree_print_code::print_fcn_handle_body (tree_expression *e)
-  {
-    if (e)
-      {
-        m_suppress_newlines++;
-        e->accept (*this);
-        m_suppress_newlines--;
-      }
-  }
+  if (cleanup_code)
+    {
+      increment_indent_level ();
+
+      cleanup_code->accept (*this);
+
+      decrement_indent_level ();
+    }
+
+  print_indented_comment (cmd.trailing_comment ());
 
-  // Each print_code() function should call this before printing anything.
+  indent ();
+
+  m_os << "end_unwind_protect";
+}
 
-  void
-  tree_print_code::indent (void)
-  {
-    panic_unless (m_curr_print_indent_level >= 0);
+void
+tree_print_code::visit_while_command (tree_while_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
+
+  indent ();
 
-    if (m_beginning_of_line)
-      {
-        m_os << m_prefix;
+  m_os << "while ";
+
+  tree_expression *expr = cmd.condition ();
 
-        m_os << std::string (m_curr_print_indent_level, ' ');
+  if (expr)
+    expr->accept (*this);
+
+  newline ();
+
+  tree_statement_list *list = cmd.body ();
 
-        m_beginning_of_line = false;
-      }
-  }
+  if (list)
+    {
+      increment_indent_level ();
 
-  // All print_code() functions should use this to print new lines.
+      list->accept (*this);
+
+      decrement_indent_level ();
+    }
+
+  print_indented_comment (cmd.trailing_comment ());
 
-  void
-  tree_print_code::newline (const char *alt_txt)
-  {
-    if (m_suppress_newlines)
-      m_os << alt_txt;
-    else
-      {
-        // Print prefix for blank lines.
-        indent ();
+  indent ();
+
+  m_os << "endwhile";
+}
+
+void
+tree_print_code::visit_do_until_command (tree_do_until_command& cmd)
+{
+  print_comment_list (cmd.leading_comment ());
+
+  indent ();
 
-        m_os << "\n";
+  m_os << "do";
+
+  newline ();
+
+  tree_statement_list *list = cmd.body ();
 
-        m_beginning_of_line = true;
-      }
-  }
+  if (list)
+    {
+      increment_indent_level ();
 
-  // For resetting print_code state.
+      list->accept (*this);
 
-  void
-  tree_print_code::reset (void)
-  {
-    m_beginning_of_line = true;
-    m_curr_print_indent_level = 0;
-    while (m_nesting.top () != 'n')
-      m_nesting.pop ();
-  }
+      decrement_indent_level ();
+    }
+
+  print_indented_comment (cmd.trailing_comment ());
+
+  indent ();
+
+  m_os << "until ";
+
+  tree_expression *expr = cmd.condition ();
+
+  if (expr)
+    expr->accept (*this);
+
+  newline ();
+}
 
-  void
-  tree_print_code::print_parens (const tree_expression& expr, const char *txt)
-  {
-    int n = expr.paren_count ();
+void
+tree_print_code::visit_superclass_ref (tree_superclass_ref& scr)
+{
+  m_os << scr.method_name () << "@" << scr.class_name ();
+}
+
+void
+tree_print_code::visit_metaclass_query (tree_metaclass_query& mcq)
+{
+  m_os << "?" << mcq.class_name ();
+}
 
-    for (int i = 0; i < n; i++)
-      m_os << txt;
-  }
+void
+tree_print_code::print_fcn_handle_body (tree_expression *e)
+{
+  if (e)
+    {
+      m_suppress_newlines++;
+      e->accept (*this);
+      m_suppress_newlines--;
+    }
+}
 
-  void
-  tree_print_code::print_comment_elt (const comment_elt& elt)
-  {
-    bool printed_something = false;
-
-    bool prev_char_was_newline = false;
+// Each print_code() function should call this before printing anything.
 
-    std::string comment = elt.text ();
-
-    std::size_t len = comment.length ();
+void
+tree_print_code::indent (void)
+{
+  panic_unless (m_curr_print_indent_level >= 0);
 
-    std::size_t i = 0;
+  if (m_beginning_of_line)
+    {
+      m_os << m_prefix;
+
+      m_os << std::string (m_curr_print_indent_level, ' ');
 
-    while (i < len && comment[i++] == '\n')
-      ; // Skip leading new lines.
-    i--;
+      m_beginning_of_line = false;
+    }
+}
+
+// All print_code() functions should use this to print new lines.
 
-    while (i < len)
-      {
-        char c = comment[i++];
+void
+tree_print_code::newline (const char *alt_txt)
+{
+  if (m_suppress_newlines)
+    m_os << alt_txt;
+  else
+    {
+      // Print prefix for blank lines.
+      indent ();
+
+      m_os << "\n";
+
+      m_beginning_of_line = true;
+    }
+}
 
-        if (c == '\n')
-          {
-            if (prev_char_was_newline)
-              {
-                printed_something = true;
+// For resetting print_code state.
 
-                indent ();
+void
+tree_print_code::reset (void)
+{
+  m_beginning_of_line = true;
+  m_curr_print_indent_level = 0;
+  while (m_nesting.top () != 'n')
+    m_nesting.pop ();
+}
 
-                m_os << "##";
-              }
-
-            newline ();
+void
+tree_print_code::print_parens (const tree_expression& expr, const char *txt)
+{
+  int n = expr.paren_count ();
 
-            prev_char_was_newline = true;
-          }
-        else
-          {
-            if (m_beginning_of_line)
-              {
-                printed_something = true;
+  for (int i = 0; i < n; i++)
+    m_os << txt;
+}
+
+void
+tree_print_code::print_comment_elt (const comment_elt& elt)
+{
+  bool printed_something = false;
 
-                indent ();
+  bool prev_char_was_newline = false;
+
+  std::string comment = elt.text ();
+
+  std::size_t len = comment.length ();
 
-                m_os << "##";
+  std::size_t i = 0;
+
+  while (i < len && comment[i++] == '\n')
+    ; // Skip leading new lines.
+  i--;
 
-                if (! (isspace (c) || c == '!'))
-                  m_os << ' ';
-              }
+  while (i < len)
+    {
+      char c = comment[i++];
 
-            m_os << static_cast<char> (c);
+      if (c == '\n')
+        {
+          if (prev_char_was_newline)
+            {
+              printed_something = true;
+
+              indent ();
 
-            prev_char_was_newline = false;
-          }
-      }
+              m_os << "##";
+            }
+
+          newline ();
 
-    if (printed_something && ! m_beginning_of_line)
-      newline ();
-  }
+          prev_char_was_newline = true;
+        }
+      else
+        {
+          if (m_beginning_of_line)
+            {
+              printed_something = true;
 
-  void
-  tree_print_code::print_comment_list (comment_list *comment_list)
-  {
-    if (comment_list)
-      {
-        auto p = comment_list->begin ();
+              indent ();
+
+              m_os << "##";
+
+              if (! (isspace (c) || c == '!'))
+                m_os << ' ';
+            }
 
-        while (p != comment_list->end ())
-          {
-            comment_elt elt = *p++;
+          m_os << static_cast<char> (c);
 
-            print_comment_elt (elt);
+          prev_char_was_newline = false;
+        }
+    }
+
+  if (printed_something && ! m_beginning_of_line)
+    newline ();
+}
 
-            if (p != comment_list->end ())
-              newline ();
-          }
-      }
-  }
+void
+tree_print_code::print_comment_list (comment_list *comment_list)
+{
+  if (comment_list)
+    {
+      auto p = comment_list->begin ();
+
+      while (p != comment_list->end ())
+        {
+          comment_elt elt = *p++;
+
+          print_comment_elt (elt);
 
-  void
-  tree_print_code::print_indented_comment (comment_list *comment_list)
-  {
-    increment_indent_level ();
+          if (p != comment_list->end ())
+            newline ();
+        }
+    }
+}
 
-    print_comment_list (comment_list);
+void
+tree_print_code::print_indented_comment (comment_list *comment_list)
+{
+  increment_indent_level ();
 
-    decrement_indent_level ();
-  }
+  print_comment_list (comment_list);
+
+  decrement_indent_level ();
+}
 
 OCTAVE_END_NAMESPACE(octave)