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

codetools: search unit objcbase in modeswitch objectivec1

Browse Source 
git-svn-id: trunk@22765 -
This commit is contained in:
mattias 2009-11-25 12:13:28 +00:00
parent 6ba3e8f884
commit 2f998fb898
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/codetools/finddeclarationtool.pas
View File

@ -1860,7 +1860,8 @@ begin
and (Scanner.PascalCompiler=pcFPC) and (Scanner.PascalCompiler=pcFPC)
and (CompareIdentifiers(PChar(Result),'MacPas')=0)) and (CompareIdentifiers(PChar(Result),'MacPas')=0))
or ((Scanner.CompilerModeSwitch=cmsObjectiveC1) or ((Scanner.CompilerModeSwitch=cmsObjectiveC1)
and (CompareIdentifiers(PChar(Result),'ObjC')=0)) and ((CompareIdentifiers(PChar(Result),'ObjC')=0)
or (CompareIdentifiers(PChar(Result),'ObjCBase')=0)))
then begin then begin
Result:=''; Result:='';
exit; exit;
@ -5756,6 +5757,7 @@ type
sutMacPas, sutMacPas,
sutObjPas, sutObjPas,
sutObjC, sutObjC,
sutObjCBase,
sutLineInfo, sutLineInfo,
sutHeapTrc, sutHeapTrc,
sutSysThrds, sutSysThrds,
@ -5798,6 +5800,8 @@ begin
CurUnitType:=sutObjPas CurUnitType:=sutObjPas
else if UpAtomIs('OBJC') then else if UpAtomIs('OBJC') then
CurUnitType:=sutObjC CurUnitType:=sutObjC
else if UpAtomIs('OBJCBASE') then
CurUnitType:=sutObjCBase
else if UpAtomIs('LINEINFO') then else if UpAtomIs('LINEINFO') then
CurUnitType:=sutLineInfo CurUnitType:=sutLineInfo
else if UpAtomIs('HEAPTRC') then else if UpAtomIs('HEAPTRC') then
@ -5835,6 +5839,12 @@ begin
Result:=FindIdentifierInUsedUnit('ObjPas',Params); Result:=FindIdentifierInUsedUnit('ObjPas',Params);
if Result and Params.IsFinal then exit; if Result and Params.IsFinal then exit;
end; end;
if (CurUnitType>sutObjCBase)
and (Scanner.CompilerModeSwitch=cmsObjectiveC1) then begin
// try hidden used fpc unit 'objcbase'
Result:=FindIdentifierInUsedUnit('ObjCBase',Params);
if Result and Params.IsFinal then exit;
end;
if (CurUnitType>sutObjC) if (CurUnitType>sutObjC)
and (Scanner.CompilerModeSwitch=cmsObjectiveC1) then begin and (Scanner.CompilerModeSwitch=cmsObjectiveC1) then begin
// try hidden used fpc unit 'objc' // try hidden used fpc unit 'objc'