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.

Sign up for GitHub

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

Remove FStar.Ghost.Pull #160

Merged
merged 4 commits into from
Jan 7, 2025
Merged

Remove FStar.Ghost.Pull #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb5d5b8
Remove FStar.Ghost.Pull
gebner Dec 17, 2024
d40a8b1
revert changes on Fuel, ListUpTo
tahina-pro Dec 18, 2024
e0ae461
recover loss of Tot/Ghost effect polymorphism
tahina-pro Dec 19, 2024
57bed43
Merge branch 'master' into gebner_rm_ghost_pull
gebner Jan 7, 2025
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
9 changes: 0 additions & 9 deletions src/lowparse/LowParse.Spec.Base.fst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ let parser_kind_prop_ext
= no_lookahead_ext f1 f2;
injective_ext f1 f2

let tot_bare_parser_of_bare_parser
#t
p
= Ghost.reveal (FStar.Ghost.Pull.pull p)

let is_weaker_than_correct
(k1: parser_kind)
(k2: parser_kind)
Expand Down Expand Up @@ -101,10 +96,6 @@ let serializer_correct_implies_complete
in
Classical.forall_intro (Classical.move_requires prf)

let tot_bare_serializer_of_bare_serializer
s
= FStar.Ghost.Pull.pull s

let serializer_parser_unique'
(#k1: parser_kind)
(#t: Type)
Expand Down
35 changes: 0 additions & 35 deletions src/lowparse/LowParse.Spec.Base.fsti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,24 +368,6 @@ let tot_parser
: Tot Type
= (f: tot_bare_parser t { parser_kind_prop k f } )

val tot_bare_parser_of_bare_parser
(#t: Type)
(p: bare_parser t)
: Ghost (tot_bare_parser t)
(requires True)
(ensures (fun p' -> forall x . parse p' x == parse p x))

let tot_parser_of_parser
(#k: parser_kind)
(#t: Type)
(p: parser k t)
: Ghost (tot_parser k t)
(requires True)
(ensures (fun p' -> forall x . parse p' x == parse p x))
= let p' = tot_bare_parser_of_bare_parser p in
parser_kind_prop_ext k p p';
p'

let parser_of_tot_parser
(#k: parser_kind)
(#t: Type)
Expand Down Expand Up @@ -848,23 +830,6 @@ let serialize
: GTot bytes
= s x

val tot_bare_serializer_of_bare_serializer
(#t: Type)
(s: bare_serializer t)
: Ghost (tot_bare_serializer t)
(requires True)
(ensures (fun s' -> forall x . bare_serialize s' x == bare_serialize s x))

let tot_serializer_of_serializer
(#k: parser_kind)
(#t: Type)
(#p: parser k t)
(s: serializer p)
: Ghost (tot_serializer (tot_parser_of_parser p))
(requires True)
(ensures (fun s' -> forall x . bare_serialize s' x == serialize #k s x))
= tot_bare_serializer_of_bare_serializer s

let serializer_of_tot_serializer
(#k: parser_kind)
(#t: Type)
Expand Down
51 changes: 47 additions & 4 deletions src/lowparse/LowParse.Spec.Fuel.fst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,13 @@ let parser_kind_prop_fuel_ext
injective_fuel_ext fuel f1 f2

let close_by_fuel'
(#t: Type)
(f: (nat -> Tot (bare_parser t)))
(closure: ((b: bytes) -> GTot (n: nat { Seq.length b < n })))
: Tot (bare_parser t)
= fun x -> f (closure x) x

let tot_close_by_fuel'
(#t: Type)
(f: (nat -> Tot (tot_bare_parser t)))
(closure: ((b: bytes) -> Tot (n: nat { Seq.length b < n })))
Expand All @@ -208,8 +215,8 @@ let close_by_fuel'
let close_by_fuel_correct
(#t: Type)
(k: parser_kind)
(f: (nat -> Tot (tot_bare_parser t)))
(closure: ((b: bytes) -> Tot (n: nat { Seq.length b < n })))
(f: (nat -> Tot (bare_parser t)))
(closure: ((b: bytes) -> GTot (n: nat { Seq.length b < n })))
(f_ext: (
(fuel: nat) ->
(b: bytes { Seq.length b < fuel }) ->
Expand Down Expand Up @@ -242,6 +249,42 @@ let close_by_fuel_correct
parser_kind_prop_equiv k (close_by_fuel' f closure)

let close_by_fuel
(#k: parser_kind)
(#t: Type)
(f: (nat -> Tot (parser k t)))
(closure: ((b: bytes) -> GTot (n: nat { Seq.length b < n })))
(f_ext: (
(fuel: nat) ->
(b: bytes { Seq.length b < fuel }) ->
Lemma
(f fuel b == f (closure b) b)
))
: Tot (parser k t)
= close_by_fuel_correct k f closure f_ext (fun fuel -> parser_kind_prop_equiv k (f fuel));
close_by_fuel' f closure

let tot_close_by_fuel_correct
(#t: Type)
(k: parser_kind)
(f: (nat -> Tot (tot_bare_parser t)))
(closure: ((b: bytes) -> Tot (n: nat { Seq.length b < n })))
(f_ext: (
(fuel: nat) ->
(b: bytes { Seq.length b < fuel }) ->
Lemma
(f fuel b == f (closure b) b)
))
(f_prop: (
(fuel: nat) ->
Lemma
(parser_kind_prop_fuel fuel k (f fuel))
))
: Lemma
(parser_kind_prop k (tot_close_by_fuel' f closure))
= close_by_fuel_correct k f closure f_ext f_prop;
parser_kind_prop_ext k (tot_close_by_fuel' f closure) (close_by_fuel' f closure)

let tot_close_by_fuel
(#k: parser_kind)
(#t: Type)
(f: (nat -> Tot (tot_parser k t)))
Expand All @@ -253,5 +296,5 @@ let close_by_fuel
(f fuel b == f (closure b) b)
))
: Tot (tot_parser k t)
= close_by_fuel_correct k f closure f_ext (fun fuel -> parser_kind_prop_equiv k (f fuel));
close_by_fuel' f closure
= tot_close_by_fuel_correct k f closure f_ext (fun fuel -> parser_kind_prop_equiv k (f fuel));
tot_close_by_fuel' f closure
Loading
Loading