From 497a08de977295355c5146c64a7acf647c698e92 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 8 May 2017 11:53:32 +0000 Subject: [PATCH] codetools: renamed cmsBlocks to cmsCBlocks, because less confusing git-svn-id: trunk@54831 - --- components/codetools/linkscanner.pas | 4 ++-- components/codetools/pascalparsertool.pas | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas index e04ab07fd2..506fabf76e 100644 --- a/components/codetools/linkscanner.pas +++ b/components/codetools/linkscanner.pas @@ -198,7 +198,7 @@ type ansistring; similarly, char becomes unicodechar rather than ansichar } cmsTypeHelpers, { allows the declaration of "type helper" (non-Delphi) or "record helper" (Delphi) for primitive types } - cmsBlocks, { support for http://en.wikipedia.org/wiki/Blocks_(C_language_extension) } + cmsCBlocks, { support for http://en.wikipedia.org/wiki/Blocks_(C_language_extension) } cmsISOlike_IO, { I/O as it required by an ISO compatible compiler } cmsISOLike_Program_Para, { program parameters as it required by an ISO compatible compiler } cmsISOLike_Mod, { mod operation as it is required by an iso compatible compiler } @@ -3148,7 +3148,7 @@ begin FHiddenUsedUnits:=FHiddenUsedUnits+',ISO7185'; if (CompilerMode=cmExtPas) then FHiddenUsedUnits:=FHiddenUsedUnits+',ISO7185,ExtPas'; - if (cmsBlocks in CompilerModeSwitches) and (PascalCompiler=pcFPC) then + if (cmsCBlocks in CompilerModeSwitches) and (PascalCompiler=pcFPC) then FHiddenUsedUnits:=FHiddenUsedUnits+',BlockRTL'; if (cmsDefault_unicodestring in CompilerModeSwitches) then FHiddenUsedUnits:=FHiddenUsedUnits+',UUChar'; diff --git a/components/codetools/pascalparsertool.pas b/components/codetools/pascalparsertool.pas index 628e4f2a24..f8d39f4af5 100644 --- a/components/codetools/pascalparsertool.pas +++ b/components/codetools/pascalparsertool.pas @@ -4687,7 +4687,7 @@ end; function TPascalParserTool.KeyWordFuncTypeReferenceTo: boolean; begin - if (cmsBlocks in Scanner.CompilerModeSwitches) + if (cmsCBlocks in Scanner.CompilerModeSwitches) or (Scanner.PascalCompiler=pcPas2js) then begin CreateChildNode; CurNode.Desc:=ctnReferenceTo;