Commit ebc942ef authored by bguillaum's avatar bguillaum
Browse files

version 0.34.3: fix bug introduced in previous version

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/semagramme/libcaml-grew/trunk@8979 7838e531-6607-4d57-9587-6c381814729c
parent 4333117a
...@@ -449,7 +449,7 @@ module Massoc_make (Ord: OrderedType) = struct ...@@ -449,7 +449,7 @@ module Massoc_make (Ord: OrderedType) = struct
try M.find key t try M.find key t
with Not_found -> [] with Not_found -> []
let to_string _ _ = failwith "Not implemted" let to_string _ _ = failwith "Not implemented"
let iter fct t = let iter fct t =
M.iter M.iter
......
...@@ -412,7 +412,6 @@ module G_graph = struct ...@@ -412,7 +412,6 @@ module G_graph = struct
(* -------------------------------------------------------------------------------- *) (* -------------------------------------------------------------------------------- *)
let del_node graph node_id = let del_node graph node_id =
let node = Gid_map.find node_id graph.map in
let map_wo_node = let map_wo_node =
Gid_map.fold Gid_map.fold
(fun id value acc -> (fun id value acc ->
...@@ -420,6 +419,7 @@ module G_graph = struct ...@@ -420,6 +419,7 @@ module G_graph = struct
then acc then acc
else Gid_map.add id (G_node.remove_key node_id value) acc else Gid_map.add id (G_node.remove_key node_id value) acc
) graph.map Gid_map.empty in ) graph.map Gid_map.empty in
let node = Gid_map.find node_id map_wo_node in
let new_map = let new_map =
match (G_node.get_prec node, G_node.get_succ node) with match (G_node.get_prec node, G_node.get_succ node) with
| (Some id_prec, Some id_succ) -> | (Some id_prec, Some id_succ) ->
......
...@@ -654,7 +654,7 @@ module Rule = struct ...@@ -654,7 +654,7 @@ module Rule = struct
(* if pid >= 0 *) (* if pid >= 0 *)
(* then try P_graph.find pid positive with Not_found -> failwith "POS" *) (* then try P_graph.find pid positive with Not_found -> failwith "POS" *)
(* else try P_graph.find pid neg with Not_found -> failwith "NEG" in *) (* else try P_graph.find pid neg with Not_found -> failwith "NEG" in *)
let g_node = try G_graph.find gid graph with Not_found -> failwith "INS" in let g_node = try G_graph.find gid graph with Not_found -> Error.bug "[extend_matching_from] cannot find gid in graph" in
try try
let new_param = P_node.match_ ?param: partial.sub.m_param p_node g_node in let new_param = P_node.match_ ?param: partial.sub.m_param p_node g_node in
...@@ -666,7 +666,7 @@ module Rule = struct ...@@ -666,7 +666,7 @@ module Rule = struct
let new_partial = let new_partial =
{ partial with { partial with
unmatched_nodes = (try List_.rm pid partial.unmatched_nodes with Not_found -> failwith "List_.rm"); unmatched_nodes = (try List_.rm pid partial.unmatched_nodes with Not_found -> Error.bug "[extend_matching_from] cannot find pid in unmatched_nodes");
unmatched_edges = new_unmatched_edges; unmatched_edges = new_unmatched_edges;
already_matched_gids = gid :: partial.already_matched_gids; already_matched_gids = gid :: partial.already_matched_gids;
sub = {partial.sub with n_match = Pid_map.add pid gid partial.sub.n_match; m_param = new_param}; sub = {partial.sub with n_match = Pid_map.add pid gid partial.sub.n_match; m_param = new_param};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment