Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cduce
cduce
Commits
db47d960
Commit
db47d960
authored
May 23, 2014
by
Pietro Abate
Browse files
Merge branch 'master' into propagate
parents
180e9317
ed82611c
Changes
1
Hide whitespace changes
Inline
Side-by-side
types/patterns.ml
View file @
db47d960
...
@@ -377,7 +377,7 @@ x=(1,2)
...
@@ -377,7 +377,7 @@ x=(1,2)
(*
(*
| Cap ((_,fv1,d1) as p1,((_,fv2,d2) as p2)) ->
| Cap ((_,fv1,d1) as p1,((_,fv2,d2) as p2)) ->
(match d1 with
(match d1 with
| Capture(_, name) when Str.string_match (Str.regexp "pat[0-9]+:") name 0 ->
| Capture(_, name) when Str.string_match (Str.regexp "pat[0-9]+:")
(Encodings.Utf8.get_str
name
)
0 ->
(match d2 with | Constr _ -> fv2 | _ -> approx_var seen p2 t xs)
(match d2 with | Constr _ -> fv2 | _ -> approx_var seen p2 t xs)
| _ -> IdSet.cup
| _ -> IdSet.cup
(approx_var seen p1 t (IdSet.cap fv1 xs))
(approx_var seen p1 t (IdSet.cap fv1 xs))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment