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

codetools: c parser extern

Browse Source 
git-svn-id: trunk@29592 -
This commit is contained in:
mattias 2011-02-17 18:02:57 +00:00
parent dfbe1e665f
commit 615db58c74
3 changed files with 65 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
components/codetools/ccodeparsertool.pas
View File

@ -124,21 +124,23 @@ const
ccnRoot = 1+ccnBase; ccnRoot = 1+ccnBase;
ccnDirective = 2+ccnBase;// e.g. "#define a" ,can be multiple lines, EndPos at line end ccnDirective = 2+ccnBase;// e.g. "#define a" ,can be multiple lines, EndPos at line end
ccnExtern = 3+ccnBase;// e.g. extern "C" {} ccnExternBlock = 3+ccnBase;// e.g. extern "C" {}
ccnEnumBlock = 4+ccnBase;// e.g. enum {}; ccnEnumBlock = 4+ccnBase;// e.g. enum {};
ccnEnumID = 5+ccnBase;// e.g. name = value; ccnEnumID = 5+ccnBase;// e.g. name = value;
ccnConstant = 6+ccnBase;// e.g. 1 ccnConstant = 6+ccnBase;// e.g. 1
ccnTypedef = 7+ccnBase;// e.g. typedef int TInt; last child is ccnName ccnTypedef = 7+ccnBase;// e.g. typedef int TInt; last child is ccnName
ccnStruct = 8+ccnBase;// e.g. struct{}, child is ccnTypeName or ccnTypeName+ccnSubDefs or ccnSubDefs ccnStruct = 8+ccnBase;// e.g. struct{}, child is ccnTypeName or ccnTypeName+ccnSubDefs or ccnSubDefs
ccnUnion = 10+ccnBase;// e.g. union{} ccnUnion = 9+ccnBase;// e.g. union{}
ccnDefinition = 12+ccnBase;// e.g. variable: int i, type: struct typename {} or both: union typename {} varname ccnDefinition = 10+ccnBase;// e.g. variable: int i, type: struct typename {} or both: union typename {} varname
ccnFunction = 13+ccnBase;// e.g. int i() ccnFunction = 11+ccnBase;// e.g. int i()
ccnName = 14+ccnBase;// e.g. i ccnName = 12+ccnBase;// e.g. i
ccnTypeName = 15+ccnBase;// e.g. i ccnTypeName = 13+ccnBase;// e.g. i
ccnSubDefs = 16+ccnBase;// e.g. the {} of a struct ccnSubDefs = 14+ccnBase;// e.g. the {} of a struct
ccnFuncParamList = 17+ccnBase;// e.g. () ccnFuncParamList = 15+ccnBase;// e.g. ()
ccnFuncParameter = 18+ccnBase;// e.g. () ccnFuncParameter = 16+ccnBase;// e.g. ()
ccnStatementBlock = 19+ccnBase;// e.g. {} ccnStatementBlock = 17+ccnBase;// e.g. {}
ccnBitCount = 18+ccnBase;// e.g. int i:3
ccnExternDef = 19+ccnBase;// e.g. extern int i;
// values for Node.SubDesc // values for Node.SubDesc
ccnsNone = 0; ccnsNone = 0;
@ -272,6 +274,7 @@ type
function UpAtomIs(const s: shortstring): boolean; function UpAtomIs(const s: shortstring): boolean;
function AtomIsIdentifier: boolean; function AtomIsIdentifier: boolean;
function AtomIsStringConstant: boolean; function AtomIsStringConstant: boolean;
function AtomIsNumber: boolean;
function GetAtom: string; function GetAtom: string;
function LastAtomIs(const s: shortstring): boolean; function LastAtomIs(const s: shortstring): boolean;
function GetLastAtom: string; function GetLastAtom: string;
@ -399,7 +402,7 @@ begin
ccnsDirectivePragma : Result:=Result+'.Pragma'; ccnsDirectivePragma : Result:=Result+'.Pragma';
end; end;
end; end;
ccnExtern : Result:='extern-block'; ccnExternBlock : Result:='extern-block';
ccnEnumBlock : Result:='enum-block'; ccnEnumBlock : Result:='enum-block';
ccnEnumID : Result:='enum-ID'; ccnEnumID : Result:='enum-ID';
ccnConstant : Result:='constant'; ccnConstant : Result:='constant';
@ -410,9 +413,11 @@ begin
ccnFunction : Result:='function'; ccnFunction : Result:='function';
ccnName : Result:='name'; ccnName : Result:='name';
ccnTypeName : Result:='type-name'; ccnTypeName : Result:='type-name';
ccnSubDefs : Result:='sub-defs';
ccnFuncParamList : Result:='function-param-list'; ccnFuncParamList : Result:='function-param-list';
ccnFuncParameter : Result:='function-parameter'; ccnFuncParameter : Result:='function-parameter';
ccnStatementBlock: Result:='statement-block'; ccnStatementBlock: Result:='statement-block';
ccnBitCount : Result:='bit-count';
else Result:='?('+IntToStr(Desc)+')'; else Result:='?('+IntToStr(Desc)+')';
end; end;
end; end;
@ -789,7 +794,7 @@ function TCCodeParserTool.DirectiveToken: boolean;
repeat repeat
ReadRawNextAtom; ReadRawNextAtom;
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
debugln(['ReadExpression Atom ',GetAtom]); debugln([GetIndentStr(CurNode.GetLevel*2),'ReadExpression Atom ',GetAtom]);
{$ENDIF} {$ENDIF}
if AtomStart>SrcLen then if AtomStart>SrcLen then
RaiseException('missing expression'); RaiseException('missing expression');
@ -883,14 +888,14 @@ begin
RaiseExpectedButAtomFound('identifier'); RaiseExpectedButAtomFound('identifier');
end else if AtomIs('if') then begin end else if AtomIs('if') then begin
{$IFDEF VerboseCDirectives} {$IFDEF VerboseCDirectives}
DebugLn(['TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]);
{$ENDIF} {$ENDIF}
CurNode.SubDesc:=ccnsDirectiveIf; CurNode.SubDesc:=ccnsDirectiveIf;
IncIfLevel(AtomStart); IncIfLevel(AtomStart);
ReadExpression; ReadExpression;
end else if AtomIs('ifdef') then begin end else if AtomIs('ifdef') then begin
{$IFDEF VerboseCDirectives} {$IFDEF VerboseCDirectives}
DebugLn(['TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]);
{$ENDIF} {$ENDIF}
CurNode.SubDesc:=ccnsDirectiveIfDef; CurNode.SubDesc:=ccnsDirectiveIfDef;
IncIfLevel(AtomStart); IncIfLevel(AtomStart);
@ -899,7 +904,7 @@ begin
RaiseExpectedButAtomFound('identifier'); RaiseExpectedButAtomFound('identifier');
end else if AtomIs('ifndef') then begin end else if AtomIs('ifndef') then begin
{$IFDEF VerboseCDirectives} {$IFDEF VerboseCDirectives}
DebugLn(['TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]);
{$ENDIF} {$ENDIF}
CurNode.SubDesc:=ccnsDirectiveIfNDef; CurNode.SubDesc:=ccnsDirectiveIfNDef;
IncIfLevel(AtomStart); IncIfLevel(AtomStart);
@ -908,7 +913,7 @@ begin
RaiseExpectedButAtomFound('identifier'); RaiseExpectedButAtomFound('identifier');
end else if AtomIs('elif') then begin end else if AtomIs('elif') then begin
{$IFDEF VerboseCDirectives} {$IFDEF VerboseCDirectives}
DebugLn(['TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2-2),GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2-2),GetAtom]);
{$ENDIF} {$ENDIF}
CurNode.SubDesc:=ccnsDirectiveElIf; CurNode.SubDesc:=ccnsDirectiveElIf;
if IfLevel=0 then if IfLevel=0 then
@ -916,7 +921,7 @@ begin
ReadExpression; ReadExpression;
end else if AtomIs('else') then begin end else if AtomIs('else') then begin
{$IFDEF VerboseCDirectives} {$IFDEF VerboseCDirectives}
DebugLn(['TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2-2),GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2-2),GetAtom]);
{$ENDIF} {$ENDIF}
CurNode.SubDesc:=ccnsDirectiveElse; CurNode.SubDesc:=ccnsDirectiveElse;
if IfLevel=0 then if IfLevel=0 then
@ -927,7 +932,7 @@ begin
RaiseException('endif without if'); RaiseException('endif without if');
dec(IfLevel); dec(IfLevel);
{$IFDEF VerboseCDirectives} {$IFDEF VerboseCDirectives}
DebugLn(['TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.DirectiveToken ',GetIndentStr(IfLevel*2),GetAtom]);
{$ENDIF} {$ENDIF}
end else if AtomIs('line') then begin end else if AtomIs('line') then begin
CurNode.SubDesc:=ccnsDirectiveLine; CurNode.SubDesc:=ccnsDirectiveLine;
@ -959,13 +964,20 @@ end;
function TCCodeParserTool.ExternToken: boolean; function TCCodeParserTool.ExternToken: boolean;
begin begin
Result:=true; Result:=true;
CreateChildNode(ccnExtern); CreateChildNode(ccnExternBlock);
ReadNextAtom; ReadNextAtom;
if not AtomIsStringConstant then if AtomIsStringConstant then begin
RaiseExpectedButAtomFound('string constant'); // for example: extern "C" {
ReadNextAtom; ReadNextAtom;
if not AtomIsChar('{') then if not AtomIsChar('{') then
RaiseExpectedButAtomFound('{'); RaiseExpectedButAtomFound('{');
end else if AtomIsIdentifier then begin
// for example: extern void a();
CurNode.Desc:=ccnExternDef;
ReadVariable(false);
EndChildNode;
end else
RaiseExpectedButAtomFound('definition');
end; end;
function TCCodeParserTool.CurlyBracketCloseToken: boolean; function TCCodeParserTool.CurlyBracketCloseToken: boolean;
@ -973,7 +985,7 @@ function TCCodeParserTool.CurlyBracketCloseToken: boolean;
// end of 'extern "C" {' // end of 'extern "C" {'
begin begin
Result:=true; Result:=true;
if CurNode.Desc=ccnExtern then if CurNode.Desc=ccnExternBlock then
EndChildNode EndChildNode
else else
RaiseException('} without {'); RaiseException('} without {');
@ -1317,7 +1329,7 @@ var
MainNode: TCodeTreeNode; MainNode: TCodeTreeNode;
begin begin
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
DebugLn(['TCCodeParserTool.ReadVariable START ',GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.ReadVariable START ',GetAtom]);
{$ENDIF} {$ENDIF}
if AsParameter then begin if AsParameter then begin
CreateChildNode(ccnFuncParameter); CreateChildNode(ccnFuncParameter);
@ -1333,8 +1345,10 @@ begin
if AtomIs('struct') then begin if AtomIs('struct') then begin
ReadUnionStruct(true); ReadUnionStruct(true);
ReadNextAtom;
end else if AtomIs('union') then begin end else if AtomIs('union') then begin
ReadUnionStruct(false); ReadUnionStruct(false);
ReadNextAtom;
end else begin end else begin
if IsCCodeFunctionModifier.DoItCaseSensitive(Src,AtomStart,SrcPos-AtomStart) if IsCCodeFunctionModifier.DoItCaseSensitive(Src,AtomStart,SrcPos-AtomStart)
then begin then begin
@ -1369,10 +1383,8 @@ begin
end else end else
break; break;
until false; until false;
if LastIsName then if not LastIsName then
UndoReadNextAtom; ReadNextAtom;
// read type name
ReadNextAtom;
end; end;
while AtomIsChar('*') or AtomIs('const') do begin while AtomIsChar('*') or AtomIs('const') do begin
@ -1403,7 +1415,7 @@ begin
ReadNextAtom; ReadNextAtom;
end; end;
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
DebugLn(['TCCodeParserTool.ReadVariable name=',GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.ReadVariable name=',GetAtom]);
{$ENDIF} {$ENDIF}
if AtomIsIdentifier then begin if AtomIsIdentifier then begin
CreateChildNode(ccnName); CreateChildNode(ccnName);
@ -1416,7 +1428,7 @@ begin
RaiseExpectedButAtomFound(')'); RaiseExpectedButAtomFound(')');
end else begin end else begin
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
DebugLn(['TCCodeParserTool.ReadVariable name=',GetAtom]); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.ReadVariable name=',GetAtom]);
{$ENDIF} {$ENDIF}
if AtomIsIdentifier then begin if AtomIsIdentifier then begin
CreateChildNode(ccnName); CreateChildNode(ccnName);
@ -1470,6 +1482,14 @@ begin
ReadTilBracketClose(true); ReadTilBracketClose(true);
ReadNextAtom; ReadNextAtom;
end; end;
end else if AtomIsChar(':') then begin
// bits
ReadNextAtom;
if not AtomIsNumber then
RaiseExpectedButAtomFound('bit count number');
CreateChildNode(ccnBitCount);
EndChildNode;
ReadNextAtom;
end; end;
// read initial constant // read initial constant
@ -1740,7 +1760,7 @@ begin
ReadRawNextCAtom(Src,SrcPos,AtomStart); ReadRawNextCAtom(Src,SrcPos,AtomStart);
until (SrcPos>SrcLen) or (not (Src[AtomStart] in [#10,#13])); until (SrcPos>SrcLen) or (not (Src[AtomStart] in [#10,#13]));
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
DebugLn(['TCCodeParserTool.ReadNextAtom END ',AtomStart,'-',SrcPos,' "',copy(Src,AtomStart,SrcPos-AtomStart),'"']); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.ReadNextAtom END ',AtomStart,'-',SrcPos,' "',copy(Src,AtomStart,SrcPos-AtomStart),'"']);
{$ENDIF} {$ENDIF}
end; end;
@ -1758,7 +1778,7 @@ begin
end; end;
until (not (Src[AtomStart] in [#10,#13])); until (not (Src[AtomStart] in [#10,#13]));
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
DebugLn(['TCCodeParserTool.ReadNextAtom END ',AtomStart,'-',SrcPos,' "',copy(Src,AtomStart,SrcPos-AtomStart),'"']); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.ReadNextAtom END ',AtomStart,'-',SrcPos,' "',copy(Src,AtomStart,SrcPos-AtomStart),'"']);
{$ENDIF} {$ENDIF}
end; end;
@ -1780,7 +1800,7 @@ begin
SrcPos:=AtomStart; SrcPos:=AtomStart;
end; end;
{$IFDEF VerboseCCodeParser} {$IFDEF VerboseCCodeParser}
DebugLn(['TCCodeParserTool.UndoReadNextAtom END ',AtomStart,'-',SrcPos,' "',copy(Src,AtomStart,SrcPos-AtomStart),'"']); DebugLn([GetIndentStr(CurNode.GetLevel*2),'TCCodeParserTool.UndoReadNextAtom END ',AtomStart,'-',SrcPos,' "',copy(Src,AtomStart,SrcPos-AtomStart),'"']);
{$ENDIF} {$ENDIF}
end; end;
@ -1895,6 +1915,11 @@ begin
Result:=(AtomStart<SrcLen) and (Src[AtomStart]='"'); Result:=(AtomStart<SrcLen) and (Src[AtomStart]='"');
end; end;
function TCCodeParserTool.AtomIsNumber: boolean;
begin
Result:=(AtomStart<SrcLen) and (Src[AtomStart] in ['0'..'9']);
end;
function TCCodeParserTool.LastAtomIs(const s: shortstring): boolean; function TCCodeParserTool.LastAtomIs(const s: shortstring): boolean;
var var
len: Integer; len: Integer;
@ -2431,7 +2456,7 @@ begin
// skip root and extern nodes // skip root and extern nodes
while (IfNDefNode<>nil) do begin while (IfNDefNode<>nil) do begin
if (IfNDefNode.Desc<>ccnRoot) if (IfNDefNode.Desc<>ccnRoot)
and (IfNDefNode.Desc<>ccnExtern) then and (IfNDefNode.Desc<>ccnExternBlock) then
break; break;
IfNDefNode:=IfNDefNode.Next; IfNDefNode:=IfNDefNode.Next;
end; end;
@ -2453,7 +2478,7 @@ begin
// check that no code comes after the #EndIf // check that no code comes after the #EndIf
Node:=EndIfNode; Node:=EndIfNode;
while (Node<>nil) do begin while (Node<>nil) do begin
if (Node.Desc=ccnExtern) if (Node.Desc=ccnExternBlock)
or ((Node.Desc=ccnDirective) or ((Node.Desc=ccnDirective)
and (Node.SubDesc in [ccnsDirectiveIf,ccnsDirectiveIfDef, and (Node.SubDesc in [ccnsDirectiveIf,ccnsDirectiveIfDef,
ccnsDirectiveIfNDef,ccnsDirectiveElIf,ccnsDirectiveEndIf])) ccnsDirectiveIfNDef,ccnsDirectiveElIf,ccnsDirectiveEndIf]))

4
components/codetools/codetoolsstructs.pas
View File

@ -227,7 +227,7 @@ var
IdLen: LongInt; IdLen: LongInt;
ItemLen: PtrInt; ItemLen: PtrInt;
begin begin
Result:=CompareIdentifiersCaseSensitive(PChar(Id),PChar(PStringToStringTreeItem(Data)^.Name)); Result:=-CompareIdentifiersCaseSensitive(PChar(Id),PChar(PStringToStringTreeItem(Data)^.Name));
if Result=0 then begin if Result=0 then begin
IdLen:=GetIdentLen(Id); IdLen:=GetIdentLen(Id);
ItemLen:=length(PStringToStringTreeItem(Data)^.Name); ItemLen:=length(PStringToStringTreeItem(Data)^.Name);
@ -252,7 +252,7 @@ var
IdLen: LongInt; IdLen: LongInt;
ItemLen: PtrInt; ItemLen: PtrInt;
begin begin
Result:=CompareIdentifiers(PChar(Id),PChar(PStringToStringTreeItem(Data)^.Name)); Result:=-CompareIdentifiers(PChar(Id),PChar(PStringToStringTreeItem(Data)^.Name));
if Result=0 then begin if Result=0 then begin
IdLen:=GetIdentLen(Id); IdLen:=GetIdentLen(Id);
ItemLen:=length(PStringToStringTreeItem(Data)^.Name); ItemLen:=length(PStringToStringTreeItem(Data)^.Name);

2
components/codetools/h2pastool.pas
View File

@ -2031,7 +2031,7 @@ begin
//DebugLn(['TH2PasTool.BuildH2PTree Current ParentNode=',ParentNode.DescAsString(CTool),' CNode=',CCNodeDescAsString(CNode.Desc)]); //DebugLn(['TH2PasTool.BuildH2PTree Current ParentNode=',ParentNode.DescAsString(CTool),' CNode=',CCNodeDescAsString(CNode.Desc)]);
NextCNode:=CNode.NextSkipChilds; NextCNode:=CNode.NextSkipChilds;
case CNode.Desc of case CNode.Desc of
ccnRoot, ccnExtern: ccnRoot, ccnExternBlock:
NextCNode:=CNode.Next; NextCNode:=CNode.Next;
ccnTypedef: ccnTypedef: