aboutsummaryrefslogtreecommitdiffhomepage
path: root/parse_tree.h
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-02-27 19:56:37 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-02-27 20:34:42 -0800
commit858b6aa257c13451d0537b19c6f035fdb5114ee6 (patch)
tree38871f073dc45d15f707e4ea829410373ecbecb3 /parse_tree.h
parent74135c0600d5dcc40d396d0e7293c17b8d4bdaa7 (diff)
Correct some mistakes in the fish grammar comment
Diffstat (limited to 'parse_tree.h')
-rw-r--r--parse_tree.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/parse_tree.h b/parse_tree.h
index 1835183d..0add08cd 100644
--- a/parse_tree.h
+++ b/parse_tree.h
@@ -224,18 +224,18 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t flags, parse
# A block is a conditional, loop, or begin/end
if_statement = if_clause else_clause end_command arguments_or_redirections_list
- if_clause = <IF> job STATEMENT_TERMINATOR job_list
+ if_clause = <IF> job <TOK_END> job_list
else_clause = <empty> |
<ELSE> else_continuation
else_continuation = if_clause else_clause |
- STATEMENT_TERMINATOR job_list
+ <TOK_END> job_list
- switch_statement = SWITCH <TOK_STRING> STATEMENT_TERMINATOR case_item_list end_command arguments_or_redirections_list
+ switch_statement = SWITCH <TOK_STRING> <TOK_END> case_item_list end_command arguments_or_redirections_list
case_item_list = <empty> |
case_item case_item_list |
<TOK_END> case_item_list
- case_item = CASE argument_list STATEMENT_TERMINATOR job_list
+ case_item = CASE argument_list <TOK_END> job_list
block_statement = block_header <TOK_END> job_list end_command arguments_or_redirections_list
block_header = for_header | while_header | function_header | begin_header
@@ -264,8 +264,6 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t flags, parse
redirection = <TOK_REDIRECTION> <TOK_STRING>
- terminator = <TOK_END> | <TOK_BACKGROUND>
-
optional_background = <empty> | <TOK_BACKGROUND>
end_command = END