paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-20 13:39:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: parse guid in dispinterface, bug #32742

Browse Source 
git-svn-id: trunk@56520 -
This commit is contained in:
mattias 2017-11-28 09:19:47 +00:00
parent ec8cc2e82f
commit 5b565ad568
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/codetools/finddeclarationtool.pas
View File

@ -12870,7 +12870,8 @@ begin
{$IFDEF ShowForInEval} {$IFDEF ShowForInEval}
DebugLn(['TFindDeclarationTool.FindEnumeratorOfClass EnumeratorContext=',FindContextToString(EnumeratorContext)]); DebugLn(['TFindDeclarationTool.FindEnumeratorOfClass EnumeratorContext=',FindContextToString(EnumeratorContext)]);
{$ENDIF} {$ENDIF}
if (EnumeratorContext.Node=nil) or not(EnumeratorContext.Node.Desc in [ctnClass,ctnClassInterface,ctnRecordType]) if (EnumeratorContext.Node=nil)
or not (EnumeratorContext.Node.Desc in [ctnClass,ctnClassInterface,ctnRecordType])
then begin then begin
if ExceptionOnNotFound then begin if ExceptionOnNotFound then begin
ProcTool.MoveCursorToCleanPos(ProcNode.StartPos); ProcTool.MoveCursorToCleanPos(ProcNode.StartPos);
@ -12983,7 +12984,7 @@ begin
DebugLn(['TFindDeclarationTool.FindOperatorEnumerator ClassContext=',FindContextToString(ClassContext)]); DebugLn(['TFindDeclarationTool.FindOperatorEnumerator ClassContext=',FindContextToString(ClassContext)]);
{$ENDIF} {$ENDIF}
case ClassContext.Node.Desc of case ClassContext.Node.Desc of
ctnClass,ctnObject,ctnRecordType,ctnClassInterface: ; ctnClass,ctnObject,ctnRecordType,ctnClassInterface,ctnDispinterface: ;
else else
OperatorTool.MoveCursorToNodeStart(OperatorNode); OperatorTool.MoveCursorToNodeStart(OperatorNode);
OperatorTool.RaiseException(20170421200650,'operator enumerator result type is not object'); OperatorTool.RaiseException(20170421200650,'operator enumerator result type is not object');

2
components/codetools/pascalparsertool.pas
View File

@ -4356,7 +4356,7 @@ begin
// start the first class section (the one without a keyword) // start the first class section (the one without a keyword)
CreateChildNode; CreateChildNode;
CurNode.Desc:=ctnClassRequired; CurNode.Desc:=ctnClassRequired;
end else if IntfDesc=ctnClassInterface then begin end else if IntfDesc in [ctnClassInterface,ctnDispinterface] then begin
if CurPos.Flag=cafEdgedBracketOpen then if CurPos.Flag=cafEdgedBracketOpen then
ReadGUID; ReadGUID;
end; end;