Commits

camlspotter committed d6b306d Merge

recover the old syntax

  • Participants
  • Parent commits a3d9ad8, e3352b8
  • Branches olfend

Comments (0)

Files changed (5)

boot/ocamlc

Binary file modified.

boot/ocamldep

Binary file modified.

boot/ocamllex

Binary file modified.
 type exp = exp_desc with_loc
 
 and exp_desc = 
-  | Exp_ident Longident.t
-  | Exp_constant constant
-  | Exp_function ((pat * exp) list)
-  | Exp_apply (exp, exp list)
-  | Exp_match (exp, (pat * exp) list)
-  | Exp_tuple (exp list)
-  | Exp_construct (Longident.t, exp option)
-  | Exp_record ((Longident.t * exp) list, exp option)
-  | Exp_field (exp, Longident.t)
-  | Exp_setfield (exp, Longident.t, exp)
-  | Exp_ifthenelse (exp, exp, exp option)
-  | Exp_sequence (exp, exp)
+  | Exp_ident      of Longident.t
+  | Exp_constant   of constant
+  | Exp_function   of (pat * exp) list
+  | Exp_apply      of exp * exp list
+  | Exp_match      of exp * (pat * exp) list
+  | Exp_tuple      of exp list
+  | Exp_construct  of Longident.t * exp option
+  | Exp_record     of (Longident.t * exp) list * exp option
+  | Exp_field      of exp * Longident.t
+  | Exp_setfield   of exp * Longident.t * exp
+  | Exp_ifthenelse of exp * exp * exp option
+  | Exp_sequence   of exp * exp
 
 and pat = pat_desc with_loc
 
 and pat_desc =
   | Pat_any
-  | Pat_var string
-  | Pat_alias (pat, string)
-  | Pat_constant constant
-  | Pat_tuple (pat list)
-  | Pat_construct (Longident.t, pat option)
-  | Pat_record (Longident.t * pat) list
-  | Pat_or (pat, pat)
+  | Pat_var       of string
+  | Pat_alias     of pat * string
+  | Pat_constant  of constant
+  | Pat_tuple     of pat list
+  | Pat_construct of Longident.t * pat option
+  | Pat_record    of (Longident.t * pat) list
+  | Pat_or        of pat * pat
 
 type structure = structure_item list
 
 and structure_item = structure_item_desc with_loc
 
 and structure_item_desc =
-  | Str_eval exp
-  | Str_value (rec_flag, (pat * exp) list)
+  | Str_eval  of exp
+  | Str_value of rec_flag * (pat * exp) list

parsing/parser.mly

 constructor_arguments:
     /*empty*/                                   { [] }
   | OF core_type_list                           { List.rev $2 }
-  | LPAREN core_type_comma_list RPAREN          { List.rev $2 }
-  | core_type                                   { [$1] }
 ;
 label_declarations:
     label_declaration                           { [$1] }