paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-07 18:09:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: h2p: implemented recognizing constant identifiers in macro values

Browse Source 
git-svn-id: trunk@14650 -
This commit is contained in:
mattias 2008-03-26 13:29:28 +00:00
parent aeceb42992
commit 74426aae84
1 changed files with 83 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
components/codetools/h2pastool.pas
View File

@ -245,7 +245,8 @@ type
StartPos: integer = 1; StartPos: integer = 1;
EndPos: integer = -1): string; EndPos: integer = -1): string;
function FindH2PNodeWithPascalName(const PascalName: string): TH2PNode; function FindH2PNodeWithPascalName(const PascalName: string): TH2PNode;
function FindH2PNodeWithCName(const CName: string): TH2PNode;
function CreateH2PDirectiveNode(H2PNode: TH2PNode; Desc: TCodeTreeNodeDesc function CreateH2PDirectiveNode(H2PNode: TH2PNode; Desc: TCodeTreeNodeDesc
): TH2PDirectiveNode; ): TH2PDirectiveNode;
@ -286,6 +287,7 @@ function DefaultPredefinedCTypes: TStringToStringTree;// types in unit ctypes
function CompareH2PNodePascalNames(Data1, Data2: Pointer): integer; function CompareH2PNodePascalNames(Data1, Data2: Pointer): integer;
function CompareStringWithH2PNodePascalName(AString, ANode: Pointer): integer; function CompareStringWithH2PNodePascalName(AString, ANode: Pointer): integer;
function CompareH2PNodeCNames(Data1, Data2: Pointer): integer; function CompareH2PNodeCNames(Data1, Data2: Pointer): integer;
function CompareStringWithH2PNodeCName(AString, ANode: Pointer): integer;
function CompareH2PMacroStats(Data1, Data2: Pointer): integer; function CompareH2PMacroStats(Data1, Data2: Pointer): integer;
function ComparePCharWithH2PMacroStats(Name, MacroStats: Pointer): integer; function ComparePCharWithH2PMacroStats(Name, MacroStats: Pointer): integer;
@ -412,6 +414,12 @@ begin
PChar(Pointer(TH2PNode(Data2).CName))); PChar(Pointer(TH2PNode(Data2).CName)));
end; end;
function CompareStringWithH2PNodeCName(AString, ANode: Pointer): integer;
begin
Result:=CompareIdentifiersCaseSensitive(PChar(AString),
PChar(Pointer(TH2PNode(ANode).CName)));
end;
function CompareH2PMacroStats(Data1, Data2: Pointer): integer; function CompareH2PMacroStats(Data1, Data2: Pointer): integer;
begin begin
Result:=CompareIdentifierPtrs(Pointer(TH2PMacroStats(Data1).Name), Result:=CompareIdentifierPtrs(Pointer(TH2PMacroStats(Data1).Name),
@ -484,7 +492,7 @@ begin
// create a pascal 'record case' // create a pascal 'record case'
TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnRecordCase,'', TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnRecordCase,'',
ParentNode,false); ParentNode,false);
DebugLn(['TH2PasTool.BuildH2PTree added record case for nested union']); DebugLn(['TH2PasTool.ConvertVariable added record case for nested union']);
// build recursively the record cases // build recursively the record cases
if CNode.FirstChild.FirstChild<>nil then if CNode.FirstChild.FirstChild<>nil then
BuildH2PTree(TypeH2PNode,CNode.FirstChild.FirstChild); BuildH2PTree(TypeH2PNode,CNode.FirstChild.FirstChild);
@ -493,7 +501,7 @@ begin
// create a record type // create a record type
TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnRecordCase,'', TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnRecordCase,'',
nil,true); nil,true);
DebugLn(['TH2PasTool.BuildH2PTree added record type for union: ',TypeH2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertVariable added record type for union: ',TypeH2PNode.DescAsString(CTool)]);
// build recursively // build recursively
if CNode.FirstChild.FirstChild<>nil then if CNode.FirstChild.FirstChild<>nil then
BuildH2PTree(TypeH2PNode,CNode.FirstChild.FirstChild); BuildH2PTree(TypeH2PNode,CNode.FirstChild.FirstChild);
@ -502,9 +510,9 @@ begin
H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnVarDefinition, H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnVarDefinition,
TypeH2PNode.PascalName, TypeH2PNode.PascalName,
nil,ParentNode=nil); nil,ParentNode=nil);
DebugLn(['TH2PasTool.BuildH2PTree added variable for union: ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertVariable added variable for union: ',H2PNode.DescAsString(CTool)]);
end else begin end else begin
DebugLn(['TH2PasTool.BuildH2PTree SKIPPING union variable at ',CTool.CleanPosToStr(CNode.StartPos)]); DebugLn(['TH2PasTool.ConvertVariable SKIPPING union variable at ',CTool.CleanPosToStr(CNode.StartPos)]);
end; end;
end else begin end else begin
CurName:=CTool.ExtractVariableName(CNode); CurName:=CTool.ExtractVariableName(CNode);
@ -519,9 +527,9 @@ begin
if SimpleType<>'' then begin if SimpleType<>'' then begin
H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnVarDefinition,SimpleType, H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnVarDefinition,SimpleType,
ParentNode,ParentNode=nil); ParentNode,ParentNode=nil);
DebugLn(['TH2PasTool.BuildH2PTree added: ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertVariable added: ',H2PNode.DescAsString(CTool)]);
end else begin end else begin
DebugLn(['TH2PasTool.BuildH2PTree SKIPPING Variable Name="',CurName,'" Type="',CurType,'"']); DebugLn(['TH2PasTool.ConvertVariable SKIPPING Variable Name="',CurName,'" Type="',CurType,'"']);
end; end;
end; end;
end; end;
@ -545,7 +553,7 @@ begin
TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnEnumerationType,'', TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnEnumerationType,'',
nil,ParentNode=nil); nil,ParentNode=nil);
end; end;
DebugLn(['TH2PasTool.BuildH2PTree added: ',TypeH2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertEnumBlock added: ',TypeH2PNode.DescAsString(CTool)]);
CNode:=CNode.FirstChild; CNode:=CNode.FirstChild;
while CNode<>nil do begin while CNode<>nil do begin
@ -554,7 +562,7 @@ begin
CurValue:=CTool.ExtractEnumIDValue(CNode); CurValue:=CTool.ExtractEnumIDValue(CNode);
H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnEnumIdentifier,CurValue, H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnEnumIdentifier,CurValue,
TypeH2PNode,ParentNode=nil); TypeH2PNode,ParentNode=nil);
DebugLn(['TH2PasTool.BuildH2PTree added: ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertEnumBlock added: ',H2PNode.DescAsString(CTool)]);
end; end;
CNode:=CNode.NextBrother; CNode:=CNode.NextBrother;
end; end;
@ -580,7 +588,7 @@ begin
Ok:=true; Ok:=true;
if (CNode.LastChild<>nil) and (CNode.LastChild.Desc=ccnStatementBlock) then if (CNode.LastChild<>nil) and (CNode.LastChild.Desc=ccnStatementBlock) then
StatementNode:=CNode.LastChild; StatementNode:=CNode.LastChild;
DebugLn(['TH2PasTool.BuildH2PTree Function Name="',CurName,'" ResultType="',CurType,'" SimpleType=',SimpleType,' HasStatements=',StatementNode<>nil,' IsPointer=',IsPointerToFunction]); DebugLn(['TH2PasTool.ConvertFunction Function Name="',CurName,'" ResultType="',CurType,'" SimpleType=',SimpleType,' HasStatements=',StatementNode<>nil,' IsPointer=',IsPointerToFunction]);
if StatementNode<>nil then begin if StatementNode<>nil then begin
// this function has a body // this function has a body
Ok:=false; Ok:=false;
@ -597,11 +605,11 @@ begin
if Ok then begin if Ok then begin
H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnProcedure,SimpleType, H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnProcedure,SimpleType,
nil,false); nil,false);
DebugLn(['TH2PasTool.BuildH2PTree function added: ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertFunction function added: ',H2PNode.DescAsString(CTool)]);
// build recursively // build recursively
BuildH2PTree(H2PNode); BuildH2PTree(H2PNode);
end else begin end else begin
DebugLn(['TH2PasTool.BuildH2PTree SKIPPING Function Name="',CurName,'" Type="',CurType,'" at ',CTool.CleanPosToStr(CNode.StartPos)]); DebugLn(['TH2PasTool.ConvertFunction SKIPPING Function Name="',CurName,'" Type="',CurType,'" at ',CTool.CleanPosToStr(CNode.StartPos)]);
end; end;
end; end;
@ -617,7 +625,7 @@ begin
CurName:=CTool.ExtractParameterName(CNode); CurName:=CTool.ExtractParameterName(CNode);
CurType:=CTool.ExtractParameterType(CNode); CurType:=CTool.ExtractParameterType(CNode);
SimpleType:=GetSimplePascalTypeOfCParameter(CNode); SimpleType:=GetSimplePascalTypeOfCParameter(CNode);
DebugLn(['TH2PasTool.BuildH2PTree Parameter: Name="',CurName,'" Type="',CurType,'" SimpleType="',SimpleType,'"']); DebugLn(['TH2PasTool.ConvertFuncParameter Parameter: Name="',CurName,'" Type="',CurType,'" SimpleType="',SimpleType,'"']);
if SimpleType='' then begin if SimpleType='' then begin
// this variable has a complex type // this variable has a complex type
TypeH2PNode:=GetH2PNodeForComplexType(CNode); TypeH2PNode:=GetH2PNodeForComplexType(CNode);
@ -627,9 +635,9 @@ begin
if SimpleType<>'' then begin if SimpleType<>'' then begin
H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnVarDefinition,SimpleType, H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnVarDefinition,SimpleType,
ParentNode,false); ParentNode,false);
DebugLn(['TH2PasTool.BuildH2PTree added: ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertFuncParameter added: ',H2PNode.DescAsString(CTool)]);
end else begin end else begin
DebugLn(['TH2PasTool.BuildH2PTree SKIPPING parameter Name="',CurName,'" Type="',CurType,'" at ',CTool.CleanPosToStr(CNode.StartPos)]); DebugLn(['TH2PasTool.ConvertFuncParameter SKIPPING parameter Name="',CurName,'" Type="',CurType,'" at ',CTool.CleanPosToStr(CNode.StartPos)]);
end; end;
end; end;
@ -648,7 +656,7 @@ begin
exit; exit;
end; end;
CurName:=CTool.ExtractTypedefName(CNode); CurName:=CTool.ExtractTypedefName(CNode);
DebugLn(['TH2PasTool.BuildH2PTree Typedef name="',CurName,'"']); DebugLn(['TH2PasTool.ConvertTypedef Typedef name="',CurName,'"']);
ChildNode:=CNode.FirstChild; ChildNode:=CNode.FirstChild;
case ChildNode.Desc of case ChildNode.Desc of
@ -664,7 +672,7 @@ begin
end else begin end else begin
// this is a new struct // this is a new struct
TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnRecordType,''); TypeH2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnRecordType,'');
DebugLn(['TH2PasTool.BuildH2PTree added record: ',TypeH2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertTypedef added record: ',TypeH2PNode.DescAsString(CTool)]);
// build recursively // build recursively
if ChildNode<>nil then if ChildNode<>nil then
BuildH2PTree(TypeH2PNode,ChildNode); BuildH2PTree(TypeH2PNode,ChildNode);
@ -686,18 +694,18 @@ begin
if IsPointerToFunction and (SimpleType<>'') then begin if IsPointerToFunction and (SimpleType<>'') then begin
H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnProcedureType,SimpleType, H2PNode:=CreateH2PNode(CurName,CurName,CNode,ctnProcedureType,SimpleType,
nil,true); nil,true);
DebugLn(['TH2PasTool.BuildH2PTree function type added: ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.ConvertTypedef function type added: ',H2PNode.DescAsString(CTool)]);
// build the param list // build the param list
if ChildNode.FirstChild<>nil then if ChildNode.FirstChild<>nil then
BuildH2PTree(H2PNode,ChildNode.FirstChild); BuildH2PTree(H2PNode,ChildNode.FirstChild);
end else begin end else begin
DebugLn(['TH2PasTool.BuildH2PTree typdef function CurName=',CurName,' CurType=',CTool.ExtractFunctionResultType(ChildNode),' SimpleType=',SimpleType]); DebugLn(['TH2PasTool.ConvertTypedef typdef function CurName=',CurName,' CurType=',CTool.ExtractFunctionResultType(ChildNode),' SimpleType=',SimpleType]);
DebugLn(['TH2PasTool.BuildH2PTree SKIPPING typedef ',CCNodeDescAsString(ChildNode.Desc),' at ',CTool.CleanPosToStr(CNode.StartPos)]); DebugLn(['TH2PasTool.ConvertTypedef SKIPPING typedef ',CCNodeDescAsString(ChildNode.Desc),' at ',CTool.CleanPosToStr(CNode.StartPos)]);
end; end;
end; end;
else // typedef else // typedef
DebugLn(['TH2PasTool.BuildH2PTree SKIPPING typedef ',CCNodeDescAsString(CNode.FirstChild.Desc),' at ',CTool.CleanPosToStr(CNode.StartPos)]); DebugLn(['TH2PasTool.ConvertTypedef SKIPPING typedef ',CCNodeDescAsString(CNode.FirstChild.Desc),' at ',CTool.CleanPosToStr(CNode.StartPos)]);
end; end;
end; end;
@ -1379,10 +1387,13 @@ begin
// convert node to constant // convert node to constant
H2PNode:=Node.H2PNode; H2PNode:=Node.H2PNode;
H2PNode.PascalName:=Node.MacroName; H2PNode.PascalName:=Node.MacroName;
H2PNode.CName:=Node.MacroName;
H2PNode.PascalDesc:=ctnConstDefinition; H2PNode.PascalDesc:=ctnConstDefinition;
H2PNode.PascalCode:=' = '+PasExpr; H2PNode.PascalCode:=' = '+PasExpr;
if PasType<>'' then if PasType<>'' then
H2PNode.PascalCode:=': '+PasType+H2PNode.PascalCode; H2PNode.PascalCode:=': '+PasType+H2PNode.PascalCode;
FPascalNames.Add(H2PNode);
FCNames.Add(H2PNode);
NextNode:=TH2PDirectiveNode(Node.NextSkipChilds); NextNode:=TH2PDirectiveNode(Node.NextSkipChilds);
DeleteDirectiveNode(Node); DeleteDirectiveNode(Node);
DebugLn(['TH2PasTool.SimplifyDefineDirective ADDED constant ',H2PNode.DescAsString(CTool)]); DebugLn(['TH2PasTool.SimplifyDefineDirective ADDED constant ',H2PNode.DescAsString(CTool)]);
@ -1410,8 +1421,19 @@ function TH2PasTool.MacroValueIsConstant(Node: TH2PDirectiveNode;
var var
AtomStart: integer; AtomStart: integer;
p: Integer; p: Integer;
procedure Replace(const NewAtom: string);
begin
PasExpression:=copy(PasExpression,1,AtomStart-1)+NewAtom
+copy(PasExpression,p,length(PasExpression));
p:=AtomStart+length(NewAtom);
end;
var
CurAtom: String; CurAtom: String;
UsedNode: TH2PNode;
begin begin
//DebugLn(['TH2PasTool.MacroValueIsConstant ',Node.MacroName,':=',Node.Expression]);
Result:=false; Result:=false;
PasType:=''; PasType:='';
PasExpression:=TrimBrackets(Node.Expression); PasExpression:=TrimBrackets(Node.Expression);
@ -1419,9 +1441,30 @@ begin
repeat repeat
ReadRawNextCAtom(PasExpression,p,AtomStart); ReadRawNextCAtom(PasExpression,p,AtomStart);
if AtomStart>length(PasExpression) then break; if AtomStart>length(PasExpression) then break;
DebugLn(['TH2PasTool.MacroValueIsConstant AAA1 ',copy(PasExpression,AtomStart,p-AtomStart)]); //DebugLn(['TH2PasTool.MacroValueIsConstant Atom=',copy(PasExpression,AtomStart,p-AtomStart)]);
if IsIdentStartChar[PasExpression[AtomStart]] then begin if IsIdentStartChar[PasExpression[AtomStart]] then begin
exit; CurAtom:=copy(PasExpression,AtomStart,p-AtomStart);
if CurAtom='sizeof' then begin
// read (
ReadRawNextCAtom(PasExpression,p,AtomStart);
if (AtomStart>length(PasExpression))
or (PasExpression[AtomStart]<>'(') then break;
// skip bracket content
p:=AtomStart;
ReadTilCBracketClose(PasExpression,p);
AtomStart:=p-1;
end else begin
UsedNode:=FindH2PNodeWithCName(CurAtom);
if (UsedNode<>nil) and (UsedNode.PascalDesc=ctnConstDefinition)
then begin
if UsedNode.PascalName<>CurAtom then
Replace(UsedNode.PascalName);
end else begin
//
DebugLn(['TH2PasTool.MacroValueIsConstant NO ',CurAtom]);
exit;
end;
end;
end else if IsCHexNumber(PasExpression,AtomStart) then begin end else if IsCHexNumber(PasExpression,AtomStart) then begin
// hex number // hex number
// replace 0x with $ // replace 0x with $
@ -1443,7 +1486,7 @@ begin
or (CurAtom='+') or (CurAtom='-') then begin or (CurAtom='+') or (CurAtom='-') then begin
// same in pascal // same in pascal
end else begin end else begin
DebugLn(['TH2PasTool.MacroValueIsConstant AAA3 ',CurAtom]); DebugLn(['TH2PasTool.MacroValueIsConstant NO ',CurAtom]);
// unknown // unknown
exit; exit;
end; end;
@ -1767,8 +1810,10 @@ begin
Result.PascalCode:=PascalCode; Result.PascalCode:=PascalCode;
Tree.AddNodeAsLastChild(ParentNode,Result); Tree.AddNodeAsLastChild(ParentNode,Result);
if IsGlobal then begin if IsGlobal then begin
FPascalNames.Add(Result); if PascalName<>'' then
FCNames.Add(Result); FPascalNames.Add(Result);
if CName<>'' then
FCNames.Add(Result);
end; end;
end; end;
@ -2023,6 +2068,18 @@ begin
Result:=nil; Result:=nil;
end; end;
function TH2PasTool.FindH2PNodeWithCName(const CName: string): TH2PNode;
var
AVLNode: TAVLTreeNode;
begin
AVLNode:=FCNames.FindKey(Pointer(CName),
@CompareStringWithH2PNodeCName);
if AVLNode<>nil then
Result:=TH2PNode(AVLNode.Data)
else
Result:=nil;
end;
function TH2PasTool.CreateH2PDirectiveNode(H2PNode: TH2PNode; function TH2PasTool.CreateH2PDirectiveNode(H2PNode: TH2PNode;
Desc: TCodeTreeNodeDesc): TH2PDirectiveNode; Desc: TCodeTreeNodeDesc): TH2PDirectiveNode;
begin begin