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

IDE: using new eval

Browse Source 
git-svn-id: trunk@22812 -
This commit is contained in:
mattias 2009-11-26 20:47:19 +00:00
parent ca19910ffe
commit 4a5ccd0c77
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/definetemplates.pas
View File

@ -2539,7 +2539,7 @@ var
begin
// test expression in value
ReadValue(DirDef,DefTempl.Value,CurPath,TempValue);
EvalResult:=DirDef.Values.EvalOld(TempValue);
EvalResult:=DirDef.Values.Eval(TempValue);
if Assigned(OnCalculate) then
OnCalculate(Self,DefTempl,true,TempValue,true,EvalResult,EvalResult='1');
//debugln('da_If,da_ElseIf: DefTempl.Value="',DbgStr(DefTempl.Value),'" CurPath="',CurPath,'" TempValue="',TempValue,'" EvalResult=',EvalResult);

2
ide/compoptsmodes.pas
View File

@ -120,7 +120,7 @@ function TCompOptConditionals.GetValues(const ValueType: TCOCValueType): string;
case Node.NodeType of
cocntIf,cocntElseIf:
begin
ResultStr:=FEvaluator.EvalOld(Node.Value);
ResultStr:=FEvaluator.Eval(Node.Value);
if FEvaluator.ErrorPosition>=0 then begin
FErrorNode:=Node;
FErrorMsg:='error in expression at column '+IntToStr(FEvaluator.ErrorPosition);