aboutsummaryrefslogtreecommitdiff
path: root/lib/serialize.ml
diff options
context:
space:
mode:
authorppedrot2013-08-19 18:16:23 +0000
committerppedrot2013-08-19 18:16:23 +0000
commit51684142c40fced940bb870742bc7f75c3e2fd52 (patch)
tree9a8e883e7c53d2fa23ef8f0d9deffabeccfeb56e /lib/serialize.ml
parent09d7951e0c0009e4ac55091cede25b88576759d2 (diff)
Modulification and removing of structural equality in Stateid.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16705 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'lib/serialize.ml')
-rw-r--r--lib/serialize.ml10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/serialize.ml b/lib/serialize.ml
index 6636c24f0c..c6eaa4eda9 100644
--- a/lib/serialize.ml
+++ b/lib/serialize.ml
@@ -355,9 +355,9 @@ let to_edit_id = function
| _ -> raise Marshal_error
let of_state_id id =
- try Stateid.of_state_id id with Invalid_argument _ -> raise Marshal_error
+ try Stateid.to_xml id with Invalid_argument _ -> raise Marshal_error
let to_state_id xml =
- try Stateid.to_state_id xml with Invalid_argument _ -> raise Marshal_error
+ try Stateid.of_xml xml with Invalid_argument _ -> raise Marshal_error
let of_edit_or_state_id = function
| Interface.Edit id -> ["object","edit"], of_edit_id id
@@ -727,7 +727,7 @@ let pr_call = function
let raw = if r then "RAW" else "" in
let verb = if b then "" else "SILENT" in
"INTERP"^raw^verb^" "^string_of_int id^" ["^s^"]"
- | Backto i -> "BACKTO "^(Stateid.string_of_state_id i)
+ | Backto i -> "BACKTO "^(Stateid.to_string i)
| Goal _ -> "GOALS"
| Evars _ -> "EVARS"
| Hints _ -> "HINTS"
@@ -744,9 +744,9 @@ let pr_call = function
| Init _ -> "INIT"
let pr_value_gen pr = function
| Good v -> "GOOD " ^ pr v
- | Fail (id,None,str) -> "FAIL "^Stateid.string_of_state_id id^" ["^str^"]"
+ | Fail (id,None,str) -> "FAIL "^Stateid.to_string id^" ["^str^"]"
| Fail (id,Some(i,j),str) ->
- "FAIL "^Stateid.string_of_state_id id^
+ "FAIL "^Stateid.to_string id^
" ("^string_of_int i^","^string_of_int j^")["^str^"]"
let pr_value v = pr_value_gen (fun _ -> "FIXME") v
let pr_full_value call value =