diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-05-12 15:43:49 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-05-12 15:43:59 +0200 |
| commit | c863dd63af8e8e93582841fab4926b5899e0e285 (patch) | |
| tree | e634fc6eb0bd34062b8de3e575678e5e211c8f7b /docs | |
| parent | ebdeea989c940e9bf523f6054953dd7ceac123f7 (diff) | |
| download | dotty-c863dd63af8e8e93582841fab4926b5899e0e285.tar.gz dotty-c863dd63af8e8e93582841fab4926b5899e0e285.tar.bz2 dotty-c863dd63af8e8e93582841fab4926b5899e0e285.zip | |
Lots of fixes to parser
… and some to grammar.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/SyntaxSummary.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/SyntaxSummary.txt b/docs/SyntaxSummary.txt index b1ba3216d..a0acde0ca 100644 --- a/docs/SyntaxSummary.txt +++ b/docs/SyntaxSummary.txt @@ -98,12 +98,14 @@ grammar. FunArgTypes ::= InfixType | `(' [ FunArgType {`,' FunArgType } ] `)' InfixType ::= RefinedType {id [nl] RefinedType} InfixOp(t1, op, t2) - RefinedType ::= SimpleType {Annotation | [nl] Refinement} Annotated(t, annot), RefinedTypeTree(t, ds) + RefinedType ::= WithType {Annotation | [nl] Refinement} Annotated(t, annot), RefinedTypeTree(t, ds) + WithType ::= SimpleType {`with' SimpleType} (deprecated) SimpleType ::= SimpleType TypeArgs AppliedTypeTree(t, args) | SimpleType `#' id SelectFromTypeTree(t, name) | StableId | Path `.' `type' SingletonTypeTree(p) | `(' ArgTypes ')' Tuple(ts) + | Refinement RefinedTypeTree(EmptyTree, refinement) ArgType ::= Type | `_' TypeBounds ArgTypes ::= ArgType {`,' ArgType} @@ -113,7 +115,6 @@ grammar. | Type `*' PostfixOp(t, "*") TypeArgs ::= `[' ArgTypes `]' ts Refinement ::= `{' [Dcl] {semi [Dcl]} `}' ds - | TypeBounds ::= [`>:' Type] [`<: Type] TypeBoundsTree(lo, hi) TypeParamBounds ::= TypeBounds {`<%' Type} {`:' Type} ContextBounds(typeBounds, tps) @@ -142,7 +143,7 @@ grammar. | PostfixExpr `match' `{' CaseClauses `}' Match(expr, cases) -- point on match Ascription ::= `:' InfixType Typed(expr, tp) | `:' Annotation {Annotation} Typed(expr, Annotated(EmptyTree, annot)*) - Catches ::= `catch' `{' CaseClauses `}' cases + Catches ::= `catch' Expr PostfixExpr ::= InfixExpr [id] PostfixOp(expr, op) InfixExpr ::= PrefixExpr | InfixExpr id [nl] InfixExpr InfixOp(expr, op, expr) @@ -159,10 +160,11 @@ grammar. | SimpleExpr1 ArgumentExprs Apply(expr, args) | XmlExpr ExprsInParens ::= ExprInParens {`,' ExprInParens} - ArgumentExprs ::= `(' [ExprsInParens] `)' exprs + ParArgumentExprs ::= `(' [ExprsInParens] `)' exprs | `(' [ExprsInParens `,'] PostfixExpr `:' `_' `*' ')' exprs :+ Typed(expr, Ident(wildcardStar)) + ArgumentExprs ::= ParArgumentExprs | [nl] BlockExpr - BlockExpr ::= `{' CaseClauses `}' cases + BlockExpr ::= `{' CaseClauses `}' Match(EmptyTree, cases) | `{' Block `}' block // starts at { Block ::= {BlockStat semi} [BlockResult] Block(stats, expr?) BlockStat ::= Import @@ -188,7 +190,7 @@ grammar. CaseClause ::= `case' Pattern [Guard] `=>' Block CaseDef(pat, guard?, block) // block starts at => Pattern ::= Pattern1 { `|' Pattern1 } Alternative(pats) - Pattern1 ::= PatVar Ascription Bind(name, Typed(Ident(wildcard), tpe)) + Pattern1 ::= PatVar `:' SimpleType Bind(name, Typed(Ident(wildcard), tpe)) | Pattern2 Pattern2 ::= [varid `@'] InfixPattern Bind(name, pat) InfixPattern ::= SimplePattern { id [nl] SimplePattern } InfixOp(pat, op, pat) @@ -295,7 +297,7 @@ ac | XmlPattern TemplateOpt ::= [`extends' Template | [nl] TemplateBody] Template ::= ConstrApps [TemplateBody] | TemplateBody Template(constr, parents, self, stats) ConstrApps ::= ConstrApp {`with' ConstrApp} - ConstrApp ::= RefinedType {ArgumentExprs} Apply(tp, args) + ConstrApp ::= SimpleType {ArgumentExprs} Apply(tp, args) ConstrExpr ::= SelfInvocation | ConstrBlock |