home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.1140 < prev    next >
Encoding:
Internet Message Format  |  2013-06-06  |  5.2 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.1140
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.1140
  11. Problem:    New regexp engine: trying expensive match while the result is not
  12.         going to be used.
  13. Solution:   Check for output state already being in the state list.
  14. Files:        src/regexp_nfa.c
  15.  
  16.  
  17. *** ../vim-7.3.1139/src/regexp_nfa.c    2013-06-07 16:31:44.000000000 +0200
  18. --- src/regexp_nfa.c    2013-06-07 17:16:31.000000000 +0200
  19. ***************
  20. *** 3156,3161 ****
  21. --- 3156,3163 ----
  22.   static void copy_sub __ARGS((regsub_T *to, regsub_T *from));
  23.   static void copy_sub_off __ARGS((regsub_T *to, regsub_T *from));
  24.   static int sub_equal __ARGS((regsub_T *sub1, regsub_T *sub2));
  25. + static int has_state_with_pos __ARGS((nfa_list_T *l, nfa_state_T *state, regsubs_T *subs));
  26. + static int state_in_list __ARGS((nfa_list_T *l, nfa_state_T *state, regsubs_T *subs));
  27.   static void addstate __ARGS((nfa_list_T *l, nfa_state_T *state, regsubs_T *subs, int off));
  28.   static void addstate_here __ARGS((nfa_list_T *l, nfa_state_T *state, regsubs_T *subs, nfa_pim_T *pim, int *ip));
  29.   
  30. ***************
  31. *** 3319,3324 ****
  32. --- 3321,3371 ----
  33.   }
  34.   #endif
  35.   
  36. + /*
  37. +  * Return TRUE if the same state is already in list "l" with the same
  38. +  * positions as "subs".
  39. +  */
  40. +     static int
  41. + has_state_with_pos(l, state, subs)
  42. +     nfa_list_T        *l;    /* runtime state list */
  43. +     nfa_state_T        *state;    /* state to update */
  44. +     regsubs_T        *subs;    /* pointers to subexpressions */
  45. + {
  46. +     nfa_thread_T    *thread;
  47. +     int            i;
  48. + 
  49. +     for (i = 0; i < l->n; ++i)
  50. +     {
  51. +     thread = &l->t[i];
  52. +     if (thread->state->id == state->id
  53. +         && sub_equal(&thread->subs.norm, &subs->norm)
  54. + #ifdef FEAT_SYN_HL
  55. +         && (!nfa_has_zsubexpr ||
  56. +                sub_equal(&thread->subs.synt, &subs->synt))
  57. + #endif
  58. +                   )
  59. +         return TRUE;
  60. +     }
  61. +     return FALSE;
  62. + }
  63. + 
  64. + /*
  65. +  * Return TRUE if "state" is already in list "l".
  66. +  */
  67. +     static int
  68. + state_in_list(l, state, subs)
  69. +     nfa_list_T        *l;    /* runtime state list */
  70. +     nfa_state_T        *state;    /* state to update */
  71. +     regsubs_T        *subs;    /* pointers to subexpressions */
  72. + {
  73. +     if (state->lastlist[nfa_ll_index] == l->id)
  74. +     {
  75. +     if (!nfa_has_backref || has_state_with_pos(l, state, subs))
  76. +         return TRUE;
  77. +     }
  78. +     return FALSE;
  79. + }
  80. + 
  81.       static void
  82.   addstate(l, state, subs, off)
  83.       nfa_list_T        *l;    /* runtime state list */
  84. ***************
  85. *** 3431,3450 ****
  86.               return;
  87.           }
  88.   
  89. !         /* See if the same state is already in the list with the same
  90. !          * positions. */
  91. !         for (i = 0; i < l->n; ++i)
  92. !         {
  93. !             thread = &l->t[i];
  94. !             if (thread->state->id == state->id
  95. !                 && sub_equal(&thread->subs.norm, &subs->norm)
  96. ! #ifdef FEAT_SYN_HL
  97. !                 && (!nfa_has_zsubexpr ||
  98. !                    sub_equal(&thread->subs.synt, &subs->synt))
  99. ! #endif
  100. !                       )
  101. !             goto skip_add;
  102. !         }
  103.           }
  104.   
  105.           /* when there are backreferences or look-behind matches the number
  106. --- 3478,3485 ----
  107.               return;
  108.           }
  109.   
  110. !         if (has_state_with_pos(l, state, subs))
  111. !             goto skip_add;
  112.           }
  113.   
  114.           /* when there are backreferences or look-behind matches the number
  115. ***************
  116. *** 4600,4605 ****
  117. --- 4635,4681 ----
  118.           break;
  119.   
  120.           case NFA_START_PATTERN:
  121. +           {
  122. +         nfa_state_T *skip = NULL;
  123. + #ifdef ENABLE_LOG
  124. +         int        skip_lid = 0;
  125. + #endif
  126. + 
  127. +         /* There is no point in trying to match the pattern if the
  128. +          * output state is not going to be added to the list. */
  129. +         if (state_in_list(nextlist, t->state->out1->out, &t->subs))
  130. +         {
  131. +             skip = t->state->out1->out;
  132. + #ifdef ENABLE_LOG
  133. +             skip_lid = nextlist->id;
  134. + #endif
  135. +         }
  136. +         else if (state_in_list(nextlist,
  137. +                       t->state->out1->out->out, &t->subs))
  138. +         {
  139. +             skip = t->state->out1->out->out;
  140. + #ifdef ENABLE_LOG
  141. +             skip_lid = nextlist->id;
  142. + #endif
  143. +         }
  144. +         else if(state_in_list(thislist,
  145. +                       t->state->out1->out->out, &t->subs))
  146. +         {
  147. +             skip = t->state->out1->out->out;
  148. + #ifdef ENABLE_LOG
  149. +             skip_lid = thislist->id;
  150. + #endif
  151. +         }
  152. +         if (skip != NULL)
  153. +         {
  154. + #ifdef ENABLE_LOG
  155. +             nfa_set_code(skip->c);
  156. +             fprintf(log_fd, "> Not trying to match pattern, output state %d is already in list %d. char %d: %s\n",
  157. +                 abs(skip->id), skip_lid, skip->c, code);
  158. + #endif
  159. +             break;
  160. +         }
  161. + 
  162.           /* First try matching the pattern. */
  163.           result = recursive_regmatch(t->state, prog,
  164.                                  submatch, m, &listids);
  165. ***************
  166. *** 4654,4659 ****
  167. --- 4730,4736 ----
  168.               }
  169.           }
  170.           break;
  171. +           }
  172.   
  173.           case NFA_BOL:
  174.           if (reginput == regline)
  175. *** ../vim-7.3.1139/src/version.c    2013-06-07 16:31:45.000000000 +0200
  176. --- src/version.c    2013-06-07 17:30:12.000000000 +0200
  177. ***************
  178. *** 730,731 ****
  179. --- 730,733 ----
  180.   {   /* Add new patch number below this line */
  181. + /**/
  182. +     1140,
  183.   /**/
  184.  
  185. -- 
  186. From "know your smileys":
  187.  :-*    A big kiss!
  188.  
  189.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  190. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  191. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  192.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  193.