Rework decision process for whether to interpret keywords as structural

or as commands (for LL parser). Will allow 'builtin --' to parse as a
plain statement, instead of a decorated statement '--'

1 files changed, 13 insertions, 6 deletions

diff --git a/parse_tree.h b/parse_tree.h
index c46eb911..c1bcbab9 100644
--- a/parse_tree.h
+++ b/parse_tree.h
@@ -113,13 +113,20 @@ enum parse_keyword_t
     parse_keyword_command,
     parse_keyword_builtin,
     
-    /* The following are not really keywords but are necessary for e.g. "command --help" to work */
-    parse_keyword_dash,
-    parse_keyword_dashdash,
-    parse_keyword_dash_h,
-    parse_keyword_dashdash_help,
+    LAST_KEYWORD = parse_keyword_builtin
+};
+
+
+/** A struct representing the token type that we use internally */
+struct parse_token_t
+{
+    enum parse_token_type_t type; // The type of the token as represented by the parser
+    enum parse_keyword_t keyword; // Any keyword represented by this token
+    bool has_dash_prefix; // Hackish: whether the source contains a dash prefix
+    size_t source_start;
+    size_t source_length;
 
-    LAST_KEYWORD = parse_keyword_dashdash_help
+    wcstring describe() const;
 };