import gdb-1999-07-07 post reformat

1 files changed, 599 insertions, 515 deletions

diff --git a/gdb/ch-exp.c b/gdb/ch-exp.c
index 45436a3..62e9bfd 100644
--- a/gdb/ch-exp.c
+++ b/gdb/ch-exp.c
@@ -1,21 +1,22 @@
 /* Parser for GNU CHILL (CCITT High-Level Language)  -*- C -*-
    Copyright (C) 1992, 1993, 1995 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.
@@ -51,9 +52,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #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__
@@ -64,75 +65,79 @@ typedef union
   {
     LONGEST lval;
     ULONGEST ulval;
-    struct {
-      LONGEST val;
-      struct type *type;
-    } typed_val;
+    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;
-  }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
-};
+  }
+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. */
 
@@ -177,7 +182,7 @@ static void parse_expr PARAMS ((void));
 static void parse_primval PARAMS ((void));
 static void parse_untyped_expr PARAMS ((void));
 static int parse_opt_untyped_expr PARAMS ((void));
-static void parse_if_expression_body PARAMS((void));
+static void parse_if_expression_body PARAMS ((void));
 static enum ch_terminal ch_lex PARAMS ((void));
 INLINE static enum ch_terminal PEEK_TOKEN PARAMS ((void));
 static enum ch_terminal peek_token_ PARAMS ((int));
@@ -186,15 +191,16 @@ static void require PARAMS ((enum ch_terminal));
 static int check_token PARAMS ((enum ch_terminal));
 
 #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;
-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; */
 
 INLINE static enum ch_terminal
-PEEK_TOKEN()
+PEEK_TOKEN ()
 {
   if (terminal_buffer[0] == TOKEN_NOT_READ)
     {
@@ -231,10 +237,10 @@ pushback_token (code, node)
   if (terminal_buffer[MAX_LOOK_AHEAD] != TOKEN_NOT_READ)
     fatal ("internal error - cannot pushback token");
   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];
-  }
+    }
   terminal_buffer[0] = code;
   val_buffer[0] = node;
 }
@@ -242,13 +248,13 @@ pushback_token (code, node)
 #endif
 
 static void
-forward_token_()
+forward_token_ ()
 {
   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;
 }
@@ -258,23 +264,23 @@ forward_token_()
    if it isn't TOKEN, the parser is broken. */
 
 static void
-require(token)
+require (token)
      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);
+      sprintf (buf, "internal parser error - expected token %d", (int) token);
+      fatal (buf);
     }
-  FORWARD_TOKEN();
+  FORWARD_TOKEN ();
 }
 
 static int
 check_token (token)
      enum ch_terminal token;
 {
-  if (PEEK_TOKEN() != token)
+  if (PEEK_TOKEN () != token)
     return 0;
   FORWARD_TOKEN ();
   return 1;
@@ -282,13 +288,13 @@ check_token (token)
 
 /* return 0 if expected token was not found,
    else return 1.
-*/
+ */
 static int
 expect (token, message)
      enum ch_terminal token;
      char *message;
 {
-  if (PEEK_TOKEN() != token)
+  if (PEEK_TOKEN () != token)
     {
       if (message)
 	error (message);
@@ -299,16 +305,16 @@ expect (token, message)
       return 0;
     }
   else
-    FORWARD_TOKEN();
+    FORWARD_TOKEN ();
   return 1;
 }
 
 #if 0
 static tree
 parse_opt_name_string (allow_all)
-     int allow_all; /* 1 if ALL is allowed as a postfix */
+     int allow_all;		/* 1 if ALL is allowed as a postfix */
 {
-  int token = PEEK_TOKEN();
+  int token = PEEK_TOKEN ();
   tree name;
   if (token != NAME)
     {
@@ -319,17 +325,17 @@ parse_opt_name_string (allow_all)
 	}
       return NULL_TREE;
     }
-  name = PEEK_LVAL();
+  name = PEEK_LVAL ();
   for (;;)
     {
       FORWARD_TOKEN ();
-      token = PEEK_TOKEN();
+      token = PEEK_TOKEN ();
       if (token != '!')
 	return name;
-      FORWARD_TOKEN();
-      token = PEEK_TOKEN();
+      FORWARD_TOKEN ();
+      token = PEEK_TOKEN ();
       if (token == ALL && allow_all)
-	return get_identifier3(IDENTIFIER_POINTER (name), "!", "*");
+	return get_identifier3 (IDENTIFIER_POINTER (name), "!", "*");
       if (token != NAME)
 	{
 	  if (pass == 1)
@@ -337,15 +343,15 @@ parse_opt_name_string (allow_all)
 		   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
 parse_simple_name_string ()
 {
-  int token = PEEK_TOKEN();
+  int token = PEEK_TOKEN ();
   tree name;
   if (token != NAME)
     {
@@ -394,7 +400,7 @@ parse_name ()
 	return convert_from_reference (decl);
       else
 	return decl;
-    } 
+    }
 }
 #endif
 
@@ -461,7 +467,7 @@ parse_mode_call ()
   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;
@@ -477,7 +483,7 @@ parse_mode_or_normal_call ()
   expect ('(', NULL);
   if (PEEK_TOKEN () == TYPENAME)
     {
-      type = PEEK_LVAL().tsym.type;
+      type = PEEK_LVAL ().tsym.type;
       FORWARD_TOKEN ();
     }
   else
@@ -675,7 +681,7 @@ parse_primval ()
   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);
@@ -718,12 +724,12 @@ parse_primval ()
     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()");
-      type = PEEK_LVAL().tsym.type;
+      type = PEEK_LVAL ().tsym.type;
       FORWARD_TOKEN ();
       expect ('(', NULL);
       parse_expr ();
@@ -731,7 +737,7 @@ parse_primval ()
       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);
@@ -739,7 +745,7 @@ parse_primval ()
 #if 0
     case CONST:
     case EXPR:
-      val = PEEK_LVAL();
+      val = PEEK_LVAL ();
       FORWARD_TOKEN ();
       break;
 #endif
@@ -759,7 +765,7 @@ parse_primval ()
       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:
@@ -780,9 +786,15 @@ parse_primval ()
       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;
+    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);
@@ -794,7 +806,8 @@ parse_primval ()
     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));
@@ -820,7 +833,7 @@ parse_primval ()
     case TYPENAME:
       type = PEEK_LVAL ().tsym.type;
       FORWARD_TOKEN ();
-      switch (PEEK_TOKEN())
+      switch (PEEK_TOKEN ())
 	{
 	case '[':
 	  parse_tuple (type);
@@ -837,8 +850,8 @@ parse_primval ()
 	  error ("typename in invalid context");
 	}
       break;
-      
-    default: 
+
+    default:
       error ("invalid expression syntax at `%s'", lexptr);
     }
   for (;;)
@@ -944,11 +957,11 @@ parse_operand6 ()
       write_exp_elt_opcode (UNOP_ADDR);
     }
   else
-    parse_primval();
+    parse_primval ();
 }
 
 static void
-parse_operand5()
+parse_operand5 ()
 {
   enum exp_opcode op;
   /* We are supposed to be looking for a <string repetition operator>,
@@ -960,16 +973,20 @@ parse_operand5()
      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)
-    FORWARD_TOKEN();
-  parse_operand6();
+    FORWARD_TOKEN ();
+  parse_operand6 ();
   if (op != OP_NULL)
     write_exp_elt_opcode (op);
 }
@@ -978,20 +995,28 @@ static void
 parse_operand4 ()
 {
   enum exp_opcode op;
-  parse_operand5();
+  parse_operand5 ();
   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;
 	}
-      FORWARD_TOKEN();
-      parse_operand5();
+      FORWARD_TOKEN ();
+      parse_operand5 ();
       write_exp_elt_opcode (op);
     }
 }
@@ -1003,16 +1028,22 @@ parse_operand3 ()
   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;
 	}
-      FORWARD_TOKEN();
-      parse_operand4();
+      FORWARD_TOKEN ();
+      parse_operand4 ();
       write_exp_elt_opcode (op);
     }
 }
@@ -1026,24 +1057,36 @@ parse_operand2 ()
     {
       if (check_token (IN))
 	{
-	  parse_operand3();
+	  parse_operand3 ();
 	  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;
 	    }
-	  FORWARD_TOKEN();
-	  parse_operand3();
+	  FORWARD_TOKEN ();
+	  parse_operand3 ();
 	  write_exp_elt_opcode (op);
 	}
     }
@@ -1056,36 +1099,46 @@ parse_operand1 ()
   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;
 	}
-      FORWARD_TOKEN();
-      parse_operand2();
+      FORWARD_TOKEN ();
+      parse_operand2 ();
       write_exp_elt_opcode (op);
     }
 }
 
 static void
 parse_operand0 ()
-{ 
+{
   enum exp_opcode op;
-  parse_operand1();
+  parse_operand1 ();
   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;
 	}
-      FORWARD_TOKEN();
-      parse_operand1();
+      FORWARD_TOKEN ();
+      parse_operand1 ();
       write_exp_elt_opcode (op);
     }
 }
@@ -1147,7 +1200,7 @@ parse_if_expression ()
 static void
 parse_untyped_expr ()
 {
-  switch (PEEK_TOKEN())
+  switch (PEEK_TOKEN ())
     {
     case IF:
       parse_if_expression ();
@@ -1155,7 +1208,7 @@ parse_untyped_expr ()
     case CASE:
       error ("not implemented:  CASE expression");
     case '(':
-      switch (PEEK_TOKEN1())
+      switch (PEEK_TOKEN1 ())
 	{
 	case IF:
 	case CASE:
@@ -1166,7 +1219,7 @@ parse_untyped_expr ()
 	  parse_untyped_expr ();
 	  expect (')', "missing ')'");
 	  return;
-	default: ;
+	default:;
 	  /* fall through */
 	}
     default:
@@ -1180,9 +1233,9 @@ chill_parse ()
   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
@@ -1190,7 +1243,7 @@ chill_parse ()
   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.");
     }
@@ -1249,9 +1302,11 @@ match_simple_name_string ()
   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;
@@ -1266,12 +1321,12 @@ 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. */
-  
+
 static int
 decode_integer_value (base, tokptrptr, ivalptr)
-  int base;
-  char **tokptrptr;
-  LONGEST *ivalptr;
+     int base;
+     char **tokptrptr;
+     LONGEST *ivalptr;
 {
   char *tokptr = *tokptrptr;
   int temp;
@@ -1281,17 +1336,30 @@ decode_integer_value (base, tokptrptr, ivalptr)
     {
       temp = *tokptr;
       if (isupper (temp))
-        temp = tolower (temp);
+	temp = tolower (temp);
       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;
-	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;
@@ -1308,15 +1376,15 @@ decode_integer_value (base, tokptrptr, ivalptr)
       else
 	{
 	  /* Found something not in domain for current base. */
-	  tokptr--;	/* Unconsume what gave us indigestion. */
+	  tokptr--;		/* Unconsume what gave us indigestion. */
 	  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 (digits == 0)
     {
       return (0);
@@ -1330,16 +1398,16 @@ decode_integer_value (base, tokptrptr, ivalptr)
 
 static int
 decode_integer_literal (valptr, tokptrptr)
-  LONGEST *valptr;
-  char **tokptrptr;
+     LONGEST *valptr;
+     char **tokptrptr;
 {
   char *tokptr = *tokptrptr;
   int base = 0;
   LONGEST ival = 0;
   int explicit_base = 0;
-  
+
   /* Look for an explicit base specifier, which is optional. */
-  
+
   switch (*tokptr)
     {
     case 'd':
@@ -1370,15 +1438,15 @@ decode_integer_literal (valptr, tokptrptr)
       base = 10;
       break;
     }
-  
+
   /* If we found an explicit base ensure that the character after the
      explicit base is a single quote. */
-  
+
   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
@@ -1404,15 +1472,15 @@ decode_integer_literal (valptr, tokptrptr)
 }
 
 /*  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
 match_float_literal ()
 {
@@ -1421,12 +1489,12 @@ match_float_literal ()
   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. */
-     
+
   copy = buf = (char *) alloca (strlen (tokptr) + 1);
 
   /* Transfer all leading digits to the conversion buffer, discarding any
@@ -1450,26 +1518,26 @@ match_float_literal ()
 
   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
@@ -1490,21 +1558,21 @@ match_float_literal ()
 
   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]. */
 
-  collect_exponent:
+collect_exponent:
   if (*tokptr == '+' || *tokptr == '-')
     {
       *copy++ = *tokptr++;
@@ -1522,18 +1590,18 @@ match_float_literal ()
      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)
-      {
-        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);
 }
 
@@ -1553,7 +1621,7 @@ match_string_literal ()
   for (tempbufindex = 0, tokptr++; *tokptr != '\0'; tokptr++)
     {
       CHECKBUF (1);
-    tryagain: ;
+    tryagain:;
       if (in_ctrlseq)
 	{
 	  /* skip possible whitespaces */
@@ -1608,7 +1676,7 @@ match_string_literal ()
   if (in_ctrlseq)
     error ("Invalid control sequence");
 
-  if (*tokptr == '\0'					/* no terminator */
+  if (*tokptr == '\0'		/* no terminator */
       || (tempbufindex == 1 && *tokptr == '\''))	/* char literal */
     {
       return (0);
@@ -1637,19 +1705,19 @@ match_string_literal ()
    a string literal.
 
    Returns CHARACTER_LITERAL if a match is found.
-   */
+ */
 
 static enum ch_terminal
 match_character_literal ()
 {
   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'",
-	 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 != '\''))
 	{
@@ -1662,15 +1730,15 @@ match_character_literal ()
       tokptr++;
 
       /* Determine which form we have, either a control sequence or the
-	 single character form. */
-      
+         single character form. */
+
       if (*tokptr == '^')
 	{
 	  if (*(tokptr + 1) == '(')
 	    {
 	      /* 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 ')'. */
+	         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++ != ')'))
 		{
@@ -1698,8 +1766,8 @@ match_character_literal ()
 	}
 
       /* 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);
@@ -1726,16 +1794,16 @@ match_integer_literal ()
 {
   char *tokptr = lexptr;
   LONGEST ival;
-  
+
   if (!decode_integer_literal (&ival, &tokptr))
     {
       return (0);
     }
-  else 
+  else
     {
       yylval.typed_val.val = ival;
 #if defined(CC_HAS_LONG_LONG) && defined(__STDC__)
-      if (ival > (LONGEST)2147483647U || ival < -(LONGEST)2147483648U)
+      if (ival > (LONGEST) 2147483647U || ival < -(LONGEST) 2147483648U)
 	yylval.typed_val.type = builtin_type_long_long;
       else
 #endif
@@ -1758,13 +1826,13 @@ match_bitstring_literal ()
   int bitcount = 0;
   int bits_per_char;
   int digit;
-  
+
   tempbufindex = 0;
   CHECKBUF (1);
   tempbuf[0] = 0;
 
   /* Look for the required explicit base specifier. */
-  
+
   switch (*tokptr++)
     {
     case 'b':
@@ -1785,33 +1853,46 @@ match_bitstring_literal ()
     }
 
   /* Ensure that the character after the explicit base is a single quote. */
-  
+
   if (*tokptr++ != '\'')
     {
       return (0);
     }
-  
+
   while (*tokptr != '\0' && *tokptr != '\'')
     {
       digit = *tokptr;
       if (isupper (digit))
-        digit = tolower (digit);
+	digit = tolower (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:
-	    /* this is not a bitstring literal, probably an integer */
-	    return 0;
+	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)
 	{
@@ -1830,21 +1911,21 @@ match_bitstring_literal ()
 		{
 		  tempbuf[tempbufindex] |=
 		    (TARGET_BYTE_ORDER == BIG_ENDIAN)
-		      ? (1 << (HOST_CHAR_BIT - 1 - bitoffset))
-			: (1 << bitoffset);
+		    ? (1 << (HOST_CHAR_BIT - 1 - bitoffset))
+		    : (1 << bitoffset);
 		}
 	      bitoffset++;
 	      if (bitoffset == HOST_CHAR_BIT)
 		{
 		  bitoffset = 0;
 		  tempbufindex++;
-		  CHECKBUF(1);
+		  CHECKBUF (1);
 		  tempbuf[tempbufindex] = 0;
 		}
 	    }
 	}
     }
-  
+
   /* Verify that we consumed everything up to the trailing single quote,
      and that we found some bits (IE not just underbars). */
 
@@ -1852,7 +1933,7 @@ match_bitstring_literal ()
     {
       return (0);
     }
-  else 
+  else
     {
       yylval.sval.ptr = tempbuf;
       yylval.sval.length = bitcount;
@@ -1869,40 +1950,40 @@ struct token
 
 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[] =
 {
-    { ":=", GDB_ASSIGNMENT },
-    { "//", SLASH_SLASH },
-    { "->", POINTER },
-    { "/=", NOTEQUAL },
-    { "<=", LEQ },
-    { ">=", GEQ }
+  {":=", GDB_ASSIGNMENT},
+  {"//", SLASH_SLASH},
+  {"->", POINTER},
+  {"/=", NOTEQUAL},
+  {"<=", LEQ},
+  {">=", GEQ}
 };
 
 /* Read one token, getting characters through lexptr.  */
@@ -1912,240 +1993,243 @@ static const struct token tokentab2[] =
 static enum ch_terminal
 ch_lex ()
 {
-    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);
 	    }
-	  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;
+	    case LOC_UNRESOLVED:
+	      error ("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;
-	      case LOC_UNRESOLVED:
-		error ("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);
-	  }
-      }
-
-    /* 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 DOT_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
 write_lower_upper_value (opcode, type)
-     enum exp_opcode opcode;  /* Either UNOP_LOWER or UNOP_UPPER */
+     enum exp_opcode opcode;	/* Either UNOP_LOWER or UNOP_UPPER */
      struct type *type;
 {
   if (type == NULL)