Merge GDB 7.5.1

gdb/ada-lex.l

 /* FLEX lexer for Ada expressions, for GDB.
    Copyright (C) 1994, 1997-1998, 2000-2003, 2007-2012 Free Software
    Foundation, Inc.
 
    This file is part of GDB.
 
    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
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 275 matching lines @@
         /* CATCH-ALL ERROR CASE */
 
 .               { error (_("Invalid character '%s' in expression."), yytext); }
 %%
 
 #include <ctype.h>
 #include "gdb_string.h"
 
 /* Initialize the lexer for processing new expression. */
 
-void
+static void
 lexer_init (FILE *inp)
 {
   BEGIN INITIAL;
   yyrestart (inp);
 }
 
 
 /* Copy S2 to S1, removing all underscores, and downcasing all letters.  */
 
 static void
@@ skipping 96 matching lines @@
     yylval.typed_val_float.type = type_double ();
   if (sizeof(DOUBLEST) >= gdbarch_long_double_bit (parse_gdbarch)
                             / TARGET_CHAR_BIT)
     yylval.typed_val_float.type = type_long_double ();
 
   return FLOAT;
 }
 
 
 /* Store a canonicalized version of NAME0[0..LEN-1] in yylval.ssym.  The
-   resulting string is valid until the next call to ada_parse.  It differs
+   resulting string is valid until the next call to ada_parse.  If
+   NAME0 contains the substring "___", it is assumed to be already
+   encoded and the resulting name is equal to it.  Otherwise, it differs
    from NAME0 in that:
     + Characters between '...' or <...> are transfered verbatim to 
       yylval.ssym.
     + <, >, and trailing "'" characters in quoted sequences are removed
       (a leading quote is preserved to indicate that the name is not to be
       GNAT-encoded).
     + Unquoted whitespace is removed.
     + Unquoted alphabetic characters are mapped to lower case.
    Result is returned as a struct stoken, but for convenience, the string
    is also null-terminated.  Result string valid until the next call of
    ada_parse.
  */
 static struct stoken
 processId (const char *name0, int len)
 {
   char *name = obstack_alloc (&temp_parse_space, len + 11);
   int i0, i;
   struct stoken result;
 
+  result.ptr = name;
   while (len > 0 && isspace (name0[len-1]))
     len -= 1;
+
+  if (strstr (name0, "___") != NULL)
+    {
+      strncpy (name, name0, len);
+      name[len] = '\000';
+      result.length = len;
+      return result;
+    }
+
   i = i0 = 0;
   while (i0 < len)
     {
       if (isalnum (name0[i0]))
         {
           name[i] = tolower (name0[i0]);
           i += 1; i0 += 1;
         }
       else switch (name0[i0])
         {
@@ skipping 19 matching lines @@
             {
               name[i] = name0[i0];
               i += 1; i0 += 1;
             }
           i0 += 1;
           break;
         }
     }
   name[i] = '\000';
 
-  result.ptr = name;
   result.length = i;
   return result;
 }
 
 /* Return TEXT[0..LEN-1], a string literal without surrounding quotes,
    with special hex character notations replaced with characters. 
    Result valid until the next call to ada_parse.  */
 
 static struct stoken
 processString (const char *text, int len)
@@ skipping 126 matching lines @@
 {
   return 1;
 }
 
 /* Dummy definition to suppress warnings about unused static definitions. */
 typedef void (*dummy_function) ();
 dummy_function ada_flex_use[] = 
 { 
   (dummy_function) yyunput
 };