From cbd3fa6b01bab709d0b6f5277a984685d8c45888 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 27 Feb 2016 18:25:58 -0800 Subject: Eliminate parser_type_t It was never fully implemented and wasn't used for anything --- src/parser.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/parser.h') diff --git a/src/parser.h b/src/parser.h index 13fa6d16..df3df8ee 100644 --- a/src/parser.h +++ b/src/parser.h @@ -14,6 +14,7 @@ #include "parse_tree.h" #include "io.h" #include "parse_constants.h" +#include "expand.h" #include @@ -202,15 +203,6 @@ enum parser_error CMDSUBST_ERROR, }; -enum parser_type_t -{ - PARSER_TYPE_NONE, - PARSER_TYPE_GENERAL, - PARSER_TYPE_FUNCTIONS_ONLY, - PARSER_TYPE_COMPLETIONS_ONLY, - PARSER_TYPE_ERRORS_ONLY -}; - struct profile_item_t { /** Time spent executing the specified command, including parse time for nested blocks. */ @@ -236,8 +228,6 @@ class parser_t { friend class parse_execution_context_t; private: - enum parser_type_t parser_type; - /** Whether or not we output errors */ const bool show_errors; @@ -294,7 +284,7 @@ public: static void skip_all_blocks(); /** Create a parser of the given type */ - parser_t(enum parser_type_t type, bool show_errors); + parser_t(bool show_errors); /** Global event blocks */ event_blockage_list_t global_event_blocks; @@ -319,9 +309,10 @@ public: Errors are ignored. \param arg_src String to evaluate as an argument list + \param flags Some expand flags to use \param output List to insert output into */ - void expand_argument_list(const wcstring &arg_src, std::vector *output); + void expand_argument_list(const wcstring &arg_src, expand_flags_t flags, std::vector *output); /** Returns a string describing the current parser pisition in the format 'FILENAME (line LINE_NUMBER): LINE'. -- cgit v1.2.3