paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-07 20:49:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: use camelcase for system unit under Delphi, make ExpressionTypeDescNames a var, patch #28648 from Ondrej Pokorny

Browse Source 
git-svn-id: trunk@49796 -
This commit is contained in:
mattias 2015-09-09 11:16:09 +00:00
parent d0a5c5a338
commit 8d32bb263f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/finddeclarationtool.pas
View File

@ -261,7 +261,7 @@ type
// Do not define: TExpressionTypeDescs = set of TExpressionTypeDesc; // Do not define: TExpressionTypeDescs = set of TExpressionTypeDesc;
// There are too many enums, so the set would be big and slow // There are too many enums, so the set would be big and slow
const var
ExpressionTypeDescNames: array[TExpressionTypeDesc] of string = ( ExpressionTypeDescNames: array[TExpressionTypeDesc] of string = (
'None', 'None',
'Context', 'Context',
@ -307,6 +307,7 @@ const
'Nil' 'Nil'
); );
const
xtAllTypes = [Low(TExpressionTypeDesc)..High(TExpressionTypeDesc)]-[xtNone]; xtAllTypes = [Low(TExpressionTypeDesc)..High(TExpressionTypeDesc)]-[xtNone];
xtAllPredefinedTypes = xtAllTypes-[xtContext]; xtAllPredefinedTypes = xtAllTypes-[xtContext];
xtAllIdentTypes = xtAllTypes - [xtConstOrdInteger,xtConstBoolean,xtConstReal,xtConstString,xtConstSet,xtCompilerFunc,xtNil]; xtAllIdentTypes = xtAllTypes - [xtConstOrdInteger,xtConstBoolean,xtConstReal,xtConstString,xtConstSet,xtCompilerFunc,xtNil];

8
components/codetools/linkscanner.pas
View File

@ -54,6 +54,10 @@ uses
// LazUtils // LazUtils
LazFileUtils, LazUtilities, LazDbgLog; LazFileUtils, LazUtilities, LazDbgLog;
var
FPCSystemUnitName: String = 'system';
DelphiSystemUnitName: String = 'System';
const const
PascalCompilerDefine = ExternalMacroStart+'Compiler'; PascalCompilerDefine = ExternalMacroStart+'Compiler';
MacroUseHeapTrc = ExternalMacroStart+'UseHeapTrcUnit'; MacroUseHeapTrc = ExternalMacroStart+'UseHeapTrcUnit';
@ -2851,9 +2855,9 @@ begin
if FHiddenUsedUnits='' then begin if FHiddenUsedUnits='' then begin
// see fpc/compiler/pmodules.pp loaddefaultunits // see fpc/compiler/pmodules.pp loaddefaultunits
if PascalCompiler=pcDelphi then if PascalCompiler=pcDelphi then
FHiddenUsedUnits:='System' FHiddenUsedUnits:=DelphiSystemUnitName
else else
FHiddenUsedUnits:='system'; FHiddenUsedUnits:=FPCSystemUnitName;
if InitialValues.IsDefined('VER1_0') if InitialValues.IsDefined('VER1_0')
then begin then begin
if InitialValues.IsDefined('LINUX') then if InitialValues.IsDefined('LINUX') then