paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 16:19:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@53751 -
This commit is contained in:
juha 2016-12-21 22:35:05 +00:00
parent 1e4d0ca5e8
commit 79436e5633
14 changed files with 46 additions and 4155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -4153,7 +4153,6 @@ components/synedit/synpluginmulticaret.pp svneol=native#text/plain
components/synedit/synpluginsyncroedit.pp svneol=native#text/pascal components/synedit/synpluginsyncroedit.pp svneol=native#text/pascal
components/synedit/synpluginsyncronizededitbase.pp svneol=native#text/pascal components/synedit/synpluginsyncronizededitbase.pp svneol=native#text/pascal
components/synedit/synplugintemplateedit.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/syntextdrawer.pp svneol=native#text/pascal
components/synedit/test/SynTest.lpi svneol=native#text/plain components/synedit/test/SynTest.lpi svneol=native#text/plain
components/synedit/test/SynTest.lpr svneol=native#text/pascal components/synedit/test/SynTest.lpr svneol=native#text/pascal

4
components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas
View File

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

5
components/lazdebuggergdbmi/test/testwatches.pas
View File

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

6
components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas
View File

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

9
components/synedit/allsynedit.pas
View File

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

2
components/synedit/fpmake.pp
View File

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

5
components/synedit/synbeautifier.pas
View File

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

52
components/synedit/synedit.lpk
View File

@ -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. 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"/> <Version Major="1"/>
<Files Count="84"> <Files Count="83">
<Item1> <Item1>
<Filename Value="synbeautifier.pas"/> <Filename Value="synbeautifier.pas"/>
<UnitName Value="SynBeautifier"/> <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"/> <UnitName Value="LazSynTextArea"/>
</Item71> </Item71>
<Item72> <Item72>
<Filename Value="synregexpr.pas"/>
<UnitName Value="SynRegExpr"/>
</Item72>
<Item73>
<Filename Value="syntextdrawer.pp"/> <Filename Value="syntextdrawer.pp"/>
<UnitName Value="SynTextDrawer"/> <UnitName Value="SynTextDrawer"/>
</Item73> </Item72>
<Item74> <Item73>
<Filename Value="syneditmarkupguttermark.pp"/> <Filename Value="syneditmarkupguttermark.pp"/>
<UnitName Value="SynEditMarkupGutterMark"/> <UnitName Value="SynEditMarkupGutterMark"/>
</Item74> </Item73>
<Item75> <Item74>
<Filename Value="synhighlighterbat.pas"/> <Filename Value="synhighlighterbat.pas"/>
<UnitName Value="SynHighlighterBat"/> <UnitName Value="SynHighlighterBat"/>
</Item75> </Item74>
<Item76> <Item75>
<Filename Value="synhighlighterini.pas"/> <Filename Value="synhighlighterini.pas"/>
<UnitName Value="SynHighlighterIni"/> <UnitName Value="SynHighlighterIni"/>
</Item76> </Item75>
<Item77> <Item76>
<Filename Value="syneditmarkupspecialchar.pp"/> <Filename Value="syneditmarkupspecialchar.pp"/>
<UnitName Value="SynEditMarkupSpecialChar"/> <UnitName Value="SynEditMarkupSpecialChar"/>
</Item77> </Item76>
<Item78> <Item77>
<Filename Value="allsynedit.pas"/> <Filename Value="allsynedit.pas"/>
<Type Value="Main Unit"/> <Type Value="Main Unit"/>
<UnitName Value="allsynedit"/> <UnitName Value="allsynedit"/>
</Item78> </Item77>
<Item79> <Item78>
<Filename Value="synedittextdoublewidthchars.pas"/> <Filename Value="synedittextdoublewidthchars.pas"/>
<UnitName Value="SynEditTextDoubleWidthChars"/> <UnitName Value="SynEditTextDoubleWidthChars"/>
</Item79> </Item78>
<Item80> <Item79>
<Filename Value="synedittextsystemcharwidth.pas"/> <Filename Value="synedittextsystemcharwidth.pas"/>
<UnitName Value="synedittextsystemcharwidth"/> <UnitName Value="synedittextsystemcharwidth"/>
</Item80> </Item79>
<Item81> <Item80>
<Filename Value="syneditmarkupifdef.pp"/> <Filename Value="syneditmarkupifdef.pp"/>
<UnitName Value="syneditmarkupifdef"/> <UnitName Value="syneditmarkupifdef"/>
</Item81> </Item80>
<Item82> <Item81>
<Filename Value="synpluginmulticaret.pp"/> <Filename Value="synpluginmulticaret.pp"/>
<UnitName Value="SynPluginMultiCaret"/> <UnitName Value="SynPluginMultiCaret"/>
</Item82> </Item81>
<Item83> <Item82>
<Filename Value="synhighlighterpike.pas"/> <Filename Value="synhighlighterpike.pas"/>
<UnitName Value="synhighlighterpike"/> <UnitName Value="synhighlighterpike"/>
</Item83> </Item82>
<Item84> <Item83>
<Filename Value="syneditmarkupfoldcoloring.pas"/> <Filename Value="syneditmarkupfoldcoloring.pas"/>
<UnitName Value="SynEditMarkupFoldColoring"/> <UnitName Value="SynEditMarkupFoldColoring"/>
</Item84> </Item83>
</Files> </Files>
<LazDoc Paths="docs\xml"/> <LazDoc Paths="docs\xml"/>
<i18n> <i18n>

3
components/synedit/syneditregexsearch.pas
View File

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

4
components/synedit/syneditsearch.pp
View File

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

4
components/synedit/synhighlightermulti.pas
View File

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

4101
components/synedit/synregexpr.pas
View File

File diff suppressed because it is too large Load Diff

1
converter/convertsettings.pas
View File

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

4
test/synedit/testregexpr.pas
View File

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