Commit 23a63dd2 authored by Pietro Abate's avatar Pietro Abate
Browse files

Merge branch 'tallying-debug' into master-merge

Conflicts:
	types/types.ml
	types/types.mli
parents 2f1d479d 55741cc8
This diff is collapsed.
......@@ -427,4 +427,9 @@ end
val apply : t -> t -> Tallying.CS.sl
val apply_full : t -> t -> t
val apply_raw : t -> t -> (Tallying.CS.sl * (t * t))
val apply_raw : t -> t -> Tallying.CS.sl * t * t * t
(* apply_raw s t returns the 4-tuple (subst,ss, tt, res) where
subst is the set of substitution that make the application succeed,
ss and tt are the expansions of s and t corresponding to that substitution
and res is the type of the result of the application
*)
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