Add support for target specific command line switches to old-style simualtors.

[deliverable/binutils-gdb.git] / gdb / ch-exp.c

diff --git a/gdb/ch-exp.c b/gdb/ch-exp.c
index 4ce29821ed08b82fb0fc314987917dfd778b3474..e96a6f8e5f89375cc01fdb16894e2990e8919feb 100644 (file)
--- a/gdb/ch-exp.c
+++ b/gdb/ch-exp.c
@@ -1,21 +1,23 @@
 /* Parser for GNU CHILL (CCITT High-Level Language)  -*- C -*-
 /* Parser for GNU CHILL (CCITT High-Level Language)  -*- C -*-

-   Copyright (C) 1992, 1993, 1995 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001
+   Free Software Foundation, Inc.

 
 

-This file is part of GDB.
+   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 2 of the License, or
-(at your option) any later version.
+   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 2 of the License, or
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 /* Parse a Chill expression from text in a string,
    and return the result as a  struct expression  pointer.
 
 /* Parse a Chill expression from text in a string,
    and return the result as a  struct expression  pointer.


@@ -26,15 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    during the process of parsing; the lower levels of the tree always
    come first in the result.
 
    during the process of parsing; the lower levels of the tree always
    come first in the result.
 

-   Note that malloc's and realloc's in this file are transformed to
-   xmalloc and xrealloc respectively by the same sed command in the
-   makefile that remaps any other malloc/realloc inserted by the parser
-   generator.  Doing this with #defines and trying to control the interaction
-   with include files (<malloc.h> and <stdlib.h> for example) just became
-   too messy, particularly when such includes can be inserted at random
-   times by the parser generator.
-
-   Also note that the language accepted by this parser is more liberal
+   Note that the language accepted by this parser is more liberal

    than the one accepted by an actual Chill compiler.  For example, the
    language rule that a simple name string can not be one of the reserved
    simple name strings is not enforced (e.g "case" is not treated as a
    than the one accepted by an actual Chill compiler.  For example, the
    language rule that a simple name string can not be one of the reserved
    simple name strings is not enforced (e.g "case" is not treated as a


@@ -52,113 +46,157 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
  */
 
 #include "defs.h"
  */
 
 #include "defs.h"

-#include <string.h>
+#include "gdb_string.h"

 #include <ctype.h>
 #include "expression.h"
 #include "language.h"
 #include "value.h"
 #include "parser-defs.h"
 #include "ch-lang.h"
 #include <ctype.h>
 #include "expression.h"
 #include "language.h"
 #include "value.h"
 #include "parser-defs.h"
 #include "ch-lang.h"

-#include "bfd.h" /* Required by objfiles.h.  */
-#include "symfile.h" /* Required by objfiles.h.  */
-#include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
+#include "bfd.h"               /* Required by objfiles.h.  */
+#include "symfile.h"           /* Required by objfiles.h.  */
+#include "objfiles.h"          /* For have_full_symbols and have_partial_symbols */
+
+#ifdef __GNUC__
+#define INLINE __inline__
+#endif

 
 typedef union
 
   {
     LONGEST lval;
 
 typedef union
 
   {
     LONGEST lval;

-    unsigned LONGEST ulval;
-    struct {
-      LONGEST val;
-      struct type *type;
-    } typed_val;
+    ULONGEST ulval;
+    struct
+      {
+       LONGEST val;
+       struct type *type;
+      }
+    typed_val;

     double dval;
     struct symbol *sym;
     struct type *tval;
     struct stoken sval;
     struct ttype tsym;
     struct symtoken ssym;
     double dval;
     struct symbol *sym;
     struct type *tval;
     struct stoken sval;
     struct ttype tsym;
     struct symtoken ssym;

-  }YYSTYPE;
-
-enum ch_terminal {
-  END_TOKEN = 0,
-  /* '\001' ... '\xff' come first. */
-  TOKEN_NOT_READ = 999,
-  INTEGER_LITERAL,
-  BOOLEAN_LITERAL,
-  CHARACTER_LITERAL,
-  FLOAT_LITERAL,
-  GENERAL_PROCEDURE_NAME,
-  LOCATION_NAME,
-  EMPTINESS_LITERAL,
-  CHARACTER_STRING_LITERAL,
-  BIT_STRING_LITERAL,
-  TYPENAME,
-  FIELD_NAME,
-  CASE,
-  OF,
-  ESAC,
-  LOGIOR,
-  ORIF,
-  LOGXOR,
-  LOGAND,
-  ANDIF,
-  NOTEQUAL,
-  GEQ,
-  LEQ,
-  IN,
-  SLASH_SLASH,
-  MOD,
-  REM,
-  NOT,
-  POINTER,
-  RECEIVE,
-  UP,
-  IF,
-  THEN,
-  ELSE,
-  FI,
-  ELSIF,
-  ILLEGAL_TOKEN,
-  NUM,
-  PRED,
-  SUCC,
-  ABS,
-  CARD,
-  MAX_TOKEN,
-  MIN_TOKEN,
-  ADDR_TOKEN,
-  SIZE,
-  UPPER,
-  LOWER,
-  LENGTH,
-  ARRAY,
-  GDB_VARIABLE,
-  GDB_ASSIGNMENT
-};
+  }
+YYSTYPE;
+
+enum ch_terminal
+  {
+    END_TOKEN = 0,
+    /* '\001' ... '\xff' come first. */
+    OPEN_PAREN = '(',
+    TOKEN_NOT_READ = 999,
+    INTEGER_LITERAL,
+    BOOLEAN_LITERAL,
+    CHARACTER_LITERAL,
+    FLOAT_LITERAL,
+    GENERAL_PROCEDURE_NAME,
+    LOCATION_NAME,
+    EMPTINESS_LITERAL,
+    CHARACTER_STRING_LITERAL,
+    BIT_STRING_LITERAL,
+    TYPENAME,
+    DOT_FIELD_NAME,            /* '.' followed by <field name> */
+    CASE,
+    OF,
+    ESAC,
+    LOGIOR,
+    ORIF,
+    LOGXOR,
+    LOGAND,
+    ANDIF,
+    NOTEQUAL,
+    GEQ,
+    LEQ,
+    IN,
+    SLASH_SLASH,
+    MOD,
+    REM,
+    NOT,
+    POINTER,
+    RECEIVE,
+    UP,
+    IF,
+    THEN,
+    ELSE,
+    FI,
+    ELSIF,
+    ILLEGAL_TOKEN,
+    NUM,
+    PRED,
+    SUCC,
+    ABS,
+    CARD,
+    MAX_TOKEN,
+    MIN_TOKEN,
+    ADDR_TOKEN,
+    SIZE,
+    UPPER,
+    LOWER,
+    LENGTH,
+    ARRAY,
+    GDB_VARIABLE,
+    GDB_ASSIGNMENT
+  };

 
 /* Forward declarations. */
 
 /* Forward declarations. */

-static void parse_expr ();
-static void parse_primval ();
-static void parse_untyped_expr ();
-static int parse_opt_untyped_expr ();
-static void parse_if_expression_body PARAMS((void));
-static void write_lower_upper_value PARAMS ((enum exp_opcode, struct type *));
-static enum ch_terminal ch_lex ();
+
+static void write_lower_upper_value (enum exp_opcode, struct type *);
+static enum ch_terminal match_bitstring_literal (void);
+static enum ch_terminal match_integer_literal (void);
+static enum ch_terminal match_character_literal (void);
+static enum ch_terminal match_string_literal (void);
+static enum ch_terminal match_float_literal (void);
+static int decode_integer_literal (LONGEST *, char **);
+static int decode_integer_value (int, char **, LONGEST *);
+static char *match_simple_name_string (void);
+static void growbuf_by_size (int);
+static void parse_case_label (void);
+static void parse_untyped_expr (void);
+static void parse_if_expression (void);
+static void parse_if_expression_body (void);
+static void parse_else_alternative (void);
+static void parse_then_alternative (void);
+static void parse_expr (void);
+static void parse_operand0 (void);
+static void parse_operand1 (void);
+static void parse_operand2 (void);
+static void parse_operand3 (void);
+static void parse_operand4 (void);
+static void parse_operand5 (void);
+static void parse_operand6 (void);
+static void parse_primval (void);
+static void parse_tuple (struct type *);
+static void parse_opt_element_list (struct type *);
+static void parse_tuple_element (struct type *);
+static void parse_named_record_element (void);
+static void parse_call (void);
+static struct type *parse_mode_or_normal_call (void);
+#if 0
+static struct type *parse_mode_call (void);
+#endif
+static void parse_unary_call (void);
+static int parse_opt_untyped_expr (void);
+static int expect (enum ch_terminal, char *);
+static enum ch_terminal ch_lex (void);
+INLINE static enum ch_terminal PEEK_TOKEN (void);
+static enum ch_terminal peek_token_ (int);
+static void forward_token_ (void);
+static void require (enum ch_terminal);
+static int check_token (enum ch_terminal);

 
 #define MAX_LOOK_AHEAD 2
 
 #define MAX_LOOK_AHEAD 2

-static enum ch_terminal terminal_buffer[MAX_LOOK_AHEAD+1] = {
+static enum ch_terminal terminal_buffer[MAX_LOOK_AHEAD + 1] =
+{

   TOKEN_NOT_READ, TOKEN_NOT_READ, TOKEN_NOT_READ};
 static YYSTYPE yylval;
   TOKEN_NOT_READ, TOKEN_NOT_READ, TOKEN_NOT_READ};
 static YYSTYPE yylval;

-static YYSTYPE val_buffer[MAX_LOOK_AHEAD+1];
+static YYSTYPE val_buffer[MAX_LOOK_AHEAD + 1];

 
 

-/*int current_token, lookahead_token;*/
+/*int current_token, lookahead_token; */

 
 

-#ifdef __GNUC__
-__inline__
-#endif
-static enum ch_terminal
-PEEK_TOKEN()
+INLINE static enum ch_terminal
+PEEK_TOKEN (void)

 {
   if (terminal_buffer[0] == TOKEN_NOT_READ)
     {
 {
   if (terminal_buffer[0] == TOKEN_NOT_READ)
     {


@@ -171,11 +209,11 @@ PEEK_TOKEN()
 #define PEEK_TOKEN1() peek_token_(1)
 #define PEEK_TOKEN2() peek_token_(2)
 static enum ch_terminal
 #define PEEK_TOKEN1() peek_token_(1)
 #define PEEK_TOKEN2() peek_token_(2)
 static enum ch_terminal

-peek_token_ (i)
-     int i;
+peek_token_ (int i)

 {
   if (i > MAX_LOOK_AHEAD)
 {
   if (i > MAX_LOOK_AHEAD)

-    fatal ("internal error - too much lookahead");
+    internal_error (__FILE__, __LINE__,
+                   "too much lookahead");

   if (terminal_buffer[i] == TOKEN_NOT_READ)
     {
       terminal_buffer[i] = ch_lex ();
   if (terminal_buffer[i] == TOKEN_NOT_READ)
     {
       terminal_buffer[i] = ch_lex ();


@@ -184,31 +222,34 @@ peek_token_ (i)
   return terminal_buffer[i];
 }
 
   return terminal_buffer[i];
 }
 

+#if 0
+

 static void
 static void

-pushback_token (code, node)
-     enum ch_terminal code;
-     YYSTYPE node;
+pushback_token (enum ch_terminal code, YYSTYPE node)

 {
   int i;
   if (terminal_buffer[MAX_LOOK_AHEAD] != TOKEN_NOT_READ)
 {
   int i;
   if (terminal_buffer[MAX_LOOK_AHEAD] != TOKEN_NOT_READ)

-    fatal ("internal error - cannot pushback token");
+    internal_error (__FILE__, __LINE__,
+                   "cannot pushback token");

   for (i = MAX_LOOK_AHEAD; i > 0; i--)
   for (i = MAX_LOOK_AHEAD; i > 0; i--)

-    { 
-      terminal_buffer[i] = terminal_buffer[i - 1]; 
+    {
+      terminal_buffer[i] = terminal_buffer[i - 1];

       val_buffer[i] = val_buffer[i - 1];
       val_buffer[i] = val_buffer[i - 1];

-  }
+    }

   terminal_buffer[0] = code;
   val_buffer[0] = node;
 }
 
   terminal_buffer[0] = code;
   val_buffer[0] = node;
 }
 

+#endif
+

 static void
 static void

-forward_token_()
+forward_token_ (void)

 {
   int i;
   for (i = 0; i < MAX_LOOK_AHEAD; i++)
     {
 {
   int i;
   for (i = 0; i < MAX_LOOK_AHEAD; i++)
     {

-      terminal_buffer[i] = terminal_buffer[i+1];
-      val_buffer[i] = val_buffer[i+1];
+      terminal_buffer[i] = terminal_buffer[i + 1];
+      val_buffer[i] = val_buffer[i + 1];

     }
   terminal_buffer[MAX_LOOK_AHEAD] = TOKEN_NOT_READ;
 }
     }
   terminal_buffer[MAX_LOOK_AHEAD] = TOKEN_NOT_READ;
 }


@@ -217,24 +258,21 @@ forward_token_()
 /* Skip the next token.
    if it isn't TOKEN, the parser is broken. */
 
 /* Skip the next token.
    if it isn't TOKEN, the parser is broken. */
 

-void
-require(token)
-     enum ch_terminal token;
+static void
+require (enum ch_terminal token)

 {
 {

-  if (PEEK_TOKEN() != token)
+  if (PEEK_TOKEN () != token)

     {
     {

-      char buf[80];
-      sprintf (buf, "internal parser error - expected token %d", (int)token);
-      fatal(buf);
+      internal_error (__FILE__, __LINE__,
+                     "expected token %d", (int) token);

     }
     }

-  FORWARD_TOKEN();
+  FORWARD_TOKEN ();

 }
 
 }
 

-int
-check_token (token)
-     enum ch_terminal token;
+static int
+check_token (enum ch_terminal token)

 {
 {

-  if (PEEK_TOKEN() != token)
+  if (PEEK_TOKEN () != token)

     return 0;
   FORWARD_TOKEN ();
   return 1;
     return 0;
   FORWARD_TOKEN ();
   return 1;


@@ -242,13 +280,11 @@ check_token (token)
 
 /* return 0 if expected token was not found,
    else return 1.
 
 /* return 0 if expected token was not found,
    else return 1.

-*/
-int
-expect(token, message)
-     enum ch_terminal token;
-     char *message;
+ */
+static int
+expect (enum ch_terminal token, char *message)

 {
 {

-  if (PEEK_TOKEN() != token)
+  if (PEEK_TOKEN () != token)

     {
       if (message)
        error (message);
     {
       if (message)
        error (message);


@@ -259,16 +295,17 @@ expect(token, message)
       return 0;
     }
   else
       return 0;
     }
   else

-    FORWARD_TOKEN();
+    FORWARD_TOKEN ();

   return 1;
 }
 
 #if 0
   return 1;
 }
 
 #if 0

+/* Parse a name string.  If ALLOW_ALL is 1, ALL is allowed as a postfix. */
+

 static tree
 static tree

-parse_opt_name_string (allow_all)
-     int allow_all; /* 1 if ALL is allowed as a postfix */
+parse_opt_name_string (int allow_all)

 {
 {

-  int token = PEEK_TOKEN();
+  int token = PEEK_TOKEN ();

   tree name;
   if (token != NAME)
     {
   tree name;
   if (token != NAME)
     {


@@ -279,17 +316,17 @@ parse_opt_name_string (allow_all)
        }
       return NULL_TREE;
     }
        }
       return NULL_TREE;
     }

-  name = PEEK_LVAL();
+  name = PEEK_LVAL ();

   for (;;)
     {
       FORWARD_TOKEN ();
   for (;;)
     {
       FORWARD_TOKEN ();

-      token = PEEK_TOKEN();
+      token = PEEK_TOKEN ();

       if (token != '!')
        return name;
       if (token != '!')
        return name;

-      FORWARD_TOKEN();
-      token = PEEK_TOKEN();
+      FORWARD_TOKEN ();
+      token = PEEK_TOKEN ();

       if (token == ALL && allow_all)
       if (token == ALL && allow_all)

-       return get_identifier3(IDENTIFIER_POINTER (name), "!", "*");
+       return get_identifier3 (IDENTIFIER_POINTER (name), "!", "*");

       if (token != NAME)
        {
          if (pass == 1)
       if (token != NAME)
        {
          if (pass == 1)


@@ -297,15 +334,15 @@ parse_opt_name_string (allow_all)
                   IDENTIFIER_POINTER (name));
          return name;
        }
                   IDENTIFIER_POINTER (name));
          return name;
        }

-      name = get_identifier3(IDENTIFIER_POINTER(name),
-                            "!", IDENTIFIER_POINTER(PEEK_LVAL()));
+      name = get_identifier3 (IDENTIFIER_POINTER (name),
+                             "!", IDENTIFIER_POINTER (PEEK_LVAL ()));

     }
 }
 
 static tree
     }
 }
 
 static tree

-parse_simple_name_string ()
+parse_simple_name_string (void)

 {
 {

-  int token = PEEK_TOKEN();
+  int token = PEEK_TOKEN ();

   tree name;
   if (token != NAME)
     {
   tree name;
   if (token != NAME)
     {


@@ -318,7 +355,7 @@ parse_simple_name_string ()
 }
 
 static tree
 }
 
 static tree

-parse_name_string ()
+parse_name_string (void)

 {
   tree name = parse_opt_name_string (0);
   if (name)
 {
   tree name = parse_opt_name_string (0);
   if (name)


@@ -333,7 +370,7 @@ parse_name_string ()
    Returns if pass 2: a decl or value for identifier. */
 
 static tree
    Returns if pass 2: a decl or value for identifier. */
 
 static tree

-parse_name ()
+parse_name (void)

 {
   tree name = parse_name_string ();
   if (pass == 1 || ignoring)
 {
   tree name = parse_name_string ();
   if (pass == 1 || ignoring)


@@ -354,14 +391,13 @@ parse_name ()
        return convert_from_reference (decl);
       else
        return decl;
        return convert_from_reference (decl);
       else
        return decl;

-    } 
+    }

 }
 #endif
 
 #if 0
 static void
 }
 #endif
 
 #if 0
 static void

-pushback_paren_expr (expr)
-     tree expr;
+pushback_paren_expr (tree expr)

 {
   if (pass == 1 && !ignoring)
     expr = build1 (PAREN_EXPR, NULL_TREE, expr);
 {
   if (pass == 1 && !ignoring)
     expr = build1 (PAREN_EXPR, NULL_TREE, expr);


@@ -372,7 +408,7 @@ pushback_paren_expr (expr)
 /* Matches: <case label> */
 
 static void
 /* Matches: <case label> */
 
 static void

-parse_case_label ()
+parse_case_label (void)

 {
   if (check_token (ELSE))
     error ("ELSE in tuples labels not implemented");
 {
   if (check_token (ELSE))
     error ("ELSE in tuples labels not implemented");


@@ -386,7 +422,7 @@ parse_case_label ()
 }
 
 static int
 }
 
 static int

-parse_opt_untyped_expr ()
+parse_opt_untyped_expr (void)

 {
   switch (PEEK_TOKEN ())
     {
 {
   switch (PEEK_TOKEN ())
     {


@@ -401,7 +437,7 @@ parse_opt_untyped_expr ()
 }
 
 static void
 }
 
 static void

-parse_unary_call ()
+parse_unary_call (void)

 {
   FORWARD_TOKEN ();
   expect ('(', NULL);
 {
   FORWARD_TOKEN ();
   expect ('(', NULL);


@@ -411,29 +447,33 @@ parse_unary_call ()
 
 /* Parse NAME '(' MODENAME ')'. */
 
 
 /* Parse NAME '(' MODENAME ')'. */
 

-struct type *
-parse_mode_call ()
+#if 0
+
+static struct type *
+parse_mode_call (void)

 {
   struct type *type;
   FORWARD_TOKEN ();
   expect ('(', NULL);
   if (PEEK_TOKEN () != TYPENAME)
     error ("expect MODENAME here `%s'", lexptr);
 {
   struct type *type;
   FORWARD_TOKEN ();
   expect ('(', NULL);
   if (PEEK_TOKEN () != TYPENAME)
     error ("expect MODENAME here `%s'", lexptr);

-  type = PEEK_LVAL().tsym.type;
+  type = PEEK_LVAL ().tsym.type;

   FORWARD_TOKEN ();
   expect (')', NULL);
   return type;
 }
 
   FORWARD_TOKEN ();
   expect (')', NULL);
   return type;
 }
 

-struct type *
-parse_mode_or_normal_call ()
+#endif
+
+static struct type *
+parse_mode_or_normal_call (void)

 {
   struct type *type;
   FORWARD_TOKEN ();
   expect ('(', NULL);
   if (PEEK_TOKEN () == TYPENAME)
     {
 {
   struct type *type;
   FORWARD_TOKEN ();
   expect ('(', NULL);
   if (PEEK_TOKEN () == TYPENAME)
     {

-      type = PEEK_LVAL().tsym.type;
+      type = PEEK_LVAL ().tsym.type;

       FORWARD_TOKEN ();
     }
   else
       FORWARD_TOKEN ();
     }
   else


@@ -449,7 +489,7 @@ parse_mode_or_normal_call ()
    Assume we have parsed the function, and are at the '('. */
 
 static void
    Assume we have parsed the function, and are at the '('. */
 
 static void

-parse_call ()
+parse_call (void)

 {
   int arg_count;
   require ('(');
 {
   int arg_count;
   require ('(');


@@ -486,10 +526,14 @@ parse_call ()
 }
 
 static void
 }
 
 static void

-parse_named_record_element ()
+parse_named_record_element (void)

 {
 {

-  struct stoken label = PEEK_LVAL ().sval;
-  expect (FIELD_NAME, "expected a field name here `%s'", lexptr);
+  struct stoken label;
+  char buf[256];
+
+  label = PEEK_LVAL ().sval;
+  sprintf (buf, "expected a field name here `%s'", lexptr);
+  expect (DOT_FIELD_NAME, buf);

   if (check_token (','))
     parse_named_record_element ();
   else if (check_token (':'))
   if (check_token (','))
     parse_named_record_element ();
   else if (check_token (':'))


@@ -501,12 +545,12 @@ parse_named_record_element ()
   write_exp_elt_opcode (OP_LABELED);
 }
 
   write_exp_elt_opcode (OP_LABELED);
 }
 

-/* Returns one or nore TREE_LIST nodes, in reverse order. */
+/* Returns one or more TREE_LIST nodes, in reverse order. */

 
 static void
 
 static void

-parse_tuple_element ()
+parse_tuple_element (struct type *type)

 {
 {

-  if (PEEK_TOKEN () == FIELD_NAME)
+  if (PEEK_TOKEN () == DOT_FIELD_NAME)

     {
       /* Parse a labelled structure tuple. */
       parse_named_record_element ();
     {
       /* Parse a labelled structure tuple. */
       parse_named_record_element ();


@@ -518,7 +562,32 @@ parse_tuple_element ()
       if (check_token ('*'))
        {
          expect (')', "missing ')' after '*' case label list");
       if (check_token ('*'))
        {
          expect (')', "missing ')' after '*' case label list");

-         error ("(*) not implemented in case label list");
+         if (type)
+           {
+             if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
+               {
+                 /* do this as a range from low to high */
+                 struct type *range_type = TYPE_FIELD_TYPE (type, 0);
+                 LONGEST low_bound, high_bound;
+                 if (get_discrete_bounds (range_type, &low_bound, &high_bound) < 0)
+                   error ("cannot determine bounds for (*)");
+                 /* lower bound */
+                 write_exp_elt_opcode (OP_LONG);
+                 write_exp_elt_type (range_type);
+                 write_exp_elt_longcst (low_bound);
+                 write_exp_elt_opcode (OP_LONG);
+                 /* upper bound */
+                 write_exp_elt_opcode (OP_LONG);
+                 write_exp_elt_type (range_type);
+                 write_exp_elt_longcst (high_bound);
+                 write_exp_elt_opcode (OP_LONG);
+                 write_exp_elt_opcode (BINOP_RANGE);
+               }
+             else
+               error ("(*) in invalid context");
+           }
+         else
+           error ("(*) only possible with modename in front of tuple (mode[..])");

        }
       else
        {
        }
       else
        {


@@ -544,14 +613,14 @@ parse_tuple_element ()
 /* Matches:  a COMMA-separated list of tuple elements.
    Returns a list (of TREE_LIST nodes). */
 static void
 /* Matches:  a COMMA-separated list of tuple elements.
    Returns a list (of TREE_LIST nodes). */
 static void

-parse_opt_element_list ()
+parse_opt_element_list (struct type *type)

 {
   arglist_len = 0;
   if (PEEK_TOKEN () == ']')
     return;
   for (;;)
     {
 {
   arglist_len = 0;
   if (PEEK_TOKEN () == ']')
     return;
   for (;;)
     {

-      parse_tuple_element ();
+      parse_tuple_element (type);

       arglist_len++;
       if (PEEK_TOKEN () == ']')
        break;
       arglist_len++;
       if (PEEK_TOKEN () == ']')
        break;


@@ -564,19 +633,27 @@ parse_opt_element_list ()
    If modename is non-NULL it prefixed the tuple.  */
 
 static void
    If modename is non-NULL it prefixed the tuple.  */
 
 static void

-parse_tuple (mode)
-     struct type *mode;
+parse_tuple (struct type *mode)

 {
 {

+  struct type *type;
+  if (mode)
+    type = check_typedef (mode);
+  else
+    type = 0;

   require ('[');
   start_arglist ();
   require ('[');
   start_arglist ();

-  parse_opt_element_list ();
+  parse_opt_element_list (type);

   expect (']', "missing ']' after tuple");
   write_exp_elt_opcode (OP_ARRAY);
   write_exp_elt_longcst ((LONGEST) 0);
   write_exp_elt_longcst ((LONGEST) end_arglist () - 1);
   write_exp_elt_opcode (OP_ARRAY);
   expect (']', "missing ']' after tuple");
   write_exp_elt_opcode (OP_ARRAY);
   write_exp_elt_longcst ((LONGEST) 0);
   write_exp_elt_longcst ((LONGEST) end_arglist () - 1);
   write_exp_elt_opcode (OP_ARRAY);

-  if (mode)
+  if (type)

     {
     {

+      if (TYPE_CODE (type) != TYPE_CODE_ARRAY
+         && TYPE_CODE (type) != TYPE_CODE_STRUCT
+         && TYPE_CODE (type) != TYPE_CODE_SET)
+       error ("invalid tuple mode");

       write_exp_elt_opcode (UNOP_CAST);
       write_exp_elt_type (mode);
       write_exp_elt_opcode (UNOP_CAST);
       write_exp_elt_opcode (UNOP_CAST);
       write_exp_elt_type (mode);
       write_exp_elt_opcode (UNOP_CAST);


@@ -584,18 +661,18 @@ parse_tuple (mode)
 }
 
 static void
 }
 
 static void

-parse_primval ()
+parse_primval (void)

 {
   struct type *type;
   enum exp_opcode op;
   char *op_name;
   switch (PEEK_TOKEN ())
     {
 {
   struct type *type;
   enum exp_opcode op;
   char *op_name;
   switch (PEEK_TOKEN ())
     {

-    case INTEGER_LITERAL: 
+    case INTEGER_LITERAL:

     case CHARACTER_LITERAL:
       write_exp_elt_opcode (OP_LONG);
       write_exp_elt_type (PEEK_LVAL ().typed_val.type);
     case CHARACTER_LITERAL:
       write_exp_elt_opcode (OP_LONG);
       write_exp_elt_type (PEEK_LVAL ().typed_val.type);

-      write_exp_elt_longcst ((LONGEST) (PEEK_LVAL ().typed_val.val));
+      write_exp_elt_longcst (PEEK_LVAL ().typed_val.val);

       write_exp_elt_opcode (OP_LONG);
       FORWARD_TOKEN ();
       break;
       write_exp_elt_opcode (OP_LONG);
       FORWARD_TOKEN ();
       break;


@@ -634,19 +711,20 @@ parse_primval ()
     case ARRAY:
       FORWARD_TOKEN ();
       /* This is pseudo-Chill, similar to C's '(TYPE[])EXPR'
     case ARRAY:
       FORWARD_TOKEN ();
       /* This is pseudo-Chill, similar to C's '(TYPE[])EXPR'

-        which casts to an artificial array. */
+         which casts to an artificial array. */

       expect ('(', NULL);
       expect (')', NULL);
       if (PEEK_TOKEN () != TYPENAME)
        error ("missing MODENAME after ARRAY()");
       expect ('(', NULL);
       expect (')', NULL);
       if (PEEK_TOKEN () != TYPENAME)
        error ("missing MODENAME after ARRAY()");

-      type = PEEK_LVAL().tsym.type;
+      type = PEEK_LVAL ().tsym.type;
+      FORWARD_TOKEN ();

       expect ('(', NULL);
       parse_expr ();
       expect (')', "missing right parenthesis");
       type = create_array_type ((struct type *) NULL, type,
                                create_range_type ((struct type *) NULL,
                                                   builtin_type_int, 0, 0));
       expect ('(', NULL);
       parse_expr ();
       expect (')', "missing right parenthesis");
       type = create_array_type ((struct type *) NULL, type,
                                create_range_type ((struct type *) NULL,
                                                   builtin_type_int, 0, 0));

-      TYPE_ARRAY_UPPER_BOUND_TYPE(type) = BOUND_CANNOT_BE_DETERMINED;
+      TYPE_ARRAY_UPPER_BOUND_TYPE (type) = BOUND_CANNOT_BE_DETERMINED;

       write_exp_elt_opcode (UNOP_CAST);
       write_exp_elt_type (type);
       write_exp_elt_opcode (UNOP_CAST);
       write_exp_elt_opcode (UNOP_CAST);
       write_exp_elt_type (type);
       write_exp_elt_opcode (UNOP_CAST);


@@ -654,7 +732,7 @@ parse_primval ()
 #if 0
     case CONST:
     case EXPR:
 #if 0
     case CONST:
     case EXPR:

-      val = PEEK_LVAL();
+      val = PEEK_LVAL ();

       FORWARD_TOKEN ();
       break;
 #endif
       FORWARD_TOKEN ();
       break;
 #endif


@@ -674,7 +752,7 @@ parse_primval ()
       write_exp_elt_opcode (OP_VAR_VALUE);
       FORWARD_TOKEN ();
       break;
       write_exp_elt_opcode (OP_VAR_VALUE);
       FORWARD_TOKEN ();
       break;

-    case GDB_VARIABLE: /* gdb specific */
+    case GDB_VARIABLE:         /* gdb specific */

       FORWARD_TOKEN ();
       break;
     case NUM:
       FORWARD_TOKEN ();
       break;
     case NUM:


@@ -683,12 +761,27 @@ parse_primval ()
       write_exp_elt_type (builtin_type_int);
       write_exp_elt_opcode (UNOP_CAST);
       break;
       write_exp_elt_type (builtin_type_int);
       write_exp_elt_opcode (UNOP_CAST);
       break;

-    case PRED:      op_name = "PRED"; goto unimplemented_unary_builtin;
-    case SUCC:      op_name = "SUCC"; goto unimplemented_unary_builtin;
-    case ABS:       op_name = "ABS";  goto unimplemented_unary_builtin;
-    case CARD:      op_name = "CARD"; goto unimplemented_unary_builtin;
-    case MAX_TOKEN: op_name = "MAX";  goto unimplemented_unary_builtin;
-    case MIN_TOKEN: op_name = "MIN";  goto unimplemented_unary_builtin;
+    case CARD:
+      parse_unary_call ();
+      write_exp_elt_opcode (UNOP_CARD);
+      break;
+    case MAX_TOKEN:
+      parse_unary_call ();
+      write_exp_elt_opcode (UNOP_CHMAX);
+      break;
+    case MIN_TOKEN:
+      parse_unary_call ();
+      write_exp_elt_opcode (UNOP_CHMIN);
+      break;
+    case PRED:
+      op_name = "PRED";
+      goto unimplemented_unary_builtin;
+    case SUCC:
+      op_name = "SUCC";
+      goto unimplemented_unary_builtin;
+    case ABS:
+      op_name = "ABS";
+      goto unimplemented_unary_builtin;

     unimplemented_unary_builtin:
       parse_unary_call ();
       error ("not implemented:  %s builtin function", op_name);
     unimplemented_unary_builtin:
       parse_unary_call ();
       error ("not implemented:  %s builtin function", op_name);


@@ -700,7 +793,8 @@ parse_primval ()
     case SIZE:
       type = parse_mode_or_normal_call ();
       if (type)
     case SIZE:
       type = parse_mode_or_normal_call ();
       if (type)

-       { write_exp_elt_opcode (OP_LONG);
+       {
+         write_exp_elt_opcode (OP_LONG);

          write_exp_elt_type (builtin_type_int);
          CHECK_TYPEDEF (type);
          write_exp_elt_longcst ((LONGEST) TYPE_LENGTH (type));
          write_exp_elt_type (builtin_type_int);
          CHECK_TYPEDEF (type);
          write_exp_elt_longcst ((LONGEST) TYPE_LENGTH (type));


@@ -726,7 +820,7 @@ parse_primval ()
     case TYPENAME:
       type = PEEK_LVAL ().tsym.type;
       FORWARD_TOKEN ();
     case TYPENAME:
       type = PEEK_LVAL ().tsym.type;
       FORWARD_TOKEN ();

-      switch (PEEK_TOKEN())
+      switch (PEEK_TOKEN ())

        {
        case '[':
          parse_tuple (type);
        {
        case '[':
          parse_tuple (type);


@@ -743,15 +837,15 @@ parse_primval ()
          error ("typename in invalid context");
        }
       break;
          error ("typename in invalid context");
        }
       break;

-      
-    default: 
+
+    default:

       error ("invalid expression syntax at `%s'", lexptr);
     }
   for (;;)
     {
       switch (PEEK_TOKEN ())
        {
       error ("invalid expression syntax at `%s'", lexptr);
     }
   for (;;)
     {
       switch (PEEK_TOKEN ())
        {

-       case FIELD_NAME:
+       case DOT_FIELD_NAME:

          write_exp_elt_opcode (STRUCTOP_STRUCT);
          write_exp_string (PEEK_LVAL ().sval);
          write_exp_elt_opcode (STRUCTOP_STRUCT);
          write_exp_elt_opcode (STRUCTOP_STRUCT);
          write_exp_string (PEEK_LVAL ().sval);
          write_exp_elt_opcode (STRUCTOP_STRUCT);


@@ -769,7 +863,7 @@ parse_primval ()
            }
          write_exp_elt_opcode (UNOP_IND);
          continue;
            }
          write_exp_elt_opcode (UNOP_IND);
          continue;

-       case '(':
+       case OPEN_PAREN:

          parse_call ();
          continue;
        case CHARACTER_STRING_LITERAL:
          parse_call ();
          continue;
        case CHARACTER_STRING_LITERAL:


@@ -781,6 +875,55 @@ parse_primval ()
          write_exp_elt_longcst (1);
          write_exp_elt_opcode (MULTI_SUBSCRIPT);
          continue;
          write_exp_elt_longcst (1);
          write_exp_elt_opcode (MULTI_SUBSCRIPT);
          continue;

+       case END_TOKEN:
+       case TOKEN_NOT_READ:
+       case INTEGER_LITERAL:
+       case BOOLEAN_LITERAL:
+       case FLOAT_LITERAL:
+       case GENERAL_PROCEDURE_NAME:
+       case LOCATION_NAME:
+       case EMPTINESS_LITERAL:
+       case TYPENAME:
+       case CASE:
+       case OF:
+       case ESAC:
+       case LOGIOR:
+       case ORIF:
+       case LOGXOR:
+       case LOGAND:
+       case ANDIF:
+       case NOTEQUAL:
+       case GEQ:
+       case LEQ:
+       case IN:
+       case SLASH_SLASH:
+       case MOD:
+       case REM:
+       case NOT:
+       case RECEIVE:
+       case UP:
+       case IF:
+       case THEN:
+       case ELSE:
+       case FI:
+       case ELSIF:
+       case ILLEGAL_TOKEN:
+       case NUM:
+       case PRED:
+       case SUCC:
+       case ABS:
+       case CARD:
+       case MAX_TOKEN:
+       case MIN_TOKEN:
+       case ADDR_TOKEN:
+       case SIZE:
+       case UPPER:
+       case LOWER:
+       case LENGTH:
+       case ARRAY:
+       case GDB_VARIABLE:
+       case GDB_ASSIGNMENT:
+         break;

        }
       break;
     }
        }
       break;
     }


@@ -788,7 +931,7 @@ parse_primval ()
 }
 
 static void
 }
 
 static void

-parse_operand6 ()
+parse_operand6 (void)

 {
   if (check_token (RECEIVE))
     {
 {
   if (check_token (RECEIVE))
     {


@@ -801,11 +944,11 @@ parse_operand6 ()
       write_exp_elt_opcode (UNOP_ADDR);
     }
   else
       write_exp_elt_opcode (UNOP_ADDR);
     }
   else

-    parse_primval();
+    parse_primval ();

 }
 
 static void
 }
 
 static void

-parse_operand5()
+parse_operand5 (void)

 {
   enum exp_opcode op;
   /* We are supposed to be looking for a <string repetition operator>,
 {
   enum exp_opcode op;
   /* We are supposed to be looking for a <string repetition operator>,


@@ -817,65 +960,83 @@ parse_operand5()
      Is that a function call or string repetition?
      Instead, we handle string repetition in parse_primval,
      and build_generalized_call. */
      Is that a function call or string repetition?
      Instead, we handle string repetition in parse_primval,
      and build_generalized_call. */

-  switch (PEEK_TOKEN())
+  switch (PEEK_TOKEN ())

     {
     {

-    case NOT:  op = UNOP_LOGICAL_NOT; break;
-    case '-':  op = UNOP_NEG; break;
+    case NOT:
+      op = UNOP_LOGICAL_NOT;
+      break;
+    case '-':
+      op = UNOP_NEG;
+      break;

     default:
       op = OP_NULL;
     }
   if (op != OP_NULL)
     default:
       op = OP_NULL;
     }
   if (op != OP_NULL)

-    FORWARD_TOKEN();
-  parse_operand6();
+    FORWARD_TOKEN ();
+  parse_operand6 ();

   if (op != OP_NULL)
     write_exp_elt_opcode (op);
 }
 
 static void
   if (op != OP_NULL)
     write_exp_elt_opcode (op);
 }
 
 static void

-parse_operand4 ()
+parse_operand4 (void)

 {
   enum exp_opcode op;
 {
   enum exp_opcode op;

-  parse_operand5();
+  parse_operand5 ();

   for (;;)
     {
   for (;;)
     {

-      switch (PEEK_TOKEN())
+      switch (PEEK_TOKEN ())

        {
        {

-       case '*':  op = BINOP_MUL; break;
-       case '/':  op = BINOP_DIV; break;
-       case MOD:  op = BINOP_MOD; break;
-       case REM:  op = BINOP_REM; break;
+       case '*':
+         op = BINOP_MUL;
+         break;
+       case '/':
+         op = BINOP_DIV;
+         break;
+       case MOD:
+         op = BINOP_MOD;
+         break;
+       case REM:
+         op = BINOP_REM;
+         break;

        default:
          return;
        }
        default:
          return;
        }

-      FORWARD_TOKEN();
-      parse_operand5();
+      FORWARD_TOKEN ();
+      parse_operand5 ();

       write_exp_elt_opcode (op);
     }
 }
 
 static void
       write_exp_elt_opcode (op);
     }
 }
 
 static void

-parse_operand3 ()
+parse_operand3 (void)

 {
   enum exp_opcode op;
   parse_operand4 ();
   for (;;)
     {
 {
   enum exp_opcode op;
   parse_operand4 ();
   for (;;)
     {

-      switch (PEEK_TOKEN())
+      switch (PEEK_TOKEN ())

        {
        {

-       case '+':    op = BINOP_ADD; break;
-       case '-':    op = BINOP_SUB; break;
-       case SLASH_SLASH: op = BINOP_CONCAT; break;
+       case '+':
+         op = BINOP_ADD;
+         break;
+       case '-':
+         op = BINOP_SUB;
+         break;
+       case SLASH_SLASH:
+         op = BINOP_CONCAT;
+         break;

        default:
          return;
        }
        default:
          return;
        }

-      FORWARD_TOKEN();
-      parse_operand4();
+      FORWARD_TOKEN ();
+      parse_operand4 ();

       write_exp_elt_opcode (op);
     }
 }
 
 static void
       write_exp_elt_opcode (op);
     }
 }
 
 static void

-parse_operand2 ()
+parse_operand2 (void)

 {
   enum exp_opcode op;
   parse_operand3 ();
 {
   enum exp_opcode op;
   parse_operand3 ();


@@ -883,72 +1044,94 @@ parse_operand2 ()
     {
       if (check_token (IN))
        {
     {
       if (check_token (IN))
        {

-         parse_operand3();
+         parse_operand3 ();

          write_exp_elt_opcode (BINOP_IN);
        }
       else
        {
          write_exp_elt_opcode (BINOP_IN);
        }
       else
        {

-         switch (PEEK_TOKEN())
+         switch (PEEK_TOKEN ())

            {
            {

-           case '>':      op = BINOP_GTR; break;
-           case GEQ:      op = BINOP_GEQ; break;
-           case '<':      op = BINOP_LESS; break;
-           case LEQ:      op = BINOP_LEQ; break;
-           case '=':      op = BINOP_EQUAL; break;
-           case NOTEQUAL: op = BINOP_NOTEQUAL; break;
+           case '>':
+             op = BINOP_GTR;
+             break;
+           case GEQ:
+             op = BINOP_GEQ;
+             break;
+           case '<':
+             op = BINOP_LESS;
+             break;
+           case LEQ:
+             op = BINOP_LEQ;
+             break;
+           case '=':
+             op = BINOP_EQUAL;
+             break;
+           case NOTEQUAL:
+             op = BINOP_NOTEQUAL;
+             break;

            default:
              return;
            }
            default:
              return;
            }

-         FORWARD_TOKEN();
-         parse_operand3();
+         FORWARD_TOKEN ();
+         parse_operand3 ();

          write_exp_elt_opcode (op);
        }
     }
 }
 
 static void
          write_exp_elt_opcode (op);
        }
     }
 }
 
 static void

-parse_operand1 ()
+parse_operand1 (void)

 {
   enum exp_opcode op;
   parse_operand2 ();
   for (;;)
     {
 {
   enum exp_opcode op;
   parse_operand2 ();
   for (;;)
     {

-      switch (PEEK_TOKEN())
+      switch (PEEK_TOKEN ())

        {
        {

-       case LOGAND: op = BINOP_BITWISE_AND; break;
-       case ANDIF:  op = BINOP_LOGICAL_AND; break;
+       case LOGAND:
+         op = BINOP_BITWISE_AND;
+         break;
+       case ANDIF:
+         op = BINOP_LOGICAL_AND;
+         break;

        default:
          return;
        }
        default:
          return;
        }

-      FORWARD_TOKEN();
-      parse_operand2();
+      FORWARD_TOKEN ();
+      parse_operand2 ();

       write_exp_elt_opcode (op);
     }
 }
 
 static void
       write_exp_elt_opcode (op);
     }
 }
 
 static void

-parse_operand0 ()
-{ 
+parse_operand0 (void)
+{

   enum exp_opcode op;
   enum exp_opcode op;

-  parse_operand1();
+  parse_operand1 ();

   for (;;)
     {
   for (;;)
     {

-      switch (PEEK_TOKEN())
+      switch (PEEK_TOKEN ())

        {
        {

-       case LOGIOR:  op = BINOP_BITWISE_IOR; break;
-       case LOGXOR:  op = BINOP_BITWISE_XOR; break;
-       case ORIF:    op = BINOP_LOGICAL_OR; break;
+       case LOGIOR:
+         op = BINOP_BITWISE_IOR;
+         break;
+       case LOGXOR:
+         op = BINOP_BITWISE_XOR;
+         break;
+       case ORIF:
+         op = BINOP_LOGICAL_OR;
+         break;

        default:
          return;
        }
        default:
          return;
        }

-      FORWARD_TOKEN();
-      parse_operand1();
+      FORWARD_TOKEN ();
+      parse_operand1 ();

       write_exp_elt_opcode (op);
     }
 }
 
 static void
       write_exp_elt_opcode (op);
     }
 }
 
 static void

-parse_expr ()
+parse_expr (void)

 {
   parse_operand0 ();
   if (check_token (GDB_ASSIGNMENT))
 {
   parse_operand0 ();
   if (check_token (GDB_ASSIGNMENT))


@@ -959,14 +1142,14 @@ parse_expr ()
 }
 
 static void
 }
 
 static void

-parse_then_alternative ()
+parse_then_alternative (void)

 {
   expect (THEN, "missing 'THEN' in 'IF' expression");
   parse_expr ();
 }
 
 static void
 {
   expect (THEN, "missing 'THEN' in 'IF' expression");
   parse_expr ();
 }
 
 static void

-parse_else_alternative ()
+parse_else_alternative (void)

 {
   if (check_token (ELSIF))
     parse_if_expression_body ();
 {
   if (check_token (ELSIF))
     parse_if_expression_body ();


@@ -979,7 +1162,7 @@ parse_else_alternative ()
 /* Matches: <boolean expression> <then alternative> <else alternative> */
 
 static void
 /* Matches: <boolean expression> <then alternative> <else alternative> */
 
 static void

-parse_if_expression_body ()
+parse_if_expression_body (void)

 {
   parse_expr ();
   parse_then_alternative ();
 {
   parse_expr ();
   parse_then_alternative ();


@@ -988,7 +1171,7 @@ parse_if_expression_body ()
 }
 
 static void
 }
 
 static void

-parse_if_expression ()
+parse_if_expression (void)

 {
   require (IF);
   parse_if_expression_body ();
 {
   require (IF);
   parse_if_expression_body ();


@@ -1002,9 +1185,9 @@ parse_if_expression ()
    You should call convert() to fix up the <untyped_expr>. */
 
 static void
    You should call convert() to fix up the <untyped_expr>. */
 
 static void

-parse_untyped_expr ()
+parse_untyped_expr (void)

 {
 {

-  switch (PEEK_TOKEN())
+  switch (PEEK_TOKEN ())

     {
     case IF:
       parse_if_expression ();
     {
     case IF:
       parse_if_expression ();


@@ -1012,7 +1195,7 @@ parse_untyped_expr ()
     case CASE:
       error ("not implemented:  CASE expression");
     case '(':
     case CASE:
       error ("not implemented:  CASE expression");
     case '(':

-      switch (PEEK_TOKEN1())
+      switch (PEEK_TOKEN1 ())

        {
        case IF:
        case CASE:
        {
        case IF:
        case CASE:


@@ -1023,7 +1206,7 @@ parse_untyped_expr ()
          parse_untyped_expr ();
          expect (')', "missing ')'");
          return;
          parse_untyped_expr ();
          expect (')', "missing ')'");
          return;

-       default: ;
+       default:;

          /* fall through */
        }
     default:
          /* fall through */
        }
     default:


@@ -1032,14 +1215,14 @@ parse_untyped_expr ()
 }
 
 int
 }
 
 int

-chill_parse ()
+chill_parse (void)

 {
   terminal_buffer[0] = TOKEN_NOT_READ;
   if (PEEK_TOKEN () == TYPENAME && PEEK_TOKEN1 () == END_TOKEN)
     {
 {
   terminal_buffer[0] = TOKEN_NOT_READ;
   if (PEEK_TOKEN () == TYPENAME && PEEK_TOKEN1 () == END_TOKEN)
     {

-      write_exp_elt_opcode(OP_TYPE);
-      write_exp_elt_type(PEEK_LVAL ().tsym.type);
-      write_exp_elt_opcode(OP_TYPE);
+      write_exp_elt_opcode (OP_TYPE);
+      write_exp_elt_type (PEEK_LVAL ().tsym.type);
+      write_exp_elt_opcode (OP_TYPE);

       FORWARD_TOKEN ();
     }
   else
       FORWARD_TOKEN ();
     }
   else


@@ -1047,7 +1230,7 @@ chill_parse ()
   if (terminal_buffer[0] != END_TOKEN)
     {
       if (comma_terminates && terminal_buffer[0] == ',')
   if (terminal_buffer[0] != END_TOKEN)
     {
       if (comma_terminates && terminal_buffer[0] == ',')

-       lexptr--;  /* Put the comma back.  */
+       lexptr--;               /* Put the comma back.  */

       else
        error ("Junk after end of expression.");
     }
       else
        error ("Junk after end of expression.");
     }


@@ -1077,8 +1260,7 @@ static int tempbufindex;  /* Current index into buffer */
    on demand. */
 
 static void
    on demand. */
 
 static void

-growbuf_by_size (count)
-     int count;
+growbuf_by_size (int count)

 {
   int growby;
 
 {
   int growby;
 


@@ -1086,11 +1268,11 @@ growbuf_by_size (count)
   tempbufsize += growby;
   if (tempbuf == NULL)
     {
   tempbufsize += growby;
   if (tempbuf == NULL)
     {

-      tempbuf = (char *) malloc (tempbufsize);
+      tempbuf = (char *) xmalloc (tempbufsize);

     }
   else
     {
     }
   else
     {

-      tempbuf = (char *) realloc (tempbuf, tempbufsize);
+      tempbuf = (char *) xrealloc (tempbuf, tempbufsize);

     }
 }
 
     }
 }
 


@@ -1099,16 +1281,18 @@ growbuf_by_size (count)
    in symbol table lookups.  If not successful, returns NULL. */
 
 static char *
    in symbol table lookups.  If not successful, returns NULL. */
 
 static char *

-match_simple_name_string ()
+match_simple_name_string (void)

 {
   char *tokptr = lexptr;
 
   if (isalpha (*tokptr) || *tokptr == '_')
     {
       char *result;
 {
   char *tokptr = lexptr;
 
   if (isalpha (*tokptr) || *tokptr == '_')
     {
       char *result;

-      do {
-       tokptr++;
-      } while (isalnum (*tokptr) || (*tokptr == '_'));
+      do
+       {
+         tokptr++;
+       }
+      while (isalnum (*tokptr) || (*tokptr == '_'));

       yylval.sval.ptr = lexptr;
       yylval.sval.length = tokptr - lexptr;
       lexptr = tokptr;
       yylval.sval.ptr = lexptr;
       yylval.sval.length = tokptr - lexptr;
       lexptr = tokptr;


@@ -1123,12 +1307,9 @@ match_simple_name_string ()
    and are simply ignored.  Since we must find at least one valid digit,
    or reject this token as an integer literal, we keep track of how many
    digits we have encountered. */
    and are simply ignored.  Since we must find at least one valid digit,
    or reject this token as an integer literal, we keep track of how many
    digits we have encountered. */

-  
+

 static int
 static int

-decode_integer_value (base, tokptrptr, ivalptr)
-  int base;
-  char **tokptrptr;
-  LONGEST *ivalptr;
+decode_integer_value (int base, char **tokptrptr, LONGEST *ivalptr)

 {
   char *tokptr = *tokptrptr;
   int temp;
 {
   char *tokptr = *tokptrptr;
   int temp;


@@ -1138,17 +1319,30 @@ decode_integer_value (base, tokptrptr, ivalptr)
     {
       temp = *tokptr;
       if (isupper (temp))
     {
       temp = *tokptr;
       if (isupper (temp))

-        temp = tolower (temp);
+       temp = tolower (temp);

       tokptr++;
       switch (temp)
        {
        case '_':
          continue;
       tokptr++;
       switch (temp)
        {
        case '_':
          continue;

-       case '0':  case '1':  case '2':  case '3':  case '4':
-       case '5':  case '6':  case '7':  case '8':  case '9':
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':

          temp -= '0';
          break;
          temp -= '0';
          break;

-       case 'a':  case 'b':  case 'c':  case 'd':  case 'e': case 'f':
+       case 'a':
+       case 'b':
+       case 'c':
+       case 'd':
+       case 'e':
+       case 'f':

          temp -= 'a';
          temp += 10;
          break;
          temp -= 'a';
          temp += 10;
          break;


@@ -1165,15 +1359,15 @@ decode_integer_value (base, tokptrptr, ivalptr)
       else
        {
          /* Found something not in domain for current base. */
       else
        {
          /* Found something not in domain for current base. */

-         tokptr--;     /* Unconsume what gave us indigestion. */
+         tokptr--;             /* Unconsume what gave us indigestion. */

          break;
        }
     }
          break;
        }
     }

-  
+

   /* If we didn't find any digits, then we don't have a valid integer
      value, so reject the entire token.  Otherwise, update the lexical
      scan pointer, and return non-zero for success. */
   /* If we didn't find any digits, then we don't have a valid integer
      value, so reject the entire token.  Otherwise, update the lexical
      scan pointer, and return non-zero for success. */

-  
+

   if (digits == 0)
     {
       return (0);
   if (digits == 0)
     {
       return (0);


@@ -1186,17 +1380,15 @@ decode_integer_value (base, tokptrptr, ivalptr)
 }
 
 static int
 }
 
 static int

-decode_integer_literal (valptr, tokptrptr)
-  LONGEST *valptr;
-  char **tokptrptr;
+decode_integer_literal (LONGEST *valptr, char **tokptrptr)

 {
   char *tokptr = *tokptrptr;
   int base = 0;
   LONGEST ival = 0;
   int explicit_base = 0;
 {
   char *tokptr = *tokptrptr;
   int base = 0;
   LONGEST ival = 0;
   int explicit_base = 0;

-  
+

   /* Look for an explicit base specifier, which is optional. */
   /* Look for an explicit base specifier, which is optional. */

-  
+

   switch (*tokptr)
     {
     case 'd':
   switch (*tokptr)
     {
     case 'd':


@@ -1227,15 +1419,15 @@ decode_integer_literal (valptr, tokptrptr)
       base = 10;
       break;
     }
       base = 10;
       break;
     }

-  
+

   /* If we found an explicit base ensure that the character after the
      explicit base is a single quote. */
   /* If we found an explicit base ensure that the character after the
      explicit base is a single quote. */

-  
+

   if (explicit_base && (*tokptr++ != '\''))
     {
       return (0);
     }
   if (explicit_base && (*tokptr++ != '\''))
     {
       return (0);
     }

-  
+

   /* Attempt to decode whatever follows as an integer value in the
      indicated base, updating the token pointer in the process and
      computing the value into ival.  Also, if we have an explicit
   /* Attempt to decode whatever follows as an integer value in the
      indicated base, updating the token pointer in the process and
      computing the value into ival.  Also, if we have an explicit


@@ -1261,29 +1453,29 @@ decode_integer_literal (valptr, tokptrptr)
 }
 
 /*  If it wasn't for the fact that floating point values can contain '_'
 }
 
 /*  If it wasn't for the fact that floating point values can contain '_'

-    characters, we could just let strtod do all the hard work by letting it
-    try to consume as much of the current token buffer as possible and
-    find a legal conversion.  Unfortunately we need to filter out the '_'
-    characters before calling strtod, which we do by copying the other
-    legal chars to a local buffer to be converted.  However since we also
-    need to keep track of where the last unconsumed character in the input
-    buffer is, we have transfer only as many characters as may compose a
-    legal floating point value. */
-    
+   characters, we could just let strtod do all the hard work by letting it
+   try to consume as much of the current token buffer as possible and
+   find a legal conversion.  Unfortunately we need to filter out the '_'
+   characters before calling strtod, which we do by copying the other
+   legal chars to a local buffer to be converted.  However since we also
+   need to keep track of where the last unconsumed character in the input
+   buffer is, we have transfer only as many characters as may compose a
+   legal floating point value. */
+

 static enum ch_terminal
 static enum ch_terminal

-match_float_literal ()
+match_float_literal (void)

 {
   char *tokptr = lexptr;
   char *buf;
   char *copy;
   double dval;
   extern double strtod ();
 {
   char *tokptr = lexptr;
   char *buf;
   char *copy;
   double dval;
   extern double strtod ();

-  
+

   /* Make local buffer in which to build the string to convert.  This is
      required because underscores are valid in chill floating point numbers
      but not in the string passed to strtod to convert.  The string will be
      no longer than our input string. */
   /* Make local buffer in which to build the string to convert.  This is
      required because underscores are valid in chill floating point numbers
      but not in the string passed to strtod to convert.  The string will be
      no longer than our input string. */

-     
+

   copy = buf = (char *) alloca (strlen (tokptr) + 1);
 
   /* Transfer all leading digits to the conversion buffer, discarding any
   copy = buf = (char *) alloca (strlen (tokptr) + 1);
 
   /* Transfer all leading digits to the conversion buffer, discarding any


@@ -1307,26 +1499,26 @@ match_float_literal ()
 
   switch (*tokptr++)
     {
 
   switch (*tokptr++)
     {

-      case '.':
-        /* Accept and then look for fractional part and/or exponent. */
-       *copy++ = '.';
-       break;
+    case '.':
+      /* Accept and then look for fractional part and/or exponent. */
+      *copy++ = '.';
+      break;

 
 

-      case 'e':
-      case 'E':
-      case 'd':
-      case 'D':
-       if (copy == buf)
-         {
-           return (0);
-         }
-       *copy++ = 'e';
-       goto collect_exponent;
-       break;
+    case 'e':
+    case 'E':
+    case 'd':
+    case 'D':
+      if (copy == buf)
+       {
+         return (0);
+       }
+      *copy++ = 'e';
+      goto collect_exponent;
+      break;

 
 

-      default:
-       return (0);
-        break;
+    default:
+      return (0);
+      break;

     }
 
   /* We found a '.', copy any fractional digits to the conversion buffer, up
     }
 
   /* We found a '.', copy any fractional digits to the conversion buffer, up


@@ -1347,21 +1539,21 @@ match_float_literal ()
 
   switch (*tokptr)
     {
 
   switch (*tokptr)
     {

-      case 'e':
-      case 'E':
-      case 'd':
-      case 'D':
-       *copy++ = 'e';
-       tokptr++;
-       break;
-      default:
-       goto convert_float;
-       break;
+    case 'e':
+    case 'E':
+    case 'd':
+    case 'D':
+      *copy++ = 'e';
+      tokptr++;
+      break;
+    default:
+      goto convert_float;
+      break;

     }
 
   /* Accept an optional '-' or '+' following one of [eEdD]. */
 
     }
 
   /* Accept an optional '-' or '+' following one of [eEdD]. */
 

-  collect_exponent:
+collect_exponent:

   if (*tokptr == '+' || *tokptr == '-')
     {
       *copy++ = *tokptr++;
   if (*tokptr == '+' || *tokptr == '-')
     {
       *copy++ = *tokptr++;


@@ -1379,18 +1571,18 @@ match_float_literal ()
      contents as a floating point value.  If any characters remain, then we
      must not have a valid floating point string. */
 
      contents as a floating point value.  If any characters remain, then we
      must not have a valid floating point string. */
 

-  convert_float:
+convert_float:

   *copy = '\0';
   if (copy != buf)
   *copy = '\0';
   if (copy != buf)

-      {
-        dval = strtod (buf, &copy);
-        if (*copy == '\0')
-         {
-           yylval.dval = dval;
-           lexptr = tokptr;
-           return (FLOAT_LITERAL);
-         }
-      }
+    {
+      dval = strtod (buf, &copy);
+      if (*copy == '\0')
+       {
+         yylval.dval = dval;
+         lexptr = tokptr;
+         return (FLOAT_LITERAL);
+       }
+    }

   return (0);
 }
 
   return (0);
 }
 


@@ -1401,27 +1593,71 @@ match_float_literal ()
    a string, it is simply doubled (I.E. "this""is""one""string") */
 
 static enum ch_terminal
    a string, it is simply doubled (I.E. "this""is""one""string") */
 
 static enum ch_terminal

-match_string_literal ()
+match_string_literal (void)

 {
   char *tokptr = lexptr;
 {
   char *tokptr = lexptr;

+  int in_ctrlseq = 0;
+  LONGEST ival;

 
   for (tempbufindex = 0, tokptr++; *tokptr != '\0'; tokptr++)
     {
       CHECKBUF (1);
 
   for (tempbufindex = 0, tokptr++; *tokptr != '\0'; tokptr++)
     {
       CHECKBUF (1);

-      if (*tokptr == *lexptr)
+    tryagain:;
+      if (in_ctrlseq)

        {
        {

-         if (*(tokptr + 1) == *lexptr)
+         /* skip possible whitespaces */
+         while ((*tokptr == ' ' || *tokptr == '\t') && *tokptr)
+           tokptr++;
+         if (*tokptr == ')')

            {
            {

+             in_ctrlseq = 0;

              tokptr++;
              tokptr++;

+             goto tryagain;
+           }
+         else if (*tokptr != ',')
+           error ("Invalid control sequence");
+         tokptr++;
+         /* skip possible whitespaces */
+         while ((*tokptr == ' ' || *tokptr == '\t') && *tokptr)
+           tokptr++;
+         if (!decode_integer_literal (&ival, &tokptr))
+           error ("Invalid control sequence");
+         tokptr--;
+       }
+      else if (*tokptr == *lexptr)
+       {
+         if (*(tokptr + 1) == *lexptr)
+           {
+             ival = *tokptr++;

            }
          else
            {
              break;
            }
        }
            }
          else
            {
              break;
            }
        }

-      tempbuf[tempbufindex++] = *tokptr;
+      else if (*tokptr == '^')
+       {
+         if (*(tokptr + 1) == '(')
+           {
+             in_ctrlseq = 1;
+             tokptr += 2;
+             if (!decode_integer_literal (&ival, &tokptr))
+               error ("Invalid control sequence");
+             tokptr--;
+           }
+         else if (*(tokptr + 1) == '^')
+           ival = *tokptr++;
+         else
+           error ("Invalid control sequence");
+       }
+      else
+       ival = *tokptr;
+      tempbuf[tempbufindex++] = ival;

     }
     }

-  if (*tokptr == '\0'                                  /* no terminator */
+  if (in_ctrlseq)
+    error ("Invalid control sequence");
+
+  if (*tokptr == '\0'          /* no terminator */

       || (tempbufindex == 1 && *tokptr == '\''))       /* char literal */
     {
       return (0);
       || (tempbufindex == 1 && *tokptr == '\''))       /* char literal */
     {
       return (0);


@@ -1449,26 +1685,20 @@ match_string_literal ()
    Note that more than a single character, enclosed in single quotes, is
    a string literal.
 
    Note that more than a single character, enclosed in single quotes, is
    a string literal.
 

-   Also note that the control sequence form is not in GNU Chill since it
-   is ambiguous with the string literal form using single quotes.  I.E.
-   is '^(7)' a character literal or a string literal.  In theory it it
-   possible to tell by context, but GNU Chill doesn't accept the control
-   sequence form, so neither do we (for now the code is disabled).
-

    Returns CHARACTER_LITERAL if a match is found.
    Returns CHARACTER_LITERAL if a match is found.

-   */
+ */

 
 static enum ch_terminal
 
 static enum ch_terminal

-match_character_literal ()
+match_character_literal (void)

 {
   char *tokptr = lexptr;
   LONGEST ival = 0;
 {
   char *tokptr = lexptr;
   LONGEST ival = 0;

-  
+

   if ((*tokptr == 'c' || *tokptr == 'C') && (*(tokptr + 1) == '\''))
     {
       /* We have a GNU chill extension form, so skip the leading "C'",
   if ((*tokptr == 'c' || *tokptr == 'C') && (*(tokptr + 1) == '\''))
     {
       /* We have a GNU chill extension form, so skip the leading "C'",

-        decode the hex value, and then ensure that we have a trailing
-        single quote character. */
+         decode the hex value, and then ensure that we have a trailing
+         single quote character. */

       tokptr += 2;
       if (!decode_integer_value (16, &tokptr, &ival) || (*tokptr != '\''))
        {
       tokptr += 2;
       if (!decode_integer_value (16, &tokptr, &ival) || (*tokptr != '\''))
        {


@@ -1481,33 +1711,44 @@ match_character_literal ()
       tokptr++;
 
       /* Determine which form we have, either a control sequence or the
       tokptr++;
 
       /* Determine which form we have, either a control sequence or the

-        single character form. */
-      
-      if ((*tokptr == '^') && (*(tokptr + 1) == '('))
+         single character form. */
+
+      if (*tokptr == '^')

        {
        {

-#if 0     /* Disable, see note above. -fnf */
-         /* Match and decode a control sequence.  Return zero if we don't
-            find a valid integer literal, or if the next unconsumed character
-            after the integer literal is not the trailing ')'.
-            FIXME:  We currently don't handle the multiple integer literal
-            form. */
-         tokptr += 2;
-         if (!decode_integer_literal (&ival, &tokptr) || (*tokptr++ != ')'))
+         if (*(tokptr + 1) == '(')

            {
            {

-             return (0);
+             /* Match and decode a control sequence.  Return zero if we don't
+                find a valid integer literal, or if the next unconsumed character
+                after the integer literal is not the trailing ')'. */
+             tokptr += 2;
+             if (!decode_integer_literal (&ival, &tokptr) || (*tokptr++ != ')'))
+               {
+                 return (0);
+               }

            }
            }

-#else
-         return (0);
-#endif
+         else if (*(tokptr + 1) == '^')
+           {
+             ival = *tokptr;
+             tokptr += 2;
+           }
+         else
+           /* fail */
+           error ("Invalid control sequence");
+       }
+      else if (*tokptr == '\'')
+       {
+         /* this must be duplicated */
+         ival = *tokptr;
+         tokptr += 2;

        }
       else
        {
          ival = *tokptr++;
        }
        }
       else
        {
          ival = *tokptr++;
        }

-      
+

       /* The trailing quote has not yet been consumed.  If we don't find
       /* The trailing quote has not yet been consumed.  If we don't find

-        it, then we have no match. */
-      
+         it, then we have no match. */
+

       if (*tokptr++ != '\'')
        {
          return (0);
       if (*tokptr++ != '\'')
        {
          return (0);


@@ -1530,20 +1771,20 @@ match_character_literal ()
    in any integer literal. */
 
 static enum ch_terminal
    in any integer literal. */
 
 static enum ch_terminal

-match_integer_literal ()
+match_integer_literal (void)

 {
   char *tokptr = lexptr;
   LONGEST ival;
 {
   char *tokptr = lexptr;
   LONGEST ival;

-  
+

   if (!decode_integer_literal (&ival, &tokptr))
     {
       return (0);
     }
   if (!decode_integer_literal (&ival, &tokptr))
     {
       return (0);
     }

-  else 
+  else

     {
       yylval.typed_val.val = ival;
     {
       yylval.typed_val.val = ival;

-#ifdef CC_HAS_LONG_LONG
-      if (ival > 2147483647 || ival < -2147483648)
+#if defined(CC_HAS_LONG_LONG)
+      if (ival > (LONGEST) 2147483647U || ival < -(LONGEST) 2147483648U)

        yylval.typed_val.type = builtin_type_long_long;
       else
 #endif
        yylval.typed_val.type = builtin_type_long_long;
       else
 #endif


@@ -1559,20 +1800,20 @@ match_integer_literal ()
    in any bit-string literal. */
 
 static enum ch_terminal
    in any bit-string literal. */
 
 static enum ch_terminal

-match_bitstring_literal ()
+match_bitstring_literal (void)

 {
   register char *tokptr = lexptr;
   int bitoffset = 0;
   int bitcount = 0;
   int bits_per_char;
   int digit;
 {
   register char *tokptr = lexptr;
   int bitoffset = 0;
   int bitcount = 0;
   int bits_per_char;
   int digit;

-  
+

   tempbufindex = 0;
   CHECKBUF (1);
   tempbuf[0] = 0;
 
   /* Look for the required explicit base specifier. */
   tempbufindex = 0;
   CHECKBUF (1);
   tempbuf[0] = 0;
 
   /* Look for the required explicit base specifier. */

-  
+

   switch (*tokptr++)
     {
     case 'b':
   switch (*tokptr++)
     {
     case 'b':


@@ -1593,32 +1834,46 @@ match_bitstring_literal ()
     }
 
   /* Ensure that the character after the explicit base is a single quote. */
     }
 
   /* Ensure that the character after the explicit base is a single quote. */

-  
+

   if (*tokptr++ != '\'')
     {
       return (0);
     }
   if (*tokptr++ != '\'')
     {
       return (0);
     }

-  
+

   while (*tokptr != '\0' && *tokptr != '\'')
     {
       digit = *tokptr;
       if (isupper (digit))
   while (*tokptr != '\0' && *tokptr != '\'')
     {
       digit = *tokptr;
       if (isupper (digit))

-        digit = tolower (digit);
+       digit = tolower (digit);

       tokptr++;
       switch (digit)
        {
       tokptr++;
       switch (digit)
        {

-         case '_':
-           continue;
-         case '0':  case '1':  case '2':  case '3':  case '4':
-         case '5':  case '6':  case '7':  case '8':  case '9':
-           digit -= '0';
-           break;
-         case 'a':  case 'b':  case 'c':  case 'd':  case 'e': case 'f':
-           digit -= 'a';
-           digit += 10;
-           break;
-         default:
-           error ("Invalid character in bitstring or integer.");
+       case '_':
+         continue;
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
+         digit -= '0';
+         break;
+       case 'a':
+       case 'b':
+       case 'c':
+       case 'd':
+       case 'e':
+       case 'f':
+         digit -= 'a';
+         digit += 10;
+         break;
+       default:
+         /* this is not a bitstring literal, probably an integer */
+         return 0;

        }
       if (digit >= 1 << bits_per_char)
        {
        }
       if (digit >= 1 << bits_per_char)
        {


@@ -1628,30 +1883,30 @@ match_bitstring_literal ()
       else
        {
          /* Extract bits from digit, packing them into the bitstring byte. */
       else
        {
          /* Extract bits from digit, packing them into the bitstring byte. */

-         int k = TARGET_BYTE_ORDER == BIG_ENDIAN ? bits_per_char - 1 : 0;
-         for (; TARGET_BYTE_ORDER == BIG_ENDIAN ? k >= 0 : k < bits_per_char;
-              TARGET_BYTE_ORDER == BIG_ENDIAN ? k-- : k++)
+         int k = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? bits_per_char - 1 : 0;
+         for (; TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? k >= 0 : k < bits_per_char;
+              TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? k-- : k++)

            {
              bitcount++;
              if (digit & (1 << k))
                {
                  tempbuf[tempbufindex] |=
            {
              bitcount++;
              if (digit & (1 << k))
                {
                  tempbuf[tempbufindex] |=

-                   (TARGET_BYTE_ORDER == BIG_ENDIAN)
-                     ? (1 << (HOST_CHAR_BIT - 1 - bitoffset))
-                       : (1 << bitoffset);
+                   (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
+                   ? (1 << (HOST_CHAR_BIT - 1 - bitoffset))
+                   : (1 << bitoffset);

                }
              bitoffset++;
              if (bitoffset == HOST_CHAR_BIT)
                {
                  bitoffset = 0;
                  tempbufindex++;
                }
              bitoffset++;
              if (bitoffset == HOST_CHAR_BIT)
                {
                  bitoffset = 0;
                  tempbufindex++;

-                 CHECKBUF(1);
+                 CHECKBUF (1);

                  tempbuf[tempbufindex] = 0;
                }
            }
        }
     }
                  tempbuf[tempbufindex] = 0;
                }
            }
        }
     }

-  
+

   /* Verify that we consumed everything up to the trailing single quote,
      and that we found some bits (IE not just underbars). */
 
   /* Verify that we consumed everything up to the trailing single quote,
      and that we found some bits (IE not just underbars). */
 


@@ -1659,7 +1914,7 @@ match_bitstring_literal ()
     {
       return (0);
     }
     {
       return (0);
     }

-  else 
+  else

     {
       yylval.sval.ptr = tempbuf;
       yylval.sval.length = bitcount;
     {
       yylval.sval.ptr = tempbuf;
       yylval.sval.length = bitcount;


@@ -1676,40 +1931,40 @@ struct token
 
 static const struct token idtokentab[] =
 {
 
 static const struct token idtokentab[] =
 {

-    { "array", ARRAY },
-    { "length", LENGTH },
-    { "lower", LOWER },
-    { "upper", UPPER },
-    { "andif", ANDIF },
-    { "pred", PRED },
-    { "succ", SUCC },
-    { "card", CARD },
-    { "size", SIZE },
-    { "orif", ORIF },
-    { "num", NUM },
-    { "abs", ABS },
-    { "max", MAX_TOKEN },
-    { "min", MIN_TOKEN },
-    { "mod", MOD },
-    { "rem", REM },
-    { "not", NOT },
-    { "xor", LOGXOR },
-    { "and", LOGAND },
-    { "in", IN },
-    { "or", LOGIOR },
-    { "up", UP },
-    { "addr", ADDR_TOKEN },
-    { "null", EMPTINESS_LITERAL }
+  {"array", ARRAY},
+  {"length", LENGTH},
+  {"lower", LOWER},
+  {"upper", UPPER},
+  {"andif", ANDIF},
+  {"pred", PRED},
+  {"succ", SUCC},
+  {"card", CARD},
+  {"size", SIZE},
+  {"orif", ORIF},
+  {"num", NUM},
+  {"abs", ABS},
+  {"max", MAX_TOKEN},
+  {"min", MIN_TOKEN},
+  {"mod", MOD},
+  {"rem", REM},
+  {"not", NOT},
+  {"xor", LOGXOR},
+  {"and", LOGAND},
+  {"in", IN},
+  {"or", LOGIOR},
+  {"up", UP},
+  {"addr", ADDR_TOKEN},
+  {"null", EMPTINESS_LITERAL}

 };
 
 static const struct token tokentab2[] =
 {
 };
 
 static const struct token tokentab2[] =
 {

-    { ":=", GDB_ASSIGNMENT },
-    { "//", SLASH_SLASH },
-    { "->", POINTER },
-    { "/=", NOTEQUAL },
-    { "<=", LEQ },
-    { ">=", GEQ }
+  {":=", GDB_ASSIGNMENT},
+  {"//", SLASH_SLASH},
+  {"->", POINTER},
+  {"/=", NOTEQUAL},
+  {"<=", LEQ},
+  {">=", GEQ}

 };
 
 /* Read one token, getting characters through lexptr.  */
 };
 
 /* Read one token, getting characters through lexptr.  */


@@ -1717,246 +1972,251 @@ static const struct token tokentab2[] =
    operators used are compatible.  */
 
 static enum ch_terminal
    operators used are compatible.  */
 
 static enum ch_terminal

-ch_lex ()
+ch_lex (void)

 {
 {

-    unsigned int i;
-    enum ch_terminal token;
-    char *inputname;
-    struct symbol *sym;
+  unsigned int i;
+  enum ch_terminal token;
+  char *inputname;
+  struct symbol *sym;

 
 

-    /* Skip over any leading whitespace. */
-    while (isspace (*lexptr))
+  /* Skip over any leading whitespace. */
+  while (isspace (*lexptr))
+    {
+      lexptr++;
+    }
+  /* Look for special single character cases which can't be the first
+     character of some other multicharacter token. */
+  switch (*lexptr)
+    {
+    case '\0':
+      return END_TOKEN;
+    case ',':
+    case '=':
+    case ';':
+    case '!':
+    case '+':
+    case '*':
+    case '(':
+    case ')':
+    case '[':
+    case ']':
+      return (*lexptr++);
+    }
+  /* Look for characters which start a particular kind of multicharacter
+     token, such as a character literal, register name, convenience
+     variable name, string literal, etc. */
+  switch (*lexptr)
+    {
+    case '\'':
+    case '\"':
+      /* First try to match a string literal, which is any
+         sequence of characters enclosed in matching single or double
+         quotes, except that a single character inside single quotes
+         is a character literal, so we have to catch that case also. */
+      token = match_string_literal ();
+      if (token != 0)

        {
        {

-           lexptr++;
+         return (token);

        }
        }

-    /* Look for special single character cases which can't be the first
-       character of some other multicharacter token. */
-    switch (*lexptr)
+      if (*lexptr == '\'')

        {
        {

-           case '\0':
-               return END_TOKEN;
-           case ',':
-           case '=':
-           case ';':
-           case '!':
-           case '+':
-           case '*':
-           case '(':
-           case ')':
-           case '[':
-           case ']':
-               return (*lexptr++);
-       }
-    /* Look for characters which start a particular kind of multicharacter
-       token, such as a character literal, register name, convenience
-       variable name, string literal, etc. */
-    switch (*lexptr)
-      {
-       case '\'':
-       case '\"':
-         /* First try to match a string literal, which is any
-            sequence of characters enclosed in matching single or double
-            quotes, except that a single character inside single quotes
-            is a character literal, so we have to catch that case also. */
-         token = match_string_literal ();
-         if (token != 0)
-           {
-             return (token);
-           }
-         if (*lexptr == '\'')
-           {
-             token = match_character_literal ();
-             if (token != 0)
-               {
-                 return (token);
-               }
-           }
-         break;
-        case 'C':
-        case 'c':

          token = match_character_literal ();
          if (token != 0)
            {
              return (token);
            }
          token = match_character_literal ();
          if (token != 0)
            {
              return (token);
            }

-         break;
-       case '$':
-         yylval.sval.ptr = lexptr;
-         do {
-           lexptr++;
-         } while (isalnum (*lexptr) || *lexptr == '_' || *lexptr == '$');
-         yylval.sval.length = lexptr - yylval.sval.ptr;
-         write_dollar_variable (yylval.sval);
-         return GDB_VARIABLE;
-         break;
-      }
-    /* See if it is a special token of length 2.  */
-    for (i = 0; i < sizeof (tokentab2) / sizeof (tokentab2[0]); i++)
-       {
-           if (STREQN (lexptr, tokentab2[i].operator, 2))
-               {
-                   lexptr += 2;
-                   return (tokentab2[i].token);
-               }
-       }
-    /* Look for single character cases which which could be the first
-       character of some other multicharacter token, but aren't, or we
-       would already have found it. */
-    switch (*lexptr)
-       {
-           case '-':
-           case ':':
-           case '/':
-           case '<':
-           case '>':
-               return (*lexptr++);

        }
        }

-    /* Look for a float literal before looking for an integer literal, so
-       we match as much of the input stream as possible. */
-    token = match_float_literal ();
-    if (token != 0)
+      break;
+    case 'C':
+    case 'c':
+      token = match_character_literal ();
+      if (token != 0)

        {
        {

-           return (token);
+         return (token);

        }
        }

-    token = match_bitstring_literal ();
-    if (token != 0)
+      break;
+    case '$':
+      yylval.sval.ptr = lexptr;
+      do

        {
        {

-           return (token);
+         lexptr++;

        }
        }

-    token = match_integer_literal ();
-    if (token != 0)
+      while (isalnum (*lexptr) || *lexptr == '_' || *lexptr == '$');
+      yylval.sval.length = lexptr - yylval.sval.ptr;
+      write_dollar_variable (yylval.sval);
+      return GDB_VARIABLE;
+      break;
+    }
+  /* See if it is a special token of length 2.  */
+  for (i = 0; i < sizeof (tokentab2) / sizeof (tokentab2[0]); i++)
+    {
+      if (STREQN (lexptr, tokentab2[i].operator, 2))

        {
        {

-           return (token);
+         lexptr += 2;
+         return (tokentab2[i].token);

        }
        }

+    }
+  /* Look for single character cases which which could be the first
+     character of some other multicharacter token, but aren't, or we
+     would already have found it. */
+  switch (*lexptr)
+    {
+    case '-':
+    case ':':
+    case '/':
+    case '<':
+    case '>':
+      return (*lexptr++);
+    }
+  /* Look for a float literal before looking for an integer literal, so
+     we match as much of the input stream as possible. */
+  token = match_float_literal ();
+  if (token != 0)
+    {
+      return (token);
+    }
+  token = match_bitstring_literal ();
+  if (token != 0)
+    {
+      return (token);
+    }
+  token = match_integer_literal ();
+  if (token != 0)
+    {
+      return (token);
+    }

 
 

-    /* Try to match a simple name string, and if a match is found, then
-       further classify what sort of name it is and return an appropriate
-       token.  Note that attempting to match a simple name string consumes
-       the token from lexptr, so we can't back out if we later find that
-       we can't classify what sort of name it is. */
+  /* Try to match a simple name string, and if a match is found, then
+     further classify what sort of name it is and return an appropriate
+     token.  Note that attempting to match a simple name string consumes
+     the token from lexptr, so we can't back out if we later find that
+     we can't classify what sort of name it is. */

 
 

-    inputname = match_simple_name_string ();
+  inputname = match_simple_name_string ();

 
 

-    if (inputname != NULL)
-      {
-       char *simplename = (char*) alloca (strlen (inputname) + 1);
+  if (inputname != NULL)
+    {
+      char *simplename = (char *) alloca (strlen (inputname) + 1);

 
 

-       char *dptr = simplename, *sptr = inputname;
-       for (; *sptr; sptr++)
-         *dptr++ = isupper (*sptr) ? tolower(*sptr) : *sptr;
-       *dptr = '\0';
+      char *dptr = simplename, *sptr = inputname;
+      for (; *sptr; sptr++)
+       *dptr++ = isupper (*sptr) ? tolower (*sptr) : *sptr;
+      *dptr = '\0';

 
 

-       /* See if it is a reserved identifier. */
-       for (i = 0; i < sizeof (idtokentab) / sizeof (idtokentab[0]); i++)
+      /* See if it is a reserved identifier. */
+      for (i = 0; i < sizeof (idtokentab) / sizeof (idtokentab[0]); i++)
+       {
+         if (STREQ (simplename, idtokentab[i].operator))

            {
            {

-               if (STREQ (simplename, idtokentab[i].operator))
-                   {
-                       return (idtokentab[i].token);
-                   }
+             return (idtokentab[i].token);

            }
            }

+       }

 
 

-       /* Look for other special tokens. */
-       if (STREQ (simplename, "true"))
-           {
-               yylval.ulval = 1;
-               return (BOOLEAN_LITERAL);
-           }
-       if (STREQ (simplename, "false"))
+      /* Look for other special tokens. */
+      if (STREQ (simplename, "true"))
+       {
+         yylval.ulval = 1;
+         return (BOOLEAN_LITERAL);
+       }
+      if (STREQ (simplename, "false"))
+       {
+         yylval.ulval = 0;
+         return (BOOLEAN_LITERAL);
+       }
+
+      sym = lookup_symbol (inputname, expression_context_block,
+                          VAR_NAMESPACE, (int *) NULL,
+                          (struct symtab **) NULL);
+      if (sym == NULL && strcmp (inputname, simplename) != 0)
+       {
+         sym = lookup_symbol (simplename, expression_context_block,
+                              VAR_NAMESPACE, (int *) NULL,
+                              (struct symtab **) NULL);
+       }
+      if (sym != NULL)
+       {
+         yylval.ssym.stoken.ptr = NULL;
+         yylval.ssym.stoken.length = 0;
+         yylval.ssym.sym = sym;
+         yylval.ssym.is_a_field_of_this = 0;   /* FIXME, C++'ism */
+         switch (SYMBOL_CLASS (sym))

            {
            {

-               yylval.ulval = 0;
-               return (BOOLEAN_LITERAL);
+           case LOC_BLOCK:
+             /* Found a procedure name. */
+             return (GENERAL_PROCEDURE_NAME);
+           case LOC_STATIC:
+             /* Found a global or local static variable. */
+             return (LOCATION_NAME);
+           case LOC_REGISTER:
+           case LOC_ARG:
+           case LOC_REF_ARG:
+           case LOC_REGPARM:
+           case LOC_REGPARM_ADDR:
+           case LOC_LOCAL:
+           case LOC_LOCAL_ARG:
+           case LOC_BASEREG:
+           case LOC_BASEREG_ARG:
+             if (innermost_block == NULL
+                 || contained_in (block_found, innermost_block))
+               {
+                 innermost_block = block_found;
+               }
+             return (LOCATION_NAME);
+             break;
+           case LOC_CONST:
+           case LOC_LABEL:
+             return (LOCATION_NAME);
+             break;
+           case LOC_TYPEDEF:
+             yylval.tsym.type = SYMBOL_TYPE (sym);
+             return TYPENAME;
+           case LOC_UNDEF:
+           case LOC_CONST_BYTES:
+           case LOC_OPTIMIZED_OUT:
+             error ("Symbol \"%s\" names no location.", inputname);
+             break;
+           default:
+             internal_error (__FILE__, __LINE__,
+                             "unhandled SYMBOL_CLASS in ch_lex()");
+             break;

            }
            }

+       }
+      else if (!have_full_symbols () && !have_partial_symbols ())
+       {
+         error ("No symbol table is loaded.  Use the \"file\" command.");
+       }
+      else
+       {
+         error ("No symbol \"%s\" in current context.", inputname);
+       }
+    }

 
 

-       sym = lookup_symbol (inputname, expression_context_block,
-                            VAR_NAMESPACE, (int *) NULL,
-                            (struct symtab **) NULL);
-       if (sym == NULL && strcmp (inputname, simplename) != 0)
-         {
-           sym = lookup_symbol (simplename, expression_context_block,
-                                VAR_NAMESPACE, (int *) NULL,
-                                (struct symtab **) NULL);
-         }
-       if (sym != NULL)
-         {
-           yylval.ssym.stoken.ptr = NULL;
-           yylval.ssym.stoken.length = 0;
-           yylval.ssym.sym = sym;
-           yylval.ssym.is_a_field_of_this = 0; /* FIXME, C++'ism */
-           switch (SYMBOL_CLASS (sym))
-             {
-             case LOC_BLOCK:
-               /* Found a procedure name. */
-               return (GENERAL_PROCEDURE_NAME);
-             case LOC_STATIC:
-               /* Found a global or local static variable. */
-               return (LOCATION_NAME);
-             case LOC_REGISTER:
-             case LOC_ARG:
-             case LOC_REF_ARG:
-             case LOC_REGPARM:
-             case LOC_REGPARM_ADDR:
-             case LOC_LOCAL:
-             case LOC_LOCAL_ARG:
-             case LOC_BASEREG:
-             case LOC_BASEREG_ARG:
-               if (innermost_block == NULL
-                   || contained_in (block_found, innermost_block))
-                 {
-                   innermost_block = block_found;
-                 }
-               return (LOCATION_NAME);
-               break;
-             case LOC_CONST:
-             case LOC_LABEL:
-               return (LOCATION_NAME);
-               break;
-             case LOC_TYPEDEF:
-               yylval.tsym.type = SYMBOL_TYPE (sym);
-               return TYPENAME;
-             case LOC_UNDEF:
-             case LOC_CONST_BYTES:
-             case LOC_OPTIMIZED_OUT:
-               error ("Symbol \"%s\" names no location.", inputname);
-               break;
-             }
-         }
-       else if (!have_full_symbols () && !have_partial_symbols ())
-         {
-           error ("No symbol table is loaded.  Use the \"file\" command.");
-         }
-       else
-         {
-           error ("No symbol \"%s\" in current context.", inputname);
-         }
-      }
-
-    /* Catch single character tokens which are not part of some
-       longer token. */
+  /* Catch single character tokens which are not part of some
+     longer token. */

 
 

-    switch (*lexptr)
-      {
-       case '.':                       /* Not float for example. */
-         lexptr++;
-         while (isspace (*lexptr)) lexptr++;
-         inputname = match_simple_name_string ();
-         if (!inputname)
-           return '.';
-         return FIELD_NAME;
-      }
+  switch (*lexptr)
+    {
+    case '.':                  /* Not float for example. */
+      lexptr++;
+      while (isspace (*lexptr))
+       lexptr++;
+      inputname = match_simple_name_string ();
+      if (!inputname)
+       return '.';
+      return DOT_FIELD_NAME;
+    }

 
 

-    return (ILLEGAL_TOKEN);
+  return (ILLEGAL_TOKEN);

 }
 
 static void
 }
 
 static void

-write_lower_upper_value (opcode, type)
-     enum exp_opcode opcode;  /* Either UNOP_LOWER or UNOP_UPPER */
-     struct type *type;
+write_lower_upper_value (enum exp_opcode opcode,       /* Either UNOP_LOWER or UNOP_UPPER */
+                        struct type *type)

 {
   if (type == NULL)
     write_exp_elt_opcode (opcode);
   else
     {
 {
   if (type == NULL)
     write_exp_elt_opcode (opcode);
   else
     {

-      extern LONGEST type_lower_upper ();

       struct type *result_type;
       LONGEST val = type_lower_upper (opcode, type, &result_type);
       write_exp_elt_opcode (OP_LONG);
       struct type *result_type;
       LONGEST val = type_lower_upper (opcode, type, &result_type);
       write_exp_elt_opcode (OP_LONG);


@@ -1967,8 +2227,7 @@ write_lower_upper_value (opcode, type)
 }
 
 void
 }
 
 void

-chill_error (msg)
-     char *msg;
+chill_error (char *msg)

 {
   /* Never used. */
 }
 {
   /* Never used. */
 }