Skip to content

Commit 60a3c3d

Browse files
authored
Merge pull request #1225 from gusthoff/content/advanced_ada/review/editorial/general/20250525
Editorial changes to "Advanced Ada" course
2 parents ae8dcba + d2ce97a commit 60a3c3d

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

content/courses/advanced-ada/parts/control_flow/expressions.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Relations and simple expressions
3434
Expressions usually consist of relations, which in turn consist of simple
3535
expressions. (There are more details to this, but we'll keep it simple for the
3636
moment.) Let's see a code example with a few expressions, which we dissect into
37-
the corresponding grammatical elements (we're going to discuss them later):
37+
the corresponding grammatical elements |mdash| we're going to discuss them
38+
later:
3839

3940
.. code:: ada run_button project=Courses.Advanced_Ada.Control_Flow.Expressions.Expressions_Definition.Expression_Elements
4041

content/courses/advanced-ada/parts/data_types/arrays.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ its whole lifetime:
8282
-- Bounds cannot be changed!
8383
8484
85+
.. ::
86+
87+
Empty arrays
88+
~~~~~~~~~~~~
89+
90+
.. todo::
91+
92+
Complete section!
93+
94+
8595
.. _Adv_Ada_Constrained_Array_Type:
8696

8797
Constrained array types

content/courses/advanced-ada/parts/data_types/numerics.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ example, writing :ada:`A * B` triggers a compilation error. (Otherwise, which
829829
precision should be used for the result?) Therefore, we have
830830
to convert one of the objects to have matching types:
831831

832-
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Types.Universal_Types.Float_Multiplication
832+
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Numerics.Universal_Types.Float_Multiplication
833833
:class: ada-expect-compile-error
834834

835835
with Ada.Text_IO; use Ada.Text_IO;
@@ -849,7 +849,7 @@ In contrast, for fixed-point types, we can mix objects of different types in a
849849
multiplication or division. (In this case, mixing is allowed for the
850850
convenience of the programmer.) For example:
851851

852-
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Types.Universal_Types.Fixed_Point_Multiplication
852+
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Numerics.Universal_Types.Fixed_Point_Multiplication
853853

854854
package Normalized_Fixed_Point_Types is
855855

@@ -889,7 +889,7 @@ In addition to the multiplication operation, other operations such as the
889889
conversion between fixed-point types and the division operations make use of
890890
universal fixed types:
891891

892-
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Types.Universal_Types.Universal_Fixed
892+
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Numerics.Universal_Types.Universal_Fixed
893893

894894
package Custom_Decimal_Types is
895895

@@ -970,7 +970,7 @@ are universal fixed types.
970970
fixed-point types. However, those operators do **not** override the
971971
corresponding operators for universal fixed-point types. For example:
972972

973-
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Types.Universal_Types.Fixed_Point_Custom_Multiplication
973+
.. code:: ada run_button project=Courses.Advanced_Ada.Data_Types.Numerics.Universal_Types.Fixed_Point_Custom_Multiplication
974974

975975
package Normalized_Fixed_Point_Types is
976976

content/courses/advanced-ada/parts/data_types/records.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3615,7 +3615,9 @@ Per-Object Expressions
36153615
----------------------
36163616

36173617
In record type declarations, we might want to define a component that makes use
3618-
of a name that refers to a discriminant of the record type, or to the record
3618+
of a :ref:`name <Adv_Ada_Names>` that refers to a
3619+
:ref:`discriminant <Adv_Ada_Record_Discriminants>`
3620+
of the record type, or to the record
36193621
type itself. An expression where we use such a name is called a per-object
36203622
expression.
36213623

content/courses/advanced-ada/parts/data_types/types.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,8 @@ the example above accordingly:
19801980
end Incomplete_Type_Example;
19811981

19821982
A typical application of incomplete types is to create linked lists using
1983-
access types based on those incomplete types. This kind of type is called
1983+
:ref:`access types <Adv_Ada_Access_Types_Terminology>`
1984+
based on those incomplete types. This kind of type is called
19841985
a recursive type. For example:
19851986

19861987
.. code:: ada compile_button project=Courses.Advanced_Ada.Data_Types.Types.Incomplete_Types.Linked_List_Example

content/courses/advanced-ada/parts/resource_management/anonymous_access_types.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,16 @@ and
249249
cover more specific details on anonymous access types.
250250

251251

252+
.. ::
253+
254+
Universal Access Types
255+
~~~~~~~~~~~~~~~~~~~~~~
256+
257+
.. todo::
258+
259+
Complete section!
260+
261+
252262
.. _Adv_Ada_Anonymous_Access_To_Object_Types:
253263

254264
Anonymous Access-To-Object Types

0 commit comments

Comments
 (0)