Skip to content

Commit

Permalink
Use correct variants of "prefix"
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikt-ma committed Apr 11, 2021
1 parent c9ba57b commit 23e452a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions chapters/classes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ \subsection{Short Class Definitions}\label{short-class-definitions}

If a short class definition does not specify any specialized class the new class definition will inherit the specialized class (this rule applies iteratively and also for redeclare).

A base-prefix applied in the short class definition does not influence its type, but is applied to components declared of this type or types derived from it; see also \cref{restriction-on-combining-base-classes-and-other-elements}.
A \lstinline[language=grammar]!base-prefix! applied in the short class definition does not influence its type, but is applied to components declared of this type or types derived from it; see also \cref{restriction-on-combining-base-classes-and-other-elements}.

\begin{example}
\begin{lstlisting}[language=modelica]
Expand All @@ -712,7 +712,7 @@ \subsection{Short Class Definitions}\label{short-class-definitions}

\subsection{Restriction on combining base classes and other elements}\label{restriction-on-combining-base-classes-and-other-elements}

It is not legal to combine other components or base classes with an extends from an array class, a class with non-empty base-prefix, a \firstuse{simple type}\index{simple type} (\lstinline!Real!, \lstinline!Boolean!, \lstinline!Integer!, \lstinline!String! and enumeration types), or any class transitively extending from an array class, a class with non-empty base-prefix, or a simple type.
It is not legal to combine other components or base classes with an extends from an array class, a class with non-empty \lstinline[language=grammar]!base-prefix!, a \firstuse{simple type}\index{simple type} (\lstinline!Real!, \lstinline!Boolean!, \lstinline!Integer!, \lstinline!String! and enumeration types), or any class transitively extending from an array class, a class with non-empty \lstinline[language=grammar]!base-prefix!, or a simple type.

\begin{example}
\begin{lstlisting}[language=modelica]
Expand Down
8 changes: 4 additions & 4 deletions chapters/revisions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -819,8 +819,8 @@ \subsection{Main changes in Modelica 3.4}\label{main-changes-in-modelica-3-4}
\href{https://github.com/modelica/ModelicaSpecification/issues/2042}{\#2042}, and
\href{https://github.com/modelica/ModelicaSpecification/issues/2125}{\#2125}.
\item
Added missing nano-prefix, \cref{the-syntax-of-unit-expressions}. Ticket
\href{https://github.com/modelica/ModelicaSpecification/issues/1261}{\#1261}.
Added missing nano prefix, \cref{the-syntax-of-unit-expressions}.
Ticket \href{https://github.com/modelica/ModelicaSpecification/issues/1261}{\#1261}.
\item
Replaced the outdated contents of \cref{the-modelica-standard-library} by a hyperlink. Ticket
\href{https://github.com/modelica/ModelicaSpecification/issues/2130}{\#2130}.
Expand All @@ -831,8 +831,8 @@ \subsection{Main changes in Modelica 3.4}\label{main-changes-in-modelica-3-4}
Restrict grammar to avoid modifiers with leading dot, \cref{grammar}.
Ticket \href{https://github.com/modelica/ModelicaSpecification/issues/1027}{\#1027}.
\item
Restrict grammar for base-prefix, \cref{class-definition}. Ticket
\href{https://github.com/modelica/ModelicaSpecification/issues/917}{\#917}.
Restrict grammar for \lstinline[language=grammar]!base-prefix!, \cref{class-definition}.
Ticket \href{https://github.com/modelica/ModelicaSpecification/issues/917}{\#917}.
\item
Restrict grammar for arrays, \cref{expressions}. Ticket
\href{https://github.com/modelica/ModelicaSpecification/issues/809}{\#809}.
Expand Down

0 comments on commit 23e452a

Please sign in to comment.