import gdb-1999-06-21 snapshot

[deliverable/binutils-gdb.git] / gdb / jv-exp.y

diff --git a/gdb/jv-exp.y b/gdb/jv-exp.y
index 672991bb49c68c1e9db612112a9a051610884800..be5b590a36074ce65dbd30612da983dc9013a6c0 100644 (file)
--- a/gdb/jv-exp.y
+++ b/gdb/jv-exp.y
@@ -1,5 +1,5 @@
 /* YACC parser for Java expressions, for GDB.
-   Copyright (C) 1997.
+   Copyright (C) 1997, 1998, 1999.
    Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -899,7 +899,7 @@ yylex ()
        error ("Empty character constant.");
 
       yylval.typed_val_int.val = c;
-      yylval.typed_val_int.type = builtin_type_char;
+      yylval.typed_val_int.type = java_char_type;
 
       c = *lexptr++;
       if (c != '\'')
@@ -1088,8 +1088,13 @@ yylex ()
   /* It's a name.  See how long it is.  */
   namelen = 0;
   for (c = tokstart[namelen];
-       (c == '_' || c == '$' || (c >= '0' && c <= '9')
-       || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '<');)
+       (c == '_'
+       || c == '$'
+       || (c >= '0' && c <= '9')
+       || (c >= 'a' && c <= 'z')
+       || (c >= 'A' && c <= 'Z')
+       || c == '<');
+       )
     {
       if (c == '<')
        {