From 21599a49eaef2c9bc9daf5cde31dd08ccbff0362 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Tue, 25 Oct 2022 13:23:30 -0500 Subject: [PATCH] Make `CALL_STACK_LIMIT_EXCEEDED_ERR_MSG` more generic We're now using this when a stack overflow is detected during eval/substitution loops, too. --- src/parse_constants.h | 3 +-- tests/checks/stack-overflow.fish | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/parse_constants.h b/src/parse_constants.h index 0276b3e2f..add5b2d06 100644 --- a/src/parse_constants.h +++ b/src/parse_constants.h @@ -220,8 +220,7 @@ enum class pipeline_position_t : uint8_t { /// Error message on reaching maximum call stack depth. #define CALL_STACK_LIMIT_EXCEEDED_ERR_MSG \ - _(L"The function call stack limit has been exceeded. Do you have an accidental infinite " \ - L"loop?") + _(L"The call stack limit has been exceeded. Do you have an accidental infinite loop?") /// Error message when encountering an unknown builtin name. #define UNKNOWN_BUILTIN_ERR_MSG _(L"Unknown builtin '%ls'") diff --git a/tests/checks/stack-overflow.fish b/tests/checks/stack-overflow.fish index e7d742135..de2189012 100644 --- a/tests/checks/stack-overflow.fish +++ b/tests/checks/stack-overflow.fish @@ -13,7 +13,7 @@ end left -#CHECKERR: {{.*}} The function call stack limit has been exceeded. {{.*}} +#CHECKERR: {{.*}} The call stack limit has been exceeded. {{.*}} #CHECKERR: {{.*}} #CHECKERR: {{.*}} #CHECKERR: {{.*}}