Merge branch 'slides/131-replace-field_with_component' into 'master'

Resolve "Replace 'field' used in the slides with "component""

See merge request feng/training/material!294

Author: frank-at-adacore

courses/fundamentals_of_ada/030_basic_types/01-introduction.rst

@@ -114,7 +114,7 @@ Categories of Types
 Scalar Types
 --------------
 
-* Indivisible: No components
+* Indivisible: No :dfn:`components` (also known as *fields* or *elements*)
 * **Relational** operators defined (``<``,  ``=``, ...)
 
     - **Ordered**

courses/fundamentals_of_ada/060_record_types/01-introduction.rst

@@ -22,8 +22,8 @@ Syntax and Examples
    .. code:: Ada
 
       type Record1_T is record
-         Field1 : Integer;
-         Field2 : Boolean;
+         Component1 : Integer;
+         Component2 : Boolean;
       end record;
 
 * Records can be **discriminated** as well

courses/fundamentals_of_ada/060_record_types/04-aggregates.rst

@@ -249,7 +249,7 @@ Quiz
 .. code:: Ada
 
    type Nested_T is record
-      Field : Integer;
+      Component : Integer;
    end record;
    type Record_T is record
       One   : Integer;

courses/fundamentals_of_ada/060_record_types/06-variant_records.rst

@@ -32,7 +32,7 @@ Immutable Variant Record
   type Person_Group is (Student, Faculty);
   type Person (Group : Person_Group) is
   record
-     --  Fields common across all discriminants
+     --  Components common across all discriminants
      --  (must appear before variant part)
      Age : Positive;
      case Group is --  Variant part of record
@@ -46,11 +46,11 @@ Immutable Variant Record
 * In a variant record, a discriminant can be used to specify the :dfn:`variant part` (line 8)
 
    + Similar to case statements (all values must be covered)
-   + Fields listed will only be visible if choice matches discriminant
-   + Field names need to be unique (even across discriminants)
+   + Components listed will only be visible if choice matches discriminant
+   + Component names need to be unique (even across discriminants)
    + Variant part must be end of record (hence only one variant part allowed)
 
-* Discriminant is treated as any other field
+* Discriminant is treated as any other component
 
   * But is a constant in an immutable variant record
 
@@ -60,7 +60,7 @@ Immutable Variant Record
 Immutable Variant Record Example
 ----------------------------------
 
-* Each object of :ada:`Person` has three fields, but it depends on :ada:`Group`
+* Each object of :ada:`Person` has three components, but it depends on :ada:`Group`
 
     .. code:: Ada
 
@@ -69,7 +69,7 @@ Immutable Variant Record Example
 
   * :ada:`Pat` has :ada:`Group`, :ada:`Age`, and :ada:`Gpa`
   * :ada:`Sam` has :ada:`Group`, :ada:`Age`, and :ada:`Pubs`
-  * Aggregate specifies all fields, including the discriminant
+  * Aggregate specifies all components, including the discriminant
 
 * Compiler can detect some problems, but more often clashes are run-time errors
 
@@ -121,7 +121,7 @@ Mutable Variant Record
 Mutable Variant Record Example
 --------------------------------
 
-* Each object of :ada:`Person` has three fields, but it depends on :ada:`Group`
+* Each object of :ada:`Person` has three components, but it depends on :ada:`Group`
 
   .. code:: Ada
 

courses/fundamentals_of_ada/065_discriminated_records/01-introduction.rst

@@ -31,7 +31,7 @@ Defining a Discriminated Record
 
    * **Discriminant** controls behavior of the record
    * Part of record definition
-   * Can be read as any other field
+   * Can be read as any other component
 
       * But can only be modified by object assignment (sometimes)
 

courses/fundamentals_of_ada/065_discriminated_records/02-variant_records.rst

@@ -6,7 +6,7 @@ Variant Records
 What is a Variant Record?
 ---------------------------
 
-* A :dfn:`variant record` uses the discriminant to determine which fields are currently accessible
+* A :dfn:`variant record` uses the discriminant to determine which components are currently accessible
 
    .. code:: Ada
 
@@ -133,7 +133,7 @@ Mutable Variant Record Example
     end if;
     Update (Pat);
 
-* But you cannot change the discriminant like a regular field
+* But you cannot change the discriminant like a regular component
 
   .. code:: Ada
 
@@ -220,7 +220,7 @@ Quiz
 
   .. container:: latex_environment footnotesize
 
-   * If you fix the compilation error (by changing the name of one of the :ada:`End_Point` fields), then
+   * If you fix the compilation error (by changing the name of one of the :ada:`End_Point` components), then
 
       * You would get a warning on line 20 (because :ada:`A_Line` is constrained to be a :ada:`Line`
 

courses/fundamentals_of_ada/065_discriminated_records/03-discriminant_record_array_size_idiom.rst

@@ -44,7 +44,7 @@ Simple Vector of Varying Length
    Obj2 : Simple_Vstring := (0, (others => '+'));
    Obj3 : Simple_Vstring;
 
-* Issue - Operations need to consider :ada:`Last` field
+* Issue - Operations need to consider :ada:`Last` component
 
    * :ada:`Obj1 = Obj2` will be false
    * Can redefine :ada:`=` to be something like

courses/fundamentals_of_ada/065_discriminated_records/04-interfacing_with_c.rst

@@ -11,9 +11,9 @@ Passing Records Between Ada and C
    .. code:: C
 
       struct Struct_T {
-         int   Field1;
-         char  Field2;
-         float Field3;
+         int   Component1;
+         char  Component2;
+         float Component3;
       };
 
       int DoSomething (struct Struct_T);
@@ -32,9 +32,9 @@ Building a C-Compatible Record
    .. code:: Ada
 
       type Struct_T is record
-         Field1 : Interfaces.C.int;
-         Field2 : Interfaces.C.char;
-         Field3 : Interfaces.C.C_Float;
+         Component1 : Interfaces.C.int;
+         Component2 : Interfaces.C.char;
+         Component3 : Interfaces.C.C_Float;
       end record;
 
    * We use types from :ada:`Interfaces.C` to map directly to the C types
@@ -46,9 +46,9 @@ Building a C-Compatible Record
    .. code:: Ada
 
       type Struct_T is record
-         Field1 : Interfaces.C.int;
-         Field2 : Interfaces.C.char;
-         Field3 : Interfaces.C.C_Float;
+         Component1 : Interfaces.C.int;
+         Component2 : Interfaces.C.char;
+         Component3 : Interfaces.C.C_Float;
       end record with Convention => C_Pass_By_Copy;
 
 -------------------------
@@ -64,9 +64,9 @@ Mapping Ada to C Unions
    .. code:: C
 
       union Union_T {
-         int Field1;
-         char Field2;
-         float Field3;
+         int Component1;
+         char Component2;
+         float Component3;
       };
 
 * By using a discriminant record and adding aspect :ada:`Unchecked_Union`
@@ -75,9 +75,9 @@ Mapping Ada to C Unions
 
       type C_Union_T (View : natural := 0) is record
          case View is
-         when 0 => Field1 : Interfaces.C.int;
-         when 1 => Field2 : Interfaces.C.char;
-         when 2 => Field3 : Interfaces.C.C_Float;
+         when 0 => Component1 : Interfaces.C.int;
+         when 1 => Component2 : Interfaces.C.char;
+         when 2 => Component3 : Interfaces.C.C_Float;
          when others => null;
          end case;
       end record with Convention => C_Pass_By_Copy,
@@ -92,9 +92,9 @@ Quiz
 .. code:: C
 
    union Union_T {
-      struct Record_T field1;
-      char            field2[11];
-      float           field3;
+      struct Record_T component1;
+      char            component2[11];
+      float           component3;
    };
 
 .. code:: Ada

courses/fundamentals_of_ada/065_discriminated_records/99-summary.rst

@@ -9,7 +9,7 @@ Properties of Discriminated Record Types
 * Rules
 
    - Case choices for variants must partition possible values for discriminant
-   - Field names must be unique across all variants
+   - Component names must be unique across all variants
 
 * Style
 

courses/fundamentals_of_ada/100_packages/03-referencing_other_packages.rst

@@ -92,13 +92,13 @@ What To Import
    with A;
    package B is
      type Something is record
-       Field : A.Something;
+       Component : A.Something;
      end record;
    end B;
 
    with B; -- no "with" of A
    procedure Foo is
      X : B.Something;
    begin
-     X.Field := ...
+     X.Component := ...