- struct cleanup *back_to;
- struct parser_state pstate;
-
- /* Initialize the expression buffer in the parser state. The
- language does not matter, since we are using our own
- parser. */
- initialize_expout (&pstate, 10, current_language, gdbarch);
- back_to = make_cleanup (free_current_contents, &pstate.expout);
+ /* Initialize the expression builder. The language does not
+ matter, since we are using our own parser. */
+ expr_builder builder (current_language, gdbarch);