diff --git a/components/extrasyn/SyneditHighlighters/SynHighlighterLua.pas b/components/extrasyn/SyneditHighlighters/SynHighlighterLua.pas
index 5f74cb20a..1778065eb 100644
--- a/components/extrasyn/SyneditHighlighters/SynHighlighterLua.pas
+++ b/components/extrasyn/SyneditHighlighters/SynHighlighterLua.pas
@@ -1432,7 +1432,7 @@ end;
procedure TSynLuaSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynLuaSyn.GetRange: Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/SynHighlighterProlog.pas b/components/extrasyn/SyneditHighlighters/SynHighlighterProlog.pas
index a0fcc91f3..1e6c95d22 100644
--- a/components/extrasyn/SyneditHighlighters/SynHighlighterProlog.pas
+++ b/components/extrasyn/SyneditHighlighters/SynHighlighterProlog.pas
@@ -1853,7 +1853,7 @@ end;
procedure TSynPrologSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynPrologSyn.AndSymbolProc;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighteradsp21xx.pas b/components/extrasyn/SyneditHighlighters/synhighlighteradsp21xx.pas
index 4f96cd0d1..f47326bfc 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighteradsp21xx.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighteradsp21xx.pas
@@ -1391,7 +1391,7 @@ end;
procedure TSynADSP21xxSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynADSP21xxSyn.ResetRange;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas b/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas
index 0c1c696f4..6e70d267e 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterasm.pas
@@ -141,7 +141,7 @@ type
implementation
uses
- SynEditStrConst, SynEditStrConstExtra;
+ SynEditStrConst;
var
Identifiers: array[#0..#255] of ByteBool;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightercac.pas b/components/extrasyn/SyneditHighlighters/synhighlightercac.pas
index 5b2576026..8322a28a6 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightercac.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightercac.pas
@@ -1132,7 +1132,7 @@ end;
procedure TSynCACSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynCACSyn.IsFilterStored: Boolean;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightercache.pas b/components/extrasyn/SyneditHighlighters/synhighlightercache.pas
index ad6a80e68..29ebad433 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightercache.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightercache.pas
@@ -1565,7 +1565,7 @@ end;
procedure TSynCacheSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
//------------------------------------------------------------------------------
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightercobol.pas b/components/extrasyn/SyneditHighlighters/synhighlightercobol.pas
index abc6a6642..661adb965 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightercobol.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightercobol.pas
@@ -2324,7 +2324,7 @@ end;
procedure TSynCobolSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynCobolSyn.GetRange: Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightercs.pas b/components/extrasyn/SyneditHighlighters/synhighlightercs.pas
index 6b3ec416b..def11bcb6 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightercs.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightercs.pas
@@ -1509,7 +1509,7 @@ end;
procedure TSynCSSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynCSSyn.GetIdentChars: TSynIdentChars;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas b/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas
index f25cc13b6..8e3cac328 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterdml.pas
@@ -1829,7 +1829,7 @@ end;
procedure TSynDmlSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynDmlSyn.ResetRange;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterdot.pas b/components/extrasyn/SyneditHighlighters/synhighlighterdot.pas
index e5f9a2373..ea4d3d94e 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterdot.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterdot.pas
@@ -1363,7 +1363,7 @@ end;
procedure TSynDOTSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynDOTSyn.GetRange: Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightereiffel.pas b/components/extrasyn/SyneditHighlighters/synhighlightereiffel.pas
index ed9f9816c..c504db981 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightereiffel.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightereiffel.pas
@@ -1408,7 +1408,7 @@ end;
procedure TSynEiffelSyn.SetRange(Value :Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynEiffelSyn.GetRange :Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas b/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas
index b1e3ebf1f..1d53dc359 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightergalaxy.pas
@@ -416,7 +416,7 @@ end;
procedure TSynGalaxySyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynGalaxySyn.SetKeyWords(const Value: TStrings);
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightergeneral.pas b/components/extrasyn/SyneditHighlighters/synhighlightergeneral.pas
index d8cad10b4..901df5b66 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightergeneral.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightergeneral.pas
@@ -676,7 +676,7 @@ end;
procedure TSynGeneralSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynGeneralSyn.SetKeyWords(const Value: TStrings);
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightergws.pas b/components/extrasyn/SyneditHighlighters/synhighlightergws.pas
index fae09efa6..54023fe73 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightergws.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightergws.pas
@@ -1026,7 +1026,7 @@ end;
procedure TSynGWScriptSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynGWScriptSyn.GetIdentChars: TSynIdentChars;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterhaskell.pas b/components/extrasyn/SyneditHighlighters/synhighlighterhaskell.pas
index 4c685a152..cd57a28c5 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterhaskell.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterhaskell.pas
@@ -1109,7 +1109,7 @@ end;
procedure TSynHaskellSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynHaskellSyn.GetIdentChars: TSynIdentChars;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterhp48.pas b/components/extrasyn/SyneditHighlighters/synhighlighterhp48.pas
index df563e6b0..22fc4a7d6 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterhp48.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterhp48.pas
@@ -804,7 +804,7 @@ end;
procedure TSynHP48Syn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynHP48Syn.ResetRange;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas b/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas
index e45beed71..7ce673727 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighteridl.pas
@@ -909,7 +909,7 @@ end;
procedure TSynIdlSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynIdlSyn.GetRange: Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterldraw.pas b/components/extrasyn/SyneditHighlighters/synhighlighterldraw.pas
index 48dd9c9b7..eda0a4e0e 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterldraw.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterldraw.pas
@@ -564,7 +564,7 @@ end;
procedure TSynLDRSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynLDRSyn.GetRange: Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas b/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas
index 0b95778e2..d59e85374 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightermodelica.pas
@@ -943,7 +943,7 @@ end;
procedure TSynModelicaSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynModelicaSyn.GetIdentChars: TSynIdentChars;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterrc.pas b/components/extrasyn/SyneditHighlighters/synhighlighterrc.pas
index 60737fa5b..94360889a 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterrc.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterrc.pas
@@ -1133,7 +1133,7 @@ end;
procedure TSynRCSyn.SetRange(value: pointer);
begin
- fRange:= TRangeState(PtrInt(value));
+ fRange:= TRangeState(PtrUInt(value));
end;
procedure TSynRCSyn.EnumUserSettings(Settings: TStrings);
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterruby.pas b/components/extrasyn/SyneditHighlighters/synhighlighterruby.pas
index 22611ba2c..241622c02 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterruby.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterruby.pas
@@ -59,7 +59,6 @@ uses
QSynEditHighlighter,
{$ELSE}
Graphics,
- SynEditTypes,
SynEditHighlighter,
{$ENDIF}
SysUtils,
@@ -180,7 +179,6 @@ uses
QSynEditMiscProcs,
QSynEditStrConst;
{$ELSE}
- SynEditMiscProcs,
SynEditStrConst, SynEditStrConstExtra;
{$ENDIF}
@@ -743,7 +741,7 @@ begin
fHeredocChecksum := RangePointer.Checksum;
end;
{$ELSE}
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
{$ENDIF}
end;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas b/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas
index 9e67a38d7..f2305799d 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightersdd.pas
@@ -670,7 +670,7 @@ end; { ResetRange }
procedure TSynSDDSyn.SetRange(Value: Pointer);
begin
inherited;
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end; { SetRange }
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightersml.pas b/components/extrasyn/SyneditHighlighters/synhighlightersml.pas
index f665159dc..defe0789e 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightersml.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightersml.pas
@@ -939,7 +939,7 @@ end;
procedure TSynSMLSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynSMLSyn.GetRange: Pointer;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterst.pas b/components/extrasyn/SyneditHighlighters/synhighlighterst.pas
index a643c6606..cb55b6378 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterst.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterst.pas
@@ -1117,7 +1117,7 @@ end;
procedure TSynSTSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynSTSyn.ResetRange;
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas b/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas
index bcfe69c5f..f7bf93549 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightertcltk.pas
@@ -58,7 +58,6 @@ uses
QSynEditHighlighter,
{$ELSE}
Graphics,
- SynEditTypes,
SynEditHighlighter,
{$ENDIF}
SysUtils,
@@ -168,7 +167,7 @@ uses
{$IFDEF SYN_CLX}
QSynEditStrConst;
{$ELSE}
- SynEditStrConst, SynEditStrConstExtra;
+ SynEditStrConst;
{$ENDIF}
const
@@ -680,7 +679,7 @@ end;
procedure TSynTclTkSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynTclTkSyn.SetKeyWords(const Value: TStrings);
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighterunreal.pas b/components/extrasyn/SyneditHighlighters/synhighlighterunreal.pas
index 294a95b0c..f19824124 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighterunreal.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighterunreal.pas
@@ -55,7 +55,6 @@ uses
QSynEditTypes,
{$ELSE}
Graphics,
- Registry,
SynEditHighlighter,
SynEditTypes,
{$ENDIF}
@@ -1756,7 +1755,7 @@ end;
procedure TSynUnrealSyn.SetRange(Value: Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
procedure TSynUnrealSyn.EnumUserSettings(settings: TStrings);
diff --git a/components/extrasyn/SyneditHighlighters/synhighlighteruri.pas b/components/extrasyn/SyneditHighlighters/synhighlighteruri.pas
index 0c3c7f9f3..e4b6fb8c9 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlighteruri.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlighteruri.pas
@@ -197,7 +197,7 @@ const
Reserved = [';', '/', '?', ':', '@', '&', '=', '+', '$', ',', '%', '#'];
URIChars = Reserved + Unreserved;
NeverAtEnd = Mark - [''''] + Reserved - ['/', '$'];
- URIBreakChars = [#0..#255] - URIChars - [#0..#32];
+// URIBreakChars = [#0..#255] - URIChars - [#0..#32];
EMailAddressChars = ['.', '_', '-', '@'] + AlphaNum;
NeverAtEMailAddressEnd = ['.', '@'];
@@ -207,7 +207,7 @@ var
procedure MakeHashTable;
var
c: Char;
- u: Byte;
+ u: Integer;
begin
FillChar(HashTable, sizeof(HashTable), 0);
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas b/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas
index 5b30b724a..2be7a4a78 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightervbscript.pas
@@ -58,7 +58,6 @@ uses
QSynEditTypes,
{$ELSE}
Graphics,
- Registry,
SynEditHighlighter,
SynEditTypes,
{$ENDIF}
diff --git a/components/extrasyn/SyneditHighlighters/synhighlightervrml97.pas b/components/extrasyn/SyneditHighlighters/synhighlightervrml97.pas
index 6a4bb4044..141de9eec 100644
--- a/components/extrasyn/SyneditHighlighters/synhighlightervrml97.pas
+++ b/components/extrasyn/SyneditHighlighters/synhighlightervrml97.pas
@@ -4941,7 +4941,7 @@ end;
procedure TSynVrml97Syn.SetRange(Value :Pointer);
begin
- fRange := TRangeState(PtrInt(Value));
+ fRange := TRangeState(PtrUInt(Value));
end;
function TSynVrml97Syn.GetIdentChars :TSynIdentChars;
diff --git a/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi b/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi
index 02c2e1677..b5e3fee59 100644
--- a/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi
+++ b/components/extrasyn/TestHighlighters/TestSynHighlighter.lpi
@@ -54,9 +54,10 @@
+
-
-
+
+
@@ -806,7 +807,6 @@
-
diff --git a/components/extrasyn/extrahighlighters.lpk b/components/extrasyn/extrahighlighters.lpk
index 820c25414..f61215e97 100644
--- a/components/extrasyn/extrahighlighters.lpk
+++ b/components/extrasyn/extrahighlighters.lpk
@@ -3,7 +3,7 @@
-
+
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/components/extrasyn/extrahighlighters_dsgn.lpk b/components/extrasyn/extrahighlighters_dsgn.lpk
index dda396b63..4b4fb4e56 100644
--- a/components/extrasyn/extrahighlighters_dsgn.lpk
+++ b/components/extrasyn/extrahighlighters_dsgn.lpk
@@ -4,7 +4,7 @@
-
+
@@ -15,16 +15,12 @@
-
+
-
-
-
-