Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
why3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
119
Issues
119
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Why3
why3
Commits
5bc85104
Commit
5bc85104
authored
Feb 15, 2014
by
MARCHE Claude
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[interp] support for Erec, we can now compute prime numbers
parent
b7386e31
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
7 deletions
+33
-7
bench/bench
bench/bench
+1
-2
examples/knuth_prime_numbers.mlw
examples/knuth_prime_numbers.mlw
+12
-2
src/whyml/mlw_interp.ml
src/whyml/mlw_interp.ml
+20
-3
No files found.
bench/bench
View file @
5bc85104
...
...
@@ -139,8 +139,7 @@ execute examples/quicksort.mlw Quicksort.bench
execute examples/conjugate.mlw Test.bench
# fails: needs support for "val" without code (how to do it?)
# examples/vacid_0_sparse_array.mlw --exec Harness.bench
# fails: needs support for local let rec
# examples/knuth_prime_numbers.mlw --exec PrimeNumbers.bench
execute examples/knuth_prime_numbers.mlw PrimeNumbers.bench
execute examples/vstte10_max_sum.mlw TestCase.test_case
execute examples/verifythis_fm2012_LRS.mlw LCP_test.bench
execute examples/verifythis_fm2012_LRS.mlw SuffixSort_test.bench
...
...
examples/knuth_prime_numbers.mlw
View file @
5bc85104
...
...
@@ -97,7 +97,17 @@ module PrimeNumbers
exception BenchFailure
let bench () raises { BenchFailure -> true } =
let t = prime_numbers 20 in
if t[0] <> 2 then raise BenchFailure
let t = prime_numbers 100 in
if t[0] <> 2 then raise BenchFailure;
if t[1] <> 3 then raise BenchFailure;
if t[2] <> 5 then raise BenchFailure;
if t[3] <> 7 then raise BenchFailure;
if t[4] <> 11 then raise BenchFailure;
if t[5] <> 13 then raise BenchFailure;
if t[6] <> 17 then raise BenchFailure;
if t[7] <> 19 then raise BenchFailure;
if t[8] <> 23 then raise BenchFailure;
if t[9] <> 29 then raise BenchFailure;
t
end
src/whyml/mlw_interp.ml
View file @
5bc85104
...
...
@@ -132,6 +132,7 @@ let v_if v t1 t2 = Vif(v,t1,t2)
type
env
=
{
mknown
:
Mlw_decl
.
known_map
;
tknown
:
Decl
.
known_map
;
funenv
:
Mlw_expr
.
fun_defn
Mps
.
t
;
regenv
:
region
Mreg
.
t
;
vsenv
:
value
Mvs
.
t
;
}
...
...
@@ -166,7 +167,7 @@ let print_regenv fmt s =
let
get_reg
env
r
=
let
rec
aux
n
r
=
if
n
>
1000
then
if
n
>
1000
then
begin
eprintf
"@[<hov 2>looping region association ??? regenv =@ %a@]@."
print_regenv
env
.
regenv
;
...
...
@@ -936,6 +937,7 @@ let eval_global_term env km t =
let
env
=
{
mknown
=
Ident
.
Mid
.
empty
;
tknown
=
km
;
funenv
=
Mps
.
empty
;
regenv
=
Mreg
.
empty
;
vsenv
=
Mvs
.
empty
;
}
...
...
@@ -1028,6 +1030,12 @@ let print_result env s fmt r =
(* evaluation of WhyML expressions *)
let
find_definition
env
ps
=
try
Some
(
Mps
.
find
ps
env
.
funenv
)
with
Not_found
->
Mlw_decl
.
find_definition
env
.
mknown
ps
(* evaluate expressions *)
...
...
@@ -1207,7 +1215,14 @@ let rec eval_expr env (s:state) (e : expr) : result * state =
|
Eghost
e1
->
(* TODO: do not eval ghost if no assertion check *)
eval_expr
env
s
e1
|
Erec
_
|
Erec
(
defs
,
e1
)
->
let
env'
=
{
env
with
funenv
=
List
.
fold_left
(
fun
acc
d
->
Mps
.
add
d
.
fun_ps
d
acc
)
env
.
funenv
defs
}
in
eval_expr
env'
s
e1
|
Eany
_
|
Eabstr
_
|
Eabsurd
->
...
...
@@ -1242,7 +1257,7 @@ and exec_app env s ps args (*spec*) ity_result =
let
env1
=
{
env
with
regenv
=
Mreg
.
union
(
fun
_
x
_
->
Some
x
)
subst
env
.
regenv
}
in
match
Mlw_decl
.
find_definition
env
.
mknown
ps
with
match
find_definition
env
ps
with
|
Some
d
->
let
lam
=
d
.
fun_lambda
in
let
env'
=
multibind_pvs
lam
.
l_args
args'
env1
in
...
...
@@ -1296,6 +1311,7 @@ let eval_global_expr env mkm tkm _writes e =
let
env
=
{
mknown
=
mkm
;
tknown
=
tkm
;
funenv
=
Mps
.
empty
;
regenv
=
Mreg
.
empty
;
vsenv
=
Mvs
.
empty
;
}
...
...
@@ -1316,6 +1332,7 @@ let eval_global_expr env mkm tkm _writes e =
let
env
=
{
mknown
=
mkm
;
tknown
=
tkm
;
funenv
=
Mps
.
empty
;
regenv
=
Mreg
.
empty
;
vsenv
=
init_env
;
}
...
...
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