* mi-cmd-stack.c (list_args_or_locals): Output a list of "args" or

"locals" entries.
* gdbmi.texinfo (stack-list-locals, stack-list-arguments)
(exec-interrupt, target-select, thread-select): Update
documentation.
* mi-stack.exp: Update.  Output for args=... and
locals=... changed to a list.

5 files changed, 48 insertions, 35 deletions

diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 7378501..786c03a 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,5 +1,13 @@
 2001-06-26  Andrew Cagney  <ac131313@redhat.com>
 
+	* mi-cmd-stack.c (list_args_or_locals): Output a list of "args" or
+	"locals" entries.
+	* gdbmi.texinfo (stack-list-locals, stack-list-arguments)
+	(exec-interrupt, target-select, thread-select): Update
+	documentation.
+
+2001-06-26  Andrew Cagney  <ac131313@redhat.com>
+
 	* mi-cmd-stack.c (mi_cmd_stack_list_frames): Output a list of
 	"stack" entries.
 	(mi_cmd_stack_list_args): Ditto for "stack-args".
diff --git a/gdb/mi/gdbmi.texinfo b/gdb/mi/gdbmi.texinfo
index 37cef83..d2799d7 100644
--- a/gdb/mi/gdbmi.texinfo
+++ b/gdb/mi/gdbmi.texinfo
@@ -1875,7 +1875,7 @@ The corresponding @value{GDBN} command is @samp{interrupt}.
 222^done
 (@value{GDBP})
 111*stopped,signal-name="SIGINT",signal-meaning="Interrupt",
-frame=@{addr="0x00010140",func="foo",args=@{@},file="try.c",line="13"@}
+frame=@{addr="0x00010140",func="foo",args=[],file="try.c",line="13"@}
 (@value{GDBP})
 
 (@value{GDBP})
@@ -2600,34 +2600,34 @@ file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="32"@}]
 -stack-list-arguments 0
 ^done,
 stack-args=[
-frame=@{level="0",args=@{@}@},
-frame=@{level="1",args=@{name="strarg"@}@},
-frame=@{level="2",args=@{name="intarg",name="strarg"@}@},
-frame=@{level="3",args=@{name="intarg",name="strarg",name="fltarg"@}@},
-frame=@{level="4",args=@{@}@}]
+frame=@{level="0",args=[]@},
+frame=@{level="1",args=[name="strarg"]@},
+frame=@{level="2",args=[name="intarg",name="strarg"]@},
+frame=@{level="3",args=[name="intarg",name="strarg",name="fltarg"]@},
+frame=@{level="4",args=[]@}]
 (@value{GDBP})
 -stack-list-arguments 1
 ^done,
 stack-args=[
-frame=@{level="0",args=@{@}@},
+frame=@{level="0",args=[]@},
 frame=@{level="1",
- args=@{@{name="strarg",value="0x11940 \"A string argument.\""@}@}@},
-frame=@{level="2",args=@{
+ args=[@{name="strarg",value="0x11940 \"A string argument.\""@}]@},
+frame=@{level="2",args=[
 @{name="intarg",value="2"@},
-@{name="strarg",value="0x11940 \"A string argument.\""@}@}@},
-@{frame=@{level="3",args=@{
+@{name="strarg",value="0x11940 \"A string argument.\""@}]@},
+@{frame=@{level="3",args=[
 @{name="intarg",value="2"@},
 @{name="strarg",value="0x11940 \"A string argument.\""@},
-@{name="fltarg",value="3.5"@}@}@},
-frame=@{level="4",args=@{@}@}]
+@{name="fltarg",value="3.5"@}]@},
+frame=@{level="4",args=[]@}]
 (@value{GDBP})
 -stack-list-arguments 0 2 2
-^done,stack-args=[frame=@{level="2",args=@{name="intarg",name="strarg"@}@}]
+^done,stack-args=[frame=@{level="2",args=[name="intarg",name="strarg"]@}]
 (@value{GDBP})
 -stack-list-arguments 1 2 2
 ^done,stack-args=[frame=@{level="2",
-args=@{@{name="intarg",value="2"@},
-@{name="strarg",value="0x11940 \"A string argument.\""@}@}@}]
+args=[@{name="intarg",value="2"@},
+@{name="strarg",value="0x11940 \"A string argument.\""@}]@}]
 (@value{GDBP})
 @end smallexample
 
@@ -2752,11 +2752,11 @@ prints also their values.
 @smallexample
 (@value{GDBP})
 -stack-list-locals 0
-^done,locals=@{name="A",name="B",name="C"@}
+^done,locals=[name="A",name="B",name="C"]
 (@value{GDBP})
 -stack-list-locals 1
-^done,locals=@{@{name="A",value="1"@},@{name="B",value="2"@},
-  @{name="C",value="3"@}@}
+^done,locals=[@{name="A",value="1"@},@{name="B",value="2"@},
+  @{name="C",value="3"@}]
 (@value{GDBP})
 @end smallexample
 
@@ -3260,7 +3260,7 @@ which the target program is, in the following form:
 
 @smallexample
 ^connected,addr="@var{address}",func="@var{function name}",
-  args=@{@var{arg list}@}
+  args=[@var{arg list}]
 @end smallexample
 
 @subsubheading @value{GDBN} Command
@@ -3272,7 +3272,7 @@ The corresponding @value{GDBN} command is @samp{target}.
 @smallexample
 (@value{GDBP})
 -target-select async /dev/ttya
-^connected,addr="0xfe00a300",func="??",args=@{@}
+^connected,addr="0xfe00a300",func="??",args=[]
 (@value{GDBP})
 @end smallexample
 
@@ -3388,8 +3388,8 @@ number-of-threads="3"
 -thread-select 3
 ^done,new-thread-id="3",
 frame=@{level="0 ",func="vprintf",
-args=@{@{name="format",value="0x8048e9c \"%*s%c %d %c\\n\""@},
-@{name="arg",value="0x2"@}@},file="vprintf.c",line="31"@}
+args=[@{name="format",value="0x8048e9c \"%*s%c %d %c\\n\""@},
+@{name="arg",value="0x2"@}],file="vprintf.c",line="31"@}
 (@value{GDBP})
 @end smallexample
 
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 3aa62e1..3cfdadb 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -222,7 +222,7 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
 
   block = get_frame_block (fi);
 
-  ui_out_tuple_begin (uiout, locals ? "locals" : "args");
+  ui_out_list_begin (uiout, locals ? "locals" : "args");
 
   while (block != 0)
     {
@@ -289,7 +289,7 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
       else
 	block = BLOCK_SUPERBLOCK (block);
     }
-  ui_out_tuple_end (uiout);
+  ui_out_list_end (uiout);
   ui_out_stream_delete (stb);
 }
 
diff --git a/gdb/testsuite/gdb.mi/ChangeLog b/gdb/testsuite/gdb.mi/ChangeLog
index 06535bb..44edb04 100644
--- a/gdb/testsuite/gdb.mi/ChangeLog
+++ b/gdb/testsuite/gdb.mi/ChangeLog
@@ -1,5 +1,10 @@
 2001-06-26  Andrew Cagney  <ac131313@redhat.com>
 
+	* mi-stack.exp: Update.  Output for args=... and
+	locals=... changed to a list.
+	
+2001-06-26  Andrew Cagney  <ac131313@redhat.com>
+
 	* mi-stack.exp: Update. Output for stack=..., args=... and
 	stack-args=... changed to a list.
 
diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index b6e5863..8b41551 100644
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -102,27 +102,27 @@ proc test_stack_args_listing {} {
     # -stack-list-arguments 
 
     mi_gdb_test "231-stack-list-arguments 0" \
-	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\{\}\},frame=\{level=\"1\",args=\{name=\"strarg\"\}\},frame=\{level=\"2\",args=\{name=\"intarg\",name=\"strarg\"\}\},frame=\{level=\"3\",args=\{name=\"intarg\",name=\"strarg\",name=\"fltarg\"\}\},frame=\{level=\"4\",args=\{\}\}\\\]" \
+	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\},frame=\{level=\"2\",args=\\\[name=\"intarg\",name=\"strarg\"\\\]\},frame=\{level=\"3\",args=\\\[name=\"intarg\",name=\"strarg\",name=\"fltarg\"\\\]\},frame=\{level=\"4\",args=\\\[\\\]\}\\\]" \
                 "stack args listing 0"
 
     mi_gdb_test "232-stack-list-arguments 0 1 1" \
-	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\{name=\"strarg\"\}\}\\\]" \
+	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\}\\\]" \
                 "stack args listing 0 1 1"
 
     mi_gdb_test "233-stack-list-arguments 0 1 3" \
-	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\{name=\"strarg\"\}\},frame=\{level=\"2\",args=\{name=\"intarg\",name=\"strarg\"\}\},frame=\{level=\"3\",args=\{name=\"intarg\",name=\"strarg\",name=\"fltarg\"\}\}\\\]" \
+	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\},frame=\{level=\"2\",args=\\\[name=\"intarg\",name=\"strarg\"\\\]\},frame=\{level=\"3\",args=\\\[name=\"intarg\",name=\"strarg\",name=\"fltarg\"\\\]\}\\\]" \
                 "stack args listing 0 1 3"
 
     mi_gdb_test "231-stack-list-arguments 1" \
-	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\{\}\},frame=\{level=\"1\",args=\{\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\}\},frame=\{level=\"2\",args=\{\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\}\},frame=\{level=\"3\",args=\{\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\}\},frame=\{level=\"4\",args=\{\}\}\\\]" \
+	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"2\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"3\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\]\},frame=\{level=\"4\",args=\\\[\\\]\}\\\]" \
                 "stack args listing 1"
 
     mi_gdb_test "232-stack-list-arguments 1 1 1" \
-	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\{\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\}\}\\\]" \
+	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\}\\\]" \
                 "stack args listing 1 1 1"
 
     mi_gdb_test "233-stack-list-arguments 1 1 3" \
-	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\{\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\}\},frame=\{level=\"2\",args=\{\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\}\},frame=\{level=\"3\",args=\{\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\}\}\\\]" \
+	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"2\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"3\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\]\}\\\]" \
                 "stack args listing 1 1 3"
 
     mi_gdb_test "234-stack-list-arguments" \
@@ -168,7 +168,7 @@ proc test_stack_locals_listing {} {
     # -stack-list-arguments 
 
     mi_gdb_test "232-stack-list-locals 0" \
-	    "232\\^done,locals=\{name=\"A\",name=\"B\",name=\"C\"\}" \
+	    "232\\^done,locals=\\\[name=\"A\",name=\"B\",name=\"C\"\\\]" \
                 "stack locals listing 0"
 
 # step until A, B, C, have some reasonable values.
@@ -181,7 +181,7 @@ gdb_expect {
 }
 
     mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\{\{name=\"A\",value=\"1\"\},\{name=\"B\",value=\"2\"\},\{name=\"C\",value=\"3\"\}\}" \
+	    "232\\^done,locals=\\\[\{name=\"A\",value=\"1\"\},\{name=\"B\",value=\"2\"\},\{name=\"C\",value=\"3\"\}\\\]" \
                 "stack locals listing 1"
 
     mi_gdb_test "234-stack-list-locals" \
@@ -193,7 +193,7 @@ gdb_expect {
                 "stack select frame 1"
 
     mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\{\}" \
+	    "232\\^done,locals=\\\[\\\]" \
                 "stack locals listing for new frame"
 
 # this should be a no-op
@@ -203,7 +203,7 @@ gdb_expect {
                 "stack select same frame"
 
     mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\{\}" \
+	    "232\\^done,locals=\\\[\\\]" \
                 "stack locals for same frame (level 1)"
 
 }