Jedi Code Format: Reapply changes for removing LCL dependency. Generate Makefiles. Issue #39929, patch by Domingo Galmés.

This commit is contained in:
Juha 2022-10-13 20:23:42 +03:00
parent e150356a73
commit 88242f8152
23 changed files with 644 additions and 991 deletions

View File

@ -17,15 +17,9 @@
<Language Value=""/>
<CharSet Value=""/>
</VersionInfo>
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="nogui"/>
</MacroValues>
<BuildModes Count="2">
<Item1 Name="Debug" Default="True"/>
<Item2 Name="Release">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="nogui"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
<SearchPaths>
@ -54,9 +48,6 @@
</Linking>
</CompilerOptions>
</Item2>
<SharedMatrixOptions Count="1">
<Item1 ID="656785217950" Modes="Debug,Release" Type="IDEMacro" MacroName="LCLWidgetType" Value="nogui"/>
</SharedMatrixOptions>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
@ -76,15 +67,19 @@
</Mode0>
</Modes>
</RunParams>
<RequiredPackages Count="1">
<RequiredPackages Count="2">
<Item1>
<PackageName Value="jcfidelazarus"/>
<PackageName Value="LazUtils"/>
</Item1>
<Item2>
<PackageName Value="FCL"/>
</Item2>
</RequiredPackages>
<Units Count="125">
<Units Count="122">
<Unit0>
<Filename Value="jcf.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="JCF"/>
</Unit0>
<Unit1>
<Filename Value="../../Parse/Tokens.pas"/>
@ -147,456 +142,439 @@
<IsPartOfProject Value="True"/>
</Unit15>
<Unit16>
<Filename Value="../../Utils/JcfFontSetFunctions.pas"/>
<Filename Value="../../Process/VisitSetXY.pas"/>
<IsPartOfProject Value="True"/>
</Unit16>
<Unit17>
<Filename Value="../../Parse/UI/fShowParseTree.pas"/>
<Filename Value="../../Process/FormatFlags.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="frmShowParseTree"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit17>
<Unit18>
<Filename Value="../../Process/VisitSetXY.pas"/>
<Filename Value="../../Process/Obfuscate/FixCase.pas"/>
<IsPartOfProject Value="True"/>
</Unit18>
<Unit19>
<Filename Value="../../Process/FormatFlags.pas"/>
<Filename Value="../../Process/Obfuscate/RemoveComment.pas"/>
<IsPartOfProject Value="True"/>
</Unit19>
<Unit20>
<Filename Value="../../Process/Obfuscate/FixCase.pas"/>
<Filename Value="../../Process/Obfuscate/RemoveUnneededWhiteSpace.pas"/>
<IsPartOfProject Value="True"/>
</Unit20>
<Unit21>
<Filename Value="../../Process/Obfuscate/RemoveComment.pas"/>
<Filename Value="../../Process/Obfuscate/RemoveReturn.pas"/>
<IsPartOfProject Value="True"/>
</Unit21>
<Unit22>
<Filename Value="../../Process/Obfuscate/RemoveUnneededWhiteSpace.pas"/>
<Filename Value="../../Process/Obfuscate/RebreakLines.pas"/>
<IsPartOfProject Value="True"/>
</Unit22>
<Unit23>
<Filename Value="../../Process/Obfuscate/RemoveReturn.pas"/>
<Filename Value="../../Process/RemoveEmptyComment.pas"/>
<IsPartOfProject Value="True"/>
</Unit23>
<Unit24>
<Filename Value="../../Process/Obfuscate/RebreakLines.pas"/>
<Filename Value="../../Process/Capitalisation/IdentifierCaps.pas"/>
<IsPartOfProject Value="True"/>
</Unit24>
<Unit25>
<Filename Value="../../Process/RemoveEmptyComment.pas"/>
<Filename Value="../../Process/Capitalisation/Capitalisation.pas"/>
<IsPartOfProject Value="True"/>
</Unit25>
<Unit26>
<Filename Value="../../Process/Capitalisation/IdentifierCaps.pas"/>
<Filename Value="../../Process/Returns/ReturnChars.pas"/>
<IsPartOfProject Value="True"/>
</Unit26>
<Unit27>
<Filename Value="../../Process/Capitalisation/Capitalisation.pas"/>
<Filename Value="../../Process/Returns/BlockStyles.pas"/>
<IsPartOfProject Value="True"/>
</Unit27>
<Unit28>
<Filename Value="../../Process/Returns/ReturnChars.pas"/>
<Filename Value="../../Process/Spacing/TabToSpace.pas"/>
<IsPartOfProject Value="True"/>
</Unit28>
<Unit29>
<Filename Value="../../Process/Returns/BlockStyles.pas"/>
<Filename Value="../../Process/Spacing/SpaceToTab.pas"/>
<IsPartOfProject Value="True"/>
</Unit29>
<Unit30>
<Filename Value="../../Process/Spacing/TabToSpace.pas"/>
<Filename Value="../../Process/Spacing/MaxSpaces.pas"/>
<IsPartOfProject Value="True"/>
</Unit30>
<Unit31>
<Filename Value="../../Process/Spacing/SpaceToTab.pas"/>
<Filename Value="../../Process/Spacing/SingleSpaceBefore.pas"/>
<IsPartOfProject Value="True"/>
</Unit31>
<Unit32>
<Filename Value="../../Process/Spacing/MaxSpaces.pas"/>
<Filename Value="../../Process/Spacing/SingleSpaceAfter.pas"/>
<IsPartOfProject Value="True"/>
</Unit32>
<Unit33>
<Filename Value="../../Process/Spacing/SingleSpaceBefore.pas"/>
<Filename Value="../../Process/Spacing/SpaceBeforeColon.pas"/>
<IsPartOfProject Value="True"/>
</Unit33>
<Unit34>
<Filename Value="../../Process/Spacing/SingleSpaceAfter.pas"/>
<Filename Value="../../Process/Indent/Indenter.pas"/>
<IsPartOfProject Value="True"/>
</Unit34>
<Unit35>
<Filename Value="../../Process/Spacing/SpaceBeforeColon.pas"/>
<Filename Value="../../Process/Returns/LongLineBreaker.pas"/>
<IsPartOfProject Value="True"/>
</Unit35>
<Unit36>
<Filename Value="../../Process/Indent/Indenter.pas"/>
<Filename Value="../../Process/Info/BasicStats.pas"/>
<IsPartOfProject Value="True"/>
</Unit36>
<Unit37>
<Filename Value="../../Process/Returns/LongLineBreaker.pas"/>
<Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokens.pas"/>
<IsPartOfProject Value="True"/>
</Unit37>
<Unit38>
<Filename Value="../../Process/Info/BasicStats.pas"/>
<Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokenise.pas"/>
<IsPartOfProject Value="True"/>
</Unit38>
<Unit39>
<Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokens.pas"/>
<Filename Value="../../ReadWrite/FileConverter.pas"/>
<IsPartOfProject Value="True"/>
</Unit39>
<Unit40>
<Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokenise.pas"/>
<Filename Value="../../Utils/JcfUnicodeFiles.pas"/>
<IsPartOfProject Value="True"/>
</Unit40>
<Unit41>
<Filename Value="../../ReadWrite/FileConverter.pas"/>
<Filename Value="../CommandLineConstants.pas"/>
<IsPartOfProject Value="True"/>
</Unit41>
<Unit42>
<Filename Value="../../Utils/JcfUnicodeFiles.pas"/>
<Filename Value="../StatusMessageReceiver.pas"/>
<IsPartOfProject Value="True"/>
</Unit42>
<Unit43>
<Filename Value="../../Ui/fJcfErrorDisplay.pas"/>
<Filename Value="../CommandLineReturnCode.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="ExceptionDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit43>
<Unit44>
<Filename Value="../CommandLineConstants.pas"/>
<Filename Value="../../ReadWrite/ConvertTypes.pas"/>
<IsPartOfProject Value="True"/>
</Unit44>
<Unit45>
<Filename Value="../StatusMessageReceiver.pas"/>
<Filename Value="../../Parse/ParseError.pas"/>
<IsPartOfProject Value="True"/>
</Unit45>
<Unit46>
<Filename Value="../CommandLineReturnCode.pas"/>
<Filename Value="../../Parse/ParseTreeNode.pas"/>
<IsPartOfProject Value="True"/>
</Unit46>
<Unit47>
<Filename Value="../../ReadWrite/ConvertTypes.pas"/>
<Filename Value="../../Parse/ParseTreeNodeType.pas"/>
<IsPartOfProject Value="True"/>
</Unit47>
<Unit48>
<Filename Value="../../Parse/ParseError.pas"/>
<Filename Value="../../Parse/SourceToken.pas"/>
<IsPartOfProject Value="True"/>
</Unit48>
<Unit49>
<Filename Value="../../Parse/ParseTreeNode.pas"/>
<Filename Value="../../Parse/SourceTokenList.pas"/>
<IsPartOfProject Value="True"/>
</Unit49>
<Unit50>
<Filename Value="../../Parse/ParseTreeNodeType.pas"/>
<IsPartOfProject Value="True"/>
</Unit50>
<Unit51>
<Filename Value="../../Parse/SourceToken.pas"/>
<IsPartOfProject Value="True"/>
</Unit51>
<Unit52>
<Filename Value="../../Parse/SourceTokenList.pas"/>
<IsPartOfProject Value="True"/>
</Unit52>
<Unit53>
<Filename Value="../../Utils/JcfLog.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="JCFLog"/>
</Unit50>
<Unit51>
<Filename Value="../../Settings/SetUses.pas"/>
<IsPartOfProject Value="True"/>
</Unit51>
<Unit52>
<Filename Value="../../Settings/JcfSetBase.pas"/>
<IsPartOfProject Value="True"/>
</Unit52>
<Unit53>
<Filename Value="../../Settings/SetAlign.pas"/>
<IsPartOfProject Value="True"/>
</Unit53>
<Unit54>
<Filename Value="../../Settings/SetUses.pas"/>
<Filename Value="../../Settings/SetCaps.pas"/>
<IsPartOfProject Value="True"/>
</Unit54>
<Unit55>
<Filename Value="../../Settings/JcfSetBase.pas"/>
<Filename Value="../../Settings/SetFile.pas"/>
<IsPartOfProject Value="True"/>
</Unit55>
<Unit56>
<Filename Value="../../Settings/SetAlign.pas"/>
<Filename Value="../../Settings/SetIndent.pas"/>
<IsPartOfProject Value="True"/>
</Unit56>
<Unit57>
<Filename Value="../../Settings/SetCaps.pas"/>
<Filename Value="../../Settings/SetObfuscate.pas"/>
<IsPartOfProject Value="True"/>
</Unit57>
<Unit58>
<Filename Value="../../Settings/SetFile.pas"/>
<Filename Value="../../Process/Warnings/WarnUnusedParam.pas"/>
<IsPartOfProject Value="True"/>
</Unit58>
<Unit59>
<Filename Value="../../Settings/SetIndent.pas"/>
<Filename Value="../../Process/Warnings/WarnDestroy.pas"/>
<IsPartOfProject Value="True"/>
</Unit59>
<Unit60>
<Filename Value="../../Settings/SetObfuscate.pas"/>
<Filename Value="../../Process/Warnings/WarnAssignToFunctionName.pas"/>
<IsPartOfProject Value="True"/>
</Unit60>
<Unit61>
<Filename Value="../../Process/Warnings/WarnUnusedParam.pas"/>
<Filename Value="../../Process/Capitalisation/UnitNameCaps.pas"/>
<IsPartOfProject Value="True"/>
</Unit61>
<Unit62>
<Filename Value="../../Process/Warnings/WarnDestroy.pas"/>
<Filename Value="../../Process/Transform/SortUsesData.pas"/>
<IsPartOfProject Value="True"/>
</Unit62>
<Unit63>
<Filename Value="../../Process/Warnings/WarnAssignToFunctionName.pas"/>
<Filename Value="../../Process/Capitalisation/SpecificWordCaps.pas"/>
<IsPartOfProject Value="True"/>
</Unit63>
<Unit64>
<Filename Value="../../Process/Capitalisation/UnitNameCaps.pas"/>
<Filename Value="../../Settings/SetWordList.pas"/>
<IsPartOfProject Value="True"/>
</Unit64>
<Unit65>
<Filename Value="../../Process/Transform/SortUsesData.pas"/>
<IsPartOfProject Value="True"/>
</Unit65>
<Unit66>
<Filename Value="../../Process/Capitalisation/SpecificWordCaps.pas"/>
<IsPartOfProject Value="True"/>
</Unit66>
<Unit67>
<Filename Value="../../Settings/SetWordList.pas"/>
<IsPartOfProject Value="True"/>
</Unit67>
<Unit68>
<Filename Value="../../Settings/SetPreProcessor.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="SetPreprocessor"/>
</Unit65>
<Unit66>
<Filename Value="../../Settings/SetReturns.pas"/>
<IsPartOfProject Value="True"/>
</Unit66>
<Unit67>
<Filename Value="../../Settings/SetSpaces.pas"/>
<IsPartOfProject Value="True"/>
</Unit67>
<Unit68>
<Filename Value="../../Settings/Streams/RegistrySettings.pas"/>
<IsPartOfProject Value="True"/>
</Unit68>
<Unit69>
<Filename Value="../../Utils/JcfHelp.pas"/>
<Filename Value="../../Process/Obfuscate/ReduceWhiteSpace.pas"/>
<IsPartOfProject Value="True"/>
</Unit69>
<Unit70>
<Filename Value="../../Settings/SetReturns.pas"/>
<Filename Value="../../Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas"/>
<IsPartOfProject Value="True"/>
</Unit70>
<Unit71>
<Filename Value="../../Settings/SetSpaces.pas"/>
<Filename Value="../../Process/Warnings/WarnRealType.pas"/>
<IsPartOfProject Value="True"/>
</Unit71>
<Unit72>
<Filename Value="../../Settings/Streams/RegistrySettings.pas"/>
<Filename Value="../../Process/Warnings/WarnCaseNoElse.pas"/>
<IsPartOfProject Value="True"/>
</Unit72>
<Unit73>
<Filename Value="../../Process/Obfuscate/ReduceWhiteSpace.pas"/>
<Filename Value="../../Process/Warnings/WarnEmptyBlock.pas"/>
<IsPartOfProject Value="True"/>
</Unit73>
<Unit74>
<Filename Value="../../Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas"/>
<Filename Value="../../Process/Warnings/Warning.pas"/>
<IsPartOfProject Value="True"/>
</Unit74>
<Unit75>
<Filename Value="../../Process/Warnings/WarnRealType.pas"/>
<Filename Value="../../Process/Spacing/NoSpaceBefore.pas"/>
<IsPartOfProject Value="True"/>
</Unit75>
<Unit76>
<Filename Value="../../Process/Warnings/WarnCaseNoElse.pas"/>
<Filename Value="../../Process/Spacing/NoSpaceAfter.pas"/>
<IsPartOfProject Value="True"/>
</Unit76>
<Unit77>
<Filename Value="../../Process/Warnings/WarnEmptyBlock.pas"/>
<Filename Value="../../Process/Returns/ReturnAfter.pas"/>
<IsPartOfProject Value="True"/>
</Unit77>
<Unit78>
<Filename Value="../../Process/Warnings/Warning.pas"/>
<Filename Value="../../Process/Nesting.pas"/>
<IsPartOfProject Value="True"/>
</Unit78>
<Unit79>
<Filename Value="../../Process/Spacing/NoSpaceBefore.pas"/>
<Filename Value="../../Process/VisitSetNesting.pas"/>
<IsPartOfProject Value="True"/>
</Unit79>
<Unit80>
<Filename Value="../../Process/Spacing/NoSpaceAfter.pas"/>
<Filename Value="../../Process/Returns/ReturnBefore.pas"/>
<IsPartOfProject Value="True"/>
</Unit80>
<Unit81>
<Filename Value="../../Process/Returns/ReturnAfter.pas"/>
<Filename Value="../../Process/Returns/NoReturnAfter.pas"/>
<IsPartOfProject Value="True"/>
</Unit81>
<Unit82>
<Filename Value="../../Process/Nesting.pas"/>
<Filename Value="../../Process/Returns/NoReturnBefore.pas"/>
<IsPartOfProject Value="True"/>
</Unit82>
<Unit83>
<Filename Value="../../Process/VisitSetNesting.pas"/>
<Filename Value="../../Process/AllProcesses.pas"/>
<IsPartOfProject Value="True"/>
</Unit83>
<Unit84>
<Filename Value="../../Process/Returns/ReturnBefore.pas"/>
<Filename Value="../../Process/Obfuscate/RemoveBlankLine.pas"/>
<IsPartOfProject Value="True"/>
</Unit84>
<Unit85>
<Filename Value="../../Process/Returns/NoReturnAfter.pas"/>
<Filename Value="../../Process/SwitchableVisitor.pas"/>
<IsPartOfProject Value="True"/>
</Unit85>
<Unit86>
<Filename Value="../../Process/Returns/NoReturnBefore.pas"/>
<Filename Value="../../Process/Returns/PropertyOnOneLine.pas"/>
<IsPartOfProject Value="True"/>
</Unit86>
<Unit87>
<Filename Value="../../Process/AllProcesses.pas"/>
<Filename Value="../../Process/VisitStripEmptySpace.pas"/>
<IsPartOfProject Value="True"/>
</Unit87>
<Unit88>
<Filename Value="../../Process/Obfuscate/RemoveBlankLine.pas"/>
<Filename Value="../../Process/Returns/RemoveBlankLinesAfterProcHeader.pas"/>
<IsPartOfProject Value="True"/>
</Unit88>
<Unit89>
<Filename Value="../../Process/SwitchableVisitor.pas"/>
<Filename Value="../../Process/Returns/RemoveBlankLinesInVars.pas"/>
<IsPartOfProject Value="True"/>
</Unit89>
<Unit90>
<Filename Value="../../Process/Returns/PropertyOnOneLine.pas"/>
<Filename Value="../../Process/Returns/RemoveReturnsBeforeEnd.pas"/>
<IsPartOfProject Value="True"/>
</Unit90>
<Unit91>
<Filename Value="../../Process/VisitStripEmptySpace.pas"/>
<Filename Value="../../Process/Returns/RemoveReturnsAfterBegin.pas"/>
<IsPartOfProject Value="True"/>
</Unit91>
<Unit92>
<Filename Value="../../Process/Returns/RemoveBlankLinesAfterProcHeader.pas"/>
<Filename Value="../../Utils/IntList.pas"/>
<IsPartOfProject Value="True"/>
</Unit92>
<Unit93>
<Filename Value="../../Process/Returns/RemoveBlankLinesInVars.pas"/>
<Filename Value="../../Process/Align/AlignConst.pas"/>
<IsPartOfProject Value="True"/>
</Unit93>
<Unit94>
<Filename Value="../../Process/Returns/RemoveReturnsBeforeEnd.pas"/>
<Filename Value="../../Process/Align/AlignBase.pas"/>
<IsPartOfProject Value="True"/>
</Unit94>
<Unit95>
<Filename Value="../../Process/Returns/RemoveReturnsAfterBegin.pas"/>
<Filename Value="../../Process/Align/AlignAssign.pas"/>
<IsPartOfProject Value="True"/>
</Unit95>
<Unit96>
<Filename Value="../../Utils/IntList.pas"/>
<Filename Value="../../Process/Align/AlignVars.pas"/>
<IsPartOfProject Value="True"/>
</Unit96>
<Unit97>
<Filename Value="../../Process/Align/AlignConst.pas"/>
<Filename Value="../../Process/Align/AlignTypedef.pas"/>
<IsPartOfProject Value="True"/>
</Unit97>
<Unit98>
<Filename Value="../../Process/Align/AlignBase.pas"/>
<Filename Value="../../Process/Align/AlignComment.pas"/>
<IsPartOfProject Value="True"/>
</Unit98>
<Unit99>
<Filename Value="../../Process/Align/AlignAssign.pas"/>
<Filename Value="../../Parse/PreProcessor/PreProcessorExpressionParser.pas"/>
<IsPartOfProject Value="True"/>
</Unit99>
<Unit100>
<Filename Value="../../Process/Align/AlignVars.pas"/>
<Filename Value="../../Process/Spacing/RemoveSpaceAtLineEnd.pas"/>
<IsPartOfProject Value="True"/>
</Unit100>
<Unit101>
<Filename Value="../../Process/Align/AlignTypedef.pas"/>
<Filename Value="../../Process/Transform/FindReplace.pas"/>
<IsPartOfProject Value="True"/>
</Unit101>
<Unit102>
<Filename Value="../../Process/Align/AlignComment.pas"/>
<Filename Value="../../Process/Returns/ReturnsAfterFinalEnd.pas"/>
<IsPartOfProject Value="True"/>
</Unit102>
<Unit103>
<Filename Value="../../Parse/PreProcessor/PreProcessorExpressionParser.pas"/>
<Filename Value="../../Parse/PreProcessor/PreProcessorParseTree.pas"/>
<IsPartOfProject Value="True"/>
</Unit103>
<Unit104>
<Filename Value="../../Process/Spacing/RemoveSpaceAtLineEnd.pas"/>
<Filename Value="../../Process/Returns/RemoveConsecutiveReturns.pas"/>
<IsPartOfProject Value="True"/>
</Unit104>
<Unit105>
<Filename Value="../../Process/Transform/FindReplace.pas"/>
<Filename Value="../../Process/Transform/UsesClauseFindReplace.pas"/>
<IsPartOfProject Value="True"/>
</Unit105>
<Unit106>
<Filename Value="../../Process/Returns/ReturnsAfterFinalEnd.pas"/>
<Filename Value="../../Process/Transform/UsesClauseInsert.pas"/>
<IsPartOfProject Value="True"/>
</Unit106>
<Unit107>
<Filename Value="../../Parse/PreProcessor/PreProcessorParseTree.pas"/>
<Filename Value="../../Process/Transform/UsesClauseRemove.pas"/>
<IsPartOfProject Value="True"/>
</Unit107>
<Unit108>
<Filename Value="../../Process/Returns/RemoveConsecutiveReturns.pas"/>
<Filename Value="../../Settings/SetComments.pas"/>
<IsPartOfProject Value="True"/>
</Unit108>
<Unit109>
<Filename Value="../../Process/Transform/UsesClauseFindReplace.pas"/>
<Filename Value="../../Process/TreeWalker.pas"/>
<IsPartOfProject Value="True"/>
</Unit109>
<Unit110>
<Filename Value="../../Process/Transform/UsesClauseInsert.pas"/>
<Filename Value="../../Process/Transform/AddBlockEndSemicolon.pas"/>
<IsPartOfProject Value="True"/>
</Unit110>
<Unit111>
<Filename Value="../../Process/Transform/UsesClauseRemove.pas"/>
<Filename Value="../../Process/Transform/AddBeginEnd.pas"/>
<IsPartOfProject Value="True"/>
</Unit111>
<Unit112>
<Filename Value="../../Settings/SetComments.pas"/>
<Filename Value="../../Settings/SetTransform.pas"/>
<IsPartOfProject Value="True"/>
</Unit112>
<Unit113>
<Filename Value="../../Process/TreeWalker.pas"/>
<Filename Value="../../Process/Align/AlignField.pas"/>
<IsPartOfProject Value="True"/>
</Unit113>
<Unit114>
<Filename Value="../../Process/Transform/AddBlockEndSemicolon.pas"/>
<Filename Value="../../Process/Transform/SortUses.pas"/>
<IsPartOfProject Value="True"/>
</Unit114>
<Unit115>
<Filename Value="../../Process/Transform/AddBeginEnd.pas"/>
<Filename Value="../../Settings/SetAsm.pas"/>
<IsPartOfProject Value="True"/>
</Unit115>
<Unit116>
<Filename Value="../../Settings/SetTransform.pas"/>
<Filename Value="../../Process/Returns/RemoveReturnsAfter.pas"/>
<IsPartOfProject Value="True"/>
</Unit116>
<Unit117>
<Filename Value="../../Process/Align/AlignField.pas"/>
<Filename Value="../../Process/Indent/IndentAsmParam.pas"/>
<IsPartOfProject Value="True"/>
</Unit117>
<Unit118>
<Filename Value="../../Process/Transform/SortUses.pas"/>
<Filename Value="../../Utils/JcfStringUtils.pas"/>
<IsPartOfProject Value="True"/>
</Unit118>
<Unit119>
<Filename Value="../../Settings/SetAsm.pas"/>
<Filename Value="../../Process/Spacing/MoveSpaceToBeforeColon.pas"/>
<IsPartOfProject Value="True"/>
</Unit119>
<Unit120>
<Filename Value="../../Process/Returns/RemoveReturnsAfter.pas"/>
<Filename Value="../../Utils/JcfSystemUtils.pas"/>
<IsPartOfProject Value="True"/>
</Unit120>
<Unit121>
<Filename Value="../../Process/Indent/IndentAsmParam.pas"/>
<Filename Value="../../Ui/jcfuitools.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="JcfUiTools"/>
</Unit121>
<Unit122>
<Filename Value="../../Utils/JcfStringUtils.pas"/>
<IsPartOfProject Value="True"/>
</Unit122>
<Unit123>
<Filename Value="../../Process/Spacing/MoveSpaceToBeforeColon.pas"/>
<IsPartOfProject Value="True"/>
</Unit123>
<Unit124>
<Filename Value="../../Utils/JcfSystemUtils.pas"/>
<IsPartOfProject Value="True"/>
</Unit124>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
<SearchPaths>
<IncludeFiles Value="../../Include"/>
<OtherUnitFiles Value="../../Output/Lazarus"/>
<OtherUnitFiles Value="../../Output/Lazarus;../../IdePlugin/lazarus"/>
<UnitOutputDirectory Value="../../lib/CommandLine-$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
<SrcPath Value="../../Include"/>
</SearchPaths>
@ -624,5 +602,8 @@
<UseExternalDbgSyms Value="True"/>
</Debugging>
</Linking>
<Other>
<CustomOptions Value="-dCOMMAND_LINE"/>
</Other>
</CompilerOptions>
</CONFIG>

View File

@ -27,13 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
{$I JcfGlobal.inc}
uses
{$IFDEF UNIX}{$IFDEF UseCThreads}
cthreads,
{$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset
Forms,
SysUtils,
FileCtrl,
JcfStringUtils in '..\..\Utils\JcfStringUtils.pas',
JcfSystemUtils in '..\..\Utils\JcfSystemUtils.pas',
Converter in '..\..\ReadWrite\Converter.pas',
@ -50,7 +44,6 @@ uses
BaseVisitor in '..\..\Process\BaseVisitor.pas',
JcfMiscFunctions in '..\..\Utils\JcfMiscFunctions.pas',
JcfLog in '..\..\Utils\JcfLog.pas',
fShowParseTree in '..\..\Parse\UI\fShowParseTree.pas' {frmShowParseTree},
SetUses in '..\..\Settings\SetUses.pas',
JcfSetBase in '..\..\Settings\JcfSetBase.pas',
JcfSettings in '..\..\Settings\JcfSettings.pas',
@ -77,8 +70,9 @@ uses
WarnCaseNoElse in '..\..\Process\Warnings\WarnCaseNoElse.pas',
WarnDestroy in '..\..\Process\Warnings\WarnDestroy.pas',
WarnEmptyBlock in '..\..\Process\Warnings\WarnEmptyBlock.pas',
WarnImbalancedComment in '..\..\Process\Warnings\WarnImbalancedComment.pas',
Warning in '..\..\Process\Warnings\Warning.pas',
JcfVersionConsts in '..\..\JcfVersionConsts.pas', jcfidelazarus,
JcfVersionConsts in '..\..\JcfVersionConsts.pas',
JcfRegistrySettings in '..\..\Settings\JcfRegistrySettings.pas',
TokenUtils in '..\..\Parse\TokenUtils.pas',
NoSpaceBefore in '..\..\Process\Spacing\NoSpaceBefore.pas',
@ -123,13 +117,11 @@ uses
PreProcessorExpressionTokens in '..\..\Parse\PreProcessor\PreProcessorExpressionTokens.pas',
PreProcessorExpressionParser in '..\..\Parse\PreProcessor\PreProcessorExpressionParser.pas',
PreProcessorExpressionTokenise in '..\..\Parse\PreProcessor\PreProcessorExpressionTokenise.pas',
JcfHelp in '..\..\Utils\JcfHelp.pas',
SettingsTypes in '..\..\Settings\SettingsTypes.pas',
SetPreProcessor in '..\..\Settings\SetPreProcessor.pas',
UnitNameCaps in '..\..\Process\Capitalisation\UnitNameCaps.pas',
RemoveSpaceAtLineEnd in '..\..\Process\Spacing\RemoveSpaceAtLineEnd.pas',
FindReplace in '..\..\Process\Transform\FindReplace.pas',
fJcfErrorDisplay in '..\..\Ui\fJcfErrorDisplay.pas' {ExceptionDialog},
ReturnsAfterFinalEnd in '..\..\Process\Returns\ReturnsAfterFinalEnd.pas',
PreProcessorParseTree in '..\..\Parse\PreProcessor\PreProcessorParseTree.pas',
RemoveEmptyComment in '..\..\Process\RemoveEmptyComment.pas',
@ -148,7 +140,6 @@ uses
SortUsesData in '..\..\Process\Transform\SortUsesData.pas',
IdentifierCaps in '..\..\Process\Capitalisation\IdentifierCaps.pas',
WarnUnusedParam in '..\..\Process\Warnings\WarnUnusedParam.pas',
JcfFontSetFunctions in '..\..\Utils\JcfFontSetFunctions.pas',
SetAsm in '..\..\Settings\SetAsm.pas',
RemoveReturnsAfter in '..\..\Process\Returns\RemoveReturnsAfter.pas',
IndentAsmParam in '..\..\Process\Indent\IndentAsmParam.pas',
@ -157,6 +148,7 @@ uses
CommandLineReturnCode in '..\CommandLineReturnCode.pas',
CommandLineConstants in '..\CommandLineConstants.pas',
StatusMessageReceiver in '..\StatusMessageReceiver.pas',
JcfUiTools in '..\..\Ui\jcfuitools.pas',
MoveSpaceToBeforeColon in '..\..\Process\Spacing\MoveSpaceToBeforeColon.pas';
const
@ -406,7 +398,6 @@ var
{ main program starts here }
begin
Application.Initialize;
GetDefaultSettingsFileName := CmdLineDefGetDefaultSettingsFileName;
feReturnCode := rcSuccess;
{ read registry }
@ -437,6 +428,10 @@ begin
ConvertFiles;
end;
// keep for debuginng in the lazarus ide.
//Write('Press enter to end');
//ReadLn;
FreeAndNil(lcStatus);
HaltOnError(feReturnCode);

View File

@ -0,0 +1,185 @@
<?xml version="1.0" ?>
<JediCodeFormatSettings>
<WriteVersion> 2.44 </WriteVersion>
<WriteDateTime> 44779.7261157755 </WriteDateTime>
<Description> format settings for use with Lazarus </Description>
<ConfirmFormat> True </ConfirmFormat>
<Obfuscate>
<Enabled> False </Enabled>
<Caps> 1 </Caps>
<RemoveComments> True </RemoveComments>
<RemoveWhiteSpace> True </RemoveWhiteSpace>
<RemoveIndent> True </RemoveIndent>
<RebreakLines> True </RebreakLines>
</Obfuscate>
<Clarify>
<OnceOffs> 0 </OnceOffs>
<Warnings> True </Warnings>
<WarnUnusedParams> False </WarnUnusedParams>
<IgnoreUnusedParams> Sender </IgnoreUnusedParams>
<FileExtensions> dpr,lpr,pas,pp </FileExtensions>
</Clarify>
<Indent>
<IndentationSpaces> 2 </IndentationSpaces>
<FirstLevelIndent> 0 </FirstLevelIndent>
<HasFirstLevelIndent> False </HasFirstLevelIndent>
<IndentBeginEnd> False </IndentBeginEnd>
<IndentbeginEndSpaces> 2 </IndentbeginEndSpaces>
<IndentLibraryProcs> True </IndentLibraryProcs>
<IndentProcedureBody> False </IndentProcedureBody>
<KeepCommentsWithCodeInGlobals> True </KeepCommentsWithCodeInGlobals>
<KeepCommentsWithCodeInProcs> True </KeepCommentsWithCodeInProcs>
<KeepCommentsWithCodeInClassDef> True </KeepCommentsWithCodeInClassDef>
<KeepCommentsWithCodeElsewhere> True </KeepCommentsWithCodeElsewhere>
<IndentElse> False </IndentElse>
<IndentCaseElse> True </IndentCaseElse>
<IndentNestedTypes> False </IndentNestedTypes>
<IndentVarAndConstInClass> False </IndentVarAndConstInClass>
</Indent>
<Spaces>
<TabsToSpaces> True </TabsToSpaces>
<SpacesToTabs> False </SpacesToTabs>
<SpacesPerTab> 2 </SpacesPerTab>
<SpacesForTab> 2 </SpacesForTab>
<FixSpacing> True </FixSpacing>
<SpaceBeforeClassHeritage> False </SpaceBeforeClassHeritage>
<SpacesBeforeColonVar> 0 </SpacesBeforeColonVar>
<SpacesBeforeColonConst> 0 </SpacesBeforeColonConst>
<SpacesBeforeColonParam> 0 </SpacesBeforeColonParam>
<SpacesBeforeColonFn> 0 </SpacesBeforeColonFn>
<SpacesBeforeColonClassVar> 0 </SpacesBeforeColonClassVar>
<SpacesBeforeColonRecordField> 0 </SpacesBeforeColonRecordField>
<SpacesBeforeColonCaseLabel> 0 </SpacesBeforeColonCaseLabel>
<SpacesBeforeColonLabel> 0 </SpacesBeforeColonLabel>
<SpacesBeforeColonInGeneric> 0 </SpacesBeforeColonInGeneric>
<MaxSpacesInCode> 2 </MaxSpacesInCode>
<UseMaxSpacesInCode> True </UseMaxSpacesInCode>
<SpaceForOperator> 0 </SpaceForOperator>
<SpaceBeforeOpenBracketsInFunctionDeclaration> False </SpaceBeforeOpenBracketsInFunctionDeclaration>
<SpaceBeforeOpenBracketsInFunctionCall> False </SpaceBeforeOpenBracketsInFunctionCall>
<SpaceBeforeOpenSquareBracketsInExpression> False </SpaceBeforeOpenSquareBracketsInExpression>
<SpaceAfterOpenBrackets> False </SpaceAfterOpenBrackets>
<SpaceBeforeCloseBrackets> False </SpaceBeforeCloseBrackets>
<MoveSpaceToBeforeColon> False </MoveSpaceToBeforeColon>
</Spaces>
<Returns>
<WhenRebreakLines> 1 </WhenRebreakLines>
<MaxLineLength> 110 </MaxLineLength>
<NumReturnsAfterFinalEnd> 1 </NumReturnsAfterFinalEnd>
<RemoveBadReturns> True </RemoveBadReturns>
<AddGoodReturns> True </AddGoodReturns>
<UsesOnePerLine> False </UsesOnePerLine>
<BreakAfterUses> False </BreakAfterUses>
<RemoveExpressionReturns> True </RemoveExpressionReturns>
<RemoveVarReturns> True </RemoveVarReturns>
<NoReturnsInProperty> True </NoReturnsInProperty>
<RemoveProcedureDefReturns> True </RemoveProcedureDefReturns>
<RemoveReturns> True </RemoveReturns>
<RemoveVarBlankLines> True </RemoveVarBlankLines>
<RemoveProcHeaderBlankLines> True </RemoveProcHeaderBlankLines>
<Block> 1 </Block>
<BlockBegin> 1 </BlockBegin>
<Label> 1 </Label>
<LabelBegin> 1 </LabelBegin>
<CaseLabel> 1 </CaseLabel>
<CaseBegin> 1 </CaseBegin>
<CaseElse> 0 </CaseElse>
<CaseElseBegin> 0 </CaseElseBegin>
<EndElse> 0 </EndElse>
<ElseIf> 1 </ElseIf>
<ElseBegin> 0 </ElseBegin>
<BeforeCompilerDirectUses> 1 </BeforeCompilerDirectUses>
<BeforeCompilerDirectStatements> 0 </BeforeCompilerDirectStatements>
<BeforeCompilerDirectGeneral> 1 </BeforeCompilerDirectGeneral>
<AfterCompilerDirectUses> 1 </AfterCompilerDirectUses>
<AfterCompilerDirectStatements> 0 </AfterCompilerDirectStatements>
<AfterCompilerDirectGeneral> 1 </AfterCompilerDirectGeneral>
<ReturnChars> 0 </ReturnChars>
<RemoveConsecutiveBlankLines> True </RemoveConsecutiveBlankLines>
<MaxConsecutiveBlankLines> 4 </MaxConsecutiveBlankLines>
<MaxBlankLinesInSection> 1 </MaxBlankLinesInSection>
<LinesBeforeProcedure> 1 </LinesBeforeProcedure>
</Returns>
<Comments>
<RemoveEmptyDoubleSlashComments> True </RemoveEmptyDoubleSlashComments>
<RemoveEmptyCurlyBraceComments> True </RemoveEmptyCurlyBraceComments>
</Comments>
<Capitalisation>
<Enabled> True </Enabled>
<ReservedWords> 1 </ReservedWords>
<Operators> 1 </Operators>
<Directives> 1 </Directives>
<Constants> 1 </Constants>
<Types> 1 </Types>
</Capitalisation>
<SpecificWordCaps>
<Enabled> True </Enabled>
<Words> </Words>
</SpecificWordCaps>
<Identifiers>
<Enabled> True </Enabled>
<Words> ActivePage,AnsiCompareStr,AnsiCompareText,AnsiUpperCase,AsBoolean,AsDateTime,AsFloat,AsInteger,Assign,AsString,AsVariant,BeginDrag,Buttons,Caption,Checked,Classes,ClassName,Clear,Close,Components,Controls,Count,Create,Data,Dec,Delete,Destroy,Dialogs,Enabled,EndDrag,EOF,Exception,Execute,False,FieldByName,First,Forms,Free,FreeAndNil,GetFirstChild,Graphics,Height,idAbort,idCancel,idIgnore,IDispatch,idNo,idOk,idRetry,idYes,Inc,Initialize,IntToStr,ItemIndex,IUnknown,Lines,Math,MaxValue,mbAbort,mbAll,mbCancel,mbHelp,mbIgnore,mbNo,mbOK,mbRetry,mbYes,mbYesToAll,Messages,MinValue,mnNoToAll,mrAbort,mrAll,mrCancel,mrIgnore,mrNo,mrNone,mrNoToAll,mrOk,mrRetry,mrYes,mrYesToAll,mtConfirmation,mtCustom,mtError,mtInformation,mtWarning,Name,Next,Open,Ord,ParamStr,PChar,Perform,ProcessMessages,Read,ReadOnly,RecordCount,Register,Release,Result,Sender,SetFocus,Show,ShowMessage,Source,StdCtrls,StrToInt,SysUtils,TAutoObject,TButton,TComponent,TDataModule,Text,TForm,TFrame,TList,TNotifyEvent,TObject,TObjectList,TPageControl,TPersistent,True,TStringList,TStrings,TTabSheet,Unassigned,Value,Visible,WideString,Width,Windows,Write </Words>
</Identifiers>
<NotIdent>
<Enabled> True </Enabled>
<Words> False,Name,nil,PChar,read,ReadOnly,True,WideString,write </Words>
</NotIdent>
<UnitNameCaps>
<Enabled> True </Enabled>
<Words> ActnColorMaps,ActnCtrls,ActnList,ActnMan,ActnMenus,ActnPopup,ActnRes,ADOConst,ADODB,ADOInt,AppEvnts,AxCtrls,BandActn,bdeconst,bdemts,Buttons,CheckLst,Classes,Clipbrd.pas,CmAdmCtl,ComCtrls,ComStrs,Consts,Controls,CtlConsts,CtlPanel,CustomizeDlg,DataBkr,DB,DBActns,dbcgrids,DBClient,DBClientActnRes,DBClientActns,DBCommon,DBConnAdmin,DBConsts,DBCtrls,DbExcept,DBGrids,DBLocal,DBLocalI,DBLogDlg,dblookup,DBOleCtl,DBPWDlg,DBTables,DBXpress,DdeMan,Dialogs,DrTable,DSIntf,ExtActns,ExtCtrls,ExtDlgs,FileCtrl,FMTBcd,Forms,Graphics,GraphUtil,Grids,HTTPIntr,IB,IBBlob,IBCustomDataSet,IBDatabase,IBDatabaseInfo,IBDCLConst,IBErrorCodes,IBEvents,IBExternals,IBExtract,IBGeneratorEditor,IBHeader,IBIntf,IBQuery,IBRestoreEditor,IBSecurityEditor,IBServiceEditor,IBSQL,IBSQLMonitor,IBStoredProc,IBTable,IBUpdateSQL,IBUtils,IBXConst,ImgList,Jcl8087,JclAbstractContainers,JclAlgorithms,JclAnsiStrings,JclAppInst,JclArrayLists,JclArraySets,JclBase,JclBinaryTrees,JclBorlandTools,JclCIL,JclCLR,JclCOM,JclComplex,JclCompression,JclConsole,JclContainerIntf,JclCounter,JclDateTime,JclDebug,JclDotNet,JclEDI,JclEDISEF,JclEDITranslators,JclEDIXML,JclEDI_ANSIX12,JclEDI_ANSIX12_Ext,JclEDI_UNEDIFACT,JclEDI_UNEDIFACT_Ext,JclExprEval,JclFileUtils,JclFont,JclGraphics,JclGraphUtils,JclHashMaps,JclHashSets,JclHookExcept,JclIniFiles,JclLANMan,JclLinkedLists,JclLocales,JclLogic,JclMapi,JclMath,JclMetadata,JclMIDI,JclMime,JclMiscel,JclMsdosSys,JclMultimedia,JclNTFS,JclPCRE,JclPeImage,JclPrint,JclQGraphics,JclQGraphUtils,JclQueues,JclRegistry,JclResources,JclRTTI,JclSchedule,JclSecurity,JclShell,JclSimpleXml,JclStacks,JclStatistics,JclStreams,JclStrHashMap,JclStringLists,JclStrings,JclStructStorage,JclSvcCtrl,JclSynch,JclSysInfo,JclSysUtils,JclTask,JclTD32,JclUnicode,JclUnitConv,JclUnitVersioning,JclUnitVersioningProviders,JclValidation,JclVectors,JclWideFormat,JclWideStrings,JclWin32,JclWin32Ex,JclWinMIDI,ListActns,Mask,MConnect,Menus,Midas,MidasCon,MidConst,MPlayer,MtsRdm,Mxconsts,ObjBrkr,OleAuto,OleConst,OleCtnrs,OleCtrls,OleDB,OleServer,Outline,Printers,Provider,recerror,ScktCnst,ScktComp,ScktMain,SConnect,ShadowWnd,SimpleDS,SMINTF,SqlConst,SqlExpr,SqlTimSt,StdActnMenus,StdActns,StdCtrls,StdStyleActnCtrls,SvcMgr,SysUtils,TabNotBk,Tabs,TConnect,Themes,ToolWin,ValEdit,VDBConsts,WinHelpViewer,XPActnCtrls,XPMan,XPStyleActnCtrls </Words>
</UnitNameCaps>
<Asm>
<Caps> 0 </Caps>
<BreaksAfterLabel> 1 </BreaksAfterLabel>
<BreaksAfterLabelEnabled> True </BreaksAfterLabelEnabled>
<StatementIndentEnabled> True </StatementIndentEnabled>
<StatementIndent> 7 </StatementIndent>
<ParamsIndentEnabled> True </ParamsIndentEnabled>
<ParamsIndent> 15 </ParamsIndent>
</Asm>
<PreProcessor>
<Enabled> True </Enabled>
<DefinedSymbols> FPC,MSWINDOWS </DefinedSymbols>
<DefinedOptions> </DefinedOptions>
</PreProcessor>
<Align>
<AlignAssign> False </AlignAssign>
<AlignConst> False </AlignConst>
<AlignTypedef> False </AlignTypedef>
<AlignVars> False </AlignVars>
<AlignComment> False </AlignComment>
<AlignFields> False </AlignFields>
<InterfaceOnly> False </InterfaceOnly>
<MinColumn> 2 </MinColumn>
<MaxColumn> 60 </MaxColumn>
<MaxVariance> 5 </MaxVariance>
<MaxVarianceInterface> 5 </MaxVarianceInterface>
<MaxUnalignedStatements> 0 </MaxUnalignedStatements>
</Align>
<Replace>
<Enabled> False </Enabled>
<Words> </Words>
</Replace>
<Uses>
<RemoveEnabled> False </RemoveEnabled>
<InsertInterfaceEnabled> False </InsertInterfaceEnabled>
<InsertImplementationEnabled> False </InsertImplementationEnabled>
<FindReplaceEnabled> False </FindReplaceEnabled>
<Remove> </Remove>
<InsertInterface> </InsertInterface>
<InsertImplementation> </InsertImplementation>
<Find> </Find>
<Replace> </Replace>
</Uses>
<Transform>
<BeginEndStyle> 1 </BeginEndStyle>
<AddBlockEndSemicolon> True </AddBlockEndSemicolon>
<SortUsesInterface> False </SortUsesInterface>
<SortUsesImplmentation> False </SortUsesImplmentation>
<SortUsesProgram> False </SortUsesProgram>
<SortUsesBreakOnReturn> False </SortUsesBreakOnReturn>
<SortUsesBreakOnComment> False </SortUsesBreakOnComment>
<SortUsesSortOrder> 0 </SortUsesSortOrder>
<SortUsesNoComments> False </SortUsesNoComments>
</Transform>
</JediCodeFormatSettings>

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Makefile Value="2"/>
<Params Value=" -Fu../..;../../Parse;../../Parse/PreProcessor;../../Parse/UI;../../Process;../../Process/Align;../../Process/Capitalisation;../../Process/Indent;../../Process/Info;../../Process/Obfuscate;../../Process/Onceoffs;../../Process/Returns;../../Process/Spacing;../../Process/Transform;../../Process/Warnings;../../ReadWrite;../../Settings;../../Settings/Streams;../../Ui;../../Ui/Settings;../../Utils;../../Utils/DragDrop;../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../buildintf/units/$(CPU_TARGET)-$(OS_TARGET);../../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -Fi../../Include;../../Ui/Settings -MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) jcfidelazarus.pas"/>
<Params Value=" -Fu../..;../../Parse;../../Parse/PreProcessor;../../Parse/UI;../../Process;../../Process/Align;../../Process/Capitalisation;../../Process/Indent;../../Process/Info;../../Process/Obfuscate;../../Process/Onceoffs;../../Process/Returns;../../Process/Spacing;../../Process/Transform;../../Process/Warnings;../../ReadWrite;../../Settings;../../Settings/Streams;../../Ui;../../Ui/Settings;../../Utils;../../Utils/DragDrop;../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../../buildintf/units/$(CPU_TARGET)-$(OS_TARGET);../../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);. -Fi../../Include;../../Ui/Settings -MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dLAZARUS_PLUGIN jcfidelazarus.pas"/>
</CONFIG>

View File

@ -2,7 +2,7 @@
#
# Makefile.fpc for jcfidelazarus 2.0
#
# This file was generated on 14-7-20
# This file was generated on 13-10-22
[package]
name=jcfidelazarus
@ -12,7 +12,7 @@ version=2.0
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
unitdir=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
includedir=../../Include ../../Ui/Settings
options= -MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
options= -MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dLAZARUS_PLUGIN $(DBG_OPTIONS)
[target]
units=jcfidelazarus.pas

View File

@ -20,7 +20,8 @@
</SyntaxOptions>
</Parsing>
<Other>
<CustomOptions Value="$(IDEBuildOptions)"/>
<CustomOptions Value="$(IDEBuildOptions)
-dLAZARUS_PLUGIN"/>
</Other>
</CompilerOptions>
<Description Value="JEDI Code Format IDE Plugin for Lazarus"/>
@ -734,6 +735,10 @@
<Filename Value="..\..\Utils\JcfUnicodeFiles.pas"/>
<UnitName Value="JcfUnicodeFiles"/>
</Item>
<Item>
<Filename Value="..\..\Ui\jcfuitools.pas"/>
<UnitName Value="JcfUiTools"/>
</Item>
</Files>
<i18n>
<EnableI18N Value="True"/>

View File

@ -42,7 +42,7 @@ uses
frAnyCapsSettings, frIdentifierCapsSettings, frNotIdentifierCapsSettings,
frUnitCaps, frReplace, frUses, frTransform, frAsm, frPreProcessor,
JcfUIConsts, Diff, diffmerge, JcfStringUtils, JcfSystemUtils,
JcfUnicodeFiles, LazarusPackageIntf;
JcfUnicodeFiles, JcfUiTools, LazarusPackageIntf;
implementation

View File

@ -41,7 +41,6 @@ interface
uses
Contnrs, SysUtils,
Forms,
// local
ParseTreeNode,
ParseTreeNodeType,
@ -299,6 +298,9 @@ type
implementation
uses
JcfUiTools;
const
UPDATE_INTERVAL = 512;
@ -449,10 +451,7 @@ begin
end;
Inc(fiTokenCount);
{$IFnDEF LCLNOGUI}
if (fiTokenCount mod UPDATE_INTERVAL) = 0 then
Application.ProcessMessages;
{$ENDIF}
UpdateGUI(fiTokenCount,UPDATE_INTERVAL);
{ add trailing white space
fixes some problems, causes others

View File

@ -39,9 +39,8 @@ interface
uses
SysUtils, StrUtils,
Forms,
{ local }
Tokens, SourceToken, SourceTokenList;
Tokens, SourceToken, SourceTokenList, JcfUiTools;
type
@ -963,27 +962,18 @@ const
var
lcList: TSourceTokenList;
lcNew: TSourceToken;
{$IFnDEF LCLNOGUI}
liCounter: integer;
{$ENDIF}
begin
Assert(SourceCode <> '');
{$IFnDEF LCLNOGUI}
liCounter := 0;
{$ENDIF}
lcList := TSourceTokenList.Create;
while not EndOfFile do
begin
lcNew := GetNextToken;
lcList.Add(lcNew);
{$IFnDEF LCLNOGUI}
Inc(liCounter);
if (liCounter mod UPDATE_INTERVAL) = 0 then
Application.ProcessMessages;
{$ENDIF}
UpdateGUI(liCounter, UPDATE_INTERVAL);
end;
Result := lcList;

View File

@ -34,7 +34,6 @@ interface
uses
Classes, SysUtils,
Forms,
{ local }
Tokens, SourceTokenList, SourceToken;
@ -92,7 +91,7 @@ implementation
uses
{ local }
PreProcessorExpressionTokenise, PreProcessorExpressionParser,
ParseError, JcfSettings;
ParseError, JcfSettings, JcfUiTools;
procedure RemoveConditionalCompilation(const pcTokens: TSourceTokenList);
var
@ -178,17 +177,11 @@ end;
procedure TPreProcessorParseTree.NextToken;
{$IFnDEF LCLNOGUI}
const
UPDATE_INTERVAL = 512;
{$ENDIF}
begin
Inc(fiCurrentTokenIndex);
{$IFnDEF LCLNOGUI}
if (fiCurrentTokenIndex mod UPDATE_INTERVAL) = 0 then
Application.ProcessMessages;
{$ENDIF}
UpdateGUI(fiCurrentTokenIndex,UPDATE_INTERVAL);
end;
function TPreProcessorParseTree.CurrentToken: TSourceToken;

View File

@ -71,7 +71,7 @@ type
implementation
uses
Forms, SysUtils,
SysUtils,
{ local }
JcfSettings, SetClarify, VisitSetXY,
{ once-offs }
@ -107,7 +107,7 @@ uses
BasicStats,
{ align }
AlignConst, AlignVars, AlignAssign, AlignTypedef, AlignComment, AlignField,
IndentAsmParam;
IndentAsmParam, JcfUiTools;
constructor TAllProcesses.Create;
begin
@ -158,9 +158,7 @@ begin
if lc.FinalSummary(lsMessage) then
OnMessage('', lsMessage, mtFinalSummary, -1, -1);
{$IFnDEF LCLNOGUI}
Application.ProcessMessages;
{$ENDIF}
UpdateGUI;
{ if the main process fired, do the follow set too }
for liLoop := Low(pcFollowSet) to High(pcFollowSet) do

View File

@ -37,11 +37,7 @@ unit Converter;
interface
uses
SysUtils, strutils,
// LazUtils
LazFileUtils,
// LCL
Controls, Forms,
SysUtils, strutils, LazFileUtils,
// local
ConvertTypes, ParseTreeNode, BuildTokenList, BuildParseTree, BaseVisitor;
@ -69,9 +65,6 @@ type
This could be in batch file on a server }
fbGuiMessages: Boolean;
fbShowParseTree: Boolean;
{$IFnDEF LCLNOGUI}
leOldCursor: TCursor;
{$ENDIF}
function GetOnStatusMessage: TStatusMessageProc;
procedure SetOnStatusMessage(const Value: TStatusMessageProc);
@ -116,9 +109,10 @@ type
implementation
uses
AllProcesses, fShowParseTree, JcfRegistrySettings,
AllProcesses,
JcfRegistrySettings,
JcfSettings, JcfStringUtils, ParseError, PreProcessorParseTree,
SourceToken, SourceTokenList, TreeWalker, VisitSetNesting, VisitSetXY;
SourceToken, SourceTokenList, TreeWalker, VisitSetNesting, VisitSetXY, JcfUiTools;
function StrInsert(const psSub, psMain: String; const piPos: Integer): String;
begin
@ -158,12 +152,10 @@ var
lcTokenList: TSourceTokenList;
begin
fbConvertError := False;
{$IFnDEF LCLNOGUI}
leOldCursor := Screen.Cursor;
try { finally normal cursor }
// this can take a long time for large files
Screen.Cursor := crHourGlass;
{$ENDIF}
SetWaitCursorUI;
// turn text into tokens
fcTokeniser.SourceCode := InputCode;
@ -232,12 +224,9 @@ begin
SendExceptionMessage(E);
end;
end;
{$IFnDEF LCLNOGUI}
finally
Screen.Cursor := leOldCursor;
RestoreCursorUI;
end;
{$ENDIF}
end;
{ this is what alters the code (in parse tree form) from source to output }
@ -357,12 +346,10 @@ end;
procedure TConverter.ShowParseTree;
begin
{$IFnDEF LCLNOGUI}
// This is always called from a Cursor:=crHourGlass block. Restore old cursor.
Screen.Cursor := leOldCursor;
{$ENDIF}
RestoreCursorUI;
if fcBuildParseTree.Root <> nil then
fShowParseTree.ShowParseTree(fcBuildParseTree.Root);
ShowParseTreeUI(fcBuildParseTree.Root);
end;
procedure TConverter.ConvertPart(const piStartIndex, piEndIndex: Integer;

View File

@ -35,7 +35,6 @@ interface
uses
Classes, SysUtils,
// IdeIntf
SrcEditorIntf,
{ local }
Converter, ConvertTypes;

View File

@ -31,7 +31,6 @@ interface
uses
Classes, SysUtils,
Dialogs, Controls, Forms,
// local
Converter, ConvertTypes;
@ -114,9 +113,9 @@ implementation
uses
{ local }
JcfStringUtils, JcfSystemUtils,
JcfStringUtils, FileUtil,
JcfMiscFunctions, JcfLog,
JcfRegistrySettings, JcfSettings, JcfUnicodeFiles;
JcfRegistrySettings, JcfSettings, JcfUnicodeFiles, JcfUiTools, System.UITypes;
constructor TFileConverter.Create;
begin
@ -151,7 +150,7 @@ begin
exit;
end;
if FileGetSize(psInputFileName) < 1 then
if FileSize(psInputFileName) < 1 then
begin
SendStatusMessage(psInputFileName, 'The file "' + psInputFileName + '" is empty',
mtInputError,
@ -250,8 +249,7 @@ begin
else
lsOutType := 'Output';
wRes := MessageDlg(lsOutType + ' file ' + lsOut + ' exists already. Remove it?',
mtConfirmation, [mbYes, mbNo, mbAll, mbAbort], 0);
wRes :=MessageDlgUI(lsOutType + ' file ' + lsOut + ' exists already. Remove it?');
end;
if wRes = mrAll then
@ -361,11 +359,7 @@ begin
ProcessFile(lsDir + lsNames[liLoop]);
if fbAbort then
break;
{$IFnDEF LCLNOGUI}
// refresh the GUI
Application.ProcessMessages;
{$ENDIF}
UpdateGUI;
end;
{ all subdirs }

View File

@ -41,7 +41,6 @@ interface
uses
Registry, Classes, SysUtils,
Dialogs,
{ local }
ConvertTypes;
@ -191,7 +190,11 @@ implementation
uses
{ jcf }
JcfStringUtils, JcfSystemUtils, JcfMiscFunctions;
JcfStringUtils, JcfSystemUtils, JcfMiscFunctions, JcfUiTools
{$ifndef COMMAND_LINE}
,lclintf //< OpenDocument
{$endif}
;
const
REG_GENERAL_SECTION = 'General';
@ -521,14 +524,17 @@ procedure TJCFRegistrySettings.ViewLog;
var
lsFile: string;
begin
{$ifndef COMMAND_LINE}
lsFile := LogFileName;
if FileExists(lsFile) then
begin
ShellExecEx('notepad.exe ', lsFile);
//ShellExecEx('notepad.exe ', lsFile);
OpenDocument(lsFile);
end
else
ShowMessage('No log file found at ' + lsFile);
ShowErrorMessageUI('No log file found at ' + lsFile);
{$endif}
end;
function TJCFRegistrySettings.DirIsExcluded(const psDir: string): boolean;

View File

@ -35,24 +35,26 @@ interface
uses
SysUtils,
// LCL
Dialogs,
// BuildIntf
{$ifdef LAZARUS_PLUGIN}
IDEOptionsIntf,
// IdeIntf
IDEOptEditorIntf,
{$endif}
// local
SetObfuscate, SetClarify, SetIndent, SetSpaces, SetReturns, SetComments,
SetCaps, SetWordList, SetAlign, SetReplace, SetUses, SetPreProcessor,
SettingsStream, SetTransform, SetAsm, JcfVersionConsts,
JcfStringUtils, JcfSetBase, JcfRegistrySettings, JcfUIConsts;
JcfStringUtils, JcfSetBase, JcfRegistrySettings,
JcfUIConsts,
JcfUiTools;
type
{ TFormattingSettings }
{$ifdef LAZARUS_PLUGIN}
TFormattingSettings = class(TAbstractIDEEnvironmentOptions)
{$else}
TFormattingSettings = class
{$endif}
private
fcObfuscate: TSetObfuscate;
fcClarify: TSetClarify;
@ -90,10 +92,11 @@ type
public
constructor Create(const pbReadRegFile: boolean);
destructor Destroy; override;
{$ifdef LAZARUS_PLUGIN}
class function GetGroupCaption: String; override;
class function GetInstance: TAbstractIDEOptions; override;
procedure DoAfterWrite({%H-}Restore: boolean); override;
{$endif}
procedure Read;
procedure ReadFromFile(const psFileName: string; const pbMustExist: boolean);
procedure ReadDefaults;
@ -241,6 +244,7 @@ begin
inherited;
end;
{$ifdef LAZARUS_PLUGIN}
class function TFormattingSettings.GetGroupCaption: String;
begin
Result := lisJCFFormatSettings;
@ -260,6 +264,7 @@ begin
{ save to file }
Write;
end;
{$endif}
const
CODEFORMAT_SETTINGS_SECTION = 'JediCodeFormatSettings';
@ -297,8 +302,7 @@ begin
end;
end
else if pbMustExist then
MessageDlg(Format(lisTheSettingsFileDoesNotExist, [psFileName, NativeLineBreak]),
mtError, [mbOK], 0);
ShowErrorMessageUI(Format(lisTheSettingsFileDoesNotExist, [psFileName, NativeLineBreak]));
end;
@ -334,7 +338,7 @@ begin
begin
{ fail quietly? }
if lcReg.FormatFileWriteOption = eAlwaysWrite then
MessageDlg(Format(lisErrorWritingSettingsFileReadOnly, [lcReg.FormatConfigFileName]), mtError, [mbOK], 0);
ShowErrorMessageUI(Format(lisErrorWritingSettingsFileReadOnly, [lcReg.FormatConfigFileName]));
exit;
end;
@ -354,8 +358,7 @@ begin
begin
if lcReg.FormatFileWriteOption = eAlwaysWrite then
begin
MessageDlg(Format(lisErrorWritingSettingsException, [GetRegSettings.FormatConfigFileName, NativeLineBreak, E.Message]),
mtError, [mbOK], 0);
ShowErrorMessageUI(Format(lisErrorWritingSettingsException, [GetRegSettings.FormatConfigFileName, NativeLineBreak, E.Message]));
end;
end;
end;
@ -442,7 +445,7 @@ begin
lcAllSettings := pcStream.ExtractSection(CODEFORMAT_SETTINGS_SECTION);
if lcAllSettings = nil then
begin
ShowMessage(lisNoSettingsFound);
ShowErrorMessageUI(lisNoSettingsFound);
exit;
end;
@ -510,8 +513,10 @@ begin
end;
initialization
{$ifdef LAZARUS_PLUGIN}
JCFOptionsGroup := GetFreeIDEOptionsGroupIndex(GroupEditor);
RegisterIDEOptionsGroup(JCFOptionsGroup, TFormattingSettings);
{$endif}
finalization
FreeAndNil(mcFormattingSettings);
end.

View File

@ -34,7 +34,7 @@
<PackageName Value="LCL"/>
</Item2>
</RequiredPackages>
<Units Count="30">
<Units Count="31">
<Unit0>
<Filename Value="TestJCF.lpr"/>
<IsPartOfProject Value="True"/>
@ -162,6 +162,11 @@
<Filename Value="..\JcfVersionConsts.pas"/>
<IsPartOfProject Value="True"/>
</Unit29>
<Unit30>
<Filename Value="..\Ui\jcfuitools.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="JcfUiTools"/>
</Unit30>
</Units>
</ProjectOptions>
<CompilerOptions>
@ -172,10 +177,13 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir);..\Include"/>
<OtherUnitFiles Value="..\Parse;..\Utils;..\Settings;..\Process;..\Process\Returns;..\Process\Spacing;..\ReadWrite;..\Process\Indent;..\Process\Obfuscate;..\Process\Transform;..\Process\Warnings;..\Process\Capitalisation;..\Process\Info;..\Process\Align;..\Parse\UI;..\Parse\PreProcessor;..\Include;..\Settings\Streams;.."/>
<OtherUnitFiles Value="..\Parse;..\Utils;..\Settings;..\Process;..\Process\Returns;..\Process\Spacing;..\ReadWrite;..\Process\Indent;..\Process\Obfuscate;..\Process\Transform;..\Process\Warnings;..\Process\Capitalisation;..\Process\Info;..\Process\Align;..\Parse\UI;..\Parse\PreProcessor;..\Include;..\Settings\Streams;..;..\Ui"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Debugging>
<DebugInfoType Value="dsDwarf3"/>
</Debugging>
<Options>
<Win32>
<GraphicApplication Value="True"/>

View File

@ -10,7 +10,7 @@ uses {$IFDEF UNIX}
unit1,
BuildParseTree,
fShowParseTree,
Converter, SettingsStream,
Converter, JcfUiTools, SettingsStream,
ReturnBefore,
MoveSpaceToBeforeColon,
Indenter,

View File

@ -0,0 +1,111 @@
unit JcfUiTools;
{$mode ObjFPC}
interface
uses
Classes, SysUtils, System.UITypes, ParseTreeNode;
procedure UpdateGUI(aCounter:integer=0;aUpdateInterval:integer=512);
function MessageDlgUI(const aMessage:string):TModalResult;
procedure ShowErrorMessageUI(const aMessage:string);
procedure SetWaitCursorUI;
procedure RestoreCursorUI;
procedure ShowParseTreeUI(const pcRoot: TParseTreeNode);
implementation
{$ifdef COMMAND_LINE}
uses
crt;
procedure UpdateGUI(aCounter:integer=0;aUpdateInterval:integer=512);
begin
end;
function MessageDlgUI(const aMessage:string):TModalResult;
const
MR:array[1..4] of TModalResult = (mrYes, mrNo, mrAbort, mrAll);
var
C:char;
I:integer;
begin
WriteLn(aMessage);
Write('Yes No Abort aLl <YNAL>? ');
I:=0;
repeat
C:=ReadKey;
C:=UpCase(C);
I:=Pos(C,'YNAL');
until I>0;
WriteLn(C);
result:=MR[I];
end;
procedure ShowErrorMessageUI(const aMessage:string);
begin
writeln(aMessage);
end;
procedure SetWaitCursorUI;
begin
end;
procedure RestoreCursorUI;
begin
end;
procedure ShowParseTreeUI;
begin
end;
procedure ShowParseTreeUI(const pcRoot: TParseTreeNode);
begin
end;
{$else}
uses
Forms, Dialogs, Controls, fShowParseTree;
procedure UpdateGUI(aCounter:integer=0;aUpdateInterval:integer=512);
begin
if (aCounter mod aUpdateInterval) = 0 then
Application.ProcessMessages;
end;
function MessageDlgUI(const aMessage:string):TModalResult;
begin
result := MessageDlg(aMessage, mtConfirmation, [mbYes, mbNo, mbAll, mbAbort], 0);
end;
procedure ShowErrorMessageUI(const aMessage:string);
begin
MessageDlg(aMessage, mtError, [mbOK], 0);
end;
var
OldCursor:TCursor;
procedure SetWaitCursorUI;
begin
OldCursor := Screen.Cursor;
Screen.Cursor := crHourGlass;
end;
procedure RestoreCursorUI;
begin
Screen.Cursor := OldCursor;
end;
procedure ShowParseTreeUI(const pcRoot: TParseTreeNode);
begin
fShowParseTree.ShowParseTree(pcRoot);
end;
{$endif}
end.

View File

@ -48,10 +48,7 @@ See http://www.gnu.org/licenses/gpl.html
interface
uses
Classes, SysUtils,
Forms,
// local
JcfStringUtils;
Classes, SysUtils, JcfStringUtils;
function GetApplicationFolder: string;
@ -72,7 +69,7 @@ implementation
function GetApplicationFolder: string;
begin
Result := ExtractFilePath(Application.ExeName);
Result := ExtractFilePath(ParamStr(0));
end;
{ these come from Ralf Steinhaeusser

View File

@ -711,7 +711,6 @@ end;
function StrTrimLastEndOfLine(const aStr:string):string;
var
len:integer;
c:char;
begin
len:=length(aStr);
if (len>0) then

View File

@ -38,10 +38,6 @@ uses
function GetWindowsTempFolder: string;
function FileIsReadOnly(const ps: string): boolean;
function FileGetSize(const FileName: string): Int64;
procedure ShellExecEx(const FileName: string; const Parameters: string = '');
function IsMultiByte(const {%H-}pcChar: Char): Boolean;
function IsWinServer2008R2: Boolean;
@ -59,42 +55,18 @@ implementation
uses
{$ifdef MSWINDOWS}
Windows, ShellApi
Windows
{$endif}
{$ifdef Unix}
Unix
{$endif}
,LCLIntf, fileutil;
,FileUtil;
function GetWindowsTempFolder: string;
begin
Result := GetTempDir;
end;
function FileIsReadOnly(const ps: string): boolean;
var
liAttr: integer;
begin
Assert(FileExists(ps));
liAttr := FileGetAttr(ps);
Result := (liAttr and faReadOnly) <> 0;
end;
function FileGetSize(const FileName: string): Int64;
begin
Result := FileUtil.FileSize(FileName);
end;
procedure ShellExecEx(const FileName: string; const Parameters: string = '');
begin
{$ifdef MSWINDOWS}
ShellApi.ShellExecute(0, 'open', PChar(FileName), PChar(Parameters), nil, SW_SHOW);
{$endif}
{$ifdef unix}
fpsystem(format('%s %s',[FileName, Parameters]));
{$endif}
end;
function IsMultiByte(const pcChar: Char): Boolean;
begin
//Result := IsDBCSLeadByte(Byte(pcChar));