aboutsummaryrefslogtreecommitdiffhomepage
path: root/parse_tree.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2015-04-29 16:53:02 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2015-04-29 16:53:02 -0700
commitc91f70523cbdf62292accf87b4465ad30ca8c159 (patch)
treeac8a85e1bc1e0dc789517c091ac9e5f47acdde68 /parse_tree.cpp
parent3d9c24196dab141699bded97e78bce35f8dc27d1 (diff)
Rework error messages to be shorter and to handle more special bash-isms
Example: we can point $* to argv Fixes #1288
Diffstat (limited to 'parse_tree.cpp')
-rw-r--r--parse_tree.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/parse_tree.cpp b/parse_tree.cpp
index 25ad5b61..ed3025ed 100644
--- a/parse_tree.cpp
+++ b/parse_tree.cpp
@@ -880,7 +880,7 @@ void parse_ll_t::parse_error_failed_production(struct parse_stack_element_t &sta
if (prev_pipe != NULL)
{
/* The pipe of the previous job abuts our current token. So we have ||. */
- this->parse_error(token, parse_error_double_pipe, CMD_OR_ERR_MSG);
+ this->parse_error(token, parse_error_double_pipe, ERROR_BAD_OR);
done = true;
}
}
@@ -893,7 +893,7 @@ void parse_ll_t::parse_error_failed_production(struct parse_stack_element_t &sta
if (prev_background != NULL)
{
/* We have &&. */
- this->parse_error(token, parse_error_double_background, CMD_AND_ERR_MSG);
+ this->parse_error(token, parse_error_double_background, ERROR_BAD_AND);
done = true;
}
}