@@ -78,7 +78,7 @@ To define a class, you write:
78
78
#. The keyword ``class ``.
79
79
#. The name of the class. This is an `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers >`_
80
80
starting with an uppercase letter.
81
- #. The base types that the class is derived from via `extends ` and/or `instanceof `
81
+ #. The supertypes that the class is derived from via `extends ` and/or `instanceof `
82
82
#. The :ref: `body of the class <class-bodies >`, enclosed in braces.
83
83
84
84
For example:
@@ -106,10 +106,10 @@ This defines a class ``OneTwoThree``, which contains the values ``1``, ``2``, an
106
106
.. index :: extends
107
107
108
108
``OneTwoThree `` extends ``int ``, that is, it is a subtype of ``int ``. A class in QL must always
109
- extend at least one existing type. Those types are called the ** base types ** of the class. The
110
- values of a class are contained within the intersection of the base types (that is, they are in
111
- the :ref: `class domain type <domain-types >`). A class inherits all member predicates from its
112
- base types.
109
+ have at least one supertype. Supertypes that are referenced with the ` extends ` keyword are called
110
+ the ** base types ** of the class. The values of a class are contained within the intersection of
111
+ the supertypes (that is, they are in the :ref: `class domain type <domain-types >`).
112
+ A class inherits all member predicates from its base types.
113
113
114
114
A class can extend multiple types. For more information, see ":ref: `multiple-inheritance `."
115
115
Classes can also specialise other types without extending the class interface via `instanceof `,
@@ -230,7 +230,7 @@ Concrete classes
230
230
231
231
The classes in the above examples are all **concrete ** classes. They are defined by
232
232
restricting the values in a larger type. The values in a concrete class are precisely those
233
- values in the intersection of the base types that also satisfy the
233
+ values in the intersection of the supertypes that also satisfy the
234
234
:ref: `characteristic predicate <characteristic-predicates >` of the class.
235
235
236
236
.. _abstract-classes :
0 commit comments