updated for version 7.3.978

Problem:    Regexp debug logs don't have a good name.
Solution:   Use clear names and make it possible to write logs for the old and
            new engines separately. (Taro Muraoka)

diff --git a/src/regexp.c b/src/regexp.c
index a1f71ab979428108127498b384c5d413923f282c..60765d728f668553d06d2c04847ba53bea80519b 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -51,6 +51,8 @@
 # define BT_REGEXP_DUMP
 /* save the debugging data to a file instead of displaying it */
 # define BT_REGEXP_LOG
+# define BT_REGEXP_DEBUG_LOG
+# define BT_REGEXP_DEBUG_LOG_NAME      "bt_regexp_debug.log"
 #endif
 
 /*
@@ -7828,11 +7830,11 @@ vim_regcomp(expr_arg, re_flags)
 
     if (prog == NULL)      /* error compiling regexp with initial engine */
     {
-#ifdef DEBUG
+#ifdef BT_REGEXP_DEBUG_LOG
        if (regexp_engine != BACKTRACKING_ENGINE)   /* debugging log for NFA */
        {
            FILE *f;
-           f = fopen("debug.log", "a");
+           f = fopen(BT_REGEXP_DEBUG_LOG_NAME, "a");
            if (f)
            {
                if (!syntax_error)
@@ -7842,7 +7844,8 @@ vim_regcomp(expr_arg, re_flags)
                fclose(f);
            }
            else
-               EMSG("(NFA) Could not open \"debug.log\" to write !!!");
+               EMSG2("(NFA) Could not open \"%s\" to write !!!",
+                        BT_REGEXP_DEBUG_LOG_NAME);
            /*
            if (syntax_error)
                EMSG("NFA Regexp: Syntax Error !");

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index b50697aa3dfbfc29dd8b765bf9e535ab1758cd57..142e1abe6c6eb0e7252e7fa41a2fa43045f449f1 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -9,6 +9,8 @@
 /* Comment this out to disable log files. They can get pretty big */
 # define ENABLE_LOG
 # define LOG_NAME "log_nfarun.log"
+# define NFA_REGEXP_DEBUG_LOG
+# define NFA_REGEXP_DEBUG_LOG_NAME     "nfa_regexp_debug.log"
 #endif
 
 /* Upper limit allowed for {m,n} repetitions handled by NFA */
@@ -2849,12 +2851,12 @@ nfa_regmatch(start, submatch, m)
     int                *listids = NULL;
     int                j = 0;
     int                len = 0;
-#ifdef DEBUG
-    FILE       *debug = fopen("list.log", "a");
+#ifdef NFA_REGEXP_DEBUG_LOG
+    FILE       *debug = fopen(NFA_REGEXP_DEBUG_LOG_NAME, "a");
 
     if (debug == NULL)
     {
-       EMSG(_("(NFA) COULD NOT OPEN list.log !"));
+       EMSG2(_("(NFA) COULD NOT OPEN %s !"), NFA_REGEXP_DEBUG_LOG_NAME);
        return FALSE;
     }
 #endif
@@ -2950,7 +2952,7 @@ again:
        fprintf(log_fd, "\n");
 #endif
 
-#ifdef DEBUG
+#ifdef NFA_REGEXP_DEBUG_LOG
        fprintf(debug, "\n-------------------\n");
 #endif
 
@@ -2966,7 +2968,7 @@ again:
            else
                t = &thislist->t[i];
 
-#ifdef DEBUG
+#ifdef NFA_REGEXP_DEBUG_LOG
            nfa_set_code(t->state->c);
            fprintf(debug, "%s, ", code);
 #endif
@@ -3436,7 +3438,7 @@ theend:
     if (listids != NULL)
        vim_free(listids);
 #undef ADD_POS_NEG_STATE
-#ifdef DEBUG
+#ifdef NFA_REGEXP_DEBUG_LOG
     fclose(debug);
 #endif
 

diff --git a/src/version.c b/src/version.c
index 679c37bd86d37eb68abd8f9b2ac7329649c3bbfb..3b4353d93fff2bd26e94cd4a9138da446869ecf0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    978,
 /**/
     977,
 /**/