codetools: fixed checking if resolving edged bracket open is allowed, bug #25045

git-svn-id: trunk@42868 -
This commit is contained in:
mattias 2013-09-18 21:29:59 +00:00
parent 4192c99f76
commit 7d402a8415
2 changed files with 6 additions and 2 deletions

View File

@ -46,6 +46,7 @@ begin
writeln('Usage:');
writeln(' ',ParamStr(0));
writeln(' ',ParamStr(0),' <filename> <X> <Y>');
exit;
end;
CodeToolBoss.SimpleInit(ConfigFilename);

View File

@ -7565,8 +7565,6 @@ var
end;
if (not (NextAtomType in [vatSpace,vatPoint,vatAs,vatUp,vatRoundBracketClose,
vatRoundBracketOpen,vatEdgedBracketClose,vatEdgedBracketOpen]))
or ((ExprType.Context.Node=nil)
and (not (ExprType.Desc in EdgedBracketContexts)))
then begin
MoveCursorToCleanPos(NextAtom.StartPos);
ReadNextAtom;
@ -7584,6 +7582,11 @@ var
ExprType.Context.Node:=nil;
exit;
end;
if ExprType.Context.Node=nil then begin
MoveCursorToCleanPos(NextAtom.StartPos);
ReadNextAtom;
RaiseIllegalQualifierFound;
end;
{$IFDEF ShowExprEval}
DebugLn([' FindExpressionTypeOfTerm ResolveEdgedBracketOpen ExprType=',ExprTypeToString(ExprType)]);