Added selectors to GetTriggerInfo, GetAliasInfo to show number of match attempts

Author: nickgammon

regexp.cpp

@@ -81,6 +81,8 @@ int count;
     prog->iTimeTaken += finish.QuadPart - start.QuadPart;
     }
 
+  prog->m_iMatchAttempts++;  // how many times did we try to match?
+
   if (count == PCRE_ERROR_NOMATCH)
     return false;  // no match  - don't save matching string etc.
 

regexp.h

@@ -35,6 +35,7 @@ class t_regexp
       m_extra = NULL;
       iTimeTaken = 0;
       m_iCount = 0;
+      m_iMatchAttempts = 0;
       m_iExecutionError = 0;
                 };   // constructor
   ~t_regexp () { 
@@ -46,8 +47,9 @@ class t_regexp
 
   // pairs of offsets from match
   vector<int> m_vOffsets;
-  // count of matches
+  // count of matching wildcards
   int m_iCount;
+  long m_iMatchAttempts;
   // the string we match on (to extract wildcards from)
   string m_sTarget;
   // the program itself

scripting/methods.cpp

@@ -2280,6 +2280,11 @@ CAlias * alias_item;
         }
       break;
 
+    case  31:
+      if (alias_item->regexp)
+        SetUpVariantLong   (vaResult, alias_item->regexp->m_iMatchAttempts);
+      break;
+
     case 101: SetUpVariantString (vaResult, alias_item->wildcards [1].c_str ()); break;
     case 102: SetUpVariantString (vaResult, alias_item->wildcards [2].c_str ()); break;
     case 103: SetUpVariantString (vaResult, alias_item->wildcards [3].c_str ()); break;
@@ -2395,6 +2400,11 @@ CTrigger * trigger_item;
         }
       break;
 
+    case  38:
+      if (trigger_item->regexp)
+        SetUpVariantLong   (vaResult, trigger_item->regexp->m_iMatchAttempts);
+      break;
+
 #ifdef PANE
     case  38: SetUpVariantString (vaResult, trigger_item->strPane); break;
 #endif // PANE