Skip to content

Commit 0a4873b

Browse files
committed
Merge commit '191a09f540ac0516c4088fb8454c693743be8b3f' into analyzer
2 parents af40a7e + 191a09f commit 0a4873b

File tree

100 files changed

+7659
-3023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+7659
-3023
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ vars = {
7979
# minutes later.
8080
#
8181
# For more details, see https://github.com/dart-lang/sdk/issues/30164
82-
"dart_style_tag": "1.2.0", # Please see the note above before updating.
82+
"dart_style_tag": "1.2.1", # Please see the note above before updating.
8383

8484
"dartdoc_tag" : "v0.24.1",
8585
"file_rev": "515ed1dd48740ab14b625de1be464cb2bca4fefd", # 5.0.6

docs/language/dart.sty

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686

8787
% Colors used for for different kinds of text.
8888
\definecolor{normativeColor}{rgb}{0,0,0}
89-
\definecolor{commentaryColor}{rgb}{0.6,0.6,0.6}
90-
\definecolor{rationaleColor}{rgb}{0.6,0.6,0.6}
89+
\definecolor{commentaryColor}{rgb}{0.5,0.5,0.5}
90+
\definecolor{rationaleColor}{rgb}{0.5,0.5,0.5}
9191

9292
% Environments for different kinds of text.
9393
\newenvironment{Q}[1]{{\bf #1}}{}
@@ -165,6 +165,13 @@
165165
{#1}_1\,\EXTENDS\,{#2}_1,\,\ldots,\ %
166166
{#1}_{#3}\,\EXTENDS\,{#2}_{#3}}}
167167

168+
% Used to specify comma separated lists of symbols followed by
169+
% \EXTENDS{}, as needed for type parameter declarations where we do
170+
% not intend to refer explicitly to the bounds.
171+
% Parameters: Type parameter name, number of type parameters.
172+
\newcommand{\TypeParametersNoBounds}[2]{\ensuremath{%
173+
{#1}_1\,\EXTENDS\,\ldots,\ \ldots,\ {#1}_{#2}\,\EXTENDS\,\ldots}}
174+
168175
% For consistency, we may as well use this whenever possible.
169176
\newcommand{\TypeParametersStd}{\TypeParameters{X}{B}{s}}
170177

@@ -185,6 +192,11 @@
185192
\newcommand{\FunctionType}[6]{\leavevmode\par\noindent\code{%
186193
\ensuremath{#1}{#2}\FUNCTION<\FTTypeParameters{#3}{#4}{#5}>({#6})}}
187194

195+
% Same as \FunctionType except suitable for inline usage, hence omitting
196+
% the spacer argument.
197+
\newcommand{\RawFunctionType}[5]{\code{%
198+
\ensuremath{#1}\ \FUNCTION<\FTTypeParameters{#2}{#3}{#4}>({#5})}}
199+
188200
% Used to specify function types with positional optionals:
189201
% Arguments: Return type, spacer, type parameter name, bound name,
190202
% number of type parameters, parameter type, number of required parameters,
@@ -193,6 +205,12 @@
193205
\FunctionType{#1}{#2}{#3}{#4}{#5}{\List{#6}{1}{#7},\ %
194206
[\List{#6}{{#7}+1}{{#7}+{#8}}]}}
195207

208+
% Same as \FunctionTypePositional except suitable for inline usage,
209+
% hence omitting the spacer argument.
210+
\newcommand{\RawFunctionTypePositional}[7]{%
211+
\RawFunctionType{#1}{#2}{#3}{#4}{\List{#5}{1}{#6},\ %
212+
[\List{#5}{{#6}+1}{{#6}+{#7}}]}}
213+
196214
% Used to specify function types with named parameters:
197215
% Arguments: Return type, spacer, type parameter name, bound name,
198216
% number of type parameters, parameter type, number of required parameters,
@@ -201,6 +219,12 @@
201219
\FunctionType{#1}{#2}{#3}{#4}{#5}{\List{#6}{1}{#7},\ %
202220
\{\PairList{#6}{#8}{{#7}+1}{{#7}+{#9}}\}}}
203221

222+
% Same as \FunctionType except suitable for inline usage, hence omitting
223+
% the spacer argument.
224+
\newcommand{\RawFunctionTypeNamed}[8]{%
225+
\RawFunctionType{#1}{#2}{#3}{#4}{\List{#5}{1}{#6},\ %
226+
\{\PairList{#5}{#7}{{#6}+1}{{#6}+{#8}}\}}}
227+
204228
% Used to specify function types with no optional parameters:
205229
% Arguments: Return type, spacer, type parameter name, bound name,
206230
% number of type parameters, parameter type,
@@ -235,6 +259,26 @@
235259
\newcommand{\NotMoreSignatureSpecific}[2]{%
236260
\ensuremath{{#1}\NotMoreSignatureSpecificSymbol{#2}}}
237261

262+
% Judgment expressing that a subtype relation exists.
263+
\newcommand{\Subtype}[3]{\ensuremath{{#1}\vdash{#2}\,<:\,{#3}}}
264+
\newcommand{\SubtypeStd}[2]{\Subtype{\Gamma}{#1}{#2}}
265+
% Subtype judgment where the environment is omitted (NE: "no environment").
266+
\newcommand{\SubtypeNE}[2]{\ensuremath{{#1}\,<:\,{#2}}}
267+
268+
% Judgment expressing that a supertype relation exists.
269+
\newcommand{\Supertype}[3]{\ensuremath{{#1}\vdash{#2}\,:>\,{#3}}}
270+
\newcommand{\SupertypeStd}[2]{\Supertype{\Gamma}{#1}{#2}}
271+
272+
% Judgment expressing that an assignability relation exists.
273+
\newcommand{\AssignableRelationSymbol}{\ensuremath{\Longleftrightarrow}}
274+
\newcommand{\Assignable}[3]{%
275+
\ensuremath{{#1}\vdash{#2}\,\AssignableRelationSymbol\,{#3}}}
276+
\newcommand{\AssignableStd}[2]{\Assignable{\Gamma}{#1}{#2}}
277+
278+
% Semantic function delivering the superinterfaces of a class.
279+
\newcommand{\Superinterfaces}[1]{\ensuremath{\metavar{Superinterfaces}({#1})}}
280+
\newcommand{\Superinterface}[2]{{#1}\in\Superinterfaces{#2}}
281+
238282
% ----------------------------------------------------------------------
239283
% Support for hash valued Location Markers
240284

0 commit comments

Comments
 (0)