Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ according to their dimension. The system is implemented based on the
seven base dimensions (meter, kilogram, second, ampere, kelvin, mole,
candela), and will check that operations between these types are
consistent.
For example, a type :ada:`Speed` can be defined to represent time per
distance. Consistency between these types is checked at compile time
For example, a type :ada:`Speed` can be defined to represent distance per
time. Consistency between these types is checked at compile time
so that dimension errors will be reported as errors. For example:

.. code-block:: ada
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1787,7 +1787,7 @@ aggregates in assignments to this object:
In the first assignment to :ada:`P_3D` in the example above, we're
initializing this object with information from :ada:`P_2D` and specifying
the value of the :ada:`Z` component. Then, in the next assignment to the
:ada:`P_3D` object, we're using an aggregate with information from :ada:`P_1`
:ada:`P_3D` object, we're using an aggregate with information from :ada:`P_1D`
and specifying values for the :ada:`Y` and :ada:`Z` components. (Just as a
reminder, we can write :ada:`Y | Z => 0.1` to assign 0.1 to both :ada:`Y` and
:ada:`Z` components.)
Expand Down
2 changes: 1 addition & 1 deletion content/courses/advanced-ada/parts/data_types/arrays.rst
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ Let's use these subtypes in a test application:

As expected, assignments to objects with different subtypes |mdash| but with
the same parent type |mdash| work fine without conversion. The assignment to
:ada:`M_Max_20` fails because of the predicate failure: the predicate requires
:ada:`M_Max20` fails because of the predicate failure: the predicate requires
that the length be 20 at most, and it's 40 in this case. Also, the
assignment to :ada:`M_F2` fails because the predicate requires that the first
element must be set to :ada:`2.0`, and :ada:`MD10 (1)` has the value 4.0.
Expand Down
2 changes: 1 addition & 1 deletion content/courses/advanced-ada/parts/data_types/types.rst
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ Let's see an example:
end Show_Object_View;

In this example, both :ada:`Default` and :ada:`Dev` are constant objects.
However, they have different views: while :ada:`Default_S` has a constant view
However, they have different views: while :ada:`Default` has a constant view
because it doesn't have any parts with variable view, :ada:`Dev` has a variable
view because it's a private type. Finally, as expected, :ada:`Settings` has a
variable view because it's a variable object.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Let's see a complete code example:
end Show_Container_Aggregate_Empty;

In this example, we specify the :ada:`Empty` function for the :ada:`Aggregate`
aspect of the container type :ada:`T`. (We also use the :ada:`Add_Unnamed`
aspect of the container type :ada:`T`. (We also use the :ada:`Add_Named`
element. You can ignore it for the moment: we'll discuss it later on.)

The :ada:`A := []` statement in the :ada:`Show_Container_Aggregate_Empty`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ language standard.
Package Interfaces.C.Strings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Package :ada:`Interfaces.C` declares types and subprograms allowing an Ada
Package :ada:`Interfaces.C.Strings` declares types and subprograms allowing an Ada
program to allocate, reference, update, and free C-style strings. In
particular, the private type :ada:`chars_ptr` corresponds to a common use of
:ada:`char *` in C programs, and an object of this type can be passed to
Expand Down
Loading