From 8f9d1dc99ddc1e3caf32a88ad46066091e16d951 Mon Sep 17 00:00:00 2001 From: Manuel Krucker Date: Fri, 9 May 2008 14:38:55 +0000 Subject: [PATCH] logging strings added git-svn-id: https://projects.brucker.ch/su4sml/svn/su4sml/trunk@7934 3260e6d1-4efc-4170-b0a7-36055960796d --- su4sml/src/wfcpog/wfcpog_registry.sml | 46 +++++++++++++++------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/su4sml/src/wfcpog/wfcpog_registry.sml b/su4sml/src/wfcpog/wfcpog_registry.sml index d9d5503..9649c45 100644 --- a/su4sml/src/wfcpog/wfcpog_registry.sml +++ b/su4sml/src/wfcpog/wfcpog_registry.sml @@ -453,26 +453,32 @@ fun check_wfc model wfc = end fun check_wfcs model wfcs = - List.concat (map (fn (a as WFCPOG.WFPO{identifier,name,description,recommended,depends,recommends,apply,data}:WFCPOG.wfpo) => - if (depends = []) - then [(check_wfc model a)] - else - let - val depending_wfpos = List.map (set_data (get_wfpo supported)) depends - val depending_wfcs = List.filter (fn b => - case (WFCPOG.apply_of b) of - WFCPOG.WFC(x) => true - | WFCPOG.POG(x) => false) depending_wfpos - val depending_pos = List.filter (fn b => - case (WFCPOG.apply_of b) of - WFCPOG.WFC(x) => false - | WFCPOG.POG(x) => true) depending_wfpos - in - if (List.length depending_pos <> 0) - then raise WFCPOG_RegistryError ("A wellformedness check has a proof obligation marked as depending. But this is not allowed! \n\nCHANGE WFCPOG_Registry.supported_wfs ENTRY(IES)!!!") - else (List.map (check_wfc model) depending_wfcs)@[(check_wfc model a)] - end) wfcs) - + let + val _ = trace function_calls ("WFCPOG_Registry.check_wfcs\n") + val res = List.concat (map (fn (a as WFCPOG.WFPO{identifier,name,description,recommended,depends,recommends,apply,data}:WFCPOG.wfpo) => + if (depends = []) + then [(check_wfc model a)] + else + let + val depending_wfpos = List.map (set_data (get_wfpo supported)) depends + val depending_wfcs = List.filter (fn b => + case (WFCPOG.apply_of b) of + WFCPOG.WFC(x) => true + | WFCPOG.POG(x) => false) depending_wfpos + val depending_pos = List.filter (fn b => + case (WFCPOG.apply_of b) of + WFCPOG.WFC(x) => false + | WFCPOG.POG(x) => true) depending_wfpos + in + if (List.length depending_pos <> 0) + then raise WFCPOG_RegistryError ("A wellformedness check has a proof obligation marked as depending. But this is not allowed! \n\nCHANGE WFCPOG_Registry.supported_wfs ENTRY(IES)!!!") + else (List.map (check_wfc model) depending_wfcs)@[(check_wfc model a)] + end) wfcs) + val _ = trace function_ends ("WFCPOG_Registry.check_wfcs\n") + in + res + end + fun generate_po model po = let val _ = trace function_calls ("WFCPOG_Registry.generate_po\n")