From e748b6291f095238438b60a13cc10480b29b7df6 Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 27 Feb 2008 14:08:53 +0000 Subject: [PATCH] codetools: moved AdjustPositionAfterInsert git-svn-id: trunk@14280 - --- components/codetools/basiccodetools.pas | 23 +++++++++++++++++++++++ components/codetools/directivestree.pas | 24 ------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/components/codetools/basiccodetools.pas b/components/codetools/basiccodetools.pas index d61dccd54a..7ed609141e 100644 --- a/components/codetools/basiccodetools.pas +++ b/components/codetools/basiccodetools.pas @@ -121,6 +121,8 @@ function CountNeededLineEndsToAddForward(const Src: string; StartPos, MinLineEnds: integer): integer; function CountNeededLineEndsToAddBackward(const Src: string; StartPos, MinLineEnds: integer): integer; +procedure AdjustPositionAfterInsert(var p: integer; IsStart: boolean; + FromPos, ToPos, DiffPos: integer); // comparison function CompareText(Txt1: PChar; Len1: integer; Txt2: PChar; Len2: integer; @@ -4061,6 +4063,27 @@ begin end; end; +procedure AdjustPositionAfterInsert(var p: integer; IsStart: boolean; FromPos, + ToPos, DiffPos: integer); +begin + if (ToPos>FromPos) then begin + // replace + if p>FromPos then begin + if p>ToPos then + inc(p,DiffPos) + else + p:=FromPos; + end; + end else begin + // insert + if IsStart then begin + if p>=FromPos then inc(p,DiffPos); + end else begin + if p>FromPos then inc(p,DiffPos); + end; + end; +end; + function CompareText(Txt1: PChar; Len1: integer; Txt2: PChar; Len2: integer; CaseSensitive: boolean): integer; begin diff --git a/components/codetools/directivestree.pas b/components/codetools/directivestree.pas index 15c9c7c44c..1cb7be5307 100644 --- a/components/codetools/directivestree.pas +++ b/components/codetools/directivestree.pas @@ -274,9 +274,6 @@ function ComparePCharWithH2PasFuncName(Name, H2PasFunc: Pointer): integer; function CDNodeDescAsString(Desc: TCompilerDirectiveNodeDesc): string; function CDNodeSubDescAsString(Desc: TCompilerDirectiveNodeDesc): string; -procedure AdjustPositionAfterInsert(var p: integer; IsStart: boolean; - FromPos, ToPos, DiffPos: integer); - implementation type @@ -391,27 +388,6 @@ begin end; end; -procedure AdjustPositionAfterInsert(var p: integer; - IsStart: boolean; FromPos, ToPos, DiffPos: integer); -begin - if (ToPos>FromPos) then begin - // replace - if p>FromPos then begin - if p>ToPos then - inc(p,DiffPos) - else - p:=FromPos; - end; - end else begin - // insert - if IsStart then begin - if p>=FromPos then inc(p,DiffPos); - end else begin - if p>FromPos then inc(p,DiffPos); - end; - end; -end; - { TCompilerDirectivesTree }