Project

General

Profile

« Previous | Next » 

Revision 92aface4

Added by Arnaud Dieumegard over 3 years ago

Removed warnings and solved bug for visitors iterators references between vhdl_ast and mini_vhdl_ast

View differences:

src/tools/importer/mini_vhdl_to_lustre.ml
334 334
      mini_vhdl_declaration_t -> var_decl list=
335 335
      fun x  ->
336 336
        match x with
337
        | VarDecl { names; typ; init_val } ->
337
        | MiniVarDecl { names; typ; init_val } ->
338 338
            self#lustre_mk_var_decl InPort names typ
339 339
(*            let names = self#list self#vhdl_name_t names  in
340 340
            let typ = self#vhdl_subtype_indication_t typ  in
341 341
            let init_val = self#vhdl_expr_t init_val  in
342 342
            VarDecl { names; typ; init_val }*)
343
        | CstDecl { names; typ; init_val } ->
343
        | MiniCstDecl { names; typ; init_val } ->
344 344
            self#lustre_mk_var_decl InPort names typ
345 345
(*            let names = self#list self#vhdl_name_t names  in
346 346
            let typ = self#vhdl_subtype_indication_t typ  in
347 347
            let init_val = self#vhdl_expr_t init_val  in
348 348
            CstDecl { names; typ; init_val }*)
349
        | SigDecl { names; typ; init_val } ->
349
        | MiniSigDecl { names; typ; init_val } ->
350 350
            self#lustre_mk_var_decl InPort names typ
351 351
(*            let names = self#list self#vhdl_name_t names  in
352 352
            let typ = self#vhdl_subtype_indication_t typ  in
353 353
            let init_val = self#vhdl_expr_t init_val  in
354 354
            SigDecl { names; typ; init_val }*)
355
        | ComponentDecl { name; generics; ports } ->
355
        | MiniComponentDecl { name; generics; ports } ->
356 356
            []
357 357
(*            let name = self#vhdl_name_t name  in
358 358
            let generics = self#list self#vhdl_port_t generics  in
359 359
            let ports = self#list self#vhdl_port_t ports  in
360 360
            ComponentDecl { name; generics; ports }*)
361
        | Subprogram { spec; decl_part; stmts } ->
361
        | MiniSubprogram { spec; decl_part; stmts } ->
362 362
            []
363 363
(*            let spec = self#vhdl_subprogram_spec_t spec  in
364 364
            let decl_part = self#list self#mini_vhdl_declaration_t decl_part
......
409 409
      mini_vhdl_concurrent_stmt_t -> statement=
410 410
      fun x  ->
411 411
        match x with
412
        | Process a -> (*let a = self#mini_vhdl_process_t a in*)
412
        | MiniProcess a -> (*let a = self#mini_vhdl_process_t a in*)
413 413
            Eq {eq_lhs=["Process"];
414 414
                eq_rhs={expr_tag=Utils.new_tag (); expr_desc=Expr_ident "toto";
415 415
                        expr_type={tdesc=Tconst "cst"; tid=0}; expr_clock={cdesc=Cvar;cscoped=false;cid=0};
416 416
                        expr_delay={ddesc=Dundef;did=0}; expr_annot=None; expr_loc=Location.dummy_loc};
417 417
                eq_loc=Location.dummy_loc}
418
        | ComponentInst a ->
418
        | MiniComponentInst a ->
419 419
            let a = self#mini_vhdl_component_instantiation_t a  in a
420 420

  
421 421
    method mini_vhdl_package_t : mini_vhdl_package_t -> top_decl_desc=

Also available in: Unified diff