RFA: if/while commands in user-defined command behave differently

[Jason Molenda <jmolenda@apple.com>]

[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]

 From the gdb prompt, this is accepted:

(gdb) if(3<4)
  >print "hi\n"
  >end
$1 = "hi\n"
(gdb)

But the same sequence of commands in a user-defined command will yield 
an error:

(gdb) define f
Type commands for definition of "f".
End with a line saying just "end".
 >if(3<4)
  >print "hi\n"
  >end
 >end
(gdb) f
Junk after end of expression.
(gdb)

It is hard for a user to figure out what gdb's complaining about.  
Luckily we have a really tenacious developer at Apple who tracked it 
down and filed a bug report.

Below is a patch to fix this in cli/cli-script.c, and a testsuite 
addition to gdb.base/define.exp to test that this isn't regressed.  The 
cli-script.c change alone does not change the testsuite results on x86 
Linux w/ gcc 3.4.0 & dwarf2.

I'm not clear on who needs to approve the CLI patch; Michael should 
approve the testsuite change, obviously.  OK to commit?

Jason


[gdb/ChangeLog]
2004-09-08  Jason Molenda  (jmolenda@apple.com)

         * cli/cli-script.c (read_next_line): Accept zero or more 
whitespace
         chars after 'if' or 'while' commands in user-defined commands.

[gdb/testsuite/ChangeLog]
2004-09-08  Jason Molenda  (jmolenda@apple.com)

         * gdb.base/define.exp: Two new tests to verify zero space chars
         after 'if' and 'while' commands in a user-defined command is 
correctly
         parsed.


[-- Attachment #2: pa.txt --]
[-- Type: text/plain, Size: 3949 bytes --]

Index: cli/cli-script.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-script.c,v
retrieving revision 1.23
diff -u -p -r1.23 cli-script.c
--- cli/cli-script.c	21 Apr 2004 23:52:21 -0000	1.23
+++ cli/cli-script.c	8 Sep 2004 19:19:53 -0000
@@ -1,7 +1,7 @@
 /* GDB CLI command scripting.
 
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
    Foundation, Inc.
 
    This file is part of GDB.
@@ -727,9 +727,21 @@ read_next_line (struct command_line **co
   /* Check for while, if, break, continue, etc and build a new command
      line structure for them.  */
   if (p1 - p > 5 && !strncmp (p, "while", 5))
-    *command = build_command_line (while_control, p + 6);
+    {
+      char *first_arg;
+      first_arg = p + 5;
+      while (first_arg < p1 && isspace (*first_arg))
+        first_arg++;
+      *command = build_command_line (while_control, first_arg);
+    }
   else if (p1 - p > 2 && !strncmp (p, "if", 2))
-    *command = build_command_line (if_control, p + 3);
+    {
+      char *first_arg;
+      first_arg = p + 2;
+      while (first_arg < p1 && isspace (*first_arg))
+        first_arg++;
+      *command = build_command_line (if_control, first_arg);
+    }
   else if (p1 - p == 10 && !strncmp (p, "loop_break", 10))
     {
       *command = (struct command_line *)
Index: testsuite/gdb.base/define.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/define.exp,v
retrieving revision 1.4
diff -u -p -r1.4 define.exp
--- testsuite/gdb.base/define.exp	9 Dec 2003 18:19:20 -0000	1.4
+++ testsuite/gdb.base/define.exp	8 Sep 2004 19:19:53 -0000
@@ -1,4 +1,4 @@
-# Copyright 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -200,6 +200,47 @@ gdb_expect {
   timeout {fail "(timeout) help user command: nextwhere"}
 }
 
+# Verify that the command parser doesn't require a space after an 'if'
+# command in a user defined function.
+#
+send_gdb "define ifspace\n"
+gdb_expect {
+  -re "Type commands for definition of \"ifspace\".\r\nEnd with a line saying just \"end\".\r\n>$"\
+          {send_gdb "if(3<4)\nprint \"hi there\\n\"\nend\nend\n"
+           gdb_expect {
+             -re "$gdb_prompt $"\
+                     {pass "define user command: ifspace"}
+             timeout {fail "(timeout) define user command: ifspace"}
+           }
+          }
+  -re "$gdb_prompt $"\
+          {fail "define user command: ifspace"}
+  timeout {fail "(timeout) define user command: ifspace"}
+}
+
+gdb_test "ifspace" ".*hi there.*" "test ifspace is parsed correctly"
+
+# Verify that the command parser doesn't require a space after an 'while'
+# command in a user defined function.
+#
+send_gdb "define whilespace\n"
+gdb_expect {
+  -re "Type commands for definition of \"whilespace\".\r\nEnd with a line saying just \"end\".\r\n>$"\
+          {send_gdb "set \$i=1\nwhile(\$i<2)\nset \$i=2\nprint \"hi there\\n\"\nend\nend\n"
+           gdb_expect {
+             -re "$gdb_prompt $"\
+                     {pass "define user command: whilespace"}
+             timeout {fail "(timeout) define user command: whilespace"}
+           }
+          }
+  -re "$gdb_prompt $"\
+          {fail "define user command: whilespace"}
+  timeout {fail "(timeout) define user command: whilespace"}
+}
+
+gdb_test "whilespace" ".*hi there.*" "test whilespace is parsed correctly"
+
+
 # Verify that the user can "hook" a builtin command.  We choose to
 # hook the "stop" pseudo command, and we'll define it to use a user-
 # define command.