aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2016-02-19 17:24:23 +0100
committerodersky <odersky@gmail.com>2016-02-19 17:24:23 +0100
commit2217a4ec9ea563f01b07c852a3834d738cd6439d (patch)
tree4ac8601a9fc598d2faeaf940fb35fa12eb6b4c1f /docs
parentea407f143591aa9ffd0fd0f9a25a9ec9e812e76c (diff)
parent12301586418ebad71c7d7d5ce9a53ea4909f675a (diff)
downloaddotty-2217a4ec9ea563f01b07c852a3834d738cd6439d.tar.gz
dotty-2217a4ec9ea563f01b07c852a3834d738cd6439d.tar.bz2
dotty-2217a4ec9ea563f01b07c852a3834d738cd6439d.zip
Merge pull request #1072 from dotty-staging/change-isVolatile-2
Change is volatile 2
Diffstat (limited to 'docs')
-rw-r--r--docs/SyntaxSummary.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/SyntaxSummary.txt b/docs/SyntaxSummary.txt
index 11f23da94..d4f7ceade 100644
--- a/docs/SyntaxSummary.txt
+++ b/docs/SyntaxSummary.txt
@@ -103,7 +103,7 @@ grammar.
RefinedType ::= WithType {[nl] Refinement} RefinedTypeTree(t, ds)
WithType ::= AnnotType {`with' AnnotType} (deprecated)
AnnotType ::= SimpleType {Annotation} Annotated(t, annot)
- SimpleType ::= SimpleType TypeArgs AppliedTypeTree(t, args)
+ SimpleType ::= SimpleType (TypeArgs | NamedTypeArgs) AppliedTypeTree(t, args)
| SimpleType `#' id SelectFromTypeTree(t, name)
| StableId
| Path `.' `type' SingletonTypeTree(p)
@@ -118,6 +118,8 @@ grammar.
ParamType ::= [`=>'] ParamValueType
ParamValueType ::= Type [`*'] PostfixOp(t, "*")
TypeArgs ::= `[' ArgTypes `]' ts
+ NamedTypeArg ::= id `=' ArgType NamedArg(id, t)
+ NamedTypeArgs ::= `[' NamedTypeArg {`,' NamedTypeArg} `]' nts
Refinement ::= `{' [Dcl] {semi [Dcl]} `}' ds
TypeBounds ::= [`>:' Type] [`<: Type] | INT TypeBoundsTree(lo, hi)
TypeParamBounds ::= TypeBounds {`<%' Type} {`:' Type} ContextBounds(typeBounds, tps)
@@ -160,7 +162,7 @@ grammar.
| `_'
| `(' ExprsInParens `)' Parens(exprs)
| SimpleExpr `.' id Select(expr, id)
- | SimpleExpr TypeArgs TypeApply(expr, args)
+ | SimpleExpr (TypeArgs | NamedTypeArgs) TypeApply(expr, args)
| SimpleExpr1 ArgumentExprs Apply(expr, args)
| XmlExpr
ExprsInParens ::= ExprInParens {`,' ExprInParens}