Support for stack overflow and infinite recursion detection in new

parser

1 files changed, 9 insertions, 7 deletions

diff --git a/parse_constants.h b/parse_constants.h
index e923bc10..12fcb114 100644
--- a/parse_constants.h
+++ b/parse_constants.h
@@ -128,6 +128,8 @@ enum {
 typedef unsigned int parser_test_error_bits_t;
 
 
+/** Maximum number of function calls. */
+#define FISH_MAX_STACK_DEPTH 128
 
 /**
    Error message for tokenizer error. The tokenizer message is
@@ -140,15 +142,15 @@ typedef unsigned int parser_test_error_bits_t;
 */
 #define COND_ERR_MSG _( L"An additional command is required" )
 
-/**
-   Error message on a function that calls itself immediately
-*/
+/** Error message on a function that calls itself immediately */
 #define INFINITE_RECURSION_ERR_MSG _( L"The function calls itself immediately, which would result in an infinite loop.")
 
-/**
-   Error message on reaching maximum recursion depth
-*/
-#define OVERFLOW_RECURSION_ERR_MSG _( L"Maximum recursion depth reached. Accidental infinite loop?")
+/** Error message on a function that calls itself immediately */
+#define INFINITE_FUNC_RECURSION_ERR_MSG _( L"The function '%ls' calls itself immediately, which would result in an infinite loop.")
+
+
+/** 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 loop?")
 
 /**
    Error message used when the end of a block can't be located