diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 17:31:12 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-10 19:20:05 -0700 |
| commit | 90314673008a3bf765cf72d8cbbd3c691f27af03 (patch) | |
| tree | 650cc5babe9101eb4d6e814875c43555783787e6 /15-scala-syntax-summary.md | |
| parent | 21ca2cf9d8e39274934f2dca79c8ee8eda024ae3 (diff) | |
| download | scala-90314673008a3bf765cf72d8cbbd3c691f27af03.tar.gz scala-90314673008a3bf765cf72d8cbbd3c691f27af03.tar.bz2 scala-90314673008a3bf765cf72d8cbbd3c691f27af03.zip | |
Catch up with latex spec.
Diffstat (limited to '15-scala-syntax-summary.md')
| -rw-r--r-- | 15-scala-syntax-summary.md | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/15-scala-syntax-summary.md b/15-scala-syntax-summary.md index 8e17360622..0a5a8f73a0 100644 --- a/15-scala-syntax-summary.md +++ b/15-scala-syntax-summary.md @@ -19,19 +19,17 @@ plainid ::= upper idrest | varid | op id ::= plainid - | ‘\`’ stringLit ‘\`’ + | ‘\`’ stringLiteral ‘\`’ idrest ::= {letter | digit} [‘_’ op] -integerLiteral ::= (decimalNumeral | hexNumeral | octalNumeral) [‘L’ | ‘l’] +integerLiteral ::= (decimalNumeral | hexNumeral) [‘L’ | ‘l’] decimalNumeral ::= ‘0’ | nonZeroDigit {digit} hexNumeral ::= ‘0’ ‘x’ hexDigit {hexDigit} -octalNumeral ::= ‘0’ octalDigit {octalDigit} digit ::= ‘0’ | nonZeroDigit nonZeroDigit ::= ‘1’ | … | ‘9’ -octalDigit ::= ‘0’ | … | ‘7’ floatingPointLiteral - ::= digit {digit} ‘.’ {digit} [exponentPart] [floatType] + ::= digit {digit} ‘.’ digit {digit} [exponentPart] [floatType] | ‘.’ digit {digit} [exponentPart] [floatType] | digit {digit} exponentPart [floatType] | digit {digit} [exponentPart] floatType @@ -157,7 +155,7 @@ grammar. Enumerators ::= Generator {semi Enumerator} Enumerator ::= Generator | Guard - | ‘val’ Pattern1 ‘=’ Expr + | Pattern1 ‘=’ Expr Generator ::= Pattern1 ‘<-’ Expr [Guard] CaseClauses ::= CaseClause { CaseClause } @@ -198,7 +196,7 @@ grammar. ClassParamClauses ::= {ClassParamClause} [[nl] ‘(’ ‘implicit’ ClassParams ‘)’] ClassParamClause ::= [nl] ‘(’ [ClassParams] ‘)’ - ClassParams ::= ClassParam {‘’ ClassParam} + ClassParams ::= ClassParam {‘,’ ClassParam} ClassParam ::= {Annotation} [{Modifier} (‘val’ | ‘var’)] id ‘:’ ParamType [‘=’ Expr] Bindings ::= ‘(’ Binding {‘,’ Binding ‘)’ |