s/ui_out_list/ui_out_tupple/

6 files changed, 70 insertions, 61 deletions

diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 229dd3d6ad1..617e0cd6b97 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,3 +1,12 @@
+Fri May 11 13:55:07 2001  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* mi-cmd-var.c: Replace ui_out_list_begin, ui_out_list_end and
+ 	make_cleanup_ui_out_list_end with ui_out_tupple_begin,
+ 	ui_out_tupple_end and make_cleanup_ui_out_tupple_begin_end.
+	* mi-cmd-stack.c: Ditto.
+	* mi-cmd-disas.c: Ditto.
+	* mi-main.c: Ditto.
+
 2001-05-10  Andrew Cagney  <ac131313@redhat.com>
 
 	* mi-out.c (mi_open, mi_close): Replace list_open and list_close.
diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index 1937eb05c01..021ee5e6d94 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -364,7 +364,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
          for that line.  */
 
       next_line = 0;		/* Force out first line */
-      ui_out_list_begin (uiout, "asm_insns");
+      ui_out_tuple_begin (uiout, "asm_insns");
       num_displayed = 0;
       for (i = 0; i < newlines; i++)
 	{
@@ -377,7 +377,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 		  /* Just one line to print. */
 		  if (next_line == mle[i].line)
 		    {
-		      ui_out_list_begin (uiout, "src_and_asm_line");
+		      ui_out_tuple_begin (uiout, "src_and_asm_line");
 		      print_source_lines (symtab, next_line, mle[i].line + 1, 0);
 		    }
 		  else
@@ -385,26 +385,26 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 		      /* Several source lines w/o asm instructions associated. */
 		      for (; next_line < mle[i].line; next_line++)
 			{
-			  ui_out_list_begin (uiout, "src_and_asm_line");
+			  ui_out_tuple_begin (uiout, "src_and_asm_line");
 			  print_source_lines (symtab, next_line, mle[i].line + 1, 0);
-			  ui_out_list_begin (uiout, "line_asm_insn");
-			  ui_out_list_end (uiout);
-			  ui_out_list_end (uiout);
+			  ui_out_tuple_begin (uiout, "line_asm_insn");
+			  ui_out_tuple_end (uiout);
+			  ui_out_tuple_end (uiout);
 			}
 		      /* Print the last line and leave list open for
 		         asm instructions to be added. */
-		      ui_out_list_begin (uiout, "src_and_asm_line");
+		      ui_out_tuple_begin (uiout, "src_and_asm_line");
 		      print_source_lines (symtab, next_line, mle[i].line + 1, 0);
 		    }
 		}
 	      else
 		{
-		  ui_out_list_begin (uiout, "src_and_asm_line");
+		  ui_out_tuple_begin (uiout, "src_and_asm_line");
 		  print_source_lines (symtab, mle[i].line, mle[i].line + 1, 0);
 		}
 
 	      next_line = mle[i].line + 1;
-	      ui_out_list_begin (uiout, "line_asm_insn");
+	      ui_out_tuple_begin (uiout, "line_asm_insn");
 	      if (i + 1 < newlines && mle[i + 1].line <= mle[i].line)
 		close_list = 0;
 	    }
@@ -418,7 +418,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 		  else
 		    num_displayed++;
 		}
-	      ui_out_list_begin (uiout, NULL);
+	      ui_out_tuple_begin (uiout, NULL);
 	      ui_out_field_core_addr (uiout, "address", pc);
 
 	      if (!build_address_symbolic (pc, 0, &name, &offset, &filename, &line, &unmapped))
@@ -437,24 +437,24 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 	      pc += (*tm_print_insn) (pc, &di);
 	      ui_out_field_stream (uiout, "inst", stb);
 	      ui_file_rewind (stb->stream);
-	      ui_out_list_end (uiout);
+	      ui_out_tuple_end (uiout);
 	    }
 	  if (close_list)
 	    {
-	      ui_out_list_end (uiout);
-	      ui_out_list_end (uiout);
+	      ui_out_tuple_end (uiout);
+	      ui_out_tuple_end (uiout);
 	      close_list = 0;
 	    }
 	  if (how_many >= 0)
 	    if (num_displayed >= how_many)
 	      break;
 	}
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
   else
     {
     assembly_only:
-      ui_out_list_begin (uiout, "asm_insns");
+      ui_out_tuple_begin (uiout, "asm_insns");
       num_displayed = 0;
       for (pc = low; pc < high;)
 	{
@@ -466,7 +466,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 	      else
 		num_displayed++;
 	    }
-	  ui_out_list_begin (uiout, NULL);
+	  ui_out_tuple_begin (uiout, NULL);
 	  ui_out_field_core_addr (uiout, "address", pc);
 
 	  if (!build_address_symbolic (pc, 0, &name, &offset, &filename, &line, &unmapped))
@@ -485,9 +485,9 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 	  pc += (*tm_print_insn) (pc, &di);
 	  ui_out_field_stream (uiout, "inst", stb);
 	  ui_file_rewind (stb->stream);
-	  ui_out_list_end (uiout);
+	  ui_out_tuple_end (uiout);
 	}
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
   gdb_flush (gdb_stdout);
 
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 2d80be745ae..7d0ed7cfae1 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -77,7 +77,7 @@ mi_cmd_stack_list_frames (char *command, char **argv, int argc)
   if (fi == NULL)
     error ("mi_cmd_stack_list_frames: Not enough frames in stack.");
 
-  ui_out_list_begin (uiout, "stack");
+  ui_out_tuple_begin (uiout, "stack");
 
   /* Now let;s print the frames up to frame_high, or until there are
      frames in the stack. */
@@ -96,7 +96,7 @@ mi_cmd_stack_list_frames (char *command, char **argv, int argc)
 			0 /* args */ );
     }
 
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   if (i < frame_high)
     error ("mi_cmd_stack_list_frames: Not enough frames in stack.");
 
@@ -183,7 +183,7 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc)
   if (fi == NULL)
     error ("mi_cmd_stack_list_args: Not enough frames in stack.");
 
-  ui_out_list_begin (uiout, "stack-args");
+  ui_out_tuple_begin (uiout, "stack-args");
 
   /* Now let's print the frames up to frame_high, or until there are
      frames in the stack. */
@@ -192,13 +192,13 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc)
        i++, fi = get_prev_frame (fi))
     {
       QUIT;
-      ui_out_list_begin (uiout, "frame");
+      ui_out_tuple_begin (uiout, "frame");
       ui_out_field_int (uiout, "level", i);
       list_args_or_locals (0, atoi (argv[0]), fi);
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
 
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   if (i < frame_high)
     error ("mi_cmd_stack_list_args: Not enough frames in stack.");
 
@@ -222,7 +222,7 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
 
   block = get_frame_block (fi);
 
-  ui_out_list_begin (uiout, locals ? "locals" : "args");
+  ui_out_tuple_begin (uiout, locals ? "locals" : "args");
 
   while (block != 0)
     {
@@ -265,7 +265,7 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
 	  if (print_me)
 	    {
 	      if (values)
-		ui_out_list_begin (uiout, NULL);
+		ui_out_tuple_begin (uiout, NULL);
 	      ui_out_field_string (uiout, "name", SYMBOL_NAME (sym));
 
 	      if (values)
@@ -280,7 +280,7 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
 		    sym2 = sym;
 		  print_variable_value (sym2, fi, stb->stream);
 		  ui_out_field_stream (uiout, "value", stb);
-		  ui_out_list_end (uiout);
+		  ui_out_tuple_end (uiout);
 		}
 	    }
 	}
@@ -289,7 +289,7 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
       else
 	block = BLOCK_SUPERBLOCK (block);
     }
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   ui_out_stream_delete (stb);
 }
 
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index dfdc4a63176..3ad96731e65 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -273,11 +273,11 @@ mi_cmd_var_list_children (char *command, char **argv, int argc)
   if (numchild <= 0)
     return MI_CMD_DONE;
 
-  ui_out_list_begin (uiout, "children");
+  ui_out_tuple_begin (uiout, "children");
   cc = childlist;
   while (*cc != NULL)
     {
-      ui_out_list_begin (uiout, "child");
+      ui_out_tuple_begin (uiout, "child");
       ui_out_field_string (uiout, "name", varobj_get_objname (*cc));
       ui_out_field_string (uiout, "exp", varobj_get_expression (*cc));
       ui_out_field_int (uiout, "numchild", varobj_get_num_children (*cc));
@@ -285,10 +285,10 @@ mi_cmd_var_list_children (char *command, char **argv, int argc)
       /* C++ pseudo-variables (public, private, protected) do not have a type */
       if (type)
 	ui_out_field_string (uiout, "type", varobj_get_type (*cc));
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
       cc++;
     }
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   xfree (childlist);
   return MI_CMD_DONE;
 }
@@ -421,10 +421,10 @@ mi_cmd_var_update (char *command, char **argv, int argc)
   if ((*name == '*') && (*(name + 1) == '\0'))
     {
       nv = varobj_list (&rootlist);
-      ui_out_list_begin (uiout, "changelist");
+      ui_out_tuple_begin (uiout, "changelist");
       if (nv <= 0)
 	{
-	  ui_out_list_end (uiout);
+	  ui_out_tuple_end (uiout);
 	  return MI_CMD_DONE;
 	}
       cr = rootlist;
@@ -434,7 +434,7 @@ mi_cmd_var_update (char *command, char **argv, int argc)
 	  cr++;
 	}
       xfree (rootlist);
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
   else
     {
@@ -443,9 +443,9 @@ mi_cmd_var_update (char *command, char **argv, int argc)
       if (var == NULL)
 	error ("mi_cmd_var_update: Variable object not found");
 
-      ui_out_list_begin (uiout, "changelist");
+      ui_out_tuple_begin (uiout, "changelist");
       varobj_update_one (var);
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
     }
     return MI_CMD_DONE;
 }
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index f0d7e108216..c7476cd5916 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -273,7 +273,7 @@ mi_cmd_data_list_register_names (char *command, char **argv, int argc)
 
   numregs = NUM_REGS;
 
-  ui_out_list_begin (uiout, "register-names");
+  ui_out_tuple_begin (uiout, "register-names");
 
   if (argc == 0)		/* No args, just do all the regs */
     {
@@ -305,7 +305,7 @@ mi_cmd_data_list_register_names (char *command, char **argv, int argc)
 	  return MI_CMD_ERROR;
 	}
     }
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   return MI_CMD_DONE;
 }
 
@@ -323,7 +323,7 @@ mi_cmd_data_list_changed_registers (char *command, char **argv, int argc)
 
   numregs = NUM_REGS;
 
-  ui_out_list_begin (uiout, "changed-registers");
+  ui_out_tuple_begin (uiout, "changed-registers");
 
   if (argc == 0)		/* No args, just do all the regs */
     {
@@ -372,7 +372,7 @@ mi_cmd_data_list_changed_registers (char *command, char **argv, int argc)
 	  return MI_CMD_ERROR;
 	}
     }
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   return MI_CMD_DONE;
 }
 
@@ -433,7 +433,7 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc)
       return MI_CMD_ERROR;
     }
 
-  ui_out_list_begin (uiout, "register-values");
+  ui_out_tuple_begin (uiout, "register-values");
 
   if (argc == 1)		/* No args, beside the format: do all the regs */
     {
@@ -444,12 +444,12 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc)
 	  if (REGISTER_NAME (regnum) == NULL
 	      || *(REGISTER_NAME (regnum)) == '\0')
 	    continue;
-	  ui_out_list_begin (uiout, NULL);
+	  ui_out_tuple_begin (uiout, NULL);
 	  ui_out_field_int (uiout, "number", regnum);
 	  result = get_register (regnum, format);
 	  if (result == -1)
 	    return MI_CMD_ERROR;
-	  ui_out_list_end (uiout);
+	  ui_out_tuple_end (uiout);
 	}
     }
 
@@ -463,12 +463,12 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc)
 	  && REGISTER_NAME (regnum) != NULL
 	  && *REGISTER_NAME (regnum) != '\000')
 	{
-	  ui_out_list_begin (uiout, NULL);
+	  ui_out_tuple_begin (uiout, NULL);
 	  ui_out_field_int (uiout, "number", regnum);
 	  result = get_register (regnum, format);
 	  if (result == -1)
 	    return MI_CMD_ERROR;
-	  ui_out_list_end (uiout);
+	  ui_out_tuple_end (uiout);
 	}
       else
 	{
@@ -476,7 +476,7 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc)
 	  return MI_CMD_ERROR;
 	}
     }
-  ui_out_list_end (uiout);
+  ui_out_tuple_end (uiout);
   return MI_CMD_DONE;
 }
 
@@ -893,17 +893,17 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
     struct ui_stream *stream = ui_out_stream_new (uiout);
     int row;
     int row_byte;
-    ui_out_list_begin (uiout, "memory");
+    ui_out_tuple_begin (uiout, "memory");
     for (row = 0, row_byte = 0;
 	 row < nr_rows;
 	 row++, row_byte += nr_cols * word_size)
       {
 	int col;
 	int col_byte;
-	ui_out_list_begin (uiout, NULL);
+	ui_out_tuple_begin (uiout, NULL);
 	ui_out_field_core_addr (uiout, "addr", addr + row_byte);
 	/* ui_out_field_core_addr_symbolic (uiout, "saddr", addr + row_byte); */
-	ui_out_list_begin (uiout, "data");
+	ui_out_tuple_begin (uiout, "data");
 	for (col = 0, col_byte = row_byte;
 	     col < nr_cols;
 	     col++, col_byte += word_size)
@@ -920,7 +920,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
 		ui_out_field_stream (uiout, NULL, stream);
 	      }
 	  }
-	ui_out_list_end (uiout);
+	ui_out_tuple_end (uiout);
 	if (aschar)
 	  {
 	    int byte;
@@ -940,10 +940,10 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
 	      }
 	    ui_out_field_stream (uiout, "ascii", stream);
 	  }
-	ui_out_list_end (uiout);
+	ui_out_tuple_end (uiout);
       }
     ui_out_stream_delete (stream);
-    ui_out_list_end (uiout);
+    ui_out_tuple_end (uiout);
   }
   do_cleanups (cleanups);
   return MI_CMD_DONE;
@@ -1377,11 +1377,11 @@ mi_load_progress (const char *section_name,
       if (last_async_command)
 	fputs_unfiltered (last_async_command, raw_stdout);
       fputs_unfiltered ("+download", raw_stdout);
-      ui_out_list_begin (uiout, NULL);
+      ui_out_tuple_begin (uiout, NULL);
       ui_out_field_string (uiout, "section", section_name);
       ui_out_field_int (uiout, "section-size", total_section);
       ui_out_field_int (uiout, "total-size", grand_total);
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
       mi_out_put (uiout, raw_stdout);
       fputs_unfiltered ("\n", raw_stdout);
       gdb_flush (raw_stdout);
@@ -1395,13 +1395,13 @@ mi_load_progress (const char *section_name,
       if (last_async_command)
 	fputs_unfiltered (last_async_command, raw_stdout);
       fputs_unfiltered ("+download", raw_stdout);
-      ui_out_list_begin (uiout, NULL);
+      ui_out_tuple_begin (uiout, NULL);
       ui_out_field_string (uiout, "section", section_name);
       ui_out_field_int (uiout, "section-sent", sent_so_far);
       ui_out_field_int (uiout, "section-size", total_section);
       ui_out_field_int (uiout, "total-sent", total_sent);
       ui_out_field_int (uiout, "total-size", grand_total);
-      ui_out_list_end (uiout);
+      ui_out_tuple_end (uiout);
       mi_out_put (uiout, raw_stdout);
       fputs_unfiltered ("\n", raw_stdout);
       gdb_flush (raw_stdout);
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index a25c8903287..e9208123bbd 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -106,7 +106,7 @@ mi_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
   field_separator (uiout);
   if (tblid)
     fprintf_unfiltered (data->buffer, "%s=", tblid);
-  mi_open (uiout, ui_out_type_tupple);
+  mi_open (uiout, ui_out_type_tuple);
   data->first_header = 0;
   data->supress_field_separator = 1;
 }
@@ -119,7 +119,7 @@ mi_table_body (struct ui_out *uiout)
   struct ui_out_data *data = ui_out_data (uiout);
   /* close the table header line if there were any headers */
   if (data->first_header)
-    mi_close (uiout, ui_out_type_tupple);
+    mi_close (uiout, ui_out_type_tuple);
 }
 
 /* Mark end of a table */
@@ -128,7 +128,7 @@ void
 mi_table_end (struct ui_out *uiout)
 {
   struct ui_out_data *data = ui_out_data (uiout);
-  mi_close (uiout, ui_out_type_tupple);
+  mi_close (uiout, ui_out_type_tuple);
   /* If table was empty this flag did not get reset yet */
   data->supress_field_separator = 0;
 }
@@ -142,7 +142,7 @@ mi_table_header (struct ui_out *uiout, int width, int alignment, char *colhdr)
   if (!data->first_header++)
     {
       fputs_unfiltered ("hdr=", data->buffer);
-      mi_open (uiout, ui_out_type_tupple);
+      mi_open (uiout, ui_out_type_tuple);
     }
   mi_field_string (uiout, 0, width, alignment, 0, colhdr);
 }