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
57664be5
Commit
57664be5
authored
Oct 05, 2007
by
Pietro Abate
Browse files
[r2005-04-22 14:49:14 by afrisch] Empty log message
Original author: afrisch Date: 2005-04-22 14:49:14+00:00
parent
5273a51a
Changes
3
Hide whitespace changes
Inline
Side-by-side
runtime/value.ml
View file @
57664be5
...
...
@@ -734,6 +734,10 @@ let add v1 v2 = match (v1,v2) with
|
(
Record
r1
,
Record
r2
)
->
Record
(
LabelMap
.
merge
(
fun
x
y
->
y
)
r1
r2
)
|
_
->
assert
false
let
merge
v1
v2
=
match
(
v1
,
v2
)
with
|
(
Record
r1
,
Record
r2
)
->
Record
(
LabelMap
.
merge
(
fun
x
y
->
y
)
r1
r2
)
|
_
->
assert
false
let
sub
v1
v2
=
match
(
v1
,
v2
)
with
|
(
Integer
x
,
Integer
y
)
->
Integer
(
Intervals
.
V
.
sub
x
y
)
|
_
->
assert
false
...
...
runtime/value.mli
View file @
57664be5
...
...
@@ -143,6 +143,7 @@ val print_utf8: U.t -> unit
val
add
:
t
->
t
->
t
val
merge
:
t
->
t
->
t
val
sub
:
t
->
t
->
t
val
mul
:
t
->
t
->
t
val
div
:
t
->
t
->
t
...
...
typing/typer.ml
View file @
57664be5
...
...
@@ -367,7 +367,6 @@ module IType = struct
raise_loc_generic
loc
(
"Capture variable not allowed: "
^
(
Ident
.
to_string
x
))
module
Ids
=
Set
.
Make
(
Id
)
let
type_defs
env
b
=
let
_
,
b'
=
derecurs_def
(
penv
env
)
b
in
elim_concats
()
;
...
...
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