Post-rebase error correction

Author: eernstg

specification/dartLangSpec.tex

@@ -26,13 +26,7 @@
 % CHANGES
 % =======
 %
-% Significant changes to the specification. Note that the versions specified
-% below indicate the current tool chain version when those changes were made.
-% In practice, new features have always been integrated into the language
-% specification (this document) a while after the change was accepted into
-% the language and implemented. As of September 2022, the upcoming version of
-% the language which is being specified is indicated by a version number in
-% parentheses after the tool chain version.
+% Significant changes to the specification.
 %
 % Note that the version numbers used below (up to 2.15) were associated with
 % the currently released language and tools at the time of the spec change,
@@ -837,7 +831,7 @@ \section{Notation}
   Type inference of $e_j$ and the context type used for inference of $e_j$
   are not relevant.
   It is generally assumed that type inference has occurred already
-  (\ref{overview}).%
+  (\ref{typeInference}).%
 }
 
 \LMHash{}%
@@ -1454,13 +1448,6 @@ \section{Variables}
   That is, any kind of variable which is not a local variable.%
 }
 
-\LMHash{}%
-A \IndexCustom{non-local variable}{variable!non-local}
-is a library variable, a class variable, or an instance variable.
-\commentary{%
-  That is, any kind of variable which is not a local variable.%
-}
-
 \LMHash{}%
 A \IndexCustom{constant variable}{variable!constant}
 is a variable whose declaration includes the modifier \CONST.
@@ -1496,15 +1483,12 @@ \section{Variables}
 \subsection{Implicitly Induced Getters and Setters}
 \LMLabel{implicitlyInducedGettersAndSetters}
 
-%% TODO(eernst): When inference is specified, we should be able to conclude
-%% that the cases with no declared type do not exist after type inference
-%% (for instance `var x;` or `var x = e;`), and then we can replace all rules
-%% about such cases by commentary saying that they may exist in the input,
-%% but they are gone after type inference.
-%%
-%% At this time we rely on the assumption that type inference has already
-%% occurred, which means that we can refer to the declared type of a variable
-%% without mentioning type inference.
+%% TODO(eernst): We treat type inference as a step that has already
+%% taken place. We consider the types chosen by type inference to
+%% be available as a kind of semantic attributes of the syntax.
+%% That is, we can refer to the inferred type and say that the
+%% given declaration has the inferred type. In this way we avoid
+%% talking about an actual syntactic transformation.
 
 \LMHash{}%
 The following rules on implicitly induced getters and setters
@@ -1550,7 +1534,8 @@ \subsection{Implicitly Induced Getters and Setters}
 
 \noindent
 implicitly induces a getter with the header that
-contains \STATIC{} if{}f the declaration contains \STATIC{} and is followed by
+contains \STATIC{} if{}f the declaration contains \STATIC,
+and is followed by
 \code{$T$\,\,\GET\,\,\id},
 where $T$ is obtained from type inference
 in the case where $e$ exists,
@@ -1593,7 +1578,7 @@ \subsection{Implicitly Induced Getters and Setters}
 \code{\VOID\,\,\SET\,\,\id($T$\,\,$x$)},
 whose execution sets the value of \id{} to the incoming argument $x$.
 The type $T$ is obtained from type inference
-(\ref{overview}).
+(\ref{typeInference}).
 \EndCase
 
 \LMHash{}%
@@ -1606,10 +1591,10 @@ \subsection{Implicitly Induced Getters and Setters}
 
 \commentary{%
   Type inference has not yet been specified in this document
-  (\ref{overview}).
-  Note that type inference could change, e.g.,
-  \code{\VAR\,\,x;} to \code{$T$\,\,x;},
-  which would take us to an earlier case.%
+  (\ref{typeInference}).
+  Note that type inference could provide, e.g.,
+  \code{\VAR\,\,x;} with an inferred type $T$,
+  which is then the declared type of the variable.%
 }
 \EndCase
 
@@ -1618,7 +1603,7 @@ \subsection{Implicitly Induced Getters and Setters}
 A variable declaration of the form
 \code{\STATIC?\,\,\LATE\,\,\FINAL\,\,$T$\,\,\id;}
 implicitly induces a setter (\ref{setters}) with the header
-\code{\VOID\,\,\SET\,\,\id(\DYNAMIC\,\,$x$)}.
+\code{\VOID\,\,\SET\,\,\id($T$\,\,$x$)}.
 If this setter is executed
 in a situation where the variable \id{} has not been bound,
 it will bind \id{} to the object that $x$ is bound to.
@@ -2017,9 +2002,6 @@ \subsection{Evaluation of Implicit Variable Getters}
 % Reduce whitespace after itemized list: This is just an end symbol.
 \vspace{-\baselineskip}\EndCase
 
-% Reduce whitespace after itemized list: This is just an end symbol.
-\vspace{-\baselineskip}\EndCase
-
 
 \section{Functions}
 \LMLabel{functions}
@@ -5220,14 +5202,14 @@ \subsubsection{Inheritance and Overriding}
   The controlling language is in the relevant sections of the specification.
 
   \begin{enumerate}
+
   \item There is only one namespace
     for getters, setters, methods and constructors (\ref{scoping}).
-    A non-local variable $f$ introduces a getter $f$,
-    and a non-local variable $f$
-    also introduces a setter
+    A non-local variable $f$ introduces a getter $f$.
+    A non-local variable $f$ also introduces a setter \code{$f$=}
     if it is not final and not constant,
     or it is late and final and has no initializing expression
-    \code{$f$=} (\ref{instanceVariables}, \ref{variables}).
+    (\ref{instanceVariables}, \ref{variables}).
     When we speak of members here, we mean
     accessible instance, static, or library variables,
     getters, setters, and methods
@@ -8822,7 +8804,7 @@ \subsection{Constants}
   that is not qualified by a deferred prefix,
   is a potentially constant and constant expression.
   \commentary{%
-    For example, if class $C$ declares a constant class variable $v$,
+    For example, if class $C$ declares a constant class variable $v$, !!!TODO!!!
     \code{$C$.$v$} is a constant.
     The same is true if $C$ is accessed via a prefix $p$;
     \code{$p$.$C$.$v$} is a constant unless $p$ is a deferred prefix.%
@@ -12543,7 +12525,7 @@ \subsection{This}
 
 \LMHash{}%
 The static type of \THIS{} is the interface of the
-immediately enclosing class, enum, or mixin, if any.
+immediately enclosing class, mixin, or enum, if any.
 The static type of \THIS{} is
 the \ON{} type of the enclosing extension, if any
 (\ref{extensions}).
@@ -16625,7 +16607,7 @@ \subsection{Assignment}
 
 \LMHash{}%
 An assignment changes the value associated with a variable,
-or invokes a setter.
+or it invokes a setter.
 
 \begin{grammar}
 <assignmentOperator> ::= `='
@@ -19117,7 +19099,8 @@ \subsection{Local Variable Declaration}
 
 \LMHash{}%
 The properties of being
-\IndexCustom{initialized}{variable!initialized} or
+\IndexCustom{initialized}{variable!initialized},
+\IndexCustom{final}{variable!final}, or
 \IndexCustom{constant}{variable!constant}
 apply to local variables with the same definitions as for other variables
 (\ref{variables}).
@@ -19209,7 +19192,7 @@ \subsection{Local Variable Declaration}
 
   In every situation which is not covered by the previous paragraph,
   it is a compile-time error to assign to a local variable
-  which is \FINAL{} and not \LATE{}
+  which is final and not late
   (\ref{assignment}).%
 }
 
@@ -22478,10 +22461,13 @@ \subsection{Dynamic Type System}
 }
 
 \LMHash{}%
-An expression is a \emph{type literal} if it is an identifier,
+An expression is a \Index{type literal} if it is an identifier,
 or a qualified identifier,
 which denotes a class, mixin, enum, or type alias declaration, or it is
-an identifier denoting a type parameter of a generic class or function.
+an identifier denoting a type parameter of a generic class or function,
+or it is an identifier or qualified identifier which is a type literal
+and which is followed by a list of actual type arguments
+derived from \synt{typeArguments}.
 It is a \emph{constant type literal} if it does not denote a type parameter,
 and it is not qualified by a deferred prefix.
 \commentary{%