/ - Diff - LustreC

« Previous | Next »

Revision 7f5d0cde

Added by Arnaud Dieumegard over 6 years ago

ID 7f5d0cdedd44d27af066396899e136dc92c7bf02
Parent a3f47fb5
Child fc44085e

Qualified expressions, default values for expressions, pp for association_elements

       | Op of { id: string [@default ""]; args: vhdl_expr_t list [@default []]} [@name "EXPRESSION"]
       | IsNull [@name "IsNull"]
       | Time of { value: int; phy_unit: string [@default ""]}
       | Sig of { name: vhdl_name_t; att: vhdl_signal_attributes_t option }
       | Sig of { name: vhdl_name_t; att: vhdl_signal_attributes_t option [@default None]}
       | SuffixMod of { expr : vhdl_expr_t; selection : vhdl_suffix_selection_t }
       | Aggregate of { elems : vhdl_element_assoc_t list } [@name "AGGREGATE"]
       | Aggregate of { elems : vhdl_element_assoc_t list [@default []]} [@name "AGGREGATE"]
       | QualifiedExpression of { type_mark : vhdl_name_t; aggregate : vhdl_element_assoc_t list [@default []]; expression : vhdl_expr_t option [@default None]} [@name "QUALIFIED_EXPRESSION"]
       | Others [@name "OTHERS"]
     and vhdl_name_t = (* Add something like TOKEN_NAME for specific keywords (open, all, ...) ? *)
       | Simple of string [@name "SIMPLE_NAME"]

       selection: vhdl_suffix_selection_t }
       | Aggregate of {
       elems: vhdl_element_assoc_t list } [@name "AGGREGATE"]
       | QualifiedExpression of
+      {
       type_mark: vhdl_name_t ;
       aggregate: vhdl_element_assoc_t list ;
       expression: vhdl_expr_t option } [@name "QUALIFIED_EXPRESSION"]
       | Others [@name "OTHERS"]
     and vhdl_name_t =
       | Simple of string [@name "SIMPLE_NAME"]
-...
     (* TODO adapt for Op, Time, Sig, suffixMod *)
     and pp_vhdl_expr_t :
       Format.formatter -> vhdl_expr_t -> Ppx_deriving_runtime.unit =
       let __8 () = pp_vhdl_element_assoc_t
       let __11 () = pp_vhdl_expr_t
       and __10 () = pp_vhdl_element_assoc_t
       and __9 () = pp_vhdl_name_t
       and __8 () = pp_vhdl_element_assoc_t
       and __7 () = pp_vhdl_suffix_selection_t
-...
                                 ((__8 ()) fmt) x;
                                 true) false x))) aelems;
                   Format.fprintf fmt ")@]");)
             | QualifiedExpression
                 { type_mark = atype_mark; aggregate = aaggregate;
                   expression = aexpression }
                 ->
                   ((__9 ()) fmt) atype_mark;
                   Format.fprintf fmt "'";
                   (match aaggregate with
                   | [] -> Format.fprintf fmt "";
                   | _ ->
                     Format.fprintf fmt "(@[<v>";
                     ((fun x  ->
                        ignore
                          (List.fold_left
                             (fun sep  ->
                                fun x  ->
                                  if sep then Format.fprintf fmt ",@ ";
                                  ((__10 ()) fmt) x;
                                  true) false x))) aaggregate;
                   Format.fprintf fmt ")@]");
                   (match aexpression with
                   | None  -> Format.pp_print_string fmt ""
                   | Some x ->
                       ((__11 ()) fmt) x;);
             | Others  -> Format.pp_print_string fmt "others")
         [@ocaml.warning "-A"])
-...
               | Some a ->
                   (((__0 ()) fmt) a;
                   (match x.formal_arg with
                   | None -> ()
                   | Some b -> Format.fprintf fmt "(";
                               ((__1 ()) fmt) b;
                               Format.fprintf fmt ")");
                   | None -> Format.pp_print_string fmt ""
                   | Some b -> ((__1 ()) fmt) b);
                   Format.fprintf fmt " => "));
               (match x.actual_name with
               | None -> Format.pp_print_string fmt ""
               | None ->
                   ((match x.actual_designator with
                   | None -> Format.pp_print_string fmt ""
                   | Some NoName -> Format.pp_print_string fmt ""
                   | Some b -> ((__3 ()) fmt) b);
                   (match x.actual_expr with
                   | None -> Format.pp_print_string fmt ""
                   | Some IsNull -> Format.pp_print_string fmt ""
                   | Some c -> ((__4 ()) fmt) c);)
               | Some a ->
                   (((__2 ()) fmt) a;
                   (match a with
                   | NoName -> ()
                   | _ -> Format.fprintf fmt "(");
                   (match x.actual_designator with
                   | None -> ()
                   | Some NoName -> Format.pp_print_string fmt ""
                   | Some b -> (Format.fprintf fmt "(";
                               ((__3 ()) fmt) b;
                               Format.fprintf fmt ")"));
                   | None -> Format.pp_print_string fmt ""
                   | Some b -> ((__3 ()) fmt) b);
                   (match x.actual_expr with
                   | None -> ()
                   | None -> Format.pp_print_string fmt ""
                   | Some IsNull -> Format.pp_print_string fmt ""
                   | Some c -> (Format.fprintf fmt "(";
                               ((__4 ()) fmt) c;
                               Format.fprintf fmt ")"))));)
                   | Some c -> ((__4 ()) fmt) c);
                   (match a with
                   | NoName -> ()
                   | _ -> Format.fprintf fmt ")")));)
         [@ocaml.warning "-A"])
     and show_vhdl_assoc_element_t :
-...
                 [`String "Sig";
                 (let fields = []  in
                  let fields =
                    ("att",
                      ((function
                        | None  -> `Null
                        | Some x ->
                            ((fun x  -> vhdl_signal_attributes_t_to_yojson x)) x)
                         arg0.att))
                    :: fields  in
                    if arg0.att = None
                    then fields
                    else
                      ("att",
                        (((function
                           | None  -> `Null
                           | Some x ->
                               ((fun x  -> vhdl_signal_attributes_t_to_yojson x))
                                 x)) arg0.att))
                      :: fields
                     in
                  let fields =
                    ("name", ((fun x  -> vhdl_name_t_to_yojson x) arg0.name)) ::
                    fields  in
-...
                 [`String "AGGREGATE";
                 (let fields = []  in
                  let fields =
                    ("elems",
                      ((fun x  ->
                          `List
                            (List.map (fun x  -> vhdl_element_assoc_t_to_yojson x)
                               x)) arg0.elems))
                    if arg0.elems = []
                    then fields
                    else
                      ("elems",
                        (((fun x  ->
                             `List
                               (List.map
                                  (fun x  -> vhdl_element_assoc_t_to_yojson x) x)))
                           arg0.elems))
                      :: fields
                     in
                  `Assoc fields)]
           | QualifiedExpression arg0 ->
               `List
                 [`String "QUALIFIED_EXPRESSION";
                 (let fields = []  in
                  let fields =
                    if arg0.expression = None
                    then fields
                    else
                      ("expression",
                        (((function
                           | None  -> `Null
                           | Some x -> ((fun x  -> vhdl_expr_t_to_yojson x)) x))
                           arg0.expression))
                      :: fields
                     in
                  let fields =
                    if arg0.aggregate = []
                    then fields
                    else
                      ("aggregate",
                        (((fun x  ->
                             `List
                               (List.map
                                  (fun x  -> vhdl_element_assoc_t_to_yojson x) x)))
                           arg0.aggregate))
                      :: fields
                     in
                  let fields =
                    ("type_mark",
                      ((fun x  -> vhdl_name_t_to_yojson x) arg0.type_mark))
                    :: fields  in
                  `Assoc fields)]
           | Others  -> `List [`String "OTHERS"])
-...
                       | _::xs -> loop xs _state  in
                     loop xs
                       ((Result.Error "Vhdl_ast.vhdl_expr_t.name"),
                         (Result.Error "Vhdl_ast.vhdl_expr_t.att"))
                         (Result.Ok None))
                 | _ -> Result.Error "Vhdl_ast.vhdl_expr_t")) arg0
           | `List ((`String "SuffixMod")::arg0::[]) ->
               ((function
-...
                           arg0 >>=
                             ((fun arg0  -> Result.Ok (Aggregate { elems = arg0 })))
                       | _::xs -> loop xs _state  in
                     loop xs (Result.Error "Vhdl_ast.vhdl_expr_t.elems")
                     loop xs (Result.Ok [])
                 | _ -> Result.Error "Vhdl_ast.vhdl_expr_t")) arg0
           | `List ((`String "QUALIFIED_EXPRESSION")::arg0::[]) ->
               ((function
                 | `Assoc xs ->
                     let rec loop xs ((arg0,arg1,arg2) as _state) =
                       match xs with
                       | ("type_mark",x)::xs ->
                           loop xs
                             (((fun x  -> vhdl_name_t_of_yojson x) x), arg1, arg2)
                       | ("aggregate",x)::xs ->
                           loop xs
                             (arg0,
                               ((function
                                 | `List xs ->
                                     map_bind
                                       (fun x  -> vhdl_element_assoc_t_of_yojson x)
                                       [] xs
                                 | _ ->
                                     Result.Error "Vhdl_ast.vhdl_expr_t.aggregate")
                                  x), arg2)
                       | ("expression",x)::xs ->
                           loop xs
                             (arg0, arg1,
                               ((function
                                 | `Null -> Result.Ok None
                                 | x ->
                                     ((fun x  -> vhdl_expr_t_of_yojson x) x) >>=
                                       ((fun x  -> Result.Ok (Some x)))) x))
                       | [] ->
                           arg2 >>=
                             ((fun arg2  ->
                                 arg1 >>=
                                   (fun arg1  ->
                                      arg0 >>=
                                        (fun arg0  ->
                                           Result.Ok
                                             (QualifiedExpression
+                                               {
                                                  type_mark = arg0;
                                                  aggregate = arg1;
                                                  expression = arg2
                                                })))))
                       | _::xs -> loop xs _state  in
                     loop xs
                       ((Result.Error "Vhdl_ast.vhdl_expr_t.type_mark"),
                         (Result.Ok []), (Result.Ok None))
                 | _ -> Result.Error "Vhdl_ast.vhdl_expr_t")) arg0
           | `List ((`String "OTHERS")::[]) -> Result.Ok Others
           | _ -> Result.Error "Vhdl_ast.vhdl_expr_t")
-...
                              fun x  ->
                                if sep then Format.fprintf fmt ".";
                                ((__1 ()) fmt) x;
                                true) false x))) a0;
                  Format.fprintf fmt ";"))
                                true) false x))) a0))
         [@ocaml.warning "-A"])
     and show_vhdl_load_t : vhdl_load_t -> Ppx_deriving_runtime.string =

             | Aggregate { elems } ->
                 let elems = self#list self#vhdl_element_assoc_t elems  in
                 Aggregate { elems }
             | QualifiedExpression { type_mark; aggregate; expression } ->
                 let type_mark = self#vhdl_name_t type_mark  in
                 let aggregate = self#list self#vhdl_element_assoc_t aggregate  in
                 let expression = self#option self#vhdl_expr_t expression  in
                 QualifiedExpression { type_mark; aggregate; expression }
             | Others  -> Others
         method vhdl_name_t : vhdl_name_t -> vhdl_name_t=
           fun x  ->

             | Aggregate { elems } ->
                 let elems = self#list self#vhdl_element_assoc_t elems  in
                 Aggregate { elems }
             | QualifiedExpression { type_mark; aggregate; expression } ->
                 let type_mark = self#vhdl_name_t type_mark  in
                 let aggregate = self#list self#vhdl_element_assoc_t aggregate  in
                 let expression = self#option self#vhdl_expr_t expression  in
                 QualifiedExpression { type_mark; aggregate; expression }
             | Others  -> Others
         method vhdl_name_t : vhdl_name_t -> vhdl_name_t=
           fun x  ->

Also available in: Unified diff

Project

General

Profile

CristalCaveGem » LustreC

Revision 7f5d0cde

Added by Arnaud Dieumegard over 6 years ago