Update pre-null-safety spec with null safety sections near the end of the spec

Author: eernstg

specification/dart.sty

@@ -124,11 +124,9 @@
 \newenvironment{commentary}[1]{{\color{commentaryColor}\sf{#1}}}{}
 
 % Auxiliary functions.
-\newcommand{\flattenName}{\mbox{\it flatten}}
-\newcommand{\flatten}[1]{\ensuremath{\flattenName({#1})}}
-\newcommand{\futureOrBase}[1]{\ensuremath{\mbox{\it futureOrBase}({#1})}}
-\newcommand{\overrides}[1]{\ensuremath{\mbox{\it overrides}({#1})}}
-\newcommand{\inherited}[1]{\ensuremath{\mbox{\it inherited}({#1})}}
+\newcommand{\futureOrBase}[1]{\ensuremath{\metavar{futureOrBase}({#1})}}
+\newcommand{\overrides}[1]{\ensuremath{\metavar{overrides}({#1})}}
+\newcommand{\inherited}[1]{\ensuremath{\metavar{inherited}({#1})}}
 
 % Used as a mini-section marker, indicating visibly that a range of
 % text (usually just a couple of paragraphs) are concerned with one
@@ -386,6 +384,16 @@
 \newcommand{\FunctionTypePositionalStdCr}[1]{%
   \FunctionTypePositional{#1}{\\}{X}{B}{s}{T}{n}{k}}
 
+% Used to specify function type parameter lists with named optionals.
+% Arguments: Parameter type, number of required parameters,
+% name of optional parameters, number of optional parameters,
+% name of `required` symbol.
+\newcommand{\FunctionTypeNamedArguments}[5]{%
+  \List{#1}{1}{#2},\ \{\TripleList{#5}{#1}{#3}{{#2}+1}{{#2}+{#4}}\}}
+  
+\newcommand{\FunctionTypeNamedArgumentsStd}{%
+  \FunctionTypeNamedArguments{T}{n}{x}{k}{r}}
+
 % Used to specify function types with named parameters:
 % Arguments: Return type, spacer, type parameter name, bound name,
 %   number of type parameters, parameter type, number of required parameters,
@@ -402,7 +410,7 @@
 
 % Same as \FunctionTypeNamed except suitable for inline usage, hence omitting
 % the spacer argument.
-\newcommand{\RawFunctionTypeNamed}[8]{%
+\newcommand{\RawFunctionTypeNamed}[9]{%
   \RawFunctionType{#1}{#2}{#3}{#4}{%
     \FunctionTypeNamedParameters{#5}{#6}{#7}{#8}{r}}}
 
@@ -447,6 +455,9 @@
 \newcommand{\FunctionTypeAllRequiredStd}[1]{%
   \FunctionTypeAllRequired{#1}{ }{X}{B}{s}{T}{n}}
 
+\newcommand{\FunctionTypeNamedStdArgCr}[1]{%
+  \FunctionTypeNamedArgCr{#1}{ }{X}{B}{s}{T}{n}{x}{k}{r}}
+
 % Same as \FunctionTypeAllRequiredStd except that it includes a newline, hence
 % suitable for function types that are too long to fit in one line.
 \newcommand{\FunctionTypeAllRequiredStdCr}[1]{%