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

Converter: For adding MODE Delphi, use function GetSourceNamePos from codetools. Add log msg. Somehow solves issue .

Browse Source 
git-svn-id: trunk@58972 -
This commit is contained in:
juha 2018-09-13 10:38:16 +00:00
parent c9a2caec65
commit 8ddcf68e99
2 changed files with 22 additions and 19 deletions

40
converter/convcodetool.pas
View File

@ -281,28 +281,30 @@ end;
function TConvDelphiCodeTool.AddModeDelphiDirective: boolean;
var
ModeDirectivePos: integer;
InsertPos: Integer;
NamePos: TAtomPosition;
CaretPos: TCodeXYPosition;
InsPos: Integer;
s: String;
begin
Result:=false;
with fCTLink.CodeTool do begin
if not FindModeDirective(true,ModeDirectivePos) then begin
// add {$MODE Delphi} behind source type
if Tree.Root=nil then exit;
MoveCursorToNodeStart(Tree.Root);
ReadNextAtom; // 'unit', 'program', ..
ReadNextAtom; // name
ReadNextAtom; // semicolon
InsertPos:=CurPos.EndPos;
if fCTLink.Settings.SupportDelphi then
s:='{$IFDEF FPC}'+LineEnding+' {$MODE Delphi}'+LineEnding+'{$ENDIF}'
else
s:='{$MODE Delphi}';
fCTLink.SrcCache.Replace(gtEmptyLine,gtEmptyLine,InsertPos,InsertPos,s);
end;
// changing mode requires rescan
BuildTree(lsrEnd);
with fCTLink do begin
if CodeTool.FindModeDirective(true,InsPos) then exit; // Already has mode directive.
Assert(Assigned(CodeTool.Tree.Root), 'AddModeDelphiDirective: Tree root is Nil.');
if not CodeTool.GetSourceNamePos(NamePos) then exit; // "unit" or "program"
CodeTool.MoveCursorToCleanPos(NamePos.EndPos);
CodeTool.ReadNextAtom; // semicolon
InsPos:=CodeTool.CurPos.EndPos;
if Settings.SupportDelphi then
s:='{$IFDEF FPC}'+LineEnding+' {$MODE Delphi}'+LineEnding+'{$ENDIF}'
else
s:='{$MODE Delphi}';
SrcCache.MainScanner:=CodeTool.Scanner;
SrcCache.Replace(gtEmptyLine, gtEmptyLine, InsPos, InsPos, s);
if not SrcCache.Apply then exit;
if CodeTool.CleanPosToCaret(InsPos, CaretPos) then
fSettings.AddLogLine(mluNote, lisConvAddedModeDelphiModifier,
fCode.Filename, CaretPos.Y, CaretPos.X);
CodeTool.BuildTree(lsrEnd); // changing mode requires rescan
end;
Result:=true;
end;

1
ide/lazarusidestrconsts.pas
View File

@ -753,6 +753,7 @@ resourcestring
lisConvRepairingIncludeFiles = 'Repairing include files : ';
lisConvUserSelectedToEndConversion = 'User selected to end conversion with file %s';
lisConvFixedUnitName = 'Fixed unit name from %s to %s.';
lisConvAddedModeDelphiModifier = 'Added MODE Delphi syntax modifier after unit name.';
lisConvShouldBeFollowedByNumber = '"$" should be followed by a number: %s';
lisConvReplacedCall = 'Replaced call %s with %s';
lisConvReplFuncParameterNum = 'Replacement function parameter number should be >= 1: %s';