Skip to content

Commit 819183d

Browse files
committed
solar lab protected fix Body_Type -> Body_T
1 parent 50ff1b5 commit 819183d

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

courses/fundamentals_of_ada/labs/solar_system/adv_240_tasking_protected_objects/src/main.adb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ with Solar_System.Graphics; use Solar_System.Graphics;
2626

2727
procedure Main is
2828

29-
-- declare variable Bodies which is an array of Body_Type
29+
-- declare variable Bodies which is an array of Body_T
3030
Bodies : Bodies_Array_T;
3131

3232
-- declare a variable Now of type Time to record current time

courses/fundamentals_of_ada/labs/solar_system/adv_240_tasking_protected_objects/src/solar_system-graphics.adb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package body Solar_System.Graphics is
22

3-
procedure Draw_Body (Object : Body_Type; Canvas : Canvas_ID) is
3+
procedure Draw_Body (Object : Body_T; Canvas : Canvas_ID) is
44
begin
55
if Object.Visible then
66
Draw_Sphere

courses/fundamentals_of_ada/labs/solar_system/adv_240_tasking_protected_objects/src/solar_system-graphics.ads

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ package Solar_System.Graphics is
44

55
private
66

7-
procedure Draw_Body (Object : Body_Type; Canvas : Canvas_ID);
7+
procedure Draw_Body (Object : Body_T; Canvas : Canvas_ID);
88

99
end Solar_System.Graphics;

courses/fundamentals_of_ada/labs/solar_system/adv_240_tasking_protected_objects/src/solar_system.adb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,32 +49,32 @@ package body Solar_System is
4949
-- implement a function to compute the X coordinate
5050
-- x of the reference + distance * cos(angle)
5151
function Compute_X
52-
(Body_To_Move : Body_Type;
53-
Turns_Around : Body_Type) return Float;
52+
(Body_To_Move : Body_T;
53+
Turns_Around : Body_T) return Float;
5454

5555
-- implement a function to compute the Y coordinate
5656
-- y of the reference + distance * sin(angle)
5757
function Compute_Y
58-
(Body_To_Move : Body_Type;
59-
Turns_Around : Body_Type) return Float;
58+
(Body_To_Move : Body_T;
59+
Turns_Around : Body_T) return Float;
6060

6161
function Compute_X
62-
(Body_To_Move : Body_Type;
63-
Turns_Around : Body_Type) return Float
62+
(Body_To_Move : Body_T;
63+
Turns_Around : Body_T) return Float
6464
is
6565
begin
6666
return Turns_Around.X + Body_To_Move.Distance * Cos (Body_To_Move.Angle);
6767
end Compute_X;
6868

6969
function Compute_Y
70-
(Body_To_Move : Body_Type;
71-
Turns_Around : Body_Type) return Float
70+
(Body_To_Move : Body_T;
71+
Turns_Around : Body_T) return Float
7272
is
7373
begin
7474
return Turns_Around.Y + Body_To_Move.Distance * Sin (Body_To_Move.Angle);
7575
end Compute_Y;
7676

77-
procedure Move (Body_To_Move : in out Body_Type; Bodies : Bodies_Array_T) is
77+
procedure Move (Body_To_Move : in out Body_T; Bodies : Bodies_Array_T) is
7878
begin
7979

8080
Body_To_Move.X :=

courses/fundamentals_of_ada/labs/solar_system/adv_240_tasking_protected_objects/src/solar_system.ads

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ package Solar_System is
4242

4343
private
4444

45-
-- define a type Body_Type to store every information about a body
45+
-- define a type Body_T to store every information about a body
4646
-- X, Y, Distance, Speed, Angle, Radius, Color
47-
type Body_Type is record
47+
type Body_T is record
4848
X : Float := 0.0;
4949
Y : Float := 0.0;
5050
Distance : Float;
@@ -56,9 +56,9 @@ private
5656
Turns_Around : Bodies_Enum_T;
5757
end record;
5858

59-
-- define type Bodies_Array as an array of Body_Type indexed by bodies enumeration
60-
type Bodies_Array_T is array (Bodies_Enum_T) of Body_Type;
59+
-- define type Bodies_Array as an array of Body_T indexed by bodies enumeration
60+
type Bodies_Array_T is array (Bodies_Enum_T) of Body_T;
6161

62-
procedure Move (Body_To_Move : in out Body_Type; Bodies : Bodies_Array_T);
62+
procedure Move (Body_To_Move : in out Body_T; Bodies : Bodies_Array_T);
6363

6464
end Solar_System;

0 commit comments

Comments
 (0)