doc/syntax.tex: Refactor the <class-definition> syntax.

[sod] / doc / syntax.tex

diff --git a/doc/syntax.tex b/doc/syntax.tex
index 2059caf..3727013 100644 (file)
--- a/doc/syntax.tex
+++ b/doc/syntax.tex
@@ -546,8 +546,10 @@ class Sub : Super {
   "class" <identifier> ":" <list>$[\mbox{@<identifier>}]$
   "{" @<properties-class-item>^* "}"
 
-<class-item> ::= <slot-item> ";"
-\alt <initializer-item> ";"
+<properties-class-item> ::= @[<properties>@] <class-item>
+
+<class-item> ::= <slot-item>
+\alt <initializer-item>
 \alt <message-item>
 \alt <method-item>
 \end{grammar}
@@ -590,7 +592,6 @@ These items are discussed on the following sections.
 
 \begin{grammar}
 <slot-item> ::=
-  @[<properties>@]
   @<declaration-specifier>^+ <list>$[\mbox{@<init-declarator>}]$ ";"
 
 <init-declarator> ::= <simple-declarator> @["=" <initializer>@]
@@ -626,7 +627,7 @@ class Example : Super {
 \subsubsection{Initializer items} \label{sec:syntax.class.init}
 
 \begin{grammar}
-<initializer-item> ::= @["class"@] <list>$[\mbox{@<slot-initializer>}]$
+<initializer-item> ::= @["class"@] <list>$[\mbox{@<slot-initializer>}]$ ";"
 
 <slot-initializer> ::= <dotted-name> "=" <initializer>
 
@@ -655,16 +656,17 @@ The initializer has one of two forms.
 
 \begin{grammar}
 <message-item> ::=
-  @[<properties>@]
-  @<declaration-specifier>^+ <simple-declarator> @[<method-body>@]
+  @<declaration-specifier>^+
+  <keyword-declarator>$[\mbox{@<identifier>}]$
+  @[<method-body>@]
 \end{grammar}
 
 \subsubsection{Method items} \label{sec:syntax.class.method}
 
 \begin{grammar}
 <method-item> ::=
-  @[<properties>@]
-  @<declaration-specifier>^+ <declarator>$[\mbox{@<dotted-name>}]$
+  @<declaration-specifier>^+
+  <keyword-declarator>$[\mbox{@<dotted-name>}]$
   <method-body>
 
 <method-body> ::= "{" <c-fragment> "}" | "extern" ";"