Skip to content

Commit 5a82d23

Browse files
author
Grahame Grieve
committed
Changes to get server compiling under FPC Trunk version
1 parent 5529811 commit 5a82d23

9 files changed

+65
-26
lines changed

‎library/fhir3/fhir3_pathengine.pas

+7-2
Original file line numberDiff line numberDiff line change
@@ -3564,7 +3564,8 @@ function TFHIRPathEngine.funcPower(context: TFHIRPathExecutionContext; focus: TF
35643564
begin
35653565
qty := (base as TFhirQuantity).Clone;
35663566
try
3567-
d := TFslDecimal.Create(qty.value).Power(e);
3567+
d := TFslDecimal.Create(qty.value);
3568+
d := d.Power(e);
35683569
if not d.IsUndefined then
35693570
begin
35703571
qty.value := d.AsString;
@@ -3803,6 +3804,7 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38033804
var
38043805
base : TFHIRObject;
38053806
qty : TFHIRQuantity;
3807+
v : TFslDecimal;
38063808
begin
38073809
if (focus.count <> 1) then
38083810
raise EFHIRPath.Create('Error evaluating FHIRPath expression: focus for floor has more than one value');
@@ -3816,7 +3818,10 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38163818
begin
38173819
qty := (base as TFhirQuantity).Clone;
38183820
try
3819-
qty.value := TFslDecimal.Create(qty.value).Trunc.Add(1).AsString;
3821+
v := TFslDecimal.Create(qty.value);
3822+
v := v.Trunc;
3823+
v := v.AddInt(1);
3824+
qty.value := v.AsString;
38203825
result.add(qty.Link);
38213826
finally
38223827
qty.free;

‎library/fhir4/fhir4_pathengine.pas

+7-2
Original file line numberDiff line numberDiff line change
@@ -3593,7 +3593,8 @@ function TFHIRPathEngine.funcPower(context: TFHIRPathExecutionContext; focus: TF
35933593
begin
35943594
qty := (base as TFhirQuantity).Clone;
35953595
try
3596-
d := TFslDecimal.Create(qty.value).Power(e);
3596+
d := TFslDecimal.Create(qty.value);
3597+
d := d.Power(e);
35973598
if not d.IsUndefined then
35983599
begin
35993600
qty.value := d.AsString;
@@ -3832,6 +3833,7 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38323833
var
38333834
base : TFHIRObject;
38343835
qty : TFHIRQuantity;
3836+
v : TFslDecimal;
38353837
begin
38363838
if (focus.count <> 1) then
38373839
raise EFHIRPath.Create('Error evaluating FHIRPath expression: focus for floor has more than one value');
@@ -3845,7 +3847,10 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38453847
begin
38463848
qty := (base as TFhirQuantity).Clone;
38473849
try
3848-
qty.value := TFslDecimal.Create(qty.value).Trunc.Add(1).AsString;
3850+
v := TFslDecimal.Create(qty.value);
3851+
v := v.trunc;
3852+
v := v.addInt(1);
3853+
qty.value := v.AsString;
38493854
result.add(qty.Link);
38503855
finally
38513856
qty.free;

‎library/fhir4b/fhir4b_pathengine.pas

+7-2
Original file line numberDiff line numberDiff line change
@@ -3591,7 +3591,8 @@ function TFHIRPathEngine.funcPower(context: TFHIRPathExecutionContext; focus: TF
35913591
begin
35923592
qty := (base as TFhirQuantity).Clone;
35933593
try
3594-
d := TFslDecimal.Create(qty.value).Power(e);
3594+
d := TFslDecimal.Create(qty.value);
3595+
d := d.Power(e);
35953596
if not d.IsUndefined then
35963597
begin
35973598
qty.value := d.AsString;
@@ -3830,6 +3831,7 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38303831
var
38313832
base : TFHIRObject;
38323833
qty : TFHIRQuantity;
3834+
d : TFslDecimal;
38333835
begin
38343836
if (focus.count <> 1) then
38353837
raise EFHIRPath.Create('Error evaluating FHIRPath expression: focus for floor has more than one value');
@@ -3843,7 +3845,10 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38433845
begin
38443846
qty := (base as TFhirQuantity).Clone;
38453847
try
3846-
qty.value := TFslDecimal.Create(qty.value).Trunc.Add(1).AsString;
3848+
d := TFslDecimal.Create(qty.value);
3849+
d := d.Trunc;
3850+
d := d.AddInt(1);
3851+
qty.value := d.AsString;
38473852
result.add(qty.Link);
38483853
finally
38493854
qty.free;

‎library/fhir5/fhir5_pathengine.pas

+7-2
Original file line numberDiff line numberDiff line change
@@ -3591,7 +3591,8 @@ function TFHIRPathEngine.funcPower(context: TFHIRPathExecutionContext; focus: TF
35913591
begin
35923592
qty := (base as TFhirQuantity).Clone;
35933593
try
3594-
d := TFslDecimal.Create(qty.value).Power(e);
3594+
d := TFslDecimal.Create(qty.value);
3595+
d := d.Power(e);
35953596
if not d.IsUndefined then
35963597
begin
35973598
qty.value := d.AsString;
@@ -3830,6 +3831,7 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38303831
var
38313832
base : TFHIRObject;
38323833
qty : TFHIRQuantity;
3834+
d : TFslDecimal;
38333835
begin
38343836
if (focus.count <> 1) then
38353837
raise EFHIRPath.Create('Error evaluating FHIRPath expression: focus for floor has more than one value');
@@ -3843,7 +3845,10 @@ function TFHIRPathEngine.funcCeiling(context: TFHIRPathExecutionContext; focus:
38433845
begin
38443846
qty := (base as TFhirQuantity).Clone;
38453847
try
3846-
qty.value := TFslDecimal.Create(qty.value).Trunc.Add(1).AsString;
3848+
d := TFslDecimal.Create(qty.value);
3849+
d := d.Trunc;
3850+
d := d.AddInt(1);
3851+
qty.value := d.AsString;
38473852
result.add(qty.Link);
38483853
finally
38493854
qty.free;

‎library/fsl/fsl_utilities.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ TFslDecimalHelper = record helper for TFslDecimal
16111611
Function Modulo(oOther : TFslDecimal) : TFslDecimal; Overload;
16121612
Function Modulo(iOther : Integer) : TFslDecimal; Overload;
16131613
Function Add(oOther : TFslDecimal) : TFslDecimal; Overload;
1614-
Function Add(iOther : Integer) : TFslDecimal; Overload;
1614+
Function AddInt(iOther : Integer) : TFslDecimal; Overload;
16151615
Function Subtract(iOther : Integer) : TFslDecimal; Overload;
16161616
Function Subtract(oOther : TFslDecimal) : TFslDecimal; Overload;
16171617
function Abs: TFslDecimal; overload;
@@ -12610,7 +12610,7 @@ function TFslDecimalHelper.Abs: TFslDecimal;
1261012610
result.FNegative := false;
1261112611
end;
1261212612

12613-
Function TFslDecimalHelper.Add(iOther : Integer) : TFslDecimal;
12613+
Function TFslDecimalHelper.AddInt(iOther : Integer) : TFslDecimal;
1261412614
var
1261512615
oTemp : TFslDecimal;
1261612616
Begin

‎library/fsl/fsl_xml.pas

+13-2
Original file line numberDiff line numberDiff line change
@@ -3525,6 +3525,7 @@ function TMXmlDocument.opLessThanEqual(left, right: TFslList<TMXmlNode>): TFslLi
35253525
function TMXmlDocument.opMinus(left, right: TFslList<TMXmlNode>): TFslList<TMXmlNode>;
35263526
var
35273527
sl, sr, so: String;
3528+
d1, d2 : TFslDecimal;
35283529
begin
35293530
result := TFslList<TMXmlNode>.Create;
35303531
try
@@ -3537,7 +3538,11 @@ function TMXmlDocument.opMinus(left, right: TFslList<TMXmlNode>): TFslList<TMXml
35373538
if StringIsInteger32(sl) and StringIsInteger32(sr) then
35383539
so := IntToStr(StringToInteger32(sl) - StringToInteger32(sr))
35393540
else if StringIsDecimal(sl) and StringIsDecimal(sr) then
3540-
so := TFslDecimal.ValueOf(sl).Subtract(TFslDecimal.ValueOf(sr)).AsString
3541+
begin
3542+
d1 := TFslDecimal.ValueOf(sl);
3543+
d2 := TFslDecimal.ValueOf(sr);
3544+
so := d1.Subtract(d2).AsString;
3545+
end
35413546
else
35423547
so := sl.Replace(sr, '');
35433548
end;
@@ -3582,6 +3587,7 @@ function TMXmlDocument.opOr(left, right: TFslList<TMXmlNode>): TFslList<TMXmlNod
35823587
function TMXmlDocument.opPlus(left, right: TFslList<TMXmlNode>): TFslList<TMXmlNode>;
35833588
var
35843589
sl, sr, so: String;
3590+
d1, d2, d3 : TFslDecimal;
35853591
begin
35863592
result := TFslList<TMXmlNode>.Create;
35873593
try
@@ -3594,7 +3600,12 @@ function TMXmlDocument.opPlus(left, right: TFslList<TMXmlNode>): TFslList<TMXmlN
35943600
if StringIsInteger32(sl) and StringIsInteger32(sr) then
35953601
so := IntToStr(StringToInteger32(sl) + StringToInteger32(sr))
35963602
else if StringIsDecimal(sl) and StringIsDecimal(sr) then
3597-
so := TFslDecimal.ValueOf(sl).Add(TFslDecimal.ValueOf(sr)).AsString
3603+
begin
3604+
d1 := TFslDecimal.ValueOf(sl);
3605+
d2 := TFslDecimal.ValueOf(sr);
3606+
d3 := d1.Add(d2);
3607+
so := d3.AsString;
3608+
end
35983609
else
35993610
so := sl+sr;
36003611
end;

‎library/fsl/tests/fsl_testing.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ TFslTestSettings = class (TFslObject)
155155

156156
{$IFDEF FPC}
157157
//procedure RegisterTest(ASuitePath: String; ATestClass: TTestCaseClass); overload;
158-
procedure RegisterTest(ASuitePath: String; ATest: TTest); overload;
158+
procedure RegisterTest(ASuitePath: String; ATest: TTest);
159159
{$ELSE}
160160
procedure RegisterTest(SuitePath: string; test: ITest);
161161
{$ENDIF}
@@ -168,7 +168,7 @@ procedure RegisterTestClass(ASuitePath: String; ATestClass: TTestCaseClass); ove
168168
TestRegistry.RegisterTest(ASuitePath, ATestClass);
169169
end;
170170

171-
procedure RegisterTest(ASuitePath: String; ATest: TTest); overload;
171+
procedure RegisterTest(ASuitePath: String; ATest: TTest);
172172
begin
173173
TestRegistry.RegisterTest(ASuitePath, ATest);
174174
end;

‎library/ftx/ftx_sct_services.pas

+2-1
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,8 @@ class function TSnomedServices.checkFile(const sFilename: String): String;
14851485
v := oRead.ReadString;
14861486
if (v = SNOMED_CACHE_VERSION_CURRENT) or (v = SNOMED_CACHE_VERSION_UTF16) Then
14871487
begin
1488-
s := oread.ReadString.split(['/']);
1488+
v := oRead.ReadString;
1489+
s := v.split(['/']);
14891490
v := oread.ReadString;
14901491
result := 'Ok (edition = '+s[4]+', version = '+s[6]+', date = '+v+')'
14911492
end

‎library/fui/fui_lcl_managers.pas

+18-11
Original file line numberDiff line numberDiff line change
@@ -1156,11 +1156,12 @@ procedure TListManager<T>.doMouseMove(Sender: TObject; Shift: TShiftState; X, Y:
11561156
procedure TListManager<T>.doMnuClick(Sender: TObject);
11571157
var
11581158
mnu : TMenuItem;
1159-
mode : String;
1159+
name, mode : String;
11601160
begin
11611161
mnu := (Sender as TMenuItem);
1162-
if mnu.Name.StartsWith('mnuMode') then
1163-
mode := mnu.Name.Substring(7)
1162+
name := mnu.Name;
1163+
if name.StartsWith('mnuMode') then
1164+
mode := name.Substring(7)
11641165
else
11651166
mode := '';
11661167

@@ -2219,9 +2220,11 @@ procedure TTreeManager<T>.doPopup(sender: TObject);
22192220
procedure visitItem(item : TMenuItem);
22202221
var
22212222
i : integer;
2223+
name : String;
22222224
begin
2225+
name := item.name;
22232226
if item.Tag = ord(copCopy) then
2224-
item.Enabled := getCanCopy(focus, item.name.subString(7));
2227+
item.Enabled := getCanCopy(focus, name.subString(7));
22252228
for i := 0 to item.Count - 1 do
22262229
visitItem(item.Items[i]);
22272230
end;
@@ -2255,11 +2258,12 @@ procedure TTreeManager<T>.doControl(sender: TObject);
22552258
procedure TTreeManager<T>.doMnuClick(Sender: TObject);
22562259
var
22572260
mnu : TMenuItem;
2258-
mode : String;
2261+
name, mode : String;
22592262
begin
22602263
mnu := (Sender as TMenuItem);
2261-
if mnu.Name.StartsWith('mnuMode') then
2262-
mode := mnu.Name.Substring(7)
2264+
name := mnu.Name;
2265+
if Name.StartsWith('mnuMode') then
2266+
mode := Name.Substring(7)
22632267
else
22642268
mode := '';
22652269

@@ -2806,9 +2810,11 @@ procedure TVTreeManager<T>.doPopup(sender: TObject);
28062810
procedure visitItem(item : TMenuItem);
28072811
var
28082812
i : integer;
2813+
name : String;
28092814
begin
2815+
name := item.name;
28102816
if item.Tag = ord(copCopy) then
2811-
item.Enabled := getCanCopy(focus, item.name.subString(7));
2817+
item.Enabled := getCanCopy(focus, name.subString(7));
28122818
for i := 0 to item.Count do
28132819
visitItem(item.Items[i]);
28142820
end;
@@ -2842,11 +2848,12 @@ procedure TVTreeManager<T>.doControl(sender: TObject);
28422848
procedure TVTreeManager<T>.doMnuClick(Sender: TObject);
28432849
var
28442850
mnu : TMenuItem;
2845-
mode : String;
2851+
name, mode : String;
28462852
begin
28472853
mnu := (Sender as TMenuItem);
2848-
if mnu.Name.StartsWith('mnuMode') then
2849-
mode := mnu.Name.Substring(7)
2854+
name := mnu.Name;
2855+
if name.StartsWith('mnuMode') then
2856+
mode := name.Substring(7)
28502857
else
28512858
mode := '';
28522859

0 commit comments

Comments
 (0)