- let status, wanted = disambiguate status wanted None ctx in
- match_term status ctx wanted t
- | None -> match_term status ctx (None,ctx,t) t)
+ let status', wanted = disambiguate status wanted None ctx in
+ let (status',found), t' = match_term status' ctx wanted t in
+ if found then status',t' else status,t
+ | None ->
+ let (status,_),t = match_term status ctx (None,ctx,t) t in
+ status,t)