diff --git a/.gitignore b/.gitignore index c7523d0..6dcbde0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .external* .paths .project +.projectSettings _build *.DS_Store *.cmi @@ -28,19 +29,5 @@ _build test/*.ml test/_check_builds lib/java/.classpath -/test/async/build/convolutions_a.ept -/test/async/build/convolutions.ept -/test/async/build/fork_join_a.ept -/test/async/build/fork_join.ept -/test/async/build/java/.classpath -/test/async/build/kill.ept -/test/async/build/kill_node.ept -/test/async/build/moyen_lent_rapide_a.ept -/test/async/build/moyen_lent_rapide.ept -/test/async/build/rapide_lent_a2.ept -/test/async/build/reset_6_a.ept -/test/async/build/reset_6.ept -/test/async/build/reset_a.ept -/test/async/build/reset.ept -/test/async/build/t.ept -/test/async/build/tt.ept +/test/async/build/* +/test/image_filters/java/* diff --git a/compiler/heptagon/hept_utils.ml b/compiler/heptagon/hept_utils.ml index a21d72a..c1308de 100644 --- a/compiler/heptagon/hept_utils.ml +++ b/compiler/heptagon/hept_utils.ml @@ -107,7 +107,7 @@ let args_of_var_decs = (* before the clocking the clock is wrong in the signature *) List.map (fun vd -> Signature.mk_arg (Some (Idents.source_name vd.v_ident)) - vd.v_type (Linearity.check_linearity vd.v_linearity) Signature.Cbase) + vd.v_type (Linearity.check_linearity vd.v_linearity) Signature.Cbase) let signature_of_node n = { node_inputs = args_of_var_decs n.n_input; diff --git a/compiler/minils/minils.ml b/compiler/minils/minils.ml index 0d620fd..e58e111 100644 --- a/compiler/minils/minils.ml +++ b/compiler/minils/minils.ml @@ -185,6 +185,17 @@ let mk_extvalue ~ty ~linearity ?(clock = fresh_clock()) ?(loc = no_location) des { w_desc = desc; w_ty = ty; w_linearity = linearity; w_ck = clock; w_loc = loc } +let extvalue_true, extvalue_false = + let extvalue_bool b ck = + mk_extvalue ~ty:Initial.tbool ~linearity:Linearity.Ltop + ~clock:ck (Wconst (Initial.mk_static_bool b)) + in + extvalue_bool true, extvalue_bool false + +let mk_vd_extvalue vd = + mk_extvalue ~ty:vd.v_type ~linearity:vd.v_linearity + ~clock:vd.v_clock ~loc:vd.v_loc (Wvar vd.v_ident) + let mk_exp level_ck ty ~linearity ?(ck = Cbase) ?(ct = fresh_ct ty) ?(loc = no_location) desc = { e_desc = desc; e_ty = ty; e_linearity = linearity;