Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Why3
why3
Commits
961b3c56
Commit
961b3c56
authored
May 05, 2014
by
Andrei Paskevich
Browse files
fix the fix in e548a9c5d
parent
84dd0dc5
Changes
6
Hide whitespace changes
Inline
Side-by-side
drivers/beagle.drv
View file @
961b3c56
...
...
@@ -151,7 +151,7 @@ end
theory tptp.IntTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -219,7 +219,7 @@ end
theory tptp.RatTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -258,7 +258,7 @@ end
theory real.Truncate
syntax function floor "$to_int(%1)"
syntax function ceil "$to_int($ceil(%1))"
syntax function ceil "$to_int($ceil
ing
(%1))"
syntax function truncate "$to_int($truncate(%1))"
remove prop Truncate_int
...
...
@@ -277,6 +277,9 @@ theory real.Truncate
end
theory tptp.RealTrunc
syntax function floor "$floor(%1)"
syntax function ceiling "$ceiling(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
syntax function to_int "$to_int(%1)"
...
...
drivers/princess.drv
View file @
961b3c56
...
...
@@ -148,7 +148,7 @@ end
theory tptp.IntTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -216,7 +216,7 @@ end
theory tptp.RatTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -255,7 +255,7 @@ end
theory real.Truncate
syntax function floor "$to_int(%1)"
syntax function ceil "$to_int($ceil(%1))"
syntax function ceil "$to_int($ceil
ing
(%1))"
syntax function truncate "$to_int($truncate(%1))"
remove prop Truncate_int
...
...
@@ -274,6 +274,9 @@ theory real.Truncate
end
theory tptp.RealTrunc
syntax function floor "$floor(%1)"
syntax function ceiling "$ceiling(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
syntax function to_int "$to_int(%1)"
...
...
drivers/tptp-tff0.drv
View file @
961b3c56
...
...
@@ -143,7 +143,7 @@ end
theory tptp.IntTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -211,7 +211,7 @@ end
theory tptp.RatTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -250,7 +250,7 @@ end
theory real.Truncate
syntax function floor "$to_int(%1)"
syntax function ceil "$to_int($ceil(%1))"
syntax function ceil "$to_int($ceil
ing
(%1))"
syntax function truncate "$to_int($truncate(%1))"
remove prop Truncate_int
...
...
@@ -269,6 +269,9 @@ theory real.Truncate
end
theory tptp.RealTrunc
syntax function floor "$floor(%1)"
syntax function ceiling "$ceiling(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
syntax function to_int "$to_int(%1)"
...
...
drivers/tptp-tff1.drv
View file @
961b3c56
...
...
@@ -134,7 +134,7 @@ end
theory tptp.IntTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -200,7 +200,7 @@ end
theory tptp.RatTrunc
syntax function floor "$floor(%1)"
syntax function ceil
"$ceil(%1)"
syntax function ceil
ing
"$ceil
ing
(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
...
...
@@ -239,7 +239,7 @@ end
theory real.Truncate
syntax function floor "$to_int(%1)"
syntax function ceil "$to_int($ceil(%1))"
syntax function ceil "$to_int($ceil
ing
(%1))"
syntax function truncate "$to_int($truncate(%1))"
remove prop Truncate_int
...
...
@@ -258,6 +258,9 @@ theory real.Truncate
end
theory tptp.RealTrunc
syntax function floor "$floor(%1)"
syntax function ceiling "$ceiling(%1)"
syntax function truncate "$truncate(%1)"
syntax function round "$round(%1)"
syntax function to_int "$to_int(%1)"
...
...
plugins/tptp/tptp_typing.ml
View file @
961b3c56
...
...
@@ -171,7 +171,7 @@ let defined_arith ~loc denv env impl dw tl =
|
DF
DFrem_t
->
ns_find_ls
th
.
th_export
[
"mod_t"
]
|
DF
DFrem_f
->
ns_find_ls
th
.
th_export
[
"mod_f"
]
|
DF
DFfloor
->
ns_find_ls
th
.
th_export
[
"floor"
]
|
DF
DFceil
->
ns_find_ls
th
.
th_export
[
"ceil"
]
|
DF
DFceil
->
ns_find_ls
th
.
th_export
[
"ceil
ing
"
]
|
DF
DFtrunc
->
ns_find_ls
th
.
th_export
[
"truncate"
]
|
DF
DFround
->
ns_find_ls
th
.
th_export
[
"round"
]
|
DF
DFtoint
->
ns_find_ls
th
.
th_export
[
"to_int"
]
...
...
theories/tptp.why
View file @
961b3c56
...
...
@@ -14,7 +14,7 @@ end
theory IntTrunc
function floor (x : int) : int = x
function ceil (x : int) : int = x
function ceil
ing
(x : int) : int = x
function truncate (x : int) : int = x
function round (x : int) : int = x
...
...
@@ -83,7 +83,7 @@ theory RatTrunc
(* TODO: axiomatize *)
function floor (x : rat) : rat
function ceil (x : rat) : rat
function ceil
ing
(x : rat) : rat
function truncate (x : rat) : rat
function round (x : rat) : rat
...
...
@@ -121,17 +121,21 @@ end
theory RealTrunc
use import Real
use import real.FromInt
use export real.Truncate
use real.FromInt
use real.Truncate
function floor (x : real) : real = FromInt.from_int (Truncate.floor x)
function ceiling (x : real) : real = FromInt.from_int (Truncate.ceil x)
function truncate (x : real) : real = FromInt.from_int (Truncate.truncate x)
(* TODO : axiomatize *)
function round (x : real) : real
function to_int (x : real) : int = floor x
function to_int (x : real) : int =
Truncate.
floor x
predicate is_int (r : real) = r = from_int (truncate r)
predicate is_int (r : real) = r =
FromInt.
from_int (
Truncate.
truncate r)
predicate is_rat (r : real) =
exists n d : int. d <> 0 /\ r * from_int d = from_int n
exists n d : int. d <> 0 /\ r *
FromInt.
from_int d =
FromInt.
from_int n
end
theory RealDivE
...
...
@@ -159,9 +163,9 @@ theory IntToRat
end
theory IntToReal
use
import
real.FromInt
use real.FromInt
function to_real (x : int) : real = from_int x
function to_real (x : int) : real =
FromInt.
from_int x
end
theory RealToRat
...
...
@@ -174,8 +178,8 @@ end
theory RatToReal
use import Rat
use import real.Real
use
import
real.FromInt
use real.FromInt
function to_real (x : rat) : real =
from_int (numerator x) / from_int (denominator x)
FromInt.
from_int (numerator x) /
FromInt.
from_int (denominator x)
end
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