Skip to content

Commit

Permalink
Upgrade to latest F* master
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris-Hawblitzel committed Nov 12, 2018
1 parent 7f6b9ff commit a94b616
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .fstar_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
239dcd02e3bb8814029ad35f27408ff96f9c7a90
a762dc29d47dc4c803225af65311a58b1769246e
2 changes: 1 addition & 1 deletion .vale_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.8
0.2.9
17 changes: 12 additions & 5 deletions tools/ImportFStarTypes/src/main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1105,8 +1105,11 @@ let main (argv:string array) =
printfn "%s" err;
printfn "\nerror at line %i column %i of string\n%s" (line lexbuf) (col lexbuf) (file lexbuf)
in
!close_streams ()
()
in
let print_err_exit (err:string):unit =
print_err err;
!close_streams ()
try
(
let parse_argv (args:string list) =
Expand Down Expand Up @@ -1202,6 +1205,10 @@ let main (argv:string array) =
in
ds
in
let parse_block s =
try parse_block s with
| err -> print_err (err.ToString ()); []
in
let ds = List.collect parse_block blocks in
let ds = filter_decls ds in
let ds = List.map decl_lift_type_binders ds in
Expand Down Expand Up @@ -1232,9 +1239,9 @@ let main (argv:string array) =
()
)
with
| Err err -> print_err err
| ParseErr err -> print_err err
| Failure err -> print_err err
| err -> print_err (err.ToString ())
| Err err -> print_err_exit err
| ParseErr err -> print_err_exit err
| Failure err -> print_err_exit err
| err -> print_err_exit (err.ToString ())

let () = main (System.Environment.GetCommandLineArgs ())

0 comments on commit a94b616

Please sign in to comment.