SynEdit: Remove SynRegExpr and use the identical RegExpr from FCL.

git-svn-id: trunk@53751 -

.gitattributes

@@ -4153,7 +4153,6 @@ components/synedit/synpluginmulticaret.pp svneol=native#text/plain
 components/synedit/synpluginsyncroedit.pp svneol=native#text/pascal
 components/synedit/synpluginsyncronizededitbase.pp svneol=native#text/pascal
 components/synedit/synplugintemplateedit.pp svneol=native#text/pascal
-components/synedit/synregexpr.pas svneol=native#text/pascal
 components/synedit/syntextdrawer.pp svneol=native#text/pascal
 components/synedit/test/SynTest.lpi svneol=native#text/plain
 components/synedit/test/SynTest.lpr svneol=native#text/pascal

components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas

@@ -5,8 +5,8 @@ unit TestWatchUtils;
 interface
 
 uses
-  Classes, SysUtils, TestBase, LazLoggerBase, DbgIntfBaseTypes, DbgIntfDebuggerBase,
-  SynRegExpr;
+  Classes, SysUtils, RegExpr, TestBase, LazLoggerBase,
+  DbgIntfBaseTypes, DbgIntfDebuggerBase;
 
 type
 

components/lazdebuggergdbmi/test/testwatches.pas

@@ -5,8 +5,9 @@ unit TestWatches;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testutils, testregistry, TestGDBMIControl, DbgIntfBaseTypes,
-  DbgIntfDebuggerBase, TestBase, GDBMIDebugger, LCLProc, SynRegExpr, TestWatchUtils;
+  Classes, SysUtils, fpcunit, testutils, testregistry, RegExpr,
+  TestGDBMIControl, DbgIntfBaseTypes,
+  DbgIntfDebuggerBase, TestBase, GDBMIDebugger, LCLProc, TestWatchUtils;
 
 const
   BREAK_LINE_FOOFUNC_NEST  = 206;

components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas

@@ -5,9 +5,9 @@ unit TestWatches;
 interface
 
 uses
-  Classes, SysUtils, strutils, fpcunit, testutils, testregistry, TestGDBMIControl,
-  DbgIntfBaseTypes, DbgIntfDebuggerBase, TestBase, FpGdbmiDebugger, LCLProc, SynRegExpr,
-  TestWatchUtils, GDBMIDebugger, FpErrorMessages;
+  Classes, SysUtils, strutils, fpcunit, testutils, testregistry, RegExpr,
+  TestGDBMIControl, DbgIntfBaseTypes, DbgIntfDebuggerBase, TestBase, FpGdbmiDebugger,
+  LCLProc, TestWatchUtils, GDBMIDebugger, FpErrorMessages;
 
 const
   BREAK_COUNT_TestWatchesUnitSimple = 17;

components/synedit/allsynedit.pas

@@ -28,11 +28,10 @@ uses
   SynHighlighterTeX, synhighlighterunixshellscript, SynHighlighterVB, 
   SynHighlighterXML, SynMacroRecorder, SynMemo, SynPluginSyncroEdit, 
   SynPluginSyncronizedEditBase, SynPluginTemplateEdit, LazSynEditText, 
-  LazSynTextArea, SynRegExpr, SynTextDrawer, SynEditMarkupGutterMark, 
-  SynHighlighterBat, SynHighlighterIni, SynEditMarkupSpecialChar, 
-  SynEditTextDoubleWidthChars, SynEditTextSystemCharWidth, SynEditMarkupIfDef, 
-  SynPluginMultiCaret, synhighlighterpike, SynEditMarkupFoldColoring, 
-  LazarusPackageIntf;
+  LazSynTextArea, SynTextDrawer, SynEditMarkupGutterMark, SynHighlighterBat, 
+  SynHighlighterIni, SynEditMarkupSpecialChar, SynEditTextDoubleWidthChars, 
+  SynEditTextSystemCharWidth, SynEditMarkupIfDef, SynPluginMultiCaret, 
+  synhighlighterpike, SynEditMarkupFoldColoring, LazarusPackageIntf;
 
 implementation
 

components/synedit/fpmake.pp

@@ -117,7 +117,6 @@ begin
     t.Dependencies.AddUnit('synplugintemplateedit');
     t.Dependencies.AddUnit('lazsynedittext');
     t.Dependencies.AddUnit('lazsyntextarea');
-    t.Dependencies.AddUnit('synregexpr');
     t.Dependencies.AddUnit('syntextdrawer');
     t.Dependencies.AddUnit('syneditmarkupguttermark');
     t.Dependencies.AddUnit('synhighlighterbat');
@@ -198,7 +197,6 @@ begin
     T:=P.Targets.AddUnit('synplugintemplateedit.pp');
     T:=P.Targets.AddUnit('lazsynedittext.pas');
     T:=P.Targets.AddUnit('lazsyntextarea.pp');
-    T:=P.Targets.AddUnit('synregexpr.pas');
     T:=P.Targets.AddUnit('syntextdrawer.pp');
     T:=P.Targets.AddUnit('syneditmarkupguttermark.pp');
     T:=P.Targets.AddUnit('synhighlighterbat.pas');

components/synedit/synbeautifier.pas

@@ -40,8 +40,9 @@ unit SynBeautifier;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, SynEditMiscClasses, SynEditMiscProcs, LazSynEditText, SynEditPointClasses,
-  SynEditKeyCmds, SynHighlighterPas, SynEditHighlighterFoldBase, SynRegExpr;
+  Classes, SysUtils, RegExpr, LCLProc,
+  SynEditMiscClasses, SynEditMiscProcs, LazSynEditText, SynEditPointClasses,
+  SynEditKeyCmds, SynHighlighterPas, SynEditHighlighterFoldBase;
 
 type
 

components/synedit/synedit.lpk

@@ -37,7 +37,7 @@ Alternatively, the contents of these files may be used under the terms of the GN
 If you wish to allow use of your version of these files only under the terms of the GPL and not to allow others to use your version of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the GPL.
 "/>
     <Version Major="1"/>
-    <Files Count="84">
+    <Files Count="83">
       <Item1>
         <Filename Value="synbeautifier.pas"/>
         <UnitName Value="SynBeautifier"/>
@@ -325,58 +325,54 @@ If you wish to allow use of your version of these files only under the terms of
         <UnitName Value="LazSynTextArea"/>
       </Item71>
       <Item72>
-        <Filename Value="synregexpr.pas"/>
-        <UnitName Value="SynRegExpr"/>
-      </Item72>
-      <Item73>
         <Filename Value="syntextdrawer.pp"/>
         <UnitName Value="SynTextDrawer"/>
-      </Item73>
-      <Item74>
+      </Item72>
+      <Item73>
         <Filename Value="syneditmarkupguttermark.pp"/>
         <UnitName Value="SynEditMarkupGutterMark"/>
-      </Item74>
-      <Item75>
+      </Item73>
+      <Item74>
         <Filename Value="synhighlighterbat.pas"/>
         <UnitName Value="SynHighlighterBat"/>
-      </Item75>
-      <Item76>
+      </Item74>
+      <Item75>
         <Filename Value="synhighlighterini.pas"/>
         <UnitName Value="SynHighlighterIni"/>
-      </Item76>
-      <Item77>
+      </Item75>
+      <Item76>
         <Filename Value="syneditmarkupspecialchar.pp"/>
         <UnitName Value="SynEditMarkupSpecialChar"/>
-      </Item77>
-      <Item78>
+      </Item76>
+      <Item77>
         <Filename Value="allsynedit.pas"/>
         <Type Value="Main Unit"/>
         <UnitName Value="allsynedit"/>
-      </Item78>
-      <Item79>
+      </Item77>
+      <Item78>
         <Filename Value="synedittextdoublewidthchars.pas"/>
         <UnitName Value="SynEditTextDoubleWidthChars"/>
-      </Item79>
-      <Item80>
+      </Item78>
+      <Item79>
         <Filename Value="synedittextsystemcharwidth.pas"/>
         <UnitName Value="synedittextsystemcharwidth"/>
-      </Item80>
-      <Item81>
+      </Item79>
+      <Item80>
         <Filename Value="syneditmarkupifdef.pp"/>
         <UnitName Value="syneditmarkupifdef"/>
-      </Item81>
-      <Item82>
+      </Item80>
+      <Item81>
         <Filename Value="synpluginmulticaret.pp"/>
         <UnitName Value="SynPluginMultiCaret"/>
-      </Item82>
-      <Item83>
+      </Item81>
+      <Item82>
         <Filename Value="synhighlighterpike.pas"/>
         <UnitName Value="synhighlighterpike"/>
-      </Item83>
-      <Item84>
+      </Item82>
+      <Item83>
         <Filename Value="syneditmarkupfoldcoloring.pas"/>
         <UnitName Value="SynEditMarkupFoldColoring"/>
-      </Item84>
+      </Item83>
     </Files>
     <LazDoc Paths="docs\xml"/>
     <i18n>

components/synedit/syneditregexsearch.pas

@@ -40,9 +40,8 @@ unit SynEditRegexSearch;
 interface
 
 uses
-  Classes,
+  Classes, RegExpr,
   SynEditTypes,
-  SynRegExpr,
   SynEditMiscClasses;
 
 type

components/synedit/syneditsearch.pp

@@ -42,8 +42,8 @@ unit SynEditSearch;
 interface
 
 uses
-  Classes, SysUtils,
-  LCLIntf, LCLType, LCLProc, LazUTF8, SynRegExpr, SynEditMiscProcs, SynEditTypes;
+  Classes, SysUtils, RegExpr,
+  LCLIntf, LCLType, LCLProc, LazUTF8, SynEditMiscProcs, SynEditTypes;
 
 procedure MakeCompTable;
 

components/synedit/synhighlightermulti.pas

@@ -51,8 +51,8 @@ unit SynHighlighterMulti;
 interface
 
 uses
-  Classes, Graphics, SysUtils, LCLProc, math,
-  SynRegExpr, SynEditStrConst, SynEditTypes, SynEditTextBase,
+  Classes, Graphics, SysUtils, LCLProc, math, RegExpr,
+  SynEditStrConst, SynEditTypes, SynEditTextBase,
   SynEditHighlighter,
   {$IFDEF SynDebugMultiHL}LazLoggerBase{$ELSE}LazLoggerDummy{$ENDIF}, LazUTF8
   ;

converter/convertsettings.pas

@@ -298,7 +298,6 @@ begin
   fOmitProjUnits['SynHighlighterMulti']:='SynEdit';
   fOmitProjUnits['SynHighlighterPas']  :='SynEdit';
   fOmitProjUnits['SynTextDrawer']      :='SynEdit';
-  fOmitProjUnits['SynRegExpr']         :='SynEdit';
 end;
 
 destructor TConvertSettings.Destroy;

test/synedit/testregexpr.pas

@@ -3,7 +3,7 @@ program testregexpr;
 {$mode objfpc}{$H+}
 
 uses
-  SynRegExpr;
+  RegExpr;
 
 type
    tregexprflag = (
@@ -63,7 +63,7 @@ procedure do_error(i : longint);
   end;
 
 begin
-   writeln ('*** Testing library SynRegExpr ***');
+   writeln ('*** Testing library RegExpr ***');
 
    { basic tests }