Skip to content

Commit 2717edf

Browse files
Merge branch 'slides/156-make-spelling-of-classwide-consistent-in-all-modules' into 'master'
Use "class-wide" instead of "classwide" or "class wide" Closes #156 See merge request feng/training/material!211
2 parents 3026a91 + c260987 commit 2717edf

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

courses/fundamentals_of_ada/180_polymorphism.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Classes
7979
Indefinite Type
8080
-----------------
8181

82-
* A class wide type is an indefinite type
82+
* A class-wide type is an indefinite type
8383

8484
- Just like an unconstrained array or a record with a discriminant
8585

@@ -202,7 +202,7 @@ Warning: Subprograms with parameter of type `Root'Class` are not primitives of `
202202
'Class and Prefix Notation
203203
----------------------------
204204

205-
Prefix notation rules apply when the first parameter is of a class wide type
205+
Prefix notation rules apply when the first parameter is of a class-wide type
206206

207207
.. code:: Ada
208208
@@ -317,11 +317,11 @@ Calls on Class-Wide Types (3/3)
317317
((Animal) *My_Dog).Feed ();
318318
319319
-------------------------------
320-
Definite and Class Wide Views
320+
Definite and Class-Wide Views
321321
-------------------------------
322322

323323
* In C++, dispatching occurs only on pointers
324-
* In Ada, dispatching occurs only on class wide views
324+
* In Ada, dispatching occurs only on class-wide views
325325

326326
.. code:: Ada
327327

courses/fundamentals_of_ada/adv_250_containers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Data Structures (2/2)
104104

105105
* Holder
106106

107-
- Wraps around an indefinite (unconstrained, classwide ...)
107+
- Wraps around an indefinite (unconstrained, class-wide ...)
108108
- Resulting type is definite
109109
- Single element, no iteration or cursor
110110

courses/static_analysis_via_compiler/010_static_analysis_via_compiler.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -971,14 +971,14 @@ OOP Restrictions
971971
+ Allows
972972

973973
+ Record extensions
974-
+ Classwide membership tests
975-
+ Other classwide features
974+
+ Class-wide membership tests
975+
+ Other class-wide features
976976

977977
+ Does not allow involving implicit dispatching
978978

979979
+ Comparable to :ada:`No_Dispatch`
980980

981-
+ Except allows all classwide constructs that do not imply dispatching
981+
+ Except allows all class-wide constructs that do not imply dispatching
982982

983983
------
984984
Quiz

marketing/ada_4_hours/180_polymorphism.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Abstract Types
7474
'Class and Prefix Notation
7575
----------------------------
7676

77-
Prefix notation rules apply when the first parameter is of a class wide type
77+
Prefix notation rules apply when the first parameter is of a class-wide type
7878

7979
.. code:: Ada
8080

marketing/ada_8_hours/180_polymorphism.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Classes
6363
Indefinite type
6464
-----------------
6565

66-
* A class wide type is an indefinite type
66+
* A class-wide type is an indefinite type
6767

6868
- Just like an unconstrained array or a record with a discriminant
6969

@@ -172,7 +172,7 @@ Abstract Types Ada vs C++
172172
'Class and Prefix Notation
173173
----------------------------
174174

175-
Prefix notation rules apply when the first parameter is of a class wide type
175+
Prefix notation rules apply when the first parameter is of a class-wide type
176176

177177
.. code:: Ada
178178
@@ -282,11 +282,11 @@ Calls on class-wide types (3/3)
282282
((Root) *V2).P ();
283283
284284
-------------------------------
285-
Definite and class wide views
285+
Definite and Class-Wide views
286286
-------------------------------
287287

288288
* In C++, dispatching occurs only on pointers
289-
* In Ada, dispatching occurs only on class wide views
289+
* In Ada, dispatching occurs only on class-wide views
290290

291291
.. code:: Ada
292292

0 commit comments

Comments
 (0)