Skip to content

Commit abaa063

Browse files
committed
consistently distinguish base types and supertypes
1 parent d2f833d commit abaa063

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/codeql/ql-language-reference/types.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To define a class, you write:
7878
#. The keyword ``class``.
7979
#. The name of the class. This is an `identifier <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#identifiers>`_
8080
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`
8282
#. The :ref:`body of the class <class-bodies>`, enclosed in braces.
8383

8484
For example:
@@ -106,10 +106,10 @@ This defines a class ``OneTwoThree``, which contains the values ``1``, ``2``, an
106106
.. index:: extends
107107

108108
``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.
113113

114114
A class can extend multiple types. For more information, see ":ref:`multiple-inheritance`."
115115
Classes can also specialise other types without extending the class interface via `instanceof`,
@@ -230,7 +230,7 @@ Concrete classes
230230

231231
The classes in the above examples are all **concrete** classes. They are defined by
232232
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
234234
:ref:`characteristic predicate <characteristic-predicates>` of the class.
235235

236236
.. _abstract-classes:

0 commit comments

Comments
 (0)