Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for local state in meta programs #2948

Merged
merged 3 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions examples/native_tactics/LocalState.Test.fst
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
(*
Copyright 2008-2018 Microsoft Research

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*)
module LocalState.Test
open FStar.Tactics.V2
open LocalState

let test () = assert (hasEq nat) by (t1 ())

52 changes: 52 additions & 0 deletions examples/native_tactics/LocalState.fst
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
(*
Copyright 2008-2018 Microsoft Research

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*)
module LocalState

open FStar.Tactics.V2

type st1 = {
x : int;
y : int;
}

type st2 = int -> int

[@@ plugin]
let t2 () : Tac unit = fail "always fail"

[@@ plugin]
let t1 (_:unit) : Tac unit =
let r1 = alloc {x = 1; y = 1} in
let r2 = alloc #st2 (fun x -> x + 1) in
let s1 = read r1 in
let s2 = read r2 in
let s = s1.x + s1.y + s2 1 in
if s <> 4 then fail "Expected 4"
else let _ = write r1 ({x = 2; y = 2}) in
let _ = write r2 (fun x -> x + 2) in
let s1 = read r1 in
let s2 = read r2 in
let s = s1.x + s1.y + s2 1 in
if s <> 7 then fail "Expected 7"
else try
let _ = write r1 ({x=3; y=3}) in
t2 ()
with
| _ ->
let s1 = read r1 in
let s = s1.x + s1.y in
if s <> 6 then fail "Expected 6"
else ()
3 changes: 2 additions & 1 deletion examples/native_tactics/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ TAC_MODULES=Print\
Embeddings\
Plugins\
Registers.List\
Sealed.Plugins
Sealed.Plugins \
LocalState

# Tests for which the native tatics are declared and used in the same module
ALL=Apply\
Expand Down
2 changes: 1 addition & 1 deletion examples/native_tactics/Simplifier.fst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ let op_Colon_Equals (#a:Type) (#rel:preorder a) (r:mref a rel) (v:a)
(fun h0 x h1 -> rel (sel h0 r) v /\ h0 `contains` r /\
modifies_singleton r h0 h1 /\ equal_dom h0 h1 /\
sel h1 r == v)
= write #a #rel r v
= ST.write #a #rel r v

let test1 (r: ref int) =
(r := 0
Expand Down
52 changes: 52 additions & 0 deletions examples/tactics/LocalState.fst
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
(*
Copyright 2008-2018 Microsoft Research

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*)
module LocalState

open FStar.Tactics.V2

type st1 = {
x : int;
y : int;
}

type st2 = int -> int

let t2 () : Tac unit = fail "always fail"

let t1 (_:unit) : Tac unit =
let r1 = alloc {x = 1; y = 1} in
let r2 = alloc #st2 (fun x -> x + 1) in
let s1 = read r1 in
let s2 = read r2 in
let s = s1.x + s1.y + s2 1 in
if s <> 4 then fail "Expected 4"
else let _ = write r1 ({x = 2; y = 2}) in
let _ = write r2 (fun x -> x + 2) in
let s1 = read r1 in
let s2 = read r2 in
let s = s1.x + s1.y + s2 1 in
if s <> 7 then fail "Expected 7"
else try
let _ = write r1 ({x=3; y=3}) in
t2 ()
with
| _ ->
let s1 = read r1 in
let s = s1.x + s1.y in
if s <> 6 then fail "Expected 6"
else ()

let _ = assert (hasEq nat) by (t1 ())
4 changes: 4 additions & 0 deletions ocaml/fstar-lib/FStar_Tactics_V2_Builtins.ml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ let all_ext_options = from_tac_1 "B.all_ext_options" B.all_ext_options
let ext_getv = from_tac_1 "B.ext_getv" B.ext_getv
let ext_getns = from_tac_1 "B.ext_getns" B.ext_getns

let alloc x = from_tac_1 "B.alloc" B.alloc x
let read r = from_tac_1 "B.read" B.read r
let write r x = from_tac_2 "B.write" B.write r x

type ('env, 't) prop_validity_token = unit
type ('env, 'sc, 't, 'pats, 'bnds) match_complete_token = unit

Expand Down
2 changes: 1 addition & 1 deletion ocaml/fstar-lib/generated/FStar_CheckedFiles.ml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ocaml/fstar-lib/generated/FStar_Main.ml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ocaml/fstar-lib/generated/FStar_Parser_Const.ml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions ocaml/fstar-lib/generated/FStar_Syntax_Embeddings_Base.ml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions ocaml/fstar-lib/generated/FStar_Syntax_Syntax.ml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 8 additions & 27 deletions ocaml/fstar-lib/generated/FStar_Syntax_Util.ml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading