Re: [RFA] More linespec quoting "fixes"

[Keith Seitz <keiths@redhat.com>]

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

On 02/24/2010 02:10 PM, Keith Seitz wrote:

> * linespec.c (decode_line_1): Update comments for is_quote_enclosed.
> If the filename portion of the linespec was quoted, recheck the
> remainder for additional quoting.
> (locate_first_half): Skip over completer chars, too.

And, of course, there is a small typo in the patch... locate_first_half 
should be:

@@ -1056,7 +1066,14 @@ locate_first_half (char **argptr, int *i
        p++;
      }
    else
-    *is_quote_enclosed = 0;
+    {
+      *is_quote_enclosed = 0;
+      if (strchr (get_gdb_completer_quote_characters (), *p))
+	{
+	  ++(*argptr);
+	  ++p;
+	}
+    }
    for (; *p; p++)
      {
        if (p[0] == '<')

Sorry about that. FWIW, I've attached the corrected patch as well.

Keith

[-- Attachment #2: more-linespec-quoting.patch --]
[-- Type: text/plain, Size: 3639 bytes --]

Index: linespec.c
===================================================================
RCS file: /cvs/src/src/gdb/linespec.c,v
retrieving revision 1.96
diff -u -p -r1.96 linespec.c
--- linespec.c	16 Feb 2010 20:51:49 -0000	1.96
+++ linespec.c	24 Feb 2010 22:44:11 -0000
@@ -694,12 +694,14 @@ decode_line_1 (char **argptr, int funfir
   /* This says whether or not something in *ARGPTR is quoted with
      completer_quotes (i.e. with single quotes).  */
   int is_quoted;
-  /* Is part of *ARGPTR is enclosed in double quotes?  */
+  /* Is *ARGPTR is enclosed in double quotes?  */
   int is_quote_enclosed;
   int is_objc_method = 0;
   char *saved_arg = *argptr;
   /* If IS_QUOTED, the end of the quoted bit.  */
   char *end_quote = NULL;
+  /* The "first half" of the linespec.  */
+  char *first_half;
 
   if (not_found_ptr)
     *not_found_ptr = 0;
@@ -731,7 +733,7 @@ decode_line_1 (char **argptr, int funfir
      will point to "". If this is a C++ name, like "A::B::foo", p will
      point to "::B::foo". Argptr is not changed by this call.  */
 
-  p = locate_first_half (argptr, &is_quote_enclosed);
+  first_half = p = locate_first_half (argptr, &is_quote_enclosed);
 
   /* Check if this is an Objective-C method (anything that starts with
      a '+' or '-' and a '[').  */
@@ -751,9 +753,6 @@ decode_line_1 (char **argptr, int funfir
       return values;
   }
 
-  if (is_quoted)
-    *argptr = *argptr + 1;
-
   /* Does it look like there actually were two parts?  */
 
   if (p[0] == ':' || p[0] == '.')
@@ -828,6 +827,17 @@ decode_line_1 (char **argptr, int funfir
   /* file_symtab is specified file's symtab, or 0 if no file specified.
      arg no longer contains the file name.  */
 
+  /* If the filename was quoted, we must re-check the quotation.  */
+
+  if (end_quote == first_half && *end_quote!= '\0')
+    {
+      is_quoted = (**argptr
+		   && strchr (get_gdb_completer_quote_characters (),
+			      **argptr) != NULL);
+      if (is_quoted)
+	end_quote = skip_quoted (*argptr);
+    }
+
   /* Check whether arg is all digits (and sign).  */
 
   q = *argptr;
@@ -1056,7 +1066,14 @@ locate_first_half (char **argptr, int *i
       p++;
     }
   else
-    *is_quote_enclosed = 0;
+    {
+      *is_quote_enclosed = 0;
+      if (strchr (get_gdb_completer_quote_characters (), *p))
+	{
+	  ++(*argptr);
+	  ++p;
+	}
+    }
   for (; *p; p++)
     {
       if (p[0] == '<')
@@ -1574,7 +1591,8 @@ symtab_from_filename (char **argptr, cha
   copy = (char *) alloca (p - *argptr + 1);
   memcpy (copy, *argptr, p - *argptr);
   /* It may have the ending quote right after the file name.  */
-  if (is_quote_enclosed && copy[p - *argptr - 1] == '"')
+  if ((is_quote_enclosed && copy[p - *argptr - 1] == '"')
+      || copy[p - *argptr - 1] == '\'')
     copy[p - *argptr - 1] = 0;
   else
     copy[p - *argptr] = 0;
Index: testsuite/gdb.cp/overload.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/overload.exp,v
retrieving revision 1.16
diff -u -p -r1.16 overload.exp
--- testsuite/gdb.cp/overload.exp	16 Feb 2010 21:09:32 -0000	1.16
+++ testsuite/gdb.cp/overload.exp	24 Feb 2010 22:44:11 -0000
@@ -299,6 +299,8 @@ gdb_test "list ${srcfile}:intToChar" "in
 gdb_test "list ${srcfile}:intToChar(char)" "int intToChar.*"
 gdb_test "list ${srcfile}:'intToChar(char)'" "int intToChar.*"
 gdb_test "list '${srcfile}:intToChar(char)'" "int intToChar.*"
+gdb_test "list '${srcfile}':intToChar(char)" "int intToChar.*"
+gdb_test "list '${srcfile}':'intToChar(char)'" "int intToChar.*"
 
 # And with filename and namespace... which does not work.