c-lex.c (c_lex): Replace tok.val.aux with tok.val.c or tok.val.arg_no as appropriate.

	* c-lex.c (c_lex): Replace tok.val.aux with tok.val.c or
	tok.val.arg_no as appropriate.
	* cppexp.c (lex): Similarly.
	* cpplex.c (_cpp_lex_token, cpp_spell_token, cpp_output_token,
	cpp_equiv_tokens, cpp_can_paste, cpp_avoid_paste): Similarly.
	* cppmacro.c (stringify_arg, replace_args, lex_expansion_token,
	cpp_macro_definition): Similarly.
	* cpplib.h (struct cpp_token): Replace aux with c and arg_no.

From-SVN: r37276

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 530cc60d33c67a7ee52e375e2d653f51ef7cc7b4..725d11e9e033172472391d2f113f7b07931173eb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-06  Neil Booth  <neilb@earthling.net>
+
+       * c-lex.c (c_lex): Replace tok.val.aux with tok.val.c or
+       tok.val.arg_no as appropriate.
+       * cppexp.c (lex): Similarly.
+       * cpplex.c (_cpp_lex_token, cpp_spell_token, cpp_output_token,
+       cpp_equiv_tokens, cpp_can_paste, cpp_avoid_paste): Similarly.
+       * cppmacro.c (stringify_arg, replace_args, lex_expansion_token,
+       cpp_macro_definition): Similarly.
+       * cpplib.h (struct cpp_token): Replace aux with c and arg_no.
+
 2000-11-06  Jakub Jelinek  <jakub@redhat.com>
 
        * config/sparc/sparc.md (adddi3): If operands[2] is 4096 and

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 18a50cb42af6b4bfdf3fcce55d712c015e2f5003..4d4e4815c5f7484878868a775a5ef5a9a351a431 100644 (file)
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -1440,12 +1440,12 @@ c_lex (value)
     case CPP_OPEN_BRACE:  indent_level++;  break;
     case CPP_CLOSE_BRACE: indent_level--;  break;
 
-    /* Issue this error here, where we can get at tok.val.aux.  */
+    /* Issue this error here, where we can get at tok.val.c.  */
     case CPP_OTHER:
-      if (ISGRAPH (tok.val.aux))
-       error ("stray '%c' in program", tok.val.aux);
+      if (ISGRAPH (tok.val.c))
+       error ("stray '%c' in program", tok.val.c);
       else
-       error ("stray '\\%#o' in program", tok.val.aux);
+       error ("stray '\\%#o' in program", tok.val.c);
       goto retry;
       
     case CPP_NAME:

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 566eb15dac8a2a8749f83b6997dda322a25e8ad7..55b633e6569f98bbbfc53509e860c6554b46295c 100644 (file)
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -401,10 +401,10 @@ lex (pfile, skip_evaluation, token)
       SYNTAX_ERROR ("floating point numbers are not valid in #if");
 
     case CPP_OTHER:
-      if (ISGRAPH (token->val.aux))
-       SYNTAX_ERROR2 ("invalid character '%c' in #if", token->val.aux);
+      if (ISGRAPH (token->val.c))
+       SYNTAX_ERROR2 ("invalid character '%c' in #if", token->val.c);
       else
-       SYNTAX_ERROR2 ("invalid character '\\%03o' in #if", token->val.aux);
+       SYNTAX_ERROR2 ("invalid character '\\%03o' in #if", token->val.c);
 
     case CPP_NAME:
       if (token->val.node == pfile->spec_nodes.n_defined)

diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 86dbf5a692ddda55b88c5a93ec2f98408a63cfb4..c77ed910f9cb9d9ed253aaf1781fbbac279d7818 100644 (file)
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -1241,7 +1241,7 @@ _cpp_lex_token (pfile, result)
     random_char:
     default:
       result->type = CPP_OTHER;
-      result->val.aux = c;
+      result->val.c = c;
       break;
     }
 }
@@ -1321,7 +1321,7 @@ cpp_spell_token (pfile, token, buffer)
       break;
 
     case SPELL_CHAR:
-      *buffer++ = token->val.aux;
+      *buffer++ = token->val.c;
       break;
 
     case SPELL_NONE:
@@ -1410,7 +1410,7 @@ cpp_output_token (token, fp)
       break;
 
     case SPELL_CHAR:
-      putc (token->val.aux, fp);
+      putc (token->val.c, fp);
       break;
 
     case SPELL_NONE:
@@ -1431,9 +1431,9 @@ _cpp_equiv_tokens (a, b)
       case SPELL_OPERATOR:
        return 1;
       case SPELL_CHAR:
-       return a->val.aux == b->val.aux; /* Character.  */
+       return a->val.c == b->val.c; /* Character.  */
       case SPELL_NONE:
-       return (a->type != CPP_MACRO_ARG || a->val.aux == b->val.aux);
+       return (a->type != CPP_MACRO_ARG || a->val.c == b->val.c);
       case SPELL_IDENT:
        return a->val.node == b->val.node;
       case SPELL_STRING:
@@ -1565,7 +1565,7 @@ cpp_can_paste (pfile, token1, token2, digraph)
       break;
 
     case CPP_OTHER:
-      if (CPP_OPTION (pfile, objc) && token1->val.aux == '@')
+      if (CPP_OPTION (pfile, objc) && token1->val.c == '@')
        {
          if (b == CPP_NAME)    return CPP_NAME;
          if (b == CPP_STRING)  return CPP_OSTRING;
@@ -1627,7 +1627,7 @@ cpp_avoid_paste (pfile, token1, token2)
     case CPP_NUMBER:   return (b == CPP_NUMBER || b == CPP_NAME
                                || c == '.' || c == '+' || c == '-');
     case CPP_OTHER:    return (CPP_OPTION (pfile, objc)
-                               && token1->val.aux == '@'
+                               && token1->val.c == '@'
                                && (b == CPP_NAME || b == CPP_STRING));
     default:           break;
     }

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 9b99dcc8f864f149c6a085cf6adcb6a8f7c4d49d..cc559e1669258c85c2ed6df9b512b911e56b8fc9 100644 (file)
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -183,11 +183,11 @@ struct cpp_token
 
   union
   {
-    HOST_WIDEST_INT integer;   /* an integer */
-    struct cpp_hashnode *node; /* an identifier */
-    struct cpp_string str;     /* a string, or number */
-    unsigned int aux;          /* argument no. for a CPP_MACRO_ARG, or
-                                  character represented by CPP_OTHER.  */
+    HOST_WIDEST_INT integer;   /* An integer.  */
+    struct cpp_hashnode *node; /* An identifier.  */
+    struct cpp_string str;     /* A string, or number.  */
+    unsigned int arg_no;       /* Argument no. for a CPP_MACRO_ARG.  */
+    unsigned char c;           /* Character represented by CPP_OTHER.  */
   } val;
 };
 

diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index fa9d5fd5b0521076f9a10bbb284bee0c91ea1fde..24babafeefa6f1332be65c2f1dd20172c2fddfe3 100644 (file)
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -386,7 +386,7 @@ stringify_arg (pfile, arg)
        dest = cpp_spell_token (pfile, token, dest);
       total_len = dest - start;
 
-      if (token->type == CPP_OTHER && token->val.aux == '\\')
+      if (token->type == CPP_OTHER && token->val.c == '\\')
        backslash_count++;
       else
        backslash_count = 0;
@@ -790,7 +790,7 @@ replace_args (pfile, macro, args, list)
       {
        /* We have an argument.  If it is not being stringified or
           pasted it is macro-replaced before insertion.  */
-       arg = &args[src->val.aux - 1];
+       arg = &args[src->val.arg_no - 1];
        if (src->flags & STRINGIFY_ARG)
          {
            if (!arg->stringified)
@@ -818,7 +818,7 @@ replace_args (pfile, macro, args, list)
        unsigned int count;
        const cpp_token *from;
 
-       arg = &args[src->val.aux - 1];
+       arg = &args[src->val.arg_no - 1];
        if (src->flags & STRINGIFY_ARG)
          from = arg->stringified, count = 1;
        else if ((src->flags & PASTE_LEFT)
@@ -832,7 +832,7 @@ replace_args (pfile, macro, args, list)
            it is a variable argument, it is also flagged.  */
        dest->flags &= ~PREV_WHITE;
        dest->flags |= src->flags & PREV_WHITE;
-       if (macro->var_args && src->val.aux == macro->paramc)
+       if (macro->var_args && src->val.arg_no == macro->paramc)
          dest->flags |= VARARGS_FIRST;
 
        /* The last token gets the PASTE_LEFT of the CPP_MACRO_ARG.  */
@@ -1392,7 +1392,7 @@ lex_expansion_token (pfile, macro)
   if (token->type == CPP_NAME && token->val.node->arg_index)
     {
       token->type = CPP_MACRO_ARG;
-      token->val.aux = token->val.node->arg_index;
+      token->val.arg_no = token->val.node->arg_index;
     }
   else if (CPP_WTRADITIONAL (pfile) && macro->paramc > 0
           && (token->type == CPP_STRING || token->type == CPP_CHAR))
@@ -1624,7 +1624,7 @@ cpp_macro_definition (pfile, node)
          cpp_token *token = &macro->expansion[i];
 
          if (token->type == CPP_MACRO_ARG)
-           len += macro->params[token->val.aux - 1]->length;
+           len += macro->params[token->val.arg_no - 1]->length;
          else
            len += cpp_token_len (token); /* Includes room for ' '.  */
          if (token->flags & STRINGIFY_ARG)
@@ -1675,8 +1675,8 @@ cpp_macro_definition (pfile, node)
 
          if (token->type == CPP_MACRO_ARG)
            {
-             len = macro->params[token->val.aux - 1]->length;
-             memcpy (buffer, macro->params[token->val.aux - 1]->name, len);
+             len = macro->params[token->val.arg_no - 1]->length;
+             memcpy (buffer, macro->params[token->val.arg_no - 1]->name, len);
              buffer += len;
            }
          else