Down to 7 shift/reduce conflicts (with 0 reduce/reduce). Possibly some syntax needs to change.

ott file now builds a pdf again

1 files changed, 63 insertions, 63 deletions

diff --git a/src/parse_ast.ml b/src/parse_ast.ml
index 9d2b93cc..da716969 100644
--- a/src/parse_ast.ml
+++ b/src/parse_ast.ml
@@ -59,12 +59,6 @@ base_kind_aux =  (* base kind *)
 
 
 type 
-id_aux =  (* Identifier *)
-   Id of x
- | DeIid of terminal * x * terminal (* remove infix status *)
-
-
-type 
 efct_aux =  (* effect *)
    Effect_rreg of terminal (* read register *)
  | Effect_wreg of terminal (* write register *)
@@ -76,13 +70,14 @@ efct_aux =  (* effect *)
 
 
 type 
-base_kind = 
-   BK_aux of base_kind_aux * l
+id_aux =  (* Identifier *)
+   Id of x
+ | DeIid of terminal * x * terminal (* remove infix status *)
 
 
 type 
-id = 
-   Id_aux of id_aux * l
+base_kind = 
+   BK_aux of base_kind_aux * l
 
 
 type 
@@ -91,6 +86,11 @@ efct =
 
 
 type 
+id = 
+   Id_aux of id_aux * l
+
+
+type 
 kind_aux =  (* kinds *)
    K_kind of (base_kind * terminal) list
 
@@ -152,11 +152,6 @@ type
 
 
 type 
-'a typquant = 
-   TypQ_aux of 'a typquant_aux * 'a annot
-
-
-type 
 lit_aux =  (* Literal constant *)
    L_unit of terminal * terminal (* $() : _$ *)
  | L_zero of terminal (* $_ : _$ *)
@@ -170,8 +165,8 @@ lit_aux =  (* Literal constant *)
 
 
 type 
-'a typschm_aux =  (* type scheme *)
-   TypSchm_ts of 'a typquant * atyp
+'a typquant = 
+   TypQ_aux of 'a typquant_aux * 'a annot
 
 
 type 
@@ -180,8 +175,8 @@ lit =
 
 
 type 
-'a typschm = 
-   TypSchm_aux of 'a typschm_aux * 'a annot
+'a typschm_aux =  (* type scheme *)
+   TypSchm_ts of 'a typquant * atyp
 
 
 type 
@@ -210,6 +205,11 @@ and 'a fpat =
 
 
 type 
+'a typschm = 
+   TypSchm_aux of 'a typschm_aux * 'a annot
+
+
+type 
 'a exp_aux =  (* Expression *)
    E_block of terminal * ('a exp * terminal) list * terminal (* block (parsing conflict with structs?) *)
  | E_id of id (* identifier *)
@@ -273,15 +273,8 @@ and 'a letbind =
 
 
 type 
-naming_scheme_opt_aux =  (* Optional variable-naming-scheme specification for variables of defined type *)
-   Name_sect_none
- | Name_sect_some of terminal * terminal * terminal * terminal * string * terminal
-
-
-type 
-'a tannot_opt_aux =  (* Optional type annotation for functions *)
-   Typ_annot_opt_none
- | Typ_annot_opt_some of terminal * terminal
+'a funcl_aux =  (* Function clause *)
+   FCL_Funcl of id * 'a pat * terminal * 'a exp
 
 
 type 
@@ -297,23 +290,30 @@ type
 
 
 type 
-'a funcl_aux =  (* Function clause *)
-   FCL_Funcl of id * 'a pat * terminal * 'a exp
+'a tannot_opt_aux =  (* Optional type annotation for functions *)
+   Typ_annot_opt_none
+ | Typ_annot_opt_some of terminal * terminal
 
 
 type 
-naming_scheme_opt = 
-   Name_sect_aux of naming_scheme_opt_aux * l
+naming_scheme_opt_aux =  (* Optional variable-naming-scheme specification for variables of defined type *)
+   Name_sect_none
+ | Name_sect_some of terminal * terminal * terminal * terminal * string * terminal
 
 
 type 
-index_range_aux =  (* index specification, for bitfields in register types *)
-   BF_single of (terminal * int) (* single index *)
- | BF_range of (terminal * int) * terminal * (terminal * int) (* index range *)
- | BF_concat of index_range * terminal * index_range (* concatenation of index ranges *)
+'a funcl = 
+   FCL_aux of 'a funcl_aux * 'a annot
 
-and index_range = 
-   BF_aux of index_range_aux * l
+
+type 
+rec_opt = 
+   Rec_aux of rec_opt_aux * l
+
+
+type 
+'a effects_opt = 
+   Effects_opt_aux of 'a effects_opt_aux * 'a annot
 
 
 type 
@@ -322,18 +322,23 @@ type
 
 
 type 
-rec_opt = 
-   Rec_aux of rec_opt_aux * l
+index_range_aux =  (* index specification, for bitfields in register types *)
+   BF_single of (terminal * int) (* single index *)
+ | BF_range of (terminal * int) * terminal * (terminal * int) (* index range *)
+ | BF_concat of index_range * terminal * index_range (* concatenation of index ranges *)
+
+and index_range = 
+   BF_aux of index_range_aux * l
 
 
 type 
-'a effects_opt = 
-   Effects_opt_aux of 'a effects_opt_aux * 'a annot
+naming_scheme_opt = 
+   Name_sect_aux of naming_scheme_opt_aux * l
 
 
 type 
-'a funcl = 
-   FCL_aux of 'a funcl_aux * 'a annot
+'a fundef_aux =  (* Function definition *)
+   FD_function of terminal * rec_opt * 'a tannot_opt * 'a effects_opt * ('a funcl * terminal) list
 
 
 type 
@@ -346,8 +351,9 @@ type
 
 
 type 
-'a fundef_aux =  (* Function definition *)
-   FD_function of terminal * rec_opt * 'a tannot_opt * 'a effects_opt * ('a funcl * terminal) list
+'a default_typing_spec_aux =  (* Default kinding or typing assumption *)
+   DT_kind of terminal * base_kind * id
+ | DT_typ of terminal * 'a typschm * id
 
 
 type 
@@ -356,9 +362,8 @@ type
 
 
 type 
-'a default_typing_spec_aux =  (* Default kinding or typing assumption *)
-   DT_kind of terminal * base_kind * id
- | DT_typ of terminal * 'a typschm * id
+'a fundef = 
+   FD_aux of 'a fundef_aux * 'a annot
 
 
 type 
@@ -367,8 +372,8 @@ type
 
 
 type 
-'a fundef = 
-   FD_aux of 'a fundef_aux * 'a annot
+'a default_typing_spec = 
+   DT_aux of 'a default_typing_spec_aux * 'a annot
 
 
 type 
@@ -377,11 +382,6 @@ type
 
 
 type 
-'a default_typing_spec = 
-   DT_aux of 'a default_typing_spec_aux * 'a annot
-
-
-type 
 'a def_aux =  (* Top-level definition *)
    DEF_type of 'a type_def (* type definition *)
  | DEF_fundef of 'a fundef (* function definition *)
@@ -397,6 +397,11 @@ type
 
 
 type 
+'a def = 
+   DEF_aux of 'a def_aux * 'a annot
+
+
+type 
 'a typ_lib_aux =  (* library types and syntactic sugar for them *)
    Typ_lib_unit of terminal (* unit type with value $()$ *)
  | Typ_lib_bool of terminal (* booleans $_$ and $_$ *)
@@ -420,8 +425,8 @@ type
 
 
 type 
-'a def = 
-   DEF_aux of 'a def_aux * 'a annot
+'a defs =  (* Definition sequence *)
+   Defs of ('a def) list
 
 
 type 
@@ -434,9 +439,4 @@ type
    CT_aux of 'a ctor_def_aux * 'a annot
 
 
-type 
-'a defs =  (* Definition sequence *)
-   Defs of ('a def) list
-
-