Project

General

Profile

« Previous | Next » 

Revision 59020713

Added by Pierre-Loïc Garoche almost 6 years ago

Some progress on EMF bqckend. Refactoring machines code

View differences:

src/corelang.ml
220 220
    eexpr_quantifiers = [];
221 221
    eexpr_type = Types.new_var ();
222 222
    eexpr_clock = Clocks.new_var true;
223
    eexpr_normalized = None;
224 223
    eexpr_loc = loc }
225 224

  
226 225
let extend_eexpr q e = { e with eexpr_quantifiers = q@e.eexpr_quantifiers }
......
805 804
     eexpr_tag = Utils.new_tag ();
806 805
     eexpr_qfexpr = rename_expr f_node f_var ee.eexpr_qfexpr;
807 806
     eexpr_quantifiers = List.map (fun (typ,vdecls) -> typ, rename_vars f_node f_var vdecls) ee.eexpr_quantifiers;
808
     eexpr_normalized = Utils.option_map 
809
       (fun (vdecl, eqs, vdecls) ->
810
	 rename_var f_node f_var vdecl,
811
	 List.map (rename_eq f_node f_var) eqs,
812
	 rename_vars f_node f_var vdecls
813
       ) ee.eexpr_normalized;
814
     
815 807
   }
816 808
 
817 809
     
......
1035 1027
     eexpr_type = expr.expr_type;
1036 1028
     eexpr_clock = expr.expr_clock;
1037 1029
     eexpr_loc = expr.expr_loc;
1038
     eexpr_normalized = None
1039 1030
   }
1040 1031
 (* and expr_desc_to_eexpr_desc expr_desc = *)
1041 1032
 (*   let conv = expr_to_eexpr in *)

Also available in: Unified diff