Move arglist_len et al to parser_state
[deliverable/binutils-gdb.git] / gdb / c-exp.y
index 508e9ef28ddc96267da047e93774518314519686..cab5cd55dbd5b8559355531fb6802bd572aad5ec 100644 (file)
@@ -54,7 +54,7 @@
 #include "typeprint.h"
 #include "cp-abi.h"
 
-#define parse_type(ps) builtin_type (parse_gdbarch (ps))
+#define parse_type(ps) builtin_type (ps->gdbarch ())
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
    etc).  */
@@ -470,7 +470,7 @@ exp :       OBJC_LBRAC TYPENAME
                        {
                          CORE_ADDR theclass;
 
-                         theclass = lookup_objc_class (parse_gdbarch (pstate),
+                         theclass = lookup_objc_class (pstate->gdbarch (),
                                                     copy_name ($2.stoken));
                          if (theclass == 0)
                            error (_("%s is not an ObjC Class"),
@@ -534,11 +534,11 @@ msgarg    :       name ':' exp
 exp    :       exp '('
                        /* This is to save the value of arglist_len
                           being accumulated by an outer function call.  */
-                       { start_arglist (); }
+                       { pstate->start_arglist (); }
                arglist ')'     %prec ARROW
                        { write_exp_elt_opcode (pstate, OP_FUNCALL);
                          write_exp_elt_longcst (pstate,
-                                                (LONGEST) end_arglist ());
+                                                pstate->end_arglist ());
                          write_exp_elt_opcode (pstate, OP_FUNCALL); }
        ;
 
@@ -546,10 +546,10 @@ exp       :       exp '('
    "func()::static_var" further below, which uses
    function_method_void.  */
 exp    :       exp '(' ')' %prec ARROW
-                       { start_arglist ();
+                       { pstate->start_arglist ();
                          write_exp_elt_opcode (pstate, OP_FUNCALL);
                          write_exp_elt_longcst (pstate,
-                                                (LONGEST) end_arglist ());
+                                                pstate->end_arglist ());
                          write_exp_elt_opcode (pstate, OP_FUNCALL); }
        ;
 
@@ -559,8 +559,8 @@ exp :       UNKNOWN_CPP_NAME '('
                          /* This could potentially be a an argument defined
                             lookup function (Koenig).  */
                          write_exp_elt_opcode (pstate, OP_ADL_FUNC);
-                         write_exp_elt_block (pstate,
-                                              expression_context_block);
+                         write_exp_elt_block
+                           (pstate, pstate->expression_context_block);
                          write_exp_elt_sym (pstate,
                                             NULL); /* Placeholder.  */
                          write_exp_string (pstate, $1.stoken);
@@ -569,30 +569,30 @@ exp       :       UNKNOWN_CPP_NAME '('
                        /* This is to save the value of arglist_len
                           being accumulated by an outer function call.  */
 
-                         start_arglist ();
+                         pstate->start_arglist ();
                        }
                arglist ')'     %prec ARROW
                        {
                          write_exp_elt_opcode (pstate, OP_FUNCALL);
                          write_exp_elt_longcst (pstate,
-                                                (LONGEST) end_arglist ());
+                                                pstate->end_arglist ());
                          write_exp_elt_opcode (pstate, OP_FUNCALL);
                        }
        ;
 
 lcurly :       '{'
-                       { start_arglist (); }
+                       { pstate->start_arglist (); }
        ;
 
 arglist        :
        ;
 
 arglist        :       exp
-                       { arglist_len = 1; }
+                       { pstate->arglist_len = 1; }
        ;
 
 arglist        :       arglist ',' exp   %prec ABOVE_COMMA
-                       { arglist_len++; }
+                       { pstate->arglist_len++; }
        ;
 
 function_method:       exp '(' parameter_typelist ')' const_or_volatile
@@ -645,7 +645,7 @@ exp     :       function_method_void_or_typelist COLONCOLON name
        ;
 
 rcurly :       '}'
-                       { $$ = end_arglist () - 1; }
+                       { $$ = pstate->end_arglist () - 1; }
        ;
 exp    :       lcurly arglist rcurly   %prec ARROW
                        { write_exp_elt_opcode (pstate, OP_ARRAY);
@@ -815,8 +815,8 @@ exp :       SIZEOF '(' type ')'     %prec UNARY
                        { struct type *type = $3;
                          write_exp_elt_opcode (pstate, OP_LONG);
                          write_exp_elt_type (pstate, lookup_signed_typename
-                                             (parse_language (pstate),
-                                              parse_gdbarch (pstate),
+                                             (pstate->language (),
+                                              pstate->gdbarch (),
                                               "int"));
                          type = check_typedef (type);
 
@@ -1284,124 +1284,126 @@ typebase
        :       TYPENAME
                        { $$ = $1.type; }
        |       INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "int"); }
        |       LONG
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long"); }
        |       SHORT
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "short"); }
        |       LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long"); }
        |       LONG SIGNED_KEYWORD INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long"); }
        |       LONG SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long"); }
        |       SIGNED_KEYWORD LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long"); }
        |       UNSIGNED LONG INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long"); }
        |       LONG UNSIGNED INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long"); }
        |       LONG UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long"); }
        |       LONG LONG
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long long"); }
        |       LONG LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long long"); }
        |       LONG LONG SIGNED_KEYWORD INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long long"); }
        |       LONG LONG SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long long"); }
        |       SIGNED_KEYWORD LONG LONG
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long long"); }
        |       SIGNED_KEYWORD LONG LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "long long"); }
        |       UNSIGNED LONG LONG
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long long"); }
        |       UNSIGNED LONG LONG INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long long"); }
        |       LONG LONG UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long long"); }
        |       LONG LONG UNSIGNED INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "long long"); }
        |       SHORT INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "short"); }
        |       SHORT SIGNED_KEYWORD INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "short"); }
        |       SHORT SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "short"); }
        |       UNSIGNED SHORT INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "short"); }
        |       SHORT UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "short"); }
        |       SHORT UNSIGNED INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "short"); }
        |       DOUBLE_KEYWORD
-                       { $$ = lookup_typename (parse_language (pstate),
-                                               parse_gdbarch (pstate),
+                       { $$ = lookup_typename (pstate->language (),
+                                               pstate->gdbarch (),
                                                "double",
-                                               (struct block *) NULL,
+                                               NULL,
                                                0); }
        |       LONG DOUBLE_KEYWORD
-                       { $$ = lookup_typename (parse_language (pstate),
-                                               parse_gdbarch (pstate),
+                       { $$ = lookup_typename (pstate->language (),
+                                               pstate->gdbarch (),
                                                "long double",
-                                               (struct block *) NULL,
+                                               NULL,
                                                0); }
        |       STRUCT name
-                       { $$ = lookup_struct (copy_name ($2),
-                                             expression_context_block); }
+                       { $$
+                           = lookup_struct (copy_name ($2),
+                                            pstate->expression_context_block);
+                       }
        |       STRUCT COMPLETE
                        {
                          mark_completion_tag (TYPE_CODE_STRUCT, "", 0);
@@ -1414,8 +1416,9 @@ typebase
                          $$ = NULL;
                        }
        |       CLASS name
-                       { $$ = lookup_struct (copy_name ($2),
-                                             expression_context_block); }
+                       { $$ = lookup_struct
+                           (copy_name ($2), pstate->expression_context_block);
+                       }
        |       CLASS COMPLETE
                        {
                          mark_completion_tag (TYPE_CODE_STRUCT, "", 0);
@@ -1428,8 +1431,10 @@ typebase
                          $$ = NULL;
                        }
        |       UNION name
-                       { $$ = lookup_union (copy_name ($2),
-                                            expression_context_block); }
+                       { $$
+                           = lookup_union (copy_name ($2),
+                                           pstate->expression_context_block);
+                       }
        |       UNION COMPLETE
                        {
                          mark_completion_tag (TYPE_CODE_UNION, "", 0);
@@ -1443,7 +1448,8 @@ typebase
                        }
        |       ENUM name
                        { $$ = lookup_enum (copy_name ($2),
-                                           expression_context_block); }
+                                           pstate->expression_context_block);
+                       }
        |       ENUM COMPLETE
                        {
                          mark_completion_tag (TYPE_CODE_ENUM, "", 0);
@@ -1456,27 +1462,28 @@ typebase
                          $$ = NULL;
                        }
        |       UNSIGNED type_name
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         TYPE_NAME($2.type)); }
        |       UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language (pstate),
-                                                        parse_gdbarch (pstate),
+                       { $$ = lookup_unsigned_typename (pstate->language (),
+                                                        pstate->gdbarch (),
                                                         "int"); }
        |       SIGNED_KEYWORD type_name
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       TYPE_NAME($2.type)); }
        |       SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language (pstate),
-                                                      parse_gdbarch (pstate),
+                       { $$ = lookup_signed_typename (pstate->language (),
+                                                      pstate->gdbarch (),
                                                       "int"); }
                 /* It appears that this rule for templates is never
                    reduced; template recognition happens by lookahead
                    in the token processing code in yylex. */
        |       TEMPLATE name '<' type '>'
-                       { $$ = lookup_template_type(copy_name($2), $4,
-                                                   expression_context_block);
+                       { $$ = lookup_template_type
+                           (copy_name($2), $4,
+                            pstate->expression_context_block);
                        }
        | const_or_volatile_or_space_identifier_noopt typebase
                        { $$ = follow_types ($2); }
@@ -1489,24 +1496,24 @@ type_name:      TYPENAME
                {
                  $$.stoken.ptr = "int";
                  $$.stoken.length = 3;
-                 $$.type = lookup_signed_typename (parse_language (pstate),
-                                                   parse_gdbarch (pstate),
+                 $$.type = lookup_signed_typename (pstate->language (),
+                                                   pstate->gdbarch (),
                                                    "int");
                }
        |       LONG
                {
                  $$.stoken.ptr = "long";
                  $$.stoken.length = 4;
-                 $$.type = lookup_signed_typename (parse_language (pstate),
-                                                   parse_gdbarch (pstate),
+                 $$.type = lookup_signed_typename (pstate->language (),
+                                                   pstate->gdbarch (),
                                                    "long");
                }
        |       SHORT
                {
                  $$.stoken.ptr = "short";
                  $$.stoken.length = 5;
-                 $$.type = lookup_signed_typename (parse_language (pstate),
-                                                   parse_gdbarch (pstate),
+                 $$.type = lookup_signed_typename (pstate->language (),
+                                                   pstate->gdbarch (),
                                                    "short");
                }
        ;
@@ -1733,10 +1740,11 @@ name_not_typename :     NAME
                          struct field_of_this_result is_a_field_of_this;
 
                          $$.stoken = $1;
-                         $$.sym = lookup_symbol ($1.ptr,
-                                                 expression_context_block,
-                                                 VAR_DOMAIN,
-                                                 &is_a_field_of_this);
+                         $$.sym
+                           = lookup_symbol ($1.ptr,
+                                            pstate->expression_context_block,
+                                            VAR_DOMAIN,
+                                            &is_a_field_of_this);
                          $$.is_a_field_of_this
                            = is_a_field_of_this.type != NULL;
                        }
@@ -2021,10 +2029,10 @@ parse_number (struct parser_state *par_state,
 
   un = n >> 2;
   if (long_p == 0
-      && (un >> (gdbarch_int_bit (parse_gdbarch (par_state)) - 2)) == 0)
+      && (un >> (gdbarch_int_bit (par_state->gdbarch ()) - 2)) == 0)
     {
       high_bit
-       = ((ULONGEST)1) << (gdbarch_int_bit (parse_gdbarch (par_state)) - 1);
+       = ((ULONGEST)1) << (gdbarch_int_bit (par_state->gdbarch ()) - 1);
 
       /* A large decimal (not hex or octal) constant (between INT_MAX
         and UINT_MAX) is a long or unsigned long, according to ANSI,
@@ -2036,10 +2044,10 @@ parse_number (struct parser_state *par_state,
       signed_type = parse_type (par_state)->builtin_int;
     }
   else if (long_p <= 1
-          && (un >> (gdbarch_long_bit (parse_gdbarch (par_state)) - 2)) == 0)
+          && (un >> (gdbarch_long_bit (par_state->gdbarch ()) - 2)) == 0)
     {
       high_bit
-       = ((ULONGEST)1) << (gdbarch_long_bit (parse_gdbarch (par_state)) - 1);
+       = ((ULONGEST)1) << (gdbarch_long_bit (par_state->gdbarch ()) - 1);
       unsigned_type = parse_type (par_state)->builtin_unsigned_long;
       signed_type = parse_type (par_state)->builtin_long;
     }
@@ -2047,11 +2055,11 @@ parse_number (struct parser_state *par_state,
     {
       int shift;
       if (sizeof (ULONGEST) * HOST_CHAR_BIT
-         < gdbarch_long_long_bit (parse_gdbarch (par_state)))
+         < gdbarch_long_long_bit (par_state->gdbarch ()))
        /* A long long does not fit in a LONGEST.  */
        shift = (sizeof (ULONGEST) * HOST_CHAR_BIT - 1);
       else
-       shift = (gdbarch_long_long_bit (parse_gdbarch (par_state)) - 1);
+       shift = (gdbarch_long_long_bit (par_state->gdbarch ()) - 1);
       high_bit = (ULONGEST) 1 << shift;
       unsigned_type = parse_type (par_state)->builtin_unsigned_long_long;
       signed_type = parse_type (par_state)->builtin_long_long;
@@ -2475,8 +2483,8 @@ scan_macro_expansion (char *expansion)
 
   /* Save the old lexptr value, so we can return to it when we're done
      parsing the expanded text.  */
-  cpstate->macro_original_text = lexptr;
-  lexptr = copy;
+  cpstate->macro_original_text = pstate->lexptr;
+  pstate->lexptr = copy;
 }
 
 static int
@@ -2492,7 +2500,7 @@ finished_macro_expansion (void)
   gdb_assert (cpstate->macro_original_text);
 
   /* Pop back to the original text.  */
-  lexptr = cpstate->macro_original_text;
+  pstate->lexptr = cpstate->macro_original_text;
   cpstate->macro_original_text = 0;
 }
 
@@ -2519,6 +2527,9 @@ static int saw_name_at_eof;
    operator -- either '.' or ARROW.  */
 static bool last_was_structop;
 
+/* Depth of parentheses.  */
+static int paren_depth;
+
 /* Read one token, getting characters through lexptr.  */
 
 static int
@@ -2539,7 +2550,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
   /* Check if this is a macro invocation that we need to expand.  */
   if (! scanning_macro_expansion ())
     {
-      char *expanded = macro_expand_next (&lexptr,
+      char *expanded = macro_expand_next (&pstate->lexptr,
                                           standard_macro_lookup,
                                           expression_macro_scope);
 
@@ -2547,18 +2558,18 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
         scan_macro_expansion (expanded);
     }
 
-  prev_lexptr = lexptr;
+  pstate->prev_lexptr = pstate->lexptr;
 
-  tokstart = lexptr;
+  tokstart = pstate->lexptr;
   /* See if it is a special token of length 3.  */
   for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
     if (strncmp (tokstart, tokentab3[i].oper, 3) == 0)
       {
        if ((tokentab3[i].flags & FLAG_CXX) != 0
-           && parse_language (par_state)->la_language != language_cplus)
+           && par_state->language ()->la_language != language_cplus)
          break;
 
-       lexptr += 3;
+       pstate->lexptr += 3;
        yylval.opcode = tokentab3[i].opcode;
        return tokentab3[i].token;
       }
@@ -2568,10 +2579,10 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
     if (strncmp (tokstart, tokentab2[i].oper, 2) == 0)
       {
        if ((tokentab2[i].flags & FLAG_CXX) != 0
-           && parse_language (par_state)->la_language != language_cplus)
+           && par_state->language ()->la_language != language_cplus)
          break;
 
-       lexptr += 2;
+       pstate->lexptr += 2;
        yylval.opcode = tokentab2[i].opcode;
        if (tokentab2[i].token == ARROW)
          last_was_structop = 1;
@@ -2605,14 +2616,14 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
     case ' ':
     case '\t':
     case '\n':
-      lexptr++;
+      pstate->lexptr++;
       goto retry;
 
     case '[':
     case '(':
       paren_depth++;
-      lexptr++;
-      if (parse_language (par_state)->la_language == language_objc
+      pstate->lexptr++;
+      if (par_state->language ()->la_language == language_objc
          && c == '[')
        return OBJC_LBRAC;
       return c;
@@ -2622,20 +2633,20 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
       if (paren_depth == 0)
        return 0;
       paren_depth--;
-      lexptr++;
+      pstate->lexptr++;
       return c;
 
     case ',':
-      if (comma_terminates
+      if (pstate->comma_terminates
           && paren_depth == 0
           && ! scanning_macro_expansion ())
        return 0;
-      lexptr++;
+      pstate->lexptr++;
       return c;
 
     case '.':
       /* Might be a floating point number.  */
-      if (lexptr[1] < '0' || lexptr[1] > '9')
+      if (pstate->lexptr[1] < '0' || pstate->lexptr[1] > '9')
        {
          last_was_structop = true;
          goto symbol;          /* Nope, must be a symbol. */
@@ -2702,7 +2713,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
            err_copy[p - tokstart] = 0;
            error (_("Invalid number \"%s\"."), err_copy);
          }
-       lexptr = p;
+       pstate->lexptr = p;
        return toktype;
       }
 
@@ -2710,14 +2721,14 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
       {
        const char *p = &tokstart[1];
 
-       if (parse_language (par_state)->la_language == language_objc)
+       if (par_state->language ()->la_language == language_objc)
          {
            size_t len = strlen ("selector");
 
            if (strncmp (p, "selector", len) == 0
                && (p[len] == '\0' || ISSPACE (p[len])))
              {
-               lexptr = p + len;
+               pstate->lexptr = p + len;
                return SELECTOR;
              }
            else if (*p == '"')
@@ -2730,7 +2741,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
        if (strncmp (p, "entry", len) == 0 && !c_ident_is_alnum (p[len])
            && p[len] != '_')
          {
-           lexptr = &p[len];
+           pstate->lexptr = &p[len];
            return ENTRY;
          }
       }
@@ -2753,7 +2764,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
     case '{':
     case '}':
     symbol:
-      lexptr++;
+      pstate->lexptr++;
       return c;
 
     case 'L':
@@ -2768,8 +2779,8 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
     parse_string:
       {
        int host_len;
-       int result = parse_string_or_char (tokstart, &lexptr, &yylval.tsval,
-                                          &host_len);
+       int result = parse_string_or_char (tokstart, &pstate->lexptr,
+                                          &yylval.tsval, &host_len);
        if (result == CHAR)
          {
            if (host_len == 0)
@@ -2777,7 +2788,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
            else if (host_len > 2 && c == '\'')
              {
                ++tokstart;
-               namelen = lexptr - tokstart - 1;
+               namelen = pstate->lexptr - tokstart - 1;
                *is_quoted_name = true;
 
                goto tryname;
@@ -2849,7 +2860,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
        return 0;
     }
 
-  lexptr += namelen;
+  pstate->lexptr += namelen;
 
   tryname:
 
@@ -2862,16 +2873,17 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
     if (strcmp (copy, ident_tokens[i].oper) == 0)
       {
        if ((ident_tokens[i].flags & FLAG_CXX) != 0
-           && parse_language (par_state)->la_language != language_cplus)
+           && par_state->language ()->la_language != language_cplus)
          break;
 
        if ((ident_tokens[i].flags & FLAG_SHADOW) != 0)
          {
            struct field_of_this_result is_a_field_of_this;
 
-           if (lookup_symbol (copy, expression_context_block,
+           if (lookup_symbol (copy,
+                              pstate->expression_context_block,
                               VAR_DOMAIN,
-                              (parse_language (par_state)->la_language
+                              (par_state->language ()->la_language
                                == language_cplus ? &is_a_field_of_this
                                : NULL)).symbol
                != NULL)
@@ -2890,7 +2902,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
   if (*tokstart == '$')
     return DOLLAR_VARIABLE;
 
-  if (parse_completion && *lexptr == '\0')
+  if (parse_completion && *pstate->lexptr == '\0')
     saw_name_at_eof = 1;
 
   yylval.ssym.stoken = yylval.sval;
@@ -2940,7 +2952,7 @@ classify_name (struct parser_state *par_state, const struct block *block,
   memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
 
   bsym = lookup_symbol (copy, block, VAR_DOMAIN,
-                       parse_language (par_state)->la_name_of_this
+                       par_state->language ()->la_name_of_this
                        ? &is_a_field_of_this : NULL);
 
   if (bsym.symbol && SYMBOL_CLASS (bsym.symbol) == LOC_BLOCK)
@@ -2999,15 +3011,16 @@ classify_name (struct parser_state *par_state, const struct block *block,
     }
 
   /* See if it's an ObjC classname.  */
-  if (parse_language (par_state)->la_language == language_objc && !bsym.symbol)
+  if (par_state->language ()->la_language == language_objc && !bsym.symbol)
     {
-      CORE_ADDR Class = lookup_objc_class (parse_gdbarch (par_state), copy);
+      CORE_ADDR Class = lookup_objc_class (par_state->gdbarch (), copy);
       if (Class)
        {
          struct symbol *sym;
 
          yylval.theclass.theclass = Class;
-         sym = lookup_struct_typedef (copy, expression_context_block, 1);
+         sym = lookup_struct_typedef (copy,
+                                      par_state->expression_context_block, 1);
          if (sym)
            yylval.theclass.type = SYMBOL_TYPE (sym);
          return CLASSNAME;
@@ -3038,7 +3051,7 @@ classify_name (struct parser_state *par_state, const struct block *block,
   yylval.ssym.is_a_field_of_this = is_a_field_of_this.type != NULL;
 
   if (bsym.symbol == NULL
-      && parse_language (par_state)->la_language == language_cplus
+      && par_state->language ()->la_language == language_cplus
       && is_a_field_of_this.type == NULL
       && lookup_minimal_symbol (copy, NULL, NULL).minsym == NULL)
     return UNKNOWN_CPP_NAME;
@@ -3145,9 +3158,9 @@ yylex (void)
      name-like token.  */
   current.token = lex_one_token (pstate, &is_quoted_name);
   if (current.token == NAME)
-    current.token = classify_name (pstate, expression_context_block,
+    current.token = classify_name (pstate, pstate->expression_context_block,
                                   is_quoted_name, last_lex_was_structop);
-  if (parse_language (pstate)->la_language != language_cplus
+  if (pstate->language ()->la_language != language_cplus
       || (current.token != TYPENAME && current.token != COLONCOLON
          && current.token != FILENAME))
     return current.token;
@@ -3191,7 +3204,7 @@ yylex (void)
   else
     {
       gdb_assert (current.token == TYPENAME);
-      search_block = expression_context_block;
+      search_block = pstate->expression_context_block;
       obstack_grow (&name_obstack, current.value.sval.ptr,
                    current.value.sval.length);
       context_type = current.value.tsym.type;
@@ -3288,8 +3301,9 @@ c_parse (struct parser_state *par_state)
 
   gdb::unique_xmalloc_ptr<struct macro_scope> macro_scope;
 
-  if (expression_context_block)
-    macro_scope = sal_macro_scope (find_pc_line (expression_context_pc, 0));
+  if (par_state->expression_context_block)
+    macro_scope
+      = sal_macro_scope (find_pc_line (par_state->expression_context_pc, 0));
   else
     macro_scope = default_macro_scope ();
   if (! macro_scope)
@@ -3304,6 +3318,7 @@ c_parse (struct parser_state *par_state)
   /* Initialize some state used by the lexer.  */
   last_was_structop = false;
   saw_name_at_eof = 0;
+  paren_depth = 0;
 
   token_fifo.clear ();
   popping = 0;
@@ -3373,8 +3388,8 @@ c_print_token (FILE *file, int type, YYSTYPE value)
 static void
 yyerror (const char *msg)
 {
-  if (prev_lexptr)
-    lexptr = prev_lexptr;
+  if (pstate->prev_lexptr)
+    pstate->lexptr = pstate->prev_lexptr;
 
-  error (_("A %s in expression, near `%s'."), msg, lexptr);
+  error (_("A %s in expression, near `%s'."), msg, pstate->lexptr);
 }
This page took 0.043938 seconds and 4 git commands to generate.