From: Jérémie D. <Ba...@us...> - 2010-02-23 18:30:14
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "krobot". The branch, master has been updated via dc7f31e7038f1ac3f97cdad9b76de424fbbab041 (commit) from 4559f9bbbab6518f243fd21f6e406354ac8705ec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dc7f31e7038f1ac3f97cdad9b76de424fbbab041 Author: Jérémie Dimino <je...@di...> Date: Tue Feb 23 19:29:33 2010 +0100 [generators] prevent typos in interface names ----------------------------------------------------------------------- Changes: diff --git a/PC_Mainboard/driver/driver.ml b/PC_Mainboard/driver/driver.ml index 305a8d7..3c2a145 100644 --- a/PC_Mainboard/driver/driver.ml +++ b/PC_Mainboard/driver/driver.ml @@ -31,7 +31,7 @@ struct let get obj = obj.obus end) - include DBus_exports.Compass(OBus)(struct let get dev = dev.card end)(struct let name = "fr.krobot.Device.Compass.Unsafe" end) + include DBus_exports.Compass(OBus)(struct let get dev = dev.card end) include OBus.MakeInterface(struct let name = "fr.krobot.Device.Compass" end) @@ -76,7 +76,7 @@ struct let get obj = obj.obus end) - include DBus_exports.AX12(OBus)(struct let get dev = dev.card end)(struct let name = "fr.krobot.Device.AX12.Unsafe" end) + include DBus_exports.AX12(OBus)(struct let get dev = dev.card end) include OBus.MakeInterface(struct let name = "fr.krobot.Device.AX12" end) @@ -104,7 +104,7 @@ struct let get obj = obj.obus end) - include DBus_exports.Logic_sensors(OBus)(struct let get dev = dev.card end)(struct let name = "fr.krobot.Device.LogicSensors.Unsafe" end) + include DBus_exports.Logic_sensors(OBus)(struct let get dev = dev.card end) include OBus.MakeInterface(struct let name = "fr.krobot.Device.LogicSensors" end) @@ -149,7 +149,7 @@ struct let get obj = obj.obus end) - include DBus_exports.Range_finders(OBus)(struct let get dev = dev.card end)(struct let name = "fr.krobot.Device.RangeFinders.Unsafe" end) + include DBus_exports.Range_finders(OBus)(struct let get dev = dev.card end) include OBus.MakeInterface(struct let name = "fr.krobot.Device.RangeFinders" end) @@ -238,7 +238,7 @@ struct let get obj = obj.obus end) - include DBus_exports.Motor(OBus)(struct let get dev = dev.card end)(struct let name = "fr.krobot.Device.Motors.Unsafe" end) + include DBus_exports.Motors(OBus)(struct let get dev = dev.card end) include OBus.MakeInterface(struct let name = "fr.krobot.Device.Motors" end) @@ -535,7 +535,7 @@ struct | Some card -> card - include DBus_exports.Common(OBus)(struct let get = get_card end)(struct let name = "fr.krobot.Card.Unsafe" end) + include DBus_exports.Common(OBus)(struct let get = get_card end) include OBus.MakeInterface(struct let name = "fr.krobot.Card" end) diff --git a/PC_Mainboard/generators/gen_dbus_exports.ml b/PC_Mainboard/generators/gen_dbus_exports.ml index f3b0531..ae94a26 100644 --- a/PC_Mainboard/generators/gen_dbus_exports.ml +++ b/PC_Mainboard/generators/gen_dbus_exports.ml @@ -70,9 +70,12 @@ let rec print path indent = function print_apply (sprintf "USB_commands.%s%s (Get.get dev)" path (Name.lid cmd.cmd_name)) cmd.cmd_args | Module(name, items) -> - printf "%smodule %s(M : Object.S)(Get : sig val get : M.t -> Card.t end)(Name : OBus_interface.Name) = struct\n" + printf "%smodule %s(M : Object.S)(Get : sig val get : M.t -> Card.t end) = struct\n" indent (Name.uid name); - printf "%s include M.MakeInterface(Name)\n" indent; + printf "%s include M.MakeInterface(struct let name = %S end)\n" indent + (match name with + | "common" -> "fr.krobot.Card.Unsafe" + | _ -> sprintf "fr.krobot.Device.%s.Unsafe" (Name.uid name)); List.iter (print (path ^ Name.uid name ^ ".") (indent ^ " ")) items; printf "%send\n" indent diff --git a/PC_Mainboard/interface/interface.ml b/PC_Mainboard/interface/interface.ml index 7c640d8..011678a 100644 --- a/PC_Mainboard/interface/interface.ml +++ b/PC_Mainboard/interface/interface.ml @@ -405,7 +405,7 @@ let interface = [ (); ]); - Module("motor", [ + Module("motors", [ enum ~name:"motor" ~typ:uint8 hooks/post-receive -- krobot |