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

fixed search paths for virtual projects

Browse Source 
git-svn-id: trunk@2863 -
This commit is contained in:
mattias 2002-08-18 08:55:09 +00:00
parent 3e1f5706c1
commit 5021a1675e
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/codetools/expreval.pas
View File

@ -74,6 +74,8 @@ type
property ErrorPosition:integer read ErrorPos; property ErrorPosition:integer read ErrorPos;
property OnChange: TOnValuesChanged read FOnChange write FOnChange; property OnChange: TOnValuesChanged read FOnChange write FOnChange;
function Items(Index: integer): string; function Items(Index: integer): string;
procedure Append(const Variable, Value: string);
procedure Prepend(const Variable, Value: string);
procedure Clear; procedure Clear;
function AsString: string; function AsString: string;
constructor Create; constructor Create;
@ -199,6 +201,16 @@ begin
Result:=FNames[Index]+'='+FValues[Index]; Result:=FNames[Index]+'='+FValues[Index];
end; end;
procedure TExpressionEvaluator.Append(const Variable, Value: string);
begin
Variables[Variable]:=Variables[Variable]+Value;
end;
procedure TExpressionEvaluator.Prepend(const Variable, Value: string);
begin
Variables[Variable]:=Value+Variables[Variable];
end;
function TExpressionEvaluator.EvalAtPos: string; function TExpressionEvaluator.EvalAtPos: string;
var r: string; // current result var r: string; // current result
c,o1,o2: char; c,o1,o2: char;

18
ide/main.pp
View File

@ -284,6 +284,8 @@ type
function OnCodeToolBossCheckAbort: boolean; function OnCodeToolBossCheckAbort: boolean;
procedure CodeToolBossGetVirtualDirectoryAlias(Sender: TObject; procedure CodeToolBossGetVirtualDirectoryAlias(Sender: TObject;
var RealDir: string); var RealDir: string);
procedure CodeToolBossGetVirtualDirectoryDefines(DefTree: TDefineTree;
DirDef: TDirectoryDefines);
// MessagesView events // MessagesView events
procedure MessagesViewSelectionChanged(sender : TObject); procedure MessagesViewSelectionChanged(sender : TObject);
@ -6228,7 +6230,9 @@ begin
CodeToolBoss.DefineTree.OnGetVirtualDirectoryAlias:= CodeToolBoss.DefineTree.OnGetVirtualDirectoryAlias:=
@CodeToolBossGetVirtualDirectoryAlias; @CodeToolBossGetVirtualDirectoryAlias;
CodeToolBoss.DefineTree.OnGetVirtualDirectoryDefines:=
@CodeToolBossGetVirtualDirectoryDefines;
CodeToolsOpts.AssignTo(CodeToolBoss); CodeToolsOpts.AssignTo(CodeToolBoss);
if (not FileExists(EnvironmentOptions.CompilerFilename)) then begin if (not FileExists(EnvironmentOptions.CompilerFilename)) then begin
writeln(''); writeln('');
@ -6387,10 +6391,17 @@ end;
procedure TMainIDE.CodeToolBossGetVirtualDirectoryAlias(Sender: TObject; procedure TMainIDE.CodeToolBossGetVirtualDirectoryAlias(Sender: TObject;
var RealDir: string); var RealDir: string);
begin begin
if Project1<>nil then if (Project1<>nil) and (Project1.ProjectDirectory<>'') then
RealDir:=Project1.ProjectDirectory; RealDir:=Project1.ProjectDirectory;
end; end;
procedure TMainIDE.CodeToolBossGetVirtualDirectoryDefines(DefTree: TDefineTree;
DirDef: TDirectoryDefines);
begin
if (Project1<>nil) and Project1.IsVirtual then
Project1.GetVirtualDefines(DefTree,DirDef);
end;
procedure TMainIDE.SaveSourceEditorChangesToCodeCache(PageIndex: integer); procedure TMainIDE.SaveSourceEditorChangesToCodeCache(PageIndex: integer);
// save all open sources to code tools cache // save all open sources to code tools cache
var i: integer; var i: integer;
@ -7617,6 +7628,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.454 2003/01/15 09:08:08 mattias
fixed search paths for virtual projects
Revision 1.453 2003/01/14 17:07:22 mattias Revision 1.453 2003/01/14 17:07:22 mattias
improved source error message improved source error message