merge regular expressions support from patch

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 9d0de52..1ea0af6 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -41,6 +41,7 @@
 #include "CCPrompt.h"
 #include "PropVss.h"
 #include "PropGeneral.h"
+#include "PropFilter.h"
 #include "RegKey.h"
 #include "logfile.h"
 #include "PropSyntax.h"
@@ -56,6 +57,8 @@ CMainFrame *mf = NULL;
 extern CLogFile gLog;
 extern bool gWriteLog;
 
+// add a 
+static void add_regexp PARAMS((struct regexp_list **, char const*));
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame
 
@@ -119,6 +122,9 @@ CMainFrame::CMainFrame()
        m_strVssPath = theApp.GetProfileString(_T("Settings"), _T("VssPath"), _T(""));
        m_nTabSize = theApp.GetProfileInt(_T("Settings"), _T("TabSize"), 4);
        m_bHiliteSyntax = theApp.GetProfileInt(_T("Settings"), _T("HiliteSyntax"), TRUE)!=0;
+       m_bIgnoreRegExp = theApp.GetProfileInt(_T("Settings"), _T("IgnoreRegExp"), FALSE);
+       m_sPattern = theApp.GetProfileString(_T("Settings"), _T("RegExps"), NULL);
+
        if (m_strVssPath.IsEmpty())
        {
                CRegKeyEx reg;
@@ -134,6 +140,8 @@ CMainFrame::CMainFrame()
 
 CMainFrame::~CMainFrame()
 {
+       // destroy the reg expression list
+       FreeRegExpList();
 }
 
 int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
@@ -147,6 +155,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
        ignore_case_flag = m_bIgnoreCase;
        ignore_blank_lines_flag = m_bIgnoreBlankLines;
        ignore_some_changes = m_bIgnoreWhitespace || m_bIgnoreCase || m_bIgnoreBlankLines;
+       // build the initial reg expression list
+       RebuildRegExpList();
 
        heuristic = 1;
        output_style = OUTPUT_NORMAL;
@@ -479,8 +489,10 @@ void CMainFrame::OnProperties()
        CPropVss vss;
        CPropGeneral gen;
        CPropSyntax syn;
+       CPropFilter filter;
        sht.AddPage(&gen);
        sht.AddPage(&syn);
+       sht.AddPage(&filter);
        sht.AddPage(&vss);
        
        vss.m_nVerSys = m_nVerSys;
@@ -494,6 +506,8 @@ void CMainFrame::OnProperties()
        gen.m_nTabSize = m_nTabSize;
 
        syn.m_bHiliteSyntax = m_bHiliteSyntax;
+       filter.m_bIgnoreRegExp = m_bIgnoreRegExp;
+       filter.m_sPattern = m_sPattern;
        
        if (sht.DoModal()==IDOK)
        {
@@ -510,6 +524,9 @@ void CMainFrame::OnProperties()
                ignore_some_changes = m_bIgnoreWhitespace || m_bIgnoreCase || m_bIgnoreBlankLines;
                length_varies = m_bIgnoreWhitespace;
 
+               m_bIgnoreRegExp = filter.m_bIgnoreRegExp;
+               m_sPattern = filter.m_sPattern;
+
                theApp.WriteProfileInt(_T("Settings"), _T("VersionSystem"), m_nVerSys);
                theApp.WriteProfileInt(_T("Settings"), _T("IgnoreSpace"), m_bIgnoreWhitespace);
                theApp.WriteProfileInt(_T("Settings"), _T("ScrollToFirst"), m_bScrollToFirst);
@@ -518,10 +535,13 @@ void CMainFrame::OnProperties()
                theApp.WriteProfileInt(_T("Settings"), _T("TabSize"), m_nTabSize);
                theApp.WriteProfileInt(_T("Settings"), _T("IgnoreBlankLines"), m_bIgnoreBlankLines);
                theApp.WriteProfileInt(_T("Settings"), _T("IgnoreCase"), m_bIgnoreCase);
+               theApp.WriteProfileInt(_T("Settings"), _T("IgnoreRegExp"), m_bIgnoreRegExp);
+               theApp.WriteProfileString(_T("Settings"), _T("RegExps"), m_sPattern);
 
                m_bHiliteSyntax = syn.m_bHiliteSyntax;
                theApp.WriteProfileInt(_T("Settings"), _T("HiliteSyntax"), m_bHiliteSyntax);
 
+               RebuildRegExpList();
 
                // make an attempt at rescanning any open diff sessions
                if (m_pLeft != NULL && m_pRight != NULL)
@@ -888,3 +908,71 @@ void CMainFrame::OnClose()
 }
 
 
+void CMainFrame::FreeRegExpList()
+{
+       struct regexp_list *r;
+       r = ignore_regexp_list;
+       // iterate through the list, free the reg expression
+       // list item
+       while (ignore_regexp_list)
+       {
+               r = r->next;
+               free((ignore_regexp_list->buf).fastmap);
+               free((ignore_regexp_list->buf).buffer);
+               free(ignore_regexp_list);
+               ignore_regexp_list = r;
+       }
+
+}
+
+
+void CMainFrame::RebuildRegExpList()
+{
+       _TCHAR tmp[MAX_PATH];
+       _TCHAR* token;
+       _TCHAR sep[] = "\r\n";
+       
+       // destroy the old list if the it is not NULL
+       FreeRegExpList();
+
+       // build the new list if the user choose to
+       // ignore lines matching the reg expression patterns
+       if (m_bIgnoreRegExp)
+       {
+               // find each regular expression and add to list
+               _tcscpy(tmp, m_sPattern);
+
+               token = _tcstok(tmp, sep);
+               while (token)
+               {
+                       add_regexp(&ignore_regexp_list, token);
+                       token = _tcstok(NULL, sep);
+               }
+       }
+
+       if (ignore_regexp_list)
+       {
+               ignore_some_changes = 1;
+       }
+
+}
+
+// Add the compiled form of regexp pattern to reglist
+static void
+add_regexp(struct regexp_list **reglist,
+     char const* pattern)
+{
+  struct regexp_list *r;
+  char const *m;
+
+  r = (struct regexp_list *) xmalloc (sizeof (*r));
+  bzero (r, sizeof (*r));
+  r->buf.fastmap = (char*) xmalloc (256);
+  m = re_compile_pattern (pattern, strlen (pattern), &r->buf);
+  if (m != 0)
+    error ("%s: %s", pattern, m);
+
+  /* Add to the start of the list, since it's easier than the end.  */
+  r->next = *reglist;
+  *reglist = r;
+}

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 4d64871..83649cb 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -70,6 +70,8 @@ public:
        void CleanupFileBufs();
        BOOL m_bIgnoreBlankLines;
        BOOL m_bIgnoreCase;
+       BOOL m_bIgnoreRegExp;
+       CString m_sPattern;
        void UpdateResources();
        void UpdateCurrentFileStatus(UINT nStatus);
        BOOL SyncFiles(LPCTSTR pszSrc, LPCTSTR pszDest);
@@ -121,6 +123,14 @@ protected:
        afx_msg void OnClose();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
+
+private:
+       // builds the regular expression list if the
+       // user choose to ignore Ignore changes affecting only lines 
+       // that match the specified regexp. 
+       void RebuildRegExpList();
+       // destroy the regular expression list and free up the memory
+       void FreeRegExpList();
 };
 
 extern CMainFrame *mf;

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index daaf55a..5c49fb7 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -507,6 +507,10 @@ SOURCE=.\OpenDlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\PropFilter.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\PropGeneral.cpp
 
 !IF  "$(CFG)" == "Merge - Win32 Release"
@@ -787,6 +791,10 @@ SOURCE=.\OpenDlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\PropFilter.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\PropGeneral.h
 # End Source File
 # Begin Source File

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 2b0a276..fbb844e 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -342,6 +342,19 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,57,10
 END
 
+IDD_PROPPAGE_FILTER DIALOG DISCARDABLE  0, 0, 235, 156
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Filter"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Ignore lines matching the follow patterns",
+                    IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
+                    7,221,15
+    LTEXT           "Regular Expressions (one per line):",IDC_STATIC,7,28,
+                    221,8
+    EDITTEXT        IDC_EDITPATTERN,7,39,221,96,ES_MULTILINE | 
+                    ES_AUTOHSCROLL | ES_WANTRETURN
+END
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
@@ -465,6 +478,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 149
     END
+
+    IDD_PROPPAGE_FILTER, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

diff --git a/Src/PropFilter.cpp b/Src/PropFilter.cpp
new file mode 100644 (file)
index 0000000..08a8c62
--- /dev/null
+++ b/Src/PropFilter.cpp
@@ -0,0 +1,71 @@
+// PropFilter.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "merge.h"
+#include "PropFilter.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropFilter property page
+
+IMPLEMENT_DYNCREATE(CPropFilter, CPropertyPage)
+
+CPropFilter::CPropFilter() : CPropertyPage(CPropFilter::IDD)
+{
+       //{{AFX_DATA_INIT(CPropFilter)
+       m_bIgnoreRegExp = FALSE;
+       m_sPattern = _T("");
+       //}}AFX_DATA_INIT
+}
+
+CPropFilter::~CPropFilter()
+{
+}
+
+void CPropFilter::DoDataExchange(CDataExchange* pDX)
+{
+       CPropertyPage::DoDataExchange(pDX);
+       //{{AFX_DATA_MAP(CPropFilter)
+       DDX_Control(pDX, IDC_EDITPATTERN, m_cPattern);
+       DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
+       DDX_Text(pDX, IDC_EDITPATTERN, m_sPattern);
+       //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropFilter, CPropertyPage)
+       //{{AFX_MSG_MAP(CPropFilter)
+       ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
+       //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropFilter message handlers
+
+BOOL CPropFilter::OnInitDialog() 
+{
+       CPropertyPage::OnInitDialog();
+       
+       // TODO: Add extra initialization here
+       m_cPattern.EnableWindow(m_bIgnoreRegExp);
+       
+       return TRUE;  // return TRUE unless you set the focus to a control
+                     // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CPropFilter::OnIgnoreregexp() 
+{
+       // TODO: Add your control notification handler code here
+       UpdateData();
+       // enable or disable the edit box according to
+       // the value of the check box
+       m_cPattern.EnableWindow(m_bIgnoreRegExp);
+       if (m_bIgnoreRegExp)
+               m_cPattern.SetFocus();
+}

diff --git a/Src/PropFilter.h b/Src/PropFilter.h
new file mode 100644 (file)
index 0000000..effc03c
--- /dev/null
+++ b/Src/PropFilter.h
@@ -0,0 +1,52 @@
+#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
+#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// PropFilter.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropFilter dialog
+
+class CPropFilter : public CPropertyPage
+{
+       DECLARE_DYNCREATE(CPropFilter)
+
+// Construction
+public:
+       CPropFilter();
+       ~CPropFilter();
+
+// Dialog Data
+       //{{AFX_DATA(CPropFilter)
+       enum { IDD = IDD_PROPPAGE_FILTER };
+       CEdit   m_cPattern;
+       BOOL    m_bIgnoreRegExp;
+       CString m_sPattern;
+       //}}AFX_DATA
+
+
+// Overrides
+       // ClassWizard generate virtual function overrides
+       //{{AFX_VIRTUAL(CPropFilter)
+       protected:
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+       //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+       // Generated message map functions
+       //{{AFX_MSG(CPropFilter)
+       virtual BOOL OnInitDialog();
+       afx_msg void OnIgnoreregexp();
+       //}}AFX_MSG
+       DECLARE_MESSAGE_MAP()
+
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)

diff --git a/Src/diffutils/lib/REGEX.C b/Src/diffutils/lib/REGEX.C
index 3a338a7..baea3c9 100644 (file)
--- a/Src/diffutils/lib/REGEX.C
+++ b/Src/diffutils/lib/REGEX.C
@@ -2971,7 +2971,17 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 
   /* Set `can_be_null' for the last path (also the first path, if the
      pattern is empty).  */
-  bufp->can_be_null |= path_can_be_null;
+  bufp->can_be_null |= path_can_be_null; 
+
+  /* free the fail_statck: it is causing memory leaks */
+#ifdef MATCH_MAY_ALLOCATE
+  if (fail_stack.stack)
+  {
+       free (fail_stack.stack);
+       fail_stack.stack = NULL;
+  }
+#endif
+
   return 0;
 } /* re_compile_fastmap */
 \f

diff --git a/Src/diffutils/lib/REGEX.H b/Src/diffutils/lib/REGEX.H
index e154bd5..2377ef0 100644 (file)
--- a/Src/diffutils/lib/REGEX.H
+++ b/Src/diffutils/lib/REGEX.H
@@ -393,7 +393,7 @@ typedef struct
    unfortunately clutters up the declarations a bit, but I think it's
    worth it.  */
 
-#if __STDC__
+#if __STDC__ || defined(__MSDOS__) || defined(__NT__) || defined(WIN32)
 
 #define _RE_ARGS(args) args
 

diff --git a/Src/diffutils/src/analyze.c b/Src/diffutils/src/analyze.c
index 86e663b..2e0bf0a 100644 (file)
--- a/Src/diffutils/src/analyze.c
+++ b/Src/diffutils/src/analyze.c
@@ -1022,6 +1022,16 @@ struct change * diff_2_files (struct file_data filevec[], int depth, int * pbBin
                                }
                                script=NULL;
                        }
+                       else if (changes == 0 && ignore_regexp_list )
+                       {
+                               // determined that there were no changes after considering flags
+                               for (e = script; e; e = p)
+                               {
+                                       p = e->link;
+                                       free (e);
+                               }
+                               script=NULL;
+                       }
                        else if (changes || ! no_diff_means_no_output)
                        {
                                //  Record info for starting up output,

diff --git a/Src/resource.h b/Src/resource.h
index 0ac904b..7dc10ac 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -27,6 +27,7 @@
 #define IDS_COPY2DIR_FMT                134
 #define IDD_CLEARCASE                   134
 #define IDS_CONFIRM_COPY2DIR            135
+#define IDD_PROPPAGE_FILTER             135
 #define IDS_FONT_CHANGE                 136
 #define IDS_DIRECTORY_WINDOW_TITLE      137
 #define IDS_DIRECTORY_WINDOW_STATUS_FMT 138
@@ -101,6 +102,8 @@
 #define IDC_COMMENTS                    1017
 #define IDC_VER_SYS                     1018
 #define IDC_HILITE_CHECK                1019
+#define IDC_IGNOREREGEXP                1020
+#define IDC_EDITPATTERN                 1021
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -249,7 +252,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        135
 #define _APS_NEXT_COMMAND_VALUE         32806
-#define _APS_NEXT_CONTROL_VALUE         1020
+#define _APS_NEXT_CONTROL_VALUE         1023
 #define _APS_NEXT_SYMED_VALUE           106
 #endif
 #endif