paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 11:39:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

MG: allow var a:a; statements

Browse Source 
git-svn-id: trunk@1533 -
This commit is contained in:
lazarus 2002-03-22 13:58:00 +00:00
parent 8a29c73be8
commit c0249538e7
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/codetools/codetoolmanager.pas
View File

@ -516,6 +516,7 @@ end;
function TCodeToolManager.HandleException(AnException: Exception): boolean;
var ErrorSrcTool: TCustomCodeTool;
begin
writeln(' BBB ');
fErrorMsg:=AnException.Message;
if not ((AnException is ELinkScannerError) or (AnException is ECodeToolError))
then begin

27
components/codetools/finddeclarationtool.pas
View File

@ -1343,6 +1343,16 @@ writeln('[TFindDeclarationTool.FindIdentifierInContext] Searching in Parent Con
// do not search again in this node, go on ...
;
ctnVarDefinition, ctnConstDefinition:
if (ContextNode.Parent<>nil)
and (ContextNode.Parent.Desc=ctnParameterList) then begin
// pascal allows declarations like: 'var a: a;' in parameters
// -> skip variable and search in next context node
;
end else begin
break;
end;
ctnProcedure:
begin
Result:=FindIdentifierInClassOfMethod(ContextNode,Params);
@ -1992,13 +2002,25 @@ writeln('[TFindDeclarationTool.FindBaseTypeOfNode] Class is forward');
if IsPredefinedIdentifier then
Exclude(Params.Flags,fdfExceptionOnNotFound);
Params.ContextNode:=Result.Node.Parent;
if (Params.ContextNode.Desc in [ctnVarDefinition,ctnConstDefinition])
then
// pascal allows things like 'var a: a;' -> skip var definition
Params.ContextNode:=Params.ContextNode.Parent;
if Params.ContextNode.Desc=ctnParameterList then
// skip search in parameter list
Params.ContextNode:=Params.ContextNode.Parent;
if Params.ContextNode.Desc=ctnProcedureHead then
// skip search in proc parameters
Params.ContextNode:=Params.ContextNode.Parent;
if FindIdentifierInContext(Params) then
if FindIdentifierInContext(Params) then begin
if NodeExistsInStack(@NodeStack,Params.NewNode) then begin
// circle detected
Params.NewCodeTool.MoveCursorToNodeStart(Params.NewNode);
Params.NewCodeTool.RaiseException('circle in definitions'
+' (identifier='+GetIdentifier(Params.Identifier)+')');
end;
Result:=Params.NewCodeTool.FindBaseTypeOfNode(Params,Params.NewNode)
else
end else
// predefined identifier
Result:=CreateFindContext(Self,Result.Node);
exit;
@ -4324,7 +4346,6 @@ begin
end;
procedure TExprTypeList.Add(ExprType: TExpressionType);
var NewSize: integer;
begin
inc(Count);
if Count>Capacity then Grow;