From c61b1d64a2f8624a2b171919b9cc54e296d9a68e Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Thu, 3 Dec 2020 00:09:43 +0100 Subject: [PATCH] Add built-in types --- chapters/classes.tex | 16 ++++++---------- chapters/connectors.tex | 10 +++++----- chapters/functions.tex | 5 ++--- chapters/synchronous.tex | 5 +++-- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/chapters/classes.tex b/chapters/classes.tex index 70f3b38cb..87e08e0b9 100644 --- a/chapters/classes.tex +++ b/chapters/classes.tex @@ -1566,7 +1566,7 @@ \subsection{Other Predefined Types}\label{other-predefined-types} \subsubsection{StateSelect}\label{stateselect} -The predefined \lstinline!StateSelect! enumeration type is the type of the \lstinline!stateSelect! attribute of the \lstinline!Real! type. It is used to explicitly control state selection. +The predefined \lstinline!StateSelect!\index{StateSelect@\indexinline{StateSelect}} enumeration type is the type of the \lstinline!stateSelect! attribute of the \lstinline!Real! type. It is used to explicitly control state selection. \begin{lstlisting}[language=modelica] type StateSelect = enumeration( @@ -1585,27 +1585,23 @@ \subsubsection{StateSelect}\label{stateselect} \subsubsection{ExternalObject}\label{externalobject} -See \cref{external-objects} for information about the predefined type -\lstinline!ExternalObject!. +See \cref{external-objects} for information about the predefined type \lstinline!ExternalObject!. \subsubsection{AssertionLevel}\label{assertionlevel} -The predefined \lstinline!AssertionLevel! enumeration type is used together with -\lstinline!assert!, \cref{assert}. +The predefined \lstinline!AssertionLevel!\index{AssertionLevel@\indexinline{AssertionLevel}} enumeration type is used together with \lstinline!assert!, \cref{assert}. \begin{lstlisting}[language=modelica] type AssertionLevel=enumeration(warning, error); \end{lstlisting} \subsubsection{Connections}\label{connections} -The package \lstinline!Connections! is used for over-constrained connection graphs, \cref{equation-operators-for-overconstrained-connection-based-equation-systems}. +The package \lstinline!Connections!\index{Connections@\indexinline{Connections}} is used for over-constrained connection graphs, \cref{equation-operators-for-overconstrained-connection-based-equation-systems}. \subsubsection{Graphical Annotation Types}\label{graphical-annotation-types} -A number of ``predefined'' record types and enumeration types for -graphical annotations are described in \cref{annotations}. These types are not -predefined in the usual sense since they cannot be referenced in -ordinary Modelica code, only within annotations. +A number of ``predefined'' record types and enumeration types for graphical annotations are described in \cref{annotations}. +These types are not predefined in the usual sense since they cannot be referenced in ordinary Modelica code, only within annotations. \subsubsection{Clock Types}\label{clock-types} diff --git a/chapters/connectors.tex b/chapters/connectors.tex index dacf90894..664f87807 100644 --- a/chapters/connectors.tex +++ b/chapters/connectors.tex @@ -866,7 +866,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over \end{semantics} \end{operatordefinition*} -\begin{operatordefinition}[Connections.branch] +\begin{operatordefinition}[Connections.branch]\index{Connections.branch@\indexinline{Connections.branch}} \begin{synopsis}\begin{lstlisting} Connections.branch(A.R, B.R) \end{lstlisting}\end{synopsis} @@ -880,7 +880,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over \end{semantics} \end{operatordefinition} -\begin{operatordefinition}[Connections.root] +\begin{operatordefinition}[Connections.root]\index{Connections.root@\indexinline{Connections.root}} \begin{synopsis}\begin{lstlisting} Connections.root(A.R) \end{lstlisting}\end{synopsis} @@ -893,7 +893,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over \end{semantics} \end{operatordefinition} -\begin{operatordefinition}[Connections.potentialRoot] +\begin{operatordefinition}[Connections.potentialRoot]\index{Connections.potentialRoot@\indexinline{Connections.potentialRoot}} \begin{synopsis}\begin{lstlisting} Connections.potentialRoot(A.R) Connections.potentialRoot(A.R, priority=$p$) @@ -909,7 +909,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over \end{semantics} \end{operatordefinition} -\begin{operatordefinition}[Connections.isRoot] +\begin{operatordefinition}[Connections.isRoot]\index{Connections.isRoot@\indexinline{Connections.isRoot}} \begin{synopsis}\begin{lstlisting} Connections.isRoot(A.R) \end{lstlisting}\end{synopsis} @@ -918,7 +918,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\label{over \end{semantics} \end{operatordefinition} -\begin{operatordefinition}[Connections.rooted] +\begin{operatordefinition}[Connections.rooted]\index{Connections.rooted@\indexinline{Connections.rooted}} \begin{synopsis}\begin{lstlisting} Connections.rooted(A.R) rooted(A.R) // deprecated! diff --git a/chapters/functions.tex b/chapters/functions.tex index de0f01b2e..d08b97abb 100644 --- a/chapters/functions.tex +++ b/chapters/functions.tex @@ -2476,11 +2476,10 @@ \subsubsection{Utility Functions for Allocating Strings}\label{utility-functions \subsection{External Objects}\label{external-objects} External functions may need to store their internal memory between function calls. -Within Modelica this memory is defined as instance of the -predefined class \lstinline!ExternalObject! according to the following rules: +Within Modelica this memory is defined as instance of the predefined class \lstinline!ExternalObject! according to the following rules: \begin{itemize} \item - There is a predefined partial class \lstinline!ExternalObject!. + There is a predefined partial class \lstinline!ExternalObject!\index{ExternalObject@\indexinline{ExternalObject}}. \begin{nonnormative} Since the class is partial, it is not possible to define an instance of this class. \end{nonnormative} diff --git a/chapters/synchronous.tex b/chapters/synchronous.tex index 9b2417dfc..e6e550cd5 100644 --- a/chapters/synchronous.tex +++ b/chapters/synchronous.tex @@ -198,8 +198,9 @@ \subsection{Clocks and Clocked Variables}\label{clocks-and-clocked-variables} \end{figure} \begin{definition}[Clock variable]\index{clock variable} -Clock variables $c(t_{i})$ are of base type \lstinline!Clock!. A clock is either defined by a constructor (such as \lstinline!Clock(3)!) that defines when the clock ticks (is active) at -a particular time instant, or it is defined with clock operators relatively to other clocks, see \cref{base-clock-conversion-operators}. See \cref{fig:clock-variable}. +Clock variables $c(t_{i})$ are of base type \lstinline!Clock!\index{Clock@\indexinline{Clock}}. +A clock is either defined by a constructor (such as \lstinline!Clock(3)!) that defines when the clock ticks (is active) at a particular time instant, or it is defined with clock operators relatively to other clocks, see \cref{base-clock-conversion-operators}. +See \cref{fig:clock-variable}. \end{definition} \begin{example}