* ch-exp.y (match_character_literal): Fix case where no

	match at all is found.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b32f4b476aa681427082bb0e43e516b2e549ce48..2d4e14b5376e3c19f50c9cf70d32d1c2a65c246c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+       **** start-sanitize-chill ****
+Fri Dec  4 06:56:56 1992  Fred Fish  (fnf@cygnus.com)
+
+       * ch-exp.y (match_character_literal):  Fix case where no
+       match at all is found.
+       **** end-sanitize-chill ****
+
 Thu Dec  3 12:00:06 1992  Fred Fish  (fnf@cygnus.com)
 
        * c-exp.y (c_create_fundamental_type):  New function to create

diff --git a/gdb/ch-exp.y b/gdb/ch-exp.y
index 96dbda4c5ea4a06745b218505a3412355548d466..4a11c68a62d140dd22738348906733e2a89331c7 100644 (file)
--- a/gdb/ch-exp.y
+++ b/gdb/ch-exp.y
@@ -1014,6 +1014,11 @@ match_character_literal ()
          return (0);
        }
     }
+  else
+    {
+      /* Not a character literal. */
+      return (0);
+    }
   yylval.typed_val.val = ival;
   yylval.typed_val.type = builtin_type_chill_char;
   lexptr = tokptr;
@@ -1452,44 +1457,34 @@ chill_create_fundamental_type (objfile, typeid)
         warning ("internal error: no chill fundamental type %d", typeid);
        break;
       case FT_BOOLEAN:
-       type = init_type (TYPE_CODE_BOOL, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "BOOL", objfile);
+       type = init_type (TYPE_CODE_BOOL, 1, TYPE_FLAG_UNSIGNED, "BOOL", objfile);
        break;
       case FT_CHAR:
-       type = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "CHAR", objfile);
+       type = init_type (TYPE_CODE_INT, 1, TYPE_FLAG_UNSIGNED, "CHAR", objfile);
        break;
-      case FT_BYTE:
-       type = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_SIGNED, "BYTE", objfile);
+      case FT_SIGNED_CHAR:
+       type = init_type (TYPE_CODE_INT, 1, TYPE_FLAG_SIGNED, "BYTE", objfile);
        break;
-      case FT_UNSIGNED_BYTE:
-       type = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "UBYTE", objfile);
+      case FT_UNSIGNED_CHAR:
+       type = init_type (TYPE_CODE_INT, 1, TYPE_FLAG_UNSIGNED, "UBYTE", objfile);
        break;
-      case FT_INTEGER:
-       type = init_type (TYPE_CODE_INT, TARGET_SHORT_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_SIGNED, "INT", objfile);
+      case FT_SHORT:                   /* Chill ints are 2 bytes */
+       type = init_type (TYPE_CODE_INT, 2, TYPE_FLAG_SIGNED, "INT", objfile);
        break;
-      case FT_UNSIGNED_INTEGER:
-       type = init_type (TYPE_CODE_INT, TARGET_SHORT_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "UINT", objfile);
+      case FT_UNSIGNED_SHORT:          /* Chill ints are 2 bytes */
+       type = init_type (TYPE_CODE_INT, 2, TYPE_FLAG_UNSIGNED, "UINT", objfile);
        break;
-      case FT_LONG:
-       type = init_type (TYPE_CODE_INT, TARGET_LONG_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_SIGNED, "LONG", objfile);
+      case FT_INTEGER:                 /* Chill longs are 4 bytes */
+       type = init_type (TYPE_CODE_INT, 4, TYPE_FLAG_SIGNED, "LONG", objfile);
        break;
-      case FT_UNSIGNED_LONG:
-       type = init_type (TYPE_CODE_INT, TARGET_LONG_BIT / TARGET_CHAR_BIT,
-                         TYPE_FLAG_UNSIGNED, "ULONG", objfile);
+      case FT_UNSIGNED_INTEGER:                /* Chill longs are 4 bytes */
+       type = init_type (TYPE_CODE_INT, 4, TYPE_FLAG_UNSIGNED, "ULONG", objfile);
        break;
       case FT_FLOAT:
-       type = init_type (TYPE_CODE_FLT, TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
-                         0, "REAL", objfile);
+       type = init_type (TYPE_CODE_FLT, 4, 0, "REAL", objfile);
        break;
       case FT_DBL_PREC_FLOAT:
-       type = init_type (TYPE_CODE_FLT, TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
-                         0, "LONG REAL", objfile);
+       type = init_type (TYPE_CODE_FLT, 8, 0, "LONG_REAL", objfile);
        break;
       }
   return (type);