/src/backends/VHDL/vhdl_ast_deriving.ml - Diff - LustreC

« Previous | Next »

Revision 00970bbf

Added by Arnaud Dieumegard over 6 years ago

ID 00970bbf0f52a78df183b5baab27156077da89f5
Parent f779d524
Child cfe98135

Update of default values for some option constructions + added end if and end case closing of if and case blocks

       | NoName
     and vhdl_assoc_element_t =
+      {
       formal_name: vhdl_name_t option [@default Some NoName];
       formal_arg: vhdl_name_t option [@default Some NoName];
       actual_name: vhdl_name_t option [@default Some NoName];
       actual_designator: vhdl_name_t option [@default Some NoName];
       actual_expr: vhdl_expr_t option [@default Some IsNull]}
       formal_name: vhdl_name_t option [@default None];
       formal_arg: vhdl_name_t option [@default None];
       actual_name: vhdl_name_t option [@default None];
       actual_designator: vhdl_name_t option [@default None];
       actual_expr: vhdl_expr_t option [@default None]}
     and vhdl_element_assoc_t = {
       choices: vhdl_expr_t list ;
       expr: vhdl_expr_t }
-...
     and show_vhdl_expr_t : vhdl_expr_t -> Ppx_deriving_runtime.string =
       fun x  -> Format.asprintf "%a" pp_vhdl_expr_t x
     (* Missing adaptation for : Function *)
     (* Adapted *)
     and pp_vhdl_name_t :
       Format.formatter -> vhdl_name_t -> Ppx_deriving_runtime.unit =
       let __9 () = pp_vhdl_assoc_element_t
-...
                     ((__7 ()) fmt) aexpr;
                     Format.fprintf fmt ")")
             | Function { id = aid; assoc_list = aassoc_list } ->
                 (Format.fprintf fmt "@[<2>Function {@,";
                  ((Format.fprintf fmt "@[%s =@ " "id";
                    ((__8 ()) fmt) aid;
                    Format.fprintf fmt "@]");
                   Format.fprintf fmt ";@ ";
                   Format.fprintf fmt "@[%s =@ " "assoc_list";
                   ((fun x  ->
                       Format.fprintf fmt "@[<2>[";
                       ignore
                         (List.fold_left
                            (fun sep  ->
                               fun x  ->
                                 if sep then Format.fprintf fmt ";@ ";
                                 ((__9 ()) fmt) x;
                                 true) false x);
                       Format.fprintf fmt "@,]@]")) aassoc_list;
                   Format.fprintf fmt "@]");
                  Format.fprintf fmt "@]}")
                 (((__8 ()) fmt) aid;
                 Format.fprintf fmt "(";
                 ((fun x  ->
                   Format.fprintf fmt "@[";
                   ignore
                     (List.fold_left
                        (fun sep  ->
                           fun x  ->
                             if sep then Format.fprintf fmt ";@ ";
                             ((__9 ()) fmt) x;
                             true) false x);
                 Format.fprintf fmt "@]")) aassoc_list;
                 Format.fprintf fmt ")";)
             | NoName  -> Format.pp_print_string fmt "")
         [@ocaml.warning "-A"])
     and show_vhdl_name_t : vhdl_name_t -> Ppx_deriving_runtime.string =
       fun x  -> Format.asprintf "%a" pp_vhdl_name_t x
     (* Adapted *)
     and pp_vhdl_assoc_element_t :
       Format.formatter -> vhdl_assoc_element_t -> Ppx_deriving_runtime.unit =
       let __4 () = pp_vhdl_expr_t
-...
       ((let open! Ppx_deriving_runtime in
           fun fmt  ->
             fun x  ->
               Format.fprintf fmt "@[<2>{ ";
               (((((Format.fprintf fmt "@[%s =@ " "formal_name";
                    ((function
                      | None  -> Format.pp_print_string fmt "None"
                      | Some x ->
                          (Format.pp_print_string fmt "(Some ";
                           ((__0 ()) fmt) x;
                           Format.pp_print_string fmt ")"))) x.formal_name;
                    Format.fprintf fmt "@]");
                   Format.fprintf fmt ";@ ";
                   Format.fprintf fmt "@[%s =@ " "formal_arg";
                   ((function
                     | None  -> Format.pp_print_string fmt "None"
                     | Some x ->
                         (Format.pp_print_string fmt "(Some ";
                          ((__1 ()) fmt) x;
                          Format.pp_print_string fmt ")"))) x.formal_arg;
                   Format.fprintf fmt "@]");
                  Format.fprintf fmt ";@ ";
                  Format.fprintf fmt "@[%s =@ " "actual_name";
                  ((function
                    | None  -> Format.pp_print_string fmt "None"
                    | Some x ->
                        (Format.pp_print_string fmt "(Some ";
                         ((__2 ()) fmt) x;
                         Format.pp_print_string fmt ")"))) x.actual_name;
                  Format.fprintf fmt "@]");
                 Format.fprintf fmt ";@ ";
                 Format.fprintf fmt "@[%s =@ " "actual_designator";
                 ((function
                   | None  -> Format.pp_print_string fmt "None"
                   | Some x ->
                       (Format.pp_print_string fmt "(Some ";
                        ((__3 ()) fmt) x;
                        Format.pp_print_string fmt ")"))) x.actual_designator;
                 Format.fprintf fmt "@]");
                Format.fprintf fmt ";@ ";
                Format.fprintf fmt "@[%s =@ " "actual_expr";
                ((function
                  | None  -> Format.pp_print_string fmt "None"
                  | Some x ->
                      (Format.pp_print_string fmt "(Some ";
                       ((__4 ()) fmt) x;
                       Format.pp_print_string fmt ")"))) x.actual_expr;
                Format.fprintf fmt "@]");
               Format.fprintf fmt "@ }@]")
               (match x.formal_name with
               | None -> Format.pp_print_string fmt ""
               | Some NoName -> Format.pp_print_string fmt ""
               | Some a ->
                   (((__0 ()) fmt) a;
                   (match x.formal_arg with
                   | None -> ()
                   | Some b -> Format.fprintf fmt "(";
                               ((__1 ()) fmt) b;
                               Format.fprintf fmt ")");
                   Format.fprintf fmt " => "));
               (match x.actual_name with
               | None -> Format.pp_print_string fmt ""
               | Some a ->
                   (((__2 ()) fmt) a;
                   (match x.actual_designator with
                   | None -> ()
                   | Some NoName -> Format.pp_print_string fmt ""
                   | Some b -> (Format.fprintf fmt "(";
                               ((__3 ()) fmt) b;
                               Format.fprintf fmt ")"));
                   (match x.actual_expr with
                   | None -> ()
                   | Some IsNull -> Format.pp_print_string fmt ""
                   | Some c -> (Format.fprintf fmt "(";
                               ((__4 ()) fmt) c;
                               Format.fprintf fmt ")"))));)
         [@ocaml.warning "-A"])
     and show_vhdl_assoc_element_t :
-...
           fun x  ->
             let fields = []  in
             let fields =
               if x.actual_expr = (Some IsNull)
               if x.actual_expr = None
               then fields
               else
                 ("actual_expr",
-...
                 :: fields
                in
             let fields =
               if x.actual_designator = (Some NoName)
               if x.actual_designator = None
               then fields
               else
                 ("actual_designator",
-...
                 :: fields
                in
             let fields =
               if x.actual_name = (Some NoName)
               if x.actual_name = None
               then fields
               else
                 ("actual_name",
-...
                 :: fields
                in
             let fields =
               if x.formal_arg = (Some NoName)
               if x.formal_arg = None
               then fields
               else
                 ("formal_arg",
-...
                 :: fields
                in
             let fields =
               if x.formal_name = (Some NoName)
               if x.formal_name = None
               then fields
               else
                 ("formal_name",
-...
       names: vhdl_name_t list ;
       mode: string list [@default []];
       typ: vhdl_subtype_indication_t ;
       init_val: vhdl_cst_val_t option [@default Some (CstInt 0)]}
       init_val: vhdl_cst_val_t option [@default None]}
     let rec pp_vhdl_parameter_t :
       Format.formatter -> vhdl_parameter_t -> Ppx_deriving_runtime.unit =
-...
           fun x  ->
             let fields = []  in
             let fields =
               if x.init_val = (Some (CstInt 0))
               if x.init_val = None
               then fields
               else
                 ("init_val",
-...
                             ((__5 ()) fmt) x;
                             Format.fprintf fmt ";";
                             true) false x);
                  Format.fprintf fmt "@]@]")) arhs;
                 Format.fprintf fmt "@]@]")) arhs;
             | If { label = alabel; if_cases = aif_cases; default = adefault } ->
                 (match alabel with
                   | NoName -> Format.fprintf fmt "";
-...
                                     true
                      ) false x);
                  )) aif_cases;
                 Format.fprintf fmt "@]";
                 (match adefault with
                  (match adefault with
                   | [] -> Format.fprintf fmt "";
                   | _  -> (Format.fprintf fmt "@;else";
                           ((fun x  ->
-...
                                     fun x  ->
                                             if sep then Format.fprintf fmt "";
                               ((__8 ()) fmt) x;
                               true) false x);
                  )) adefault;))
                               true) false x))) adefault));
                 Format.fprintf fmt "@;end if;@]"
             | Case { label = alabel; guard = aguard; branches = abranches } ->
                 (match alabel with
                   | NoName -> Format.fprintf fmt "";
-...
                               if sep then Format.fprintf fmt "";
                               ((__11 ()) fmt) x;
                               true) false x);)) abranches;
                 Format.fprintf fmt "@]";
                 Format.fprintf fmt "@;end case;@]";
             | Exit
                 { label = alabel; loop_label = aloop_label;
                   condition = acondition }
-...
+      {
       names: vhdl_name_t list ;
       typ: vhdl_subtype_indication_t ;
       init_val: vhdl_cst_val_t option [@default Some (CstInt 0)]}
       init_val: vhdl_cst_val_t option [@default None]}
       [@name "VARIABLE_DECLARATION"]
       | CstDecl of
+      {
-...
+      {
       names: vhdl_name_t list ;
       typ: vhdl_subtype_indication_t ;
       init_val: vhdl_cst_val_t option [@default Some (CstInt 0)]}
       init_val: vhdl_cst_val_t option [@default None]}
       [@name "SIGNAL_DECLARATION"]
       | Subprogram of
+      {
-...
                 [`String "VARIABLE_DECLARATION";
                 (let fields = []  in
                  let fields =
                    if arg0.init_val = (Some (CstInt 0))
                    if arg0.init_val = None
                    then fields
                    else
                      ("init_val",
-...
                 [`String "SIGNAL_DECLARATION";
                 (let fields = []  in
                  let fields =
                    if arg0.init_val = (Some (CstInt 0))
                    if arg0.init_val = None
                    then fields
                    else
                      ("init_val",
-...
                             fun x  ->
                               if sep then Format.fprintf fmt "@ ";
                               ((__2 ()) fmt) x;
                               Format.fprintf fmt ";";
                               true) false x);
                     Format.fprintf fmt "@]")) x.declarations;
                 Format.fprintf fmt "@]");

Also available in: Unified diff

Project

General

Profile

CristalCaveGem » LustreC

Revision 00970bbf

Added by Arnaud Dieumegard over 6 years ago