From 5cdcfd3451d92a09821c4e61e563fa2bdaee3098 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 3 Dec 2009 11:10:47 +0000 Subject: [PATCH] codetools: fixed compilation of examples git-svn-id: trunk@22940 - --- components/codetools/examples/fixdefinitionorder.lpi | 10 +++------- components/codetools/examples/fixfilenames.lpi | 5 ++--- components/codetools/examples/fixh2pasdirectives.lpi | 10 +++------- components/codetools/examples/fpcunitlinks.pas | 2 +- components/codetools/examples/getcontext.lpi | 6 ++++-- components/codetools/examples/getcontext.lpr | 10 +++++----- components/codetools/examples/h2pastest.lpi | 8 +++----- .../codetools/examples/identifiercompletion.lpi | 12 +++++------- .../codetools/examples/listinterfaceclasses.lpi | 7 ++++--- components/codetools/examples/methodjumping.lpi | 7 ++++--- components/codetools/examples/ppudependencies.lpi | 12 +++++------- components/codetools/examples/ppudependencies.lpr | 2 +- components/codetools/examples/reduceifdefs.lpi | 10 +++------- components/codetools/examples/removeemptymethods.lpi | 12 +++++------- components/codetools/examples/removeemptymethods.lpr | 2 +- .../codetools/examples/replaceresourcedirectives.lpi | 10 +++------- components/codetools/examples/setincludepath.lpi | 5 ++--- 17 files changed, 54 insertions(+), 76 deletions(-) diff --git a/components/codetools/examples/fixdefinitionorder.lpi b/components/codetools/examples/fixdefinitionorder.lpi index 4f0d6b2baa..b01a23de4e 100644 --- a/components/codetools/examples/fixdefinitionorder.lpi +++ b/components/codetools/examples/fixdefinitionorder.lpi @@ -1,16 +1,15 @@ - - + + - @@ -51,13 +50,10 @@ - + - - - diff --git a/components/codetools/examples/fixfilenames.lpi b/components/codetools/examples/fixfilenames.lpi index a6459baf62..58a06f01e1 100644 --- a/components/codetools/examples/fixfilenames.lpi +++ b/components/codetools/examples/fixfilenames.lpi @@ -1,17 +1,16 @@ - - + + - diff --git a/components/codetools/examples/fixh2pasdirectives.lpi b/components/codetools/examples/fixh2pasdirectives.lpi index 86723b9c74..bc19dab74f 100644 --- a/components/codetools/examples/fixh2pasdirectives.lpi +++ b/components/codetools/examples/fixh2pasdirectives.lpi @@ -1,16 +1,15 @@ - - + + - @@ -41,13 +40,10 @@ - + - - - diff --git a/components/codetools/examples/fpcunitlinks.pas b/components/codetools/examples/fpcunitlinks.pas index b80a0b49b4..6cd95b7756 100644 --- a/components/codetools/examples/fpcunitlinks.pas +++ b/components/codetools/examples/fpcunitlinks.pas @@ -45,7 +45,7 @@ begin if FilenameIsPascalUnit(FileInfo.Name,false) then begin List.Add(Dir+FileInfo.Name); end else if (FileInfo.Attr and faDirectory)>0 then begin - CollectUnits(Dir+); + CollectUnits(Dir+FileInfo.Name+PathDelim,List); end; until FindNextUTF8(FileInfo)<>0; end; diff --git a/components/codetools/examples/getcontext.lpi b/components/codetools/examples/getcontext.lpi index 8540def6c4..4f0911a29d 100644 --- a/components/codetools/examples/getcontext.lpi +++ b/components/codetools/examples/getcontext.lpi @@ -1,9 +1,11 @@ - - + + + + diff --git a/components/codetools/examples/getcontext.lpr b/components/codetools/examples/getcontext.lpr index 969789aa63..a952de2ad8 100644 --- a/components/codetools/examples/getcontext.lpr +++ b/components/codetools/examples/getcontext.lpr @@ -12,8 +12,8 @@ var Code: TCodeBuffer; CodeContexts: TCodeContextInfo; i: Integer; - ExprType: TExpressionType; Filename: String; + Item: TCodeContextInfoItem; begin // setup the Options CodeToolBoss.SimpleInit(ConfigFilename); @@ -31,10 +31,10 @@ begin begin writeln('Contexts found: Count=',CodeContexts.Count); for i:=0 to CodeContexts.Count-1 do begin - ExprType:=CodeContexts[i]; - write('i=',i,' ',ExprTypeToString(ExprType)); - if ExprType.Context.Node<>nil then - write(' ',ExprType.Context.Tool.ExtractNode(ExprType.Context.Node,[])); + Item:=CodeContexts[i]; + write('i=',i,' ',ExprTypeToString(Item.Expr)); + if Item.Expr.Context.Node<>nil then + write(' ',Item.Expr.Context.Tool.ExtractNode(Item.Expr.Context.Node,[])); writeln; end; end else begin diff --git a/components/codetools/examples/h2pastest.lpi b/components/codetools/examples/h2pastest.lpi index f828373e1a..5dd44851a4 100644 --- a/components/codetools/examples/h2pastest.lpi +++ b/components/codetools/examples/h2pastest.lpi @@ -1,16 +1,15 @@ - - + + - @@ -45,7 +44,7 @@ - + @@ -56,7 +55,6 @@ - diff --git a/components/codetools/examples/identifiercompletion.lpi b/components/codetools/examples/identifiercompletion.lpi index 02b177cc81..d4f762c7b4 100644 --- a/components/codetools/examples/identifiercompletion.lpi +++ b/components/codetools/examples/identifiercompletion.lpi @@ -1,12 +1,13 @@ - - + + + + - @@ -43,10 +44,7 @@ - - - - + diff --git a/components/codetools/examples/listinterfaceclasses.lpi b/components/codetools/examples/listinterfaceclasses.lpi index 2012e90650..80a8220b33 100644 --- a/components/codetools/examples/listinterfaceclasses.lpi +++ b/components/codetools/examples/listinterfaceclasses.lpi @@ -1,12 +1,13 @@ - - + + + + - diff --git a/components/codetools/examples/methodjumping.lpi b/components/codetools/examples/methodjumping.lpi index a25cd0dbff..40b264cca3 100644 --- a/components/codetools/examples/methodjumping.lpi +++ b/components/codetools/examples/methodjumping.lpi @@ -1,12 +1,13 @@ - - + + + + - diff --git a/components/codetools/examples/ppudependencies.lpi b/components/codetools/examples/ppudependencies.lpi index a4ff0b3c61..ac855534f4 100644 --- a/components/codetools/examples/ppudependencies.lpi +++ b/components/codetools/examples/ppudependencies.lpi @@ -1,12 +1,13 @@ - - + + + + - @@ -38,10 +39,7 @@ - - - - + diff --git a/components/codetools/examples/ppudependencies.lpr b/components/codetools/examples/ppudependencies.lpr index a4b41cce32..d6762ab583 100644 --- a/components/codetools/examples/ppudependencies.lpr +++ b/components/codetools/examples/ppudependencies.lpr @@ -38,7 +38,7 @@ var Group: TPPUGroup; i: Integer; Member: TPPUMember; - MissingUnit: TStringList; + MissingUnit: TStrings; begin if (Paramcount<1) then begin writeln('Usage:'); diff --git a/components/codetools/examples/reduceifdefs.lpi b/components/codetools/examples/reduceifdefs.lpi index fc767416b1..05114fab1a 100644 --- a/components/codetools/examples/reduceifdefs.lpi +++ b/components/codetools/examples/reduceifdefs.lpi @@ -1,16 +1,15 @@ - - + + - @@ -41,13 +40,10 @@ - + - - - diff --git a/components/codetools/examples/removeemptymethods.lpi b/components/codetools/examples/removeemptymethods.lpi index 20d9b714c9..059b3d9200 100644 --- a/components/codetools/examples/removeemptymethods.lpi +++ b/components/codetools/examples/removeemptymethods.lpi @@ -1,12 +1,13 @@ - - + + + + - </General> @@ -44,13 +45,10 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="8"/> <SearchPaths> <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> <Other> <CompilerPath Value="$(CompPath)"/> </Other> diff --git a/components/codetools/examples/removeemptymethods.lpr b/components/codetools/examples/removeemptymethods.lpr index e796e037cb..a6a231573a 100644 --- a/components/codetools/examples/removeemptymethods.lpr +++ b/components/codetools/examples/removeemptymethods.lpr @@ -74,7 +74,7 @@ begin // complete code ListOfPCodeXYPosition:=TFPList.Create; Sections:=[pcsPublished,pcsPrivate,pcsProtected,pcsPublic]; - if CodeToolBoss.FindEmptyMethods(Code,X,Y,Sections,ListOfPCodeXYPosition,All) + if CodeToolBoss.FindEmptyMethods(Code,'',X,Y,Sections,ListOfPCodeXYPosition,All) then begin writeln('Found ',ListOfPCodeXYPosition.Count,' empty methods (All=',All,'):'); for i:=0 to ListOfPCodeXYPosition.Count-1 do begin diff --git a/components/codetools/examples/replaceresourcedirectives.lpi b/components/codetools/examples/replaceresourcedirectives.lpi index 2e358f18ae..7b16c9c692 100644 --- a/components/codetools/examples/replaceresourcedirectives.lpi +++ b/components/codetools/examples/replaceresourcedirectives.lpi @@ -1,16 +1,15 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> - <Version Value="6"/> + <Version Value="7"/> <General> <Flags> <MainUnitHasCreateFormStatements Value="False"/> <MainUnitHasTitleStatement Value="False"/> + <LRSInOutputDirectory Value="False"/> </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> <TargetFileExt Value=""/> <Title Value="reduceifdefs"/> </General> @@ -42,13 +41,10 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="8"/> <SearchPaths> <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> <Other> <CompilerPath Value="$(CompPath)"/> </Other> diff --git a/components/codetools/examples/setincludepath.lpi b/components/codetools/examples/setincludepath.lpi index ffaefb615b..36f5bb85db 100644 --- a/components/codetools/examples/setincludepath.lpi +++ b/components/codetools/examples/setincludepath.lpi @@ -1,16 +1,15 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> - <Version Value="6"/> + <Version Value="7"/> <General> <Flags> <MainUnitHasCreateFormStatements Value="False"/> <MainUnitHasTitleStatement Value="False"/> + <LRSInOutputDirectory Value="False"/> </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> <TargetFileExt Value=""/> <Title Value="SetIncludePath"/> </General>