Skip to content

Commit

Permalink
Fix more formatting of "(:)" for flexible array dimension clarification
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikt-ma committed Feb 16, 2021
1 parent 6c8de2e commit c46ed86
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
9 changes: 2 additions & 7 deletions chapters/functions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,7 @@ \section{Function as a Specialized Class}\label{function-as-a-specialized-class}
\end{nonnormative}
A function \emph{cannot contain} calls to the Modelica \emph{built-in operators} \lstinline!der!, \lstinline!initial!, \lstinline!terminal!, \lstinline!sample!, \lstinline!pre!, \lstinline!edge!, \lstinline!change!, \lstinline!reinit!, \lstinline!delay!, \lstinline!cardinality!, \lstinline!inStream!, \lstinline!actualStream!, to the operators of the built-in package \lstinline!Connections!, to the operators defined in \cref{synchronous-language-elements} and \cref{state-machines}, and is not allowed to contain when-statements.
\item
The dimension \emph{sizes} not declared with (:) of each array result
or array local variable (i.e., a non-input components) of a
function must be either given by the input formal parameters, or given
by constant or parameter expressions, or by expressions containing
combinations of those (\cref{initialization-and-binding-equations-of-components-in-functions}).
The dimension \emph{sizes} not declared with (\lstinline!:!) of each array result or array local variable (i.e., a non-input components) of a function must be either given by the input formal parameters, or given by constant or parameter expressions, or by expressions containing combinations of those (\cref{initialization-and-binding-equations-of-components-in-functions}).
\item
For initialization of local variables of a function see \cref{initialization-and-binding-equations-of-components-in-functions}).
\item
Expand Down Expand Up @@ -206,8 +202,7 @@ \section{Function as a Specialized Class}\label{function-as-a-specialized-class}
\item
A function may have a \lstinline!return! statement in its algorithm section body.
\item
A function allows dimension sizes declared with (:) to be resized for
non-input array variables, see \cref{flexible-array-sizes-and-resizing-of-arrays-in-functions}.
A function allows dimension sizes declared with (\lstinline!:!) to be resized for non-input array variables, see \cref{flexible-array-sizes-and-resizing-of-arrays-in-functions}.
\item
A function may be defined in a short function definition to be a
function partial derivative.
Expand Down
4 changes: 1 addition & 3 deletions chapters/revisions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2316,9 +2316,7 @@ \subsection{Main Changes in Modelica 2.2}\label{main-changes-in-modelica-2-2}
introduces two declarations with the same name, one that follows the
rules for \lstinline!inner! and another that follows the rules for \lstinline!outer!.
\item
A non-input array component declared in a function with a dimension
size specified by colon(:) and no declaration assignment, can change
size in the function in a simple and convenient way.
A non-input array component declared in a function with a dimension size specified by colon (\lstinline!:!) and no declaration assignment, can change size in the function in a simple and convenient way.
\item
A new type of connector, called \lstinline!expandable connector! was
introduced. This connector has less strict requirements about name
Expand Down

0 comments on commit c46ed86

Please sign in to comment.