Skip to content

Fixes simple bracketed compiler version compare #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chuacw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes simple bracketed compiler version compare #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Source/SimpleParser/SimpleParser.Lexer.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,12 +1702,17 @@ function TmwBasePasLex.EvaluateConditionalExpression(const AParams: String): Boo
LIsComVer: Boolean;
LIsRtlVer: Boolean;
LOper: string;
LValue: Integer;
LValue: Extended;
p: Integer;
begin
{ TODO : Expand support for <=> evaluations (complicated to do). Expand support for NESTED expressions }
LEvaluation := leeNone;
LParams := TrimLeft(AParams);
if LParams.StartsWith('(') and LParams.EndsWith(')') then
begin
Delete(LParams,1, 1);
Delete(LParams, Length(LParams), 1);
end;
LIsComVer := Pos('COMPILERVERSION', LParams) = 1;
LIsRtlVer := Pos('RTLVERSION', LParams) = 1;
if LIsComVer or LIsRtlVer then //simple parser which covers most frequent use cases
Expand All @@ -1729,7 +1734,7 @@ function TmwBasePasLex.EvaluateConditionalExpression(const AParams: String): Boo
p := Pos(' ', LParams);
if p = 0 then
p := Length(LParams) + 1;
if TryStrToInt(Copy(LParams, 1, p-1), LValue) then
if TryStrToFloat(Copy(LParams, 1, p-1), LValue) then
begin
Delete(LParams, 1, p);
while (LParams <> '') and (LParams[1] = ' ') do
Expand Down