From c1e4a7d49d13616f489bb3fad674017cb74a7392 Mon Sep 17 00:00:00 2001
From: Kathy Gray
Date: Wed, 10 Jul 2013 14:06:34 +0100
Subject: Fixes to grammar omissions (i.e. naming_scheme_opt and type_def vs
 tdef), more token addition, and start of parsing

---
 language/l2.ott | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'language')

diff --git a/language/l2.ott b/language/l2.ott
index 50c14c9c..18fb213b 100644
--- a/language/l2.ott
+++ b/language/l2.ott
@@ -468,10 +468,10 @@ ctor_def :: 'CT_' ::=
 %%   | enumeration_flag_opt '|' ctor_def1 '|' ... '|' ctor_defn            :: :: variant
 %%     {{ com Variant types }}
 %% 
-%% naming_scheme_opt {{ tex \ottnt{name}^{?} }} :: 'Name_sect_' ::=
-%%   {{ com Optional variable-naming-scheme specification for variables of defined type }} 
-%%   |                                                   :: :: none
-%%   | [ name = regexp ]                                 :: :: some
+ naming_scheme_opt :: 'Name_sect_' ::=
+   {{ com Optional variable-naming-scheme specification for variables of defined type }} 
+   |                                                   :: :: none
+   | [ name = regexp ]                                 :: :: some
 %% 
 %% type_def :: '' ::=
 %%   {{ com Type definitions }}
@@ -485,7 +485,7 @@ ctor_def :: 'CT_' ::=
 
 %%% OR, IN C STYLE
 
-tdef :: 'TD_' ::=
+type_def :: 'TD_' ::=
   {{ com Type definition body }}
   | typedef id naming_scheme_opt = typschm                                        :: :: abbrev
     {{ com type abbreviation }} {{ texlong }}
@@ -923,7 +923,7 @@ def :: 'DEF_' ::=
 
 defs :: '' ::=
   {{ com Definition sequence }}
-  {{ aux _ l }}
+%  {{ aux _ l }}
   | def1  .. defn                 :: :: Defs
 
 
-- 
cgit v1.2.3