Consolidate single-char tokens in ada-lex.l

There are two rules in ada-lex.l that match single-character tokens.
This merges them.

Also, this removes '.' from the list of such tokens.  '.' is not used
in any production in ada-exp.y, and removing it here helps the
subsequent completion patches.

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 9e35776d7c22d1f65d1593347007e4a1700970f4..ea35c7a53af82eaceeaa99be4e20f0621979c7a4 100644 (file)
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -265,7 +265,7 @@ false               { return FALSEKEYWORD; }
 
 <BEFORE_QUAL_QUOTE>"'"/{NOT_COMPLETE} { BEGIN INITIAL; return '\''; }
 
-[-&*+./:<>=|;\[\]] { return yytext[0]; }
+[-&*+{}@/:<>=|;\[\]] { return yytext[0]; }
 
 ","            { if (paren_depth == 0 && pstate->comma_terminates)
                    {
@@ -319,8 +319,6 @@ false               { return FALSEKEYWORD; }
 
 "::"            { return COLONCOLON; }
 
-[{}@]          { return yytext[0]; }
-
        /* REGISTERS AND GDB CONVENIENCE VARIABLES */
 
 "$"({LETTER}|{DIG}|"$")*  {