diff --git a/mk/fstar-12.mk b/mk/fstar-12.mk index 9d6fef0344b..a9326342bf5 100644 --- a/mk/fstar-12.mk +++ b/mk/fstar-12.mk @@ -2,7 +2,7 @@ FSTAR_OPTIONS += --lax # HACK ALERT! --MLish passed by generic.mk to FStarC modules # only. Passing it here would mean the library is checked with # --MLish, which fails. -FSTAR_OPTIONS += --MLish_effect 'FStarC.Compiler.Effect' +FSTAR_OPTIONS += --MLish_effect 'FStarC.Effect' FSTAR_OPTIONS += --no_default_includes FSTAR_OPTIONS += --include "$(FSTAR_ROOT)/ulib" diff --git a/src/FStarCompiler.fst.config.json b/src/FStarCompiler.fst.config.json index fc0a12ab1f9..cf7dee212cc 100644 --- a/src/FStarCompiler.fst.config.json +++ b/src/FStarCompiler.fst.config.json @@ -2,7 +2,7 @@ "fstar_exe": "../stage0/bin/fstar.exe", "options": [ "--MLish", - "--MLish_effect", "FStarC.Compiler.Effect", + "--MLish_effect", "FStarC.Effect", "--lax", "--cache_dir", "../stage1/fstarc.checked", "--warn_error", diff --git a/src/README b/src/README index 701ee7e95ed..86f34f61329 100644 --- a/src/README +++ b/src/README @@ -6,8 +6,8 @@ Some files are written directly in OCaml: * The lexer: uses the OCaml Sedlexing library - * Some basic system utilities, like FStarC.Compiler.Util only has an - interface in F* and is implemented as FStarC_Compiler_Util.ml + * Some basic system utilities, like FStarC.Util only has an + interface in F* and is implemented as FStarC_Util.ml -------------------------------------------------------------------------------- diff --git a/src/basic/FStarC.Basefiles.fst b/src/basic/FStarC.Basefiles.fst index 7109ba5184e..a521ff9be45 100644 --- a/src/basic/FStarC.Basefiles.fst +++ b/src/basic/FStarC.Basefiles.fst @@ -1,10 +1,10 @@ module FStarC.Basefiles open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect module O = FStarC.Options -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module E = FStarC.Errors let must_find (fn:string) : string = diff --git a/src/basic/FStarC.Basefiles.fsti b/src/basic/FStarC.Basefiles.fsti index f1653beaa4d..76410a129c7 100644 --- a/src/basic/FStarC.Basefiles.fsti +++ b/src/basic/FStarC.Basefiles.fsti @@ -1,6 +1,6 @@ module FStarC.Basefiles -open FStarC.Compiler.Effect +open FStarC.Effect val prims : unit -> string val prims_basename : unit -> string diff --git a/src/basic/FStarC.BigInt.fsti b/src/basic/FStarC.BigInt.fsti index 71bdc97a150..d7d00056d00 100644 --- a/src/basic/FStarC.BigInt.fsti +++ b/src/basic/FStarC.BigInt.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.BigInt -open FStarC.Compiler.Effect +open FStarC.Effect type bigint type t = bigint diff --git a/src/basic/FStarC.Compiler.Bytes.fsti b/src/basic/FStarC.Bytes.fsti similarity index 95% rename from src/basic/FStarC.Compiler.Bytes.fsti rename to src/basic/FStarC.Bytes.fsti index 596147aed33..a7407511dbd 100644 --- a/src/basic/FStarC.Compiler.Bytes.fsti +++ b/src/basic/FStarC.Bytes.fsti @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Bytes -open FStarC.Compiler.Effect +module FStarC.Bytes +open FStarC.Effect open FStarC.BaseTypes type bytes = array byte diff --git a/src/basic/FStarC.Common.fst b/src/basic/FStarC.Common.fst index 158c5e8c101..f29fa57c27a 100644 --- a/src/basic/FStarC.Common.fst +++ b/src/basic/FStarC.Common.fst @@ -17,9 +17,9 @@ *) module FStarC.Common -open FStarC.Compiler.Effect -module List = FStarC.Compiler.List -module BU = FStarC.Compiler.Util +open FStarC.Effect +module List = FStarC.List +module BU = FStarC.Util let snapshot (push: 'a -> 'b) (stackref: ref (list 'c)) (arg: 'a) : (int & 'b) = BU.atomically (fun () -> let len : int = List.length !stackref in diff --git a/src/basic/FStarC.Common.fsti b/src/basic/FStarC.Common.fsti index 8cc4f3d907a..aed00d54c5f 100644 --- a/src/basic/FStarC.Common.fsti +++ b/src/basic/FStarC.Common.fsti @@ -17,9 +17,9 @@ *) module FStarC.Common -open FStarC.Compiler.Effect -module List = FStarC.Compiler.List -module BU = FStarC.Compiler.Util +open FStarC.Effect +module List = FStarC.List +module BU = FStarC.Util val snapshot (push: 'a -> 'b) (stackref: ref (list 'c)) (arg: 'a) : (int & 'b) diff --git a/src/basic/FStarC.Const.fst b/src/basic/FStarC.Const.fst index be2e4ee7b8a..3db15016aa4 100644 --- a/src/basic/FStarC.Const.fst +++ b/src/basic/FStarC.Const.fst @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.Const -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.BigInt open FStar.Char @@ -22,7 +22,7 @@ open FStar.Char let eq_const c1 c2 = match c1, c2 with | Const_int (s1, o1), Const_int(s2, o2) -> - FStarC.Compiler.Util.ensure_decimal s1 = FStarC.Compiler.Util.ensure_decimal s2 && + FStarC.Util.ensure_decimal s1 = FStarC.Util.ensure_decimal s2 && o1=o2 | Const_string(a, _), Const_string(b, _) -> a=b | Const_reflect l1, Const_reflect l2 -> Ident.lid_equals l1 l2 @@ -55,5 +55,5 @@ let bounds signedness width = let within_bounds repr signedness width = let lower, upper = bounds signedness width in - let value = big_int_of_string (FStarC.Compiler.Util.ensure_decimal repr) in + let value = big_int_of_string (FStarC.Util.ensure_decimal repr) in le_big_int lower value && le_big_int value upper diff --git a/src/basic/FStarC.Const.fsti b/src/basic/FStarC.Const.fsti index 47077aa0ca1..770c1b4356a 100644 --- a/src/basic/FStarC.Const.fsti +++ b/src/basic/FStarC.Const.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.Const -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.BigInt open FStar.Char @@ -31,7 +31,7 @@ type width = | Int8 | Int16 | Int32 | Int64 | Sizet and Const_int("67108863", None) which represent the same number - You should do an "FStarC.Compiler.Util.ensure_decimal" on the + You should do an "FStarC.Util.ensure_decimal" on the string representation before comparing integer constants. eq_const below does that for you @@ -45,10 +45,10 @@ type sconst = | Const_int of string & option (signedness & width) (* When None, means "mathematical integer", i.e. Prims.int. *) | Const_char of char (* unicode code point: char in F#, int in OCaml *) | Const_real of string - | Const_string of string & FStarC.Compiler.Range.range (* UTF-8 encoded *) + | Const_string of string & FStarC.Range.range (* UTF-8 encoded *) | Const_range_of (* `range_of` primitive *) | Const_set_range_of (* `set_range_of` primitive *) - | Const_range of FStarC.Compiler.Range.range (* not denotable by the programmer *) + | Const_range of FStarC.Range.range (* not denotable by the programmer *) | Const_reify of option Ident.lid (* a coercion from a computation to its underlying repr *) (* decorated optionally with the computation effect name *) | Const_reflect of Ident.lid (* a coercion from a Tot term to an l-computation type *) diff --git a/src/basic/FStarC.Compiler.Debug.fst b/src/basic/FStarC.Debug.fst similarity index 97% rename from src/basic/FStarC.Compiler.Debug.fst rename to src/basic/FStarC.Debug.fst index 864ac786b69..8c30c5aa956 100644 --- a/src/basic/FStarC.Compiler.Debug.fst +++ b/src/basic/FStarC.Debug.fst @@ -14,9 +14,9 @@ limitations under the License. *) -module FStarC.Compiler.Debug +module FStarC.Debug -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (* Mutable state *) let anyref = BU.mk_ref false diff --git a/src/basic/FStarC.Compiler.Debug.fsti b/src/basic/FStarC.Debug.fsti similarity index 96% rename from src/basic/FStarC.Compiler.Debug.fsti rename to src/basic/FStarC.Debug.fsti index 0846155220d..8c2fb89ea07 100644 --- a/src/basic/FStarC.Compiler.Debug.fsti +++ b/src/basic/FStarC.Debug.fsti @@ -14,11 +14,11 @@ limitations under the License. *) -module FStarC.Compiler.Debug +module FStarC.Debug open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect (* State handling for this module. Used by FStarC.Options, which is the only module that modifies the debug state. *) diff --git a/src/basic/FStarC.Defensive.fst b/src/basic/FStarC.Defensive.fst index a93035ec6de..fd8271e4e6c 100644 --- a/src/basic/FStarC.Defensive.fst +++ b/src/basic/FStarC.Defensive.fst @@ -1,8 +1,8 @@ module FStarC.Defensive -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Class.Binders open FStarC.Class.Show open FStarC.Class.Ord diff --git a/src/basic/FStarC.Defensive.fsti b/src/basic/FStarC.Defensive.fsti index 8f44aa6ad13..1a7bd34b107 100644 --- a/src/basic/FStarC.Defensive.fsti +++ b/src/basic/FStarC.Defensive.fsti @@ -15,8 +15,8 @@ *) module FStarC.Defensive -open FStarC.Compiler.Effect -open FStarC.Compiler.Range +open FStarC.Effect +open FStarC.Range open FStarC.Class.Binders open FStarC.Class.PP diff --git a/src/basic/FStarC.Dyn.fsti b/src/basic/FStarC.Dyn.fsti index e9436fe0472..369a3cc9539 100644 --- a/src/basic/FStarC.Dyn.fsti +++ b/src/basic/FStarC.Dyn.fsti @@ -16,7 +16,7 @@ module FStarC.Dyn -open FStarC.Compiler.Effect +open FStarC.Effect /// Dynamic casts diff --git a/src/basic/FStarC.Compiler.Effect.fsti b/src/basic/FStarC.Effect.fsti similarity index 98% rename from src/basic/FStarC.Compiler.Effect.fsti rename to src/basic/FStarC.Effect.fsti index 9be20e2d2ff..50a6524a39e 100644 --- a/src/basic/FStarC.Compiler.Effect.fsti +++ b/src/basic/FStarC.Effect.fsti @@ -14,7 +14,7 @@ limitations under the License. *) -module FStarC.Compiler.Effect +module FStarC.Effect new_effect ALL = ALL_h unit diff --git a/src/basic/FStarC.Errors.Msg.fst b/src/basic/FStarC.Errors.Msg.fst index 906598cee3b..c5310d50a6c 100644 --- a/src/basic/FStarC.Errors.Msg.fst +++ b/src/basic/FStarC.Errors.Msg.fst @@ -1,8 +1,8 @@ module FStarC.Errors.Msg -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Pprint instance is_error_message_string : is_error_message string = { @@ -58,6 +58,6 @@ let rendermsg (ds : list document) : string = renderdoc (concat (List.map (fun d -> subdoc (group d)) ds)) let json_of_error_message (err_msg: list document): FStarC.Json.json - = FStarC.Compiler.List.map + = FStarC.List.map (fun doc -> FStarC.Json.JsonStr (renderdoc doc)) err_msg |> FStarC.Json.JsonList diff --git a/src/basic/FStarC.Errors.fst b/src/basic/FStarC.Errors.fst index 66f4e58e6c1..c920afaef98 100644 --- a/src/basic/FStarC.Errors.fst +++ b/src/basic/FStarC.Errors.fst @@ -17,14 +17,14 @@ module FStarC.Errors open FStar.Pervasives open FStar.String -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util -open FStarC.Compiler.Range +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Util +open FStarC.Range open FStarC.Options -module List = FStarC.Compiler.List -module BU = FStarC.Compiler.Util +module List = FStarC.List +module BU = FStarC.Util module PP = FStarC.Pprint open FStarC.Class.Monad @@ -282,7 +282,7 @@ let compare_issues i1 i2 = | None, None -> 0 | None, Some _ -> -1 | Some _, None -> 1 - | Some r1, Some r2 -> FStarC.Compiler.Range.compare_use_range r1 r2 + | Some r1, Some r2 -> FStarC.Range.compare_use_range r1 r2 let dummy_ide_rng : Range.rng = mk_rng "" (mk_pos 1 0) (mk_pos 1 0) @@ -437,7 +437,7 @@ let warn_unsafe_options rng_opt msg = add_one (mk_issue EError rng_opt (mkmsg ("Every use of this option triggers an error: " ^ msg)) (Some warn_on_use_errno) []) | _ -> () -let set_option_warning_callback_range (ropt:option FStarC.Compiler.Range.range) = +let set_option_warning_callback_range (ropt:option FStarC.Range.range) = Options.set_option_warning_callback (warn_unsafe_options ropt) let t_set_parse_warn_error, diff --git a/src/basic/FStarC.Errors.fsti b/src/basic/FStarC.Errors.fsti index 8f091c357f3..6cb0935ce84 100644 --- a/src/basic/FStarC.Errors.fsti +++ b/src/basic/FStarC.Errors.fsti @@ -16,7 +16,7 @@ module FStarC.Errors -module Range = FStarC.Compiler.Range +module Range = FStarC.Range include FStarC.Errors.Codes include FStarC.Errors.Msg @@ -27,13 +27,13 @@ open FStarC.Json {json} (* This is a fallback to be used if an error is raised/logged with a dummy range. It is set by TypeChecker.Tc.process_one_decl to the range of the sigelt being checked. *) -val fallback_range : FStarC.Compiler.Effect.ref (option Range.range) +val fallback_range : FStarC.Effect.ref (option Range.range) (* This range, if set, will be used to limit the range of every issue that is logged/raised. This is set, e.g. when checking a top-level definition, to the range of the definition, so no error can be reported outside of it. *) -val error_range_bound : FStarC.Compiler.Effect.ref (option Range.range) +val error_range_bound : FStarC.Effect.ref (option Range.range) val with_error_bound (r:Range.range) (f : unit -> 'a) : 'a @@ -49,7 +49,7 @@ val call_to_erased_errno : int val update_flags : list (error_flag & string) -> list error_setting (* error code, message, source position, and error context *) -type error = error_code & error_message & FStarC.Compiler.Range.range & list string +type error = error_code & error_message & FStarC.Range.range & list string exception Error of error exception Warning of error @@ -102,7 +102,7 @@ val clear : unit -> unit val set_handler : error_handler -> unit val get_ctx : unit -> list string -val set_option_warning_callback_range : ropt:option FStarC.Compiler.Range.range -> unit +val set_option_warning_callback_range : ropt:option FStarC.Range.range -> unit val set_parse_warn_error : (string -> list error_setting) -> unit val lookup : error_code -> error_setting diff --git a/src/basic/FStarC.Find.fst b/src/basic/FStarC.Find.fst index 91b7b1530c5..2cc3dcfbbc1 100644 --- a/src/basic/FStarC.Find.fst +++ b/src/basic/FStarC.Find.fst @@ -17,10 +17,10 @@ module FStarC.Find open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -module BU = FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +module BU = FStarC.Util open FStarC.Class.Show let fstar_bin_directory : string = diff --git a/src/basic/FStarC.Find.fsti b/src/basic/FStarC.Find.fsti index 0548984df51..943239bc58c 100644 --- a/src/basic/FStarC.Find.fsti +++ b/src/basic/FStarC.Find.fsti @@ -17,7 +17,7 @@ module FStarC.Find (* Utilities for finding files in the include path and related operations. *) -open FStarC.Compiler.Effect +open FStarC.Effect (* A bit silly to have this, but this is the directory where the fstar.exe executable is in. *) val fstar_bin_directory : string diff --git a/src/basic/FStarC.GenSym.fst b/src/basic/FStarC.GenSym.fst index 7245c82d8a2..df42a13ce42 100644 --- a/src/basic/FStarC.GenSym.fst +++ b/src/basic/FStarC.GenSym.fst @@ -1,6 +1,6 @@ module FStarC.GenSym -module Util = FStarC.Compiler.Util +module Util = FStarC.Util (* private *) let gensym_st = Util.mk_ref 0 diff --git a/src/basic/FStarC.GenSym.fsti b/src/basic/FStarC.GenSym.fsti index 51f4e4f1afc..df0b5352acf 100644 --- a/src/basic/FStarC.GenSym.fsti +++ b/src/basic/FStarC.GenSym.fsti @@ -18,7 +18,7 @@ *) module FStarC.GenSym -open FStarC.Compiler.Effect +open FStarC.Effect (** Obtain a fresh ID. *) val next_id : unit -> int diff --git a/src/basic/FStarC.Getopt.fsti b/src/basic/FStarC.Getopt.fsti index fefb5ebe76e..2ea8d398977 100644 --- a/src/basic/FStarC.Getopt.fsti +++ b/src/basic/FStarC.Getopt.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.Getopt -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.BaseTypes val noshort : char diff --git a/src/basic/FStarC.Hash.fsti b/src/basic/FStarC.Hash.fsti index cba5dc5b576..eaa08c87b18 100644 --- a/src/basic/FStarC.Hash.fsti +++ b/src/basic/FStarC.Hash.fsti @@ -1,5 +1,5 @@ module FStarC.Hash -open FStarC.Compiler.Effect +open FStarC.Effect type hash_code diff --git a/src/basic/FStarC.Compiler.Hints.fsti b/src/basic/FStarC.Hints.fsti similarity index 91% rename from src/basic/FStarC.Compiler.Hints.fsti rename to src/basic/FStarC.Hints.fsti index fed6c7d33b9..103a07fce54 100644 --- a/src/basic/FStarC.Compiler.Hints.fsti +++ b/src/basic/FStarC.Hints.fsti @@ -1,8 +1,8 @@ -module FStarC.Compiler.Hints +module FStarC.Hints open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect (** Hints. *) type hint = { diff --git a/src/basic/FStarC.Ident.fst b/src/basic/FStarC.Ident.fst index daf8661d7c1..f1b6241587b 100644 --- a/src/basic/FStarC.Ident.fst +++ b/src/basic/FStarC.Ident.fst @@ -1,11 +1,11 @@ module FStarC.Ident open Prims -open FStarC.Compiler.Effect -open FStarC.Compiler.Range -open FStarC.Compiler.List -module List = FStarC.Compiler.List -module Util = FStarC.Compiler.Util +open FStarC.Effect +open FStarC.Range +open FStarC.List +module List = FStarC.List +module Util = FStarC.Util module GS = FStarC.GenSym [@@ PpxDerivingYoJson; PpxDerivingShow ] diff --git a/src/basic/FStarC.Ident.fsti b/src/basic/FStarC.Ident.fsti index f98fd55641b..8b253e2aea1 100644 --- a/src/basic/FStarC.Ident.fsti +++ b/src/basic/FStarC.Ident.fsti @@ -15,7 +15,7 @@ *) module FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Class.Show open FStarC.Class.HasRange open FStarC.Class.Deq diff --git a/src/basic/FStarC.Json.fsti b/src/basic/FStarC.Json.fsti index 672f6e182e3..49a975d91d9 100644 --- a/src/basic/FStarC.Json.fsti +++ b/src/basic/FStarC.Json.fsti @@ -15,7 +15,7 @@ *) module FStarC.Json -open FStarC.Compiler.Effect +open FStarC.Effect type json = | JsonNull diff --git a/src/basic/FStarC.Compiler.List.fsti b/src/basic/FStarC.List.fsti similarity index 98% rename from src/basic/FStarC.Compiler.List.fsti rename to src/basic/FStarC.List.fsti index 0ec10ad4263..c5bba540d94 100644 --- a/src/basic/FStarC.Compiler.List.fsti +++ b/src/basic/FStarC.List.fsti @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.List -open FStarC.Compiler.Effect +module FStarC.List +open FStarC.Effect open Prims val isEmpty : (list 'a) -> Tot bool diff --git a/src/basic/FStarC.Compiler.MachineInts.fst b/src/basic/FStarC.MachineInts.fst similarity index 98% rename from src/basic/FStarC.Compiler.MachineInts.fst rename to src/basic/FStarC.MachineInts.fst index b7420b0c020..542865bcb3e 100644 --- a/src/basic/FStarC.Compiler.MachineInts.fst +++ b/src/basic/FStarC.MachineInts.fst @@ -1,11 +1,11 @@ -module FStarC.Compiler.MachineInts +module FStarC.MachineInts (* A type representing all the kinds of machine integers, and an embedding instance for them. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax module EMB = FStarC.Syntax.Embeddings diff --git a/src/basic/FStarC.Compiler.MachineInts.fsti b/src/basic/FStarC.MachineInts.fsti similarity index 93% rename from src/basic/FStarC.Compiler.MachineInts.fsti rename to src/basic/FStarC.MachineInts.fsti index 0e5bd4d052a..fc3882a337a 100644 --- a/src/basic/FStarC.Compiler.MachineInts.fsti +++ b/src/basic/FStarC.MachineInts.fsti @@ -1,8 +1,8 @@ -module FStarC.Compiler.MachineInts +module FStarC.MachineInts open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect module EMB = FStarC.Syntax.Embeddings module NBE = FStarC.TypeChecker.NBETerm diff --git a/src/basic/FStarC.Compiler.Misc.fst b/src/basic/FStarC.Misc.fst similarity index 71% rename from src/basic/FStarC.Compiler.Misc.fst rename to src/basic/FStarC.Misc.fst index f9039b6db12..a1e9e024510 100644 --- a/src/basic/FStarC.Compiler.Misc.fst +++ b/src/basic/FStarC.Misc.fst @@ -1,10 +1,10 @@ -module FStarC.Compiler.Misc +module FStarC.Misc -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util -open FStarC.Compiler.Order +open FStarC.Order open FStar.String let compare_version (v1 v2 : string) : order = diff --git a/src/basic/FStarC.Compiler.Misc.fsti b/src/basic/FStarC.Misc.fsti similarity index 81% rename from src/basic/FStarC.Compiler.Misc.fsti rename to src/basic/FStarC.Misc.fsti index d0a18fc1fa8..27d12684437 100644 --- a/src/basic/FStarC.Compiler.Misc.fsti +++ b/src/basic/FStarC.Misc.fsti @@ -1,6 +1,6 @@ -module FStarC.Compiler.Misc +module FStarC.Misc -open FStarC.Compiler.Effect +open FStarC.Effect (* This functions compare version numbers. E.g. "4.8.5" and "4.12.3". NOTE: the versions cannot contain any alphabetic character, only numbers diff --git a/src/basic/FStarC.Compiler.Option.fst b/src/basic/FStarC.Option.fst similarity index 94% rename from src/basic/FStarC.Compiler.Option.fst rename to src/basic/FStarC.Option.fst index 94debfd6fce..a79ee0a2d3a 100644 --- a/src/basic/FStarC.Compiler.Option.fst +++ b/src/basic/FStarC.Option.fst @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Option +module FStarC.Option -open FStarC.Compiler.Effect +open FStarC.Effect let isNone = function | None -> true diff --git a/src/basic/FStarC.Compiler.Option.fsti b/src/basic/FStarC.Option.fsti similarity index 93% rename from src/basic/FStarC.Compiler.Option.fsti rename to src/basic/FStarC.Option.fsti index 976f7c16391..501be710eb8 100644 --- a/src/basic/FStarC.Compiler.Option.fsti +++ b/src/basic/FStarC.Option.fsti @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Option +module FStarC.Option open Prims -open FStarC.Compiler.Effect +open FStarC.Effect val isNone: option 'a -> Tot bool val isSome: option 'a -> Tot bool diff --git a/src/basic/FStarC.Options.Ext.fst b/src/basic/FStarC.Options.Ext.fst index f5b3baff35c..4c8ddc59582 100644 --- a/src/basic/FStarC.Options.Ext.fst +++ b/src/basic/FStarC.Options.Ext.fst @@ -15,10 +15,10 @@ *) module FStarC.Options.Ext -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Class.Show -module BU = FStarC.Compiler.Util +module BU = FStarC.Util type ext_state = | E : map : BU.psmap string -> ext_state @@ -40,7 +40,7 @@ let get (k:key) : value = (* Find a home *) let is_prefix (s1 s2 : string) : ML bool = - let open FStarC.Compiler.String in + let open FStarC.String in let l1 = length s1 in let l2 = length s2 in l2 >= l1 && substring s2 0 l1 = s1 diff --git a/src/basic/FStarC.Options.Ext.fsti b/src/basic/FStarC.Options.Ext.fsti index 8670968921f..26aa1ab012c 100644 --- a/src/basic/FStarC.Options.Ext.fsti +++ b/src/basic/FStarC.Options.Ext.fsti @@ -15,7 +15,7 @@ *) module FStarC.Options.Ext -open FStarC.Compiler.Effect +open FStarC.Effect type key = string type value = string diff --git a/src/basic/FStarC.Options.fst b/src/basic/FStarC.Options.fst index e87cfad07c6..e3f6ef184f6 100644 --- a/src/basic/FStarC.Options.fst +++ b/src/basic/FStarC.Options.fst @@ -17,21 +17,21 @@ module FStarC.Options open FStar open FStarC open FStarC.BaseTypes -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.String -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.String +open FStarC.Util open FStarC.Getopt open FStar.Pervasives open FStarC.VConfig open FStarC.Class.Show open FStarC.Class.Deq -module Option = FStarC.Compiler.Option +module Option = FStarC.Option module FC = FStarC.Common -module Util = FStarC.Compiler.Util -module List = FStarC.Compiler.List +module Util = FStarC.Util +module List = FStarC.List module Ext = FStarC.Options.Ext @@ -238,7 +238,7 @@ let defaults = ("max_fuel" , Int 8); ("max_ifuel" , Int 2); ("MLish" , Bool false); - ("MLish_effect" , String "FStar.Compiler.Effect"); + ("MLish_effect" , String "FStar.Effect"); ("no_default_includes" , Bool false); ("no_extract" , List []); ("no_location_info" , Bool false); @@ -1157,7 +1157,7 @@ let rec specs_with_types warn_unsafe : list (char & string & opt_type & Pprint.d ( noshort, "MLish_effect", SimpleStr "module_name", - text "Set the default effect *module* for --MLish (default: FStar.Compiler.Effect)"); + text "Set the default effect *module* for --MLish (default: FStar.Effect)"); ( noshort, "no_default_includes", @@ -1491,12 +1491,12 @@ let rec specs_with_types warn_unsafe : list (char & string & opt_type & Pprint.d ReverseAccumulated (SimpleStr "One or more space-separated occurrences of '[+|-]( * | namespace | fact id)'"), text "Prunes the context to include only the facts from the given namespace or fact id. \ Facts can be include or excluded using the [+|-] qualifier. \ - For example --using_facts_from '* -FStarC.Reflection +FStarC.Compiler.List -FStarC.Compiler.List.Tot' will \ - remove all facts from FStarC.Compiler.List.Tot.*, \ - retain all remaining facts from FStarC.Compiler.List.*, \ + For example --using_facts_from '* -FStarC.Reflection +FStarC.List -FStarC.List.Tot' will \ + remove all facts from FStarC.List.Tot.*, \ + retain all remaining facts from FStarC.List.*, \ remove all facts from FStarC.Reflection.*, \ and retain all the rest. \ - Note, the '+' is optional: --using_facts_from 'FStarC.Compiler.List' is equivalent to --using_facts_from '+FStarC.Compiler.List'. \ + Note, the '+' is optional: --using_facts_from 'FStarC.List' is equivalent to --using_facts_from '+FStarC.List'. \ Multiple uses of this option accumulate, e.g., --using_facts_from A --using_facts_from B is interpreted as --using_facts_from A^B."); ( noshort, diff --git a/src/basic/FStarC.Options.fsti b/src/basic/FStarC.Options.fsti index b90610c84aa..fcae5cae107 100644 --- a/src/basic/FStarC.Options.fsti +++ b/src/basic/FStarC.Options.fsti @@ -15,11 +15,11 @@ *) module FStarC.Options open FStar.All -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Getopt open FStarC.BaseTypes open FStarC.VConfig -open FStarC.Compiler +open FStarC type codegen_t = | OCaml @@ -43,7 +43,7 @@ type option_val = | List of list option_val | Unset -type optionstate = FStarC.Compiler.Util.psmap option_val +type optionstate = FStarC.Util.psmap option_val type opt_type = | Const of option_val diff --git a/src/basic/FStarC.Compiler.Order.fst b/src/basic/FStarC.Order.fst similarity index 97% rename from src/basic/FStarC.Compiler.Order.fst rename to src/basic/FStarC.Order.fst index 007d8c347f2..85d8369fe58 100644 --- a/src/basic/FStarC.Compiler.Order.fst +++ b/src/basic/FStarC.Order.fst @@ -14,8 +14,8 @@ limitations under the License. *) -module FStarC.Compiler.Order -open FStarC.Compiler.Effect +module FStarC.Order +open FStarC.Effect // Some derived checks let ge (o : order) : bool = o <> Lt diff --git a/src/basic/FStarC.Compiler.Order.fsti b/src/basic/FStarC.Order.fsti similarity index 96% rename from src/basic/FStarC.Compiler.Order.fsti rename to src/basic/FStarC.Order.fsti index 9fedf6669a1..2024077c235 100644 --- a/src/basic/FStarC.Compiler.Order.fsti +++ b/src/basic/FStarC.Order.fsti @@ -14,8 +14,8 @@ limitations under the License. *) -module FStarC.Compiler.Order -open FStarC.Compiler.Effect +module FStarC.Order +open FStarC.Effect type order = | Lt | Eq | Gt diff --git a/src/basic/FStarC.Platform.fsti b/src/basic/FStarC.Platform.fsti index dd9cebe26eb..1e8b79b5be5 100644 --- a/src/basic/FStarC.Platform.fsti +++ b/src/basic/FStarC.Platform.fsti @@ -1,5 +1,5 @@ module FStarC.Platform -open FStarC.Compiler.Effect +open FStarC.Effect type sys = | Windows diff --git a/src/basic/FStarC.Compiler.Plugins.Base.fsti b/src/basic/FStarC.Plugins.Base.fsti similarity index 91% rename from src/basic/FStarC.Compiler.Plugins.Base.fsti rename to src/basic/FStarC.Plugins.Base.fsti index 052a773350e..30217e9b88a 100644 --- a/src/basic/FStarC.Compiler.Plugins.Base.fsti +++ b/src/basic/FStarC.Plugins.Base.fsti @@ -14,9 +14,9 @@ limitations under the License. *) -module FStarC.Compiler.Plugins.Base +module FStarC.Plugins.Base -open FStarC.Compiler.Effect +open FStarC.Effect exception DynlinkError of string diff --git a/src/basic/FStarC.Compiler.Plugins.fst b/src/basic/FStarC.Plugins.fst similarity index 95% rename from src/basic/FStarC.Compiler.Plugins.fst rename to src/basic/FStarC.Plugins.fst index 35d7d8cfbba..e5ebae7151b 100644 --- a/src/basic/FStarC.Compiler.Plugins.fst +++ b/src/basic/FStarC.Plugins.fst @@ -14,14 +14,14 @@ limitations under the License. *) -module FStarC.Compiler.Plugins +module FStarC.Plugins open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Plugins.Base +open FStarC +open FStarC.Effect +open FStarC.Plugins.Base -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module E = FStarC.Errors module O = FStarC.Options open FStarC.Class.Show @@ -72,7 +72,7 @@ let load_plugins tacs = let load_plugins_dir dir = (* Dynlink all .cmxs files in the given directory *) - (* fixme: confusion between FStarC.Compiler.String and FStar.String *) + (* fixme: confusion between FStarC.String and FStar.String *) BU.readdir dir |> List.filter (fun s -> String.length s >= 5 && FStar.String.sub s (String.length s - 5) 5 = ".cmxs") |> List.map (fun s -> dir ^ "/" ^ s) diff --git a/src/basic/FStarC.Compiler.Plugins.fsti b/src/basic/FStarC.Plugins.fsti similarity index 91% rename from src/basic/FStarC.Compiler.Plugins.fsti rename to src/basic/FStarC.Plugins.fsti index dcc478d236c..c4f6398acd8 100644 --- a/src/basic/FStarC.Compiler.Plugins.fsti +++ b/src/basic/FStarC.Plugins.fsti @@ -14,10 +14,10 @@ limitations under the License. *) -module FStarC.Compiler.Plugins +module FStarC.Plugins -open FStarC.Compiler.Effect -include FStarC.Compiler.Plugins.Base +open FStarC.Effect +include FStarC.Plugins.Base val load_plugin : string -> unit val load_plugins : list string -> unit diff --git a/src/basic/FStarC.Profiling.fst b/src/basic/FStarC.Profiling.fst index e079244e1b8..2a812369eff 100644 --- a/src/basic/FStarC.Profiling.fst +++ b/src/basic/FStarC.Profiling.fst @@ -16,11 +16,11 @@ module FStarC.Profiling open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -module List = FStarC.Compiler.List +open FStarC +open FStarC.Effect +module List = FStarC.List open FStarC.Options -module BU = FStarC.Compiler.Util +module BU = FStarC.Util open FStarC.Json (* diff --git a/src/basic/FStarC.Profiling.fsti b/src/basic/FStarC.Profiling.fsti index 756616924fc..fe3789465ce 100644 --- a/src/basic/FStarC.Profiling.fsti +++ b/src/basic/FStarC.Profiling.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.Profiling -open FStarC.Compiler.Effect +open FStarC.Effect // When --profile module_name // And --profile_component component_name diff --git a/src/basic/FStarC.Compiler.Range.Ops.fst b/src/basic/FStarC.Range.Ops.fst similarity index 95% rename from src/basic/FStarC.Compiler.Range.Ops.fst rename to src/basic/FStarC.Range.Ops.fst index 2e87067a096..a65731dab23 100644 --- a/src/basic/FStarC.Compiler.Range.Ops.fst +++ b/src/basic/FStarC.Range.Ops.fst @@ -14,16 +14,16 @@ limitations under the License. *) (* - Operations over the FStarC.Compiler.Range.Type.range type. + Operations over the FStarC.Range.Type.range type. *) -module FStarC.Compiler.Range.Ops +module FStarC.Range.Ops open FStarC -friend FStarC.Compiler.Range.Type +friend FStarC.Range.Type open FStarC.Json -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.Util open FStarC.Class.Ord module Options = FStarC.Options diff --git a/src/basic/FStarC.Compiler.Range.Ops.fsti b/src/basic/FStarC.Range.Ops.fsti similarity index 95% rename from src/basic/FStarC.Compiler.Range.Ops.fsti rename to src/basic/FStarC.Range.Ops.fsti index b8b4df29953..33f167d180a 100644 --- a/src/basic/FStarC.Compiler.Range.Ops.fsti +++ b/src/basic/FStarC.Range.Ops.fsti @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Range.Ops +module FStarC.Range.Ops open FStarC -open FStarC.Compiler.Range.Type -open FStarC.Compiler.Effect +open FStarC.Range.Type +open FStarC.Effect open FStarC.Class.Show open FStarC.Class.PP diff --git a/src/basic/FStarC.Compiler.Range.Type.fst b/src/basic/FStarC.Range.Type.fst similarity index 95% rename from src/basic/FStarC.Compiler.Range.Type.fst rename to src/basic/FStarC.Range.Type.fst index 53af897b478..4b13ade7863 100644 --- a/src/basic/FStarC.Compiler.Range.Type.fst +++ b/src/basic/FStarC.Range.Type.fst @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Range.Type +module FStarC.Range.Type open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Class.Deq open FStarC.Class.Ord -open FStarC.Compiler.Order -module BU = FStarC.Compiler.Util +open FStarC.Order +module BU = FStarC.Util [@@ PpxDerivingYoJson; PpxDerivingShow ] type file_name = string diff --git a/src/basic/FStarC.Compiler.Range.Type.fsti b/src/basic/FStarC.Range.Type.fsti similarity index 95% rename from src/basic/FStarC.Compiler.Range.Type.fsti rename to src/basic/FStarC.Range.Type.fsti index 4295532f5d4..f798457a108 100644 --- a/src/basic/FStarC.Compiler.Range.Type.fsti +++ b/src/basic/FStarC.Range.Type.fsti @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Range.Type +module FStarC.Range.Type -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Class.Deq open FStarC.Class.Ord diff --git a/src/basic/FStarC.Compiler.Range.fsti b/src/basic/FStarC.Range.fsti similarity index 87% rename from src/basic/FStarC.Compiler.Range.fsti rename to src/basic/FStarC.Range.fsti index 6a893bf6537..645ecf3c83b 100644 --- a/src/basic/FStarC.Compiler.Range.fsti +++ b/src/basic/FStarC.Range.fsti @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Range +module FStarC.Range (* This module simply bundles together these other two. See their interfaces for reference. *) -include FStarC.Compiler.Range.Type -include FStarC.Compiler.Range.Ops +include FStarC.Range.Type +include FStarC.Range.Ops diff --git a/src/basic/FStarC.Compiler.Real.fst b/src/basic/FStarC.Real.fst similarity index 95% rename from src/basic/FStarC.Compiler.Real.fst rename to src/basic/FStarC.Real.fst index 38e29385693..bc537b296e8 100644 --- a/src/basic/FStarC.Compiler.Real.fst +++ b/src/basic/FStarC.Real.fst @@ -13,4 +13,4 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Real +module FStarC.Real diff --git a/src/basic/FStarC.Compiler.Real.fsti b/src/basic/FStarC.Real.fsti similarity index 96% rename from src/basic/FStarC.Compiler.Real.fsti rename to src/basic/FStarC.Real.fsti index ee8d45d7132..5efc2ff0595 100644 --- a/src/basic/FStarC.Compiler.Real.fsti +++ b/src/basic/FStarC.Real.fsti @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Real +module FStarC.Real (* A type for embedded real constants. This allows to write embeddings for them (see FStarC.Syntax.Embeddings and FStarC.TypeChecker.NBETerm). *) diff --git a/src/basic/FStarC.Compiler.Sealed.fst b/src/basic/FStarC.Sealed.fst similarity index 97% rename from src/basic/FStarC.Compiler.Sealed.fst rename to src/basic/FStarC.Sealed.fst index fed2c1531bc..2eff66b7cc5 100644 --- a/src/basic/FStarC.Compiler.Sealed.fst +++ b/src/basic/FStarC.Sealed.fst @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Sealed +module FStarC.Sealed (* This is the compiler-space version of the Sealed module in ulib. Here, we define it as just an identity, but we do not expose that in diff --git a/src/basic/FStarC.Compiler.Sealed.fsti b/src/basic/FStarC.Sealed.fsti similarity index 96% rename from src/basic/FStarC.Compiler.Sealed.fsti rename to src/basic/FStarC.Sealed.fsti index a55b141230d..69ea2a82265 100644 --- a/src/basic/FStarC.Compiler.Sealed.fsti +++ b/src/basic/FStarC.Sealed.fsti @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Sealed +module FStarC.Sealed val sealed (a:Type u#a) : Type u#a diff --git a/src/basic/FStarC.Compiler.String.fsti b/src/basic/FStarC.String.fsti similarity index 96% rename from src/basic/FStarC.Compiler.String.fsti rename to src/basic/FStarC.String.fsti index a9e2f25fb6a..6cfc3277ce9 100644 --- a/src/basic/FStarC.Compiler.String.fsti +++ b/src/basic/FStarC.String.fsti @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.String +module FStarC.String -open FStarC.Compiler.Effect +open FStarC.Effect open FStar.Char open FStarC.BigInt diff --git a/src/basic/FStarC.StringBuffer.fsti b/src/basic/FStarC.StringBuffer.fsti index ac18df20d0b..ff6393796a6 100644 --- a/src/basic/FStarC.StringBuffer.fsti +++ b/src/basic/FStarC.StringBuffer.fsti @@ -15,7 +15,7 @@ *) module FStarC.StringBuffer -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.BigInt type t @@ -31,4 +31,4 @@ val create : int -> t val add: string -> t -> t val contents: t -> string val clear: t -> t -val output_channel: FStarC.Compiler.Util.out_channel -> t -> unit +val output_channel: FStarC.Util.out_channel -> t -> unit diff --git a/src/basic/FStarC.Thunk.fst b/src/basic/FStarC.Thunk.fst index 2673058f144..a3a411fb3ad 100644 --- a/src/basic/FStarC.Thunk.fst +++ b/src/basic/FStarC.Thunk.fst @@ -16,7 +16,7 @@ limitations under the License. *) module FStarC.Thunk -open FStarC.Compiler.Effect +open FStarC.Effect type thunk (a:Type) : Type = ref (either (unit -> a) a) diff --git a/src/basic/FStarC.Thunk.fsti b/src/basic/FStarC.Thunk.fsti index 013f2dd8952..2b140ecd4ca 100644 --- a/src/basic/FStarC.Thunk.fsti +++ b/src/basic/FStarC.Thunk.fsti @@ -16,7 +16,7 @@ limitations under the License. *) module FStarC.Thunk -open FStarC.Compiler.Effect +open FStarC.Effect val thunk (a:Type0) : Type0 type t 'a = thunk 'a diff --git a/src/basic/FStarC.Unionfind.fsti b/src/basic/FStarC.Unionfind.fsti index 2b501dd6ee2..9afff3e1319 100644 --- a/src/basic/FStarC.Unionfind.fsti +++ b/src/basic/FStarC.Unionfind.fsti @@ -15,7 +15,7 @@ *) module FStarC.Unionfind -open FStarC.Compiler.Effect +open FStarC.Effect type puf 'a type p_uvar 'a diff --git a/src/basic/FStarC.Compiler.Util.fsti b/src/basic/FStarC.Util.fsti similarity index 99% rename from src/basic/FStarC.Compiler.Util.fsti rename to src/basic/FStarC.Util.fsti index ebd319f8468..aebee0a5b64 100644 --- a/src/basic/FStarC.Compiler.Util.fsti +++ b/src/basic/FStarC.Util.fsti @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Util +module FStarC.Util open Prims open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Json open FStarC.BaseTypes diff --git a/src/basic/FStarC.Version.fsti b/src/basic/FStarC.Version.fsti index cec31cbae22..5b9d1e6b3b7 100644 --- a/src/basic/FStarC.Version.fsti +++ b/src/basic/FStarC.Version.fsti @@ -14,6 +14,6 @@ limitations under the License. *) module FStarC.Version -open FStarC.Compiler.Effect +open FStarC.Effect val dummy: unit -> unit diff --git a/src/class/FStarC.Class.Binders.fst b/src/class/FStarC.Class.Binders.fst index 9668db359e0..206f2ade182 100644 --- a/src/class/FStarC.Class.Binders.fst +++ b/src/class/FStarC.Class.Binders.fst @@ -1,10 +1,10 @@ module FStarC.Class.Binders -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Range -open FStarC.Compiler.Util -open FStarC.Compiler.FlatSet +open FStarC +open FStarC.Effect +open FStarC.Range +open FStarC.Util +open FStarC.FlatSet open FStarC.Syntax.Syntax module F = FStarC.Syntax.Free open FStarC.Errors diff --git a/src/class/FStarC.Class.Binders.fsti b/src/class/FStarC.Class.Binders.fsti index 855967c9c7e..93776a7f703 100644 --- a/src/class/FStarC.Class.Binders.fsti +++ b/src/class/FStarC.Class.Binders.fsti @@ -1,7 +1,7 @@ module FStarC.Class.Binders -open FStarC.Compiler.Util -open FStarC.Compiler.FlatSet +open FStarC.Util +open FStarC.FlatSet open FStarC.Syntax.Syntax (* TODO: should be for any setlike *) diff --git a/src/class/FStarC.Class.Deq.fst b/src/class/FStarC.Class.Deq.fst index e1720918730..fb5e7768e0c 100644 --- a/src/class/FStarC.Class.Deq.fst +++ b/src/class/FStarC.Class.Deq.fst @@ -1,6 +1,6 @@ module FStarC.Class.Deq -open FStarC.Compiler.Effect +open FStarC.Effect let (<>?) x y = not (x =? y) diff --git a/src/class/FStarC.Class.Deq.fsti b/src/class/FStarC.Class.Deq.fsti index 3836cc3b058..bc04a092632 100644 --- a/src/class/FStarC.Class.Deq.fsti +++ b/src/class/FStarC.Class.Deq.fsti @@ -1,6 +1,6 @@ module FStarC.Class.Deq -open FStarC.Compiler.Effect +open FStarC.Effect class deq (a:Type) = { (=?) : a -> a -> bool; diff --git a/src/class/FStarC.Class.HasRange.fst b/src/class/FStarC.Class.HasRange.fst index a0eb4e9b458..45ee78bff7f 100644 --- a/src/class/FStarC.Class.HasRange.fst +++ b/src/class/FStarC.Class.HasRange.fst @@ -1,6 +1,6 @@ module FStarC.Class.HasRange -open FStarC.Compiler.Range +open FStarC.Range instance hasRange_range : hasRange range = { pos = id; diff --git a/src/class/FStarC.Class.HasRange.fsti b/src/class/FStarC.Class.HasRange.fsti index f8582711212..88725ab0e5b 100644 --- a/src/class/FStarC.Class.HasRange.fsti +++ b/src/class/FStarC.Class.HasRange.fsti @@ -1,7 +1,7 @@ module FStarC.Class.HasRange -open FStarC.Compiler.Effect -open FStarC.Compiler.Range +open FStarC.Effect +open FStarC.Range class hasRange (a:Type) = { pos : a -> range; diff --git a/src/class/FStarC.Class.Hashable.fst b/src/class/FStarC.Class.Hashable.fst index 78371eaf077..8ac3e02b3d4 100644 --- a/src/class/FStarC.Class.Hashable.fst +++ b/src/class/FStarC.Class.Hashable.fst @@ -1,7 +1,7 @@ module FStarC.Class.Hashable open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Hash open FStarC.Class.Show open FStarC.Class.Deq diff --git a/src/class/FStarC.Class.Listlike.fst b/src/class/FStarC.Class.Listlike.fst index b2abd016c2c..5a045f99345 100644 --- a/src/class/FStarC.Class.Listlike.fst +++ b/src/class/FStarC.Class.Listlike.fst @@ -1,6 +1,6 @@ module FStarC.Class.Listlike -open FStarC.Compiler.Effect +open FStarC.Effect let is_empty (#e #s : Type) {| listlike e s |} (l : s) : bool = match view l with diff --git a/src/class/FStarC.Class.Listlike.fsti b/src/class/FStarC.Class.Listlike.fsti index d06b2ea724b..018e31ce735 100644 --- a/src/class/FStarC.Class.Listlike.fsti +++ b/src/class/FStarC.Class.Listlike.fsti @@ -1,6 +1,6 @@ module FStarC.Class.Listlike -open FStarC.Compiler.Effect +open FStarC.Effect type view_t e s = | VNil : view_t e s diff --git a/src/class/FStarC.Class.Monad.fst b/src/class/FStarC.Class.Monad.fst index 83b52598e52..f4dbfee7ec1 100644 --- a/src/class/FStarC.Class.Monad.fst +++ b/src/class/FStarC.Class.Monad.fst @@ -1,7 +1,7 @@ module FStarC.Class.Monad -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect instance monad_option : monad option = { return = (fun x -> Some x); // FIXME: without the we gell ill-typed ML diff --git a/src/class/FStarC.Class.Monad.fsti b/src/class/FStarC.Class.Monad.fsti index 4931c56aff4..8eea380a980 100644 --- a/src/class/FStarC.Class.Monad.fsti +++ b/src/class/FStarC.Class.Monad.fsti @@ -1,7 +1,7 @@ module FStarC.Class.Monad -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect class monad (m : Type -> Type) = { return : #a:Type -> a -> m a; diff --git a/src/class/FStarC.Class.Monoid.fst b/src/class/FStarC.Class.Monoid.fst index b0d483de8be..917b6819ce3 100644 --- a/src/class/FStarC.Class.Monoid.fst +++ b/src/class/FStarC.Class.Monoid.fst @@ -1,8 +1,8 @@ module FStarC.Class.Monoid -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List let ( ++ ) #a {| monoid a |} = mplus #a diff --git a/src/class/FStarC.Class.Monoid.fsti b/src/class/FStarC.Class.Monoid.fsti index 9224875f42a..3665ab0114f 100644 --- a/src/class/FStarC.Class.Monoid.fsti +++ b/src/class/FStarC.Class.Monoid.fsti @@ -1,8 +1,8 @@ module FStarC.Class.Monoid -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List class monoid (a:Type) = { mzero : a; diff --git a/src/class/FStarC.Class.Ord.fst b/src/class/FStarC.Class.Ord.fst index 01ee370a539..854a2f76aff 100644 --- a/src/class/FStarC.Class.Ord.fst +++ b/src/class/FStarC.Class.Ord.fst @@ -1,7 +1,7 @@ module FStarC.Class.Ord -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStar.Tactics.Typeclasses let ( insert x (sort xs) let dedup #a xs = - let open FStarC.Compiler.List in + let open FStarC.List in let out = fold_left (fun out x -> if existsb (fun y -> x =? y) out then out else x :: out) [] xs in List.rev out @@ -44,7 +44,7 @@ let rec sort_dedup #a xs = | x::xs -> insert x (sort_dedup xs) let ord_list_diff (#a:Type0) {| ord a |} (xs ys : list a) : list a & list a = - let open FStarC.Compiler.Order in + let open FStarC.Order in let xs = xs |> sort_dedup in let ys = ys |> sort_dedup in let rec go (xd, yd) xs ys : list a & list a = diff --git a/src/class/FStarC.Class.Ord.fsti b/src/class/FStarC.Class.Ord.fsti index fc6b03031dc..86043931391 100644 --- a/src/class/FStarC.Class.Ord.fsti +++ b/src/class/FStarC.Class.Ord.fsti @@ -1,7 +1,7 @@ module FStarC.Class.Ord -open FStarC.Compiler.Effect -open FStarC.Compiler.Order +open FStarC.Effect +open FStarC.Order include FStarC.Class.Deq open FStarC.Class.Deq diff --git a/src/class/FStarC.Class.PP.fst b/src/class/FStarC.Class.PP.fst index 9be4858f070..3ce720f4dd2 100644 --- a/src/class/FStarC.Class.PP.fst +++ b/src/class/FStarC.Class.PP.fst @@ -1,7 +1,7 @@ module FStarC.Class.PP open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Pprint let gparens a = group (nest 2 (parens a)) diff --git a/src/class/FStarC.Class.PP.fsti b/src/class/FStarC.Class.PP.fsti index f2c27165b02..c7a11c93548 100644 --- a/src/class/FStarC.Class.PP.fsti +++ b/src/class/FStarC.Class.PP.fsti @@ -1,6 +1,6 @@ module FStarC.Class.PP -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Pprint class pretty (a:Type) = { diff --git a/src/class/FStarC.Class.Setlike.fst b/src/class/FStarC.Class.Setlike.fst index cc149a51f41..3883df5949c 100644 --- a/src/class/FStarC.Class.Setlike.fst +++ b/src/class/FStarC.Class.Setlike.fst @@ -1,6 +1,6 @@ module FStarC.Class.Setlike -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Class.Ord let symdiff s1 s2 = diff s1 s2 diff --git a/src/class/FStarC.Class.Setlike.fsti b/src/class/FStarC.Class.Setlike.fsti index e6dfb157c35..b47de1ca8b9 100644 --- a/src/class/FStarC.Class.Setlike.fsti +++ b/src/class/FStarC.Class.Setlike.fsti @@ -1,6 +1,6 @@ module FStarC.Class.Setlike -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Class.Ord [@@Tactics.Typeclasses.fundeps [0]] diff --git a/src/class/FStarC.Class.Show.fst b/src/class/FStarC.Class.Show.fst index f424dad8a57..a36b1703648 100644 --- a/src/class/FStarC.Class.Show.fst +++ b/src/class/FStarC.Class.Show.fst @@ -1,6 +1,6 @@ module FStarC.Class.Show -open FStarC.Compiler.Effect +open FStarC.Effect instance showable_unit : showable unit = { diff --git a/src/class/FStarC.Class.Show.fsti b/src/class/FStarC.Class.Show.fsti index 0c3dc7f50a6..66ea3e81f68 100644 --- a/src/class/FStarC.Class.Show.fsti +++ b/src/class/FStarC.Class.Show.fsti @@ -1,7 +1,7 @@ module FStarC.Class.Show -open FStarC.Compiler.Effect -module BU = FStarC.Compiler.Util +open FStarC.Effect +module BU = FStarC.Util class showable (a:Type) = { show : a -> ML string; diff --git a/src/class/FStarC.Class.Tagged.fsti b/src/class/FStarC.Class.Tagged.fsti index f82969e89cc..349c017e403 100644 --- a/src/class/FStarC.Class.Tagged.fsti +++ b/src/class/FStarC.Class.Tagged.fsti @@ -1,6 +1,6 @@ module FStarC.Class.Tagged -open FStarC.Compiler.Effect +open FStarC.Effect (* This class is meant to print the constructor of a term. It replaces tag_of_term and tag_of_sigelt. *) diff --git a/src/data/FStarC.Compiler.CList.fst b/src/data/FStarC.CList.fst similarity index 99% rename from src/data/FStarC.Compiler.CList.fst rename to src/data/FStarC.CList.fst index 3f333b01cfc..a8281605743 100644 --- a/src/data/FStarC.Compiler.CList.fst +++ b/src/data/FStarC.CList.fst @@ -16,7 +16,7 @@ limitations under the License. *) -module FStarC.Compiler.CList +module FStarC.CList open FStar.Tactics.Typeclasses open FStarC.Class.Ord diff --git a/src/data/FStarC.Compiler.CList.fsti b/src/data/FStarC.CList.fsti similarity index 98% rename from src/data/FStarC.Compiler.CList.fsti rename to src/data/FStarC.CList.fsti index 59650e3eb88..d45a3196855 100644 --- a/src/data/FStarC.Compiler.CList.fsti +++ b/src/data/FStarC.CList.fsti @@ -17,7 +17,7 @@ *) (* Catenable lists, based on Jaskelioff and Rivas' "Functional Pearl: A Smart View on Datatypes" *) -module FStarC.Compiler.CList +module FStarC.CList open FStarC.Class.Deq open FStarC.Class.Ord diff --git a/src/data/FStarC.Compiler.FlatSet.fst b/src/data/FStarC.FlatSet.fst similarity index 94% rename from src/data/FStarC.Compiler.FlatSet.fst rename to src/data/FStarC.FlatSet.fst index 497e8226058..23432372b56 100644 --- a/src/data/FStarC.Compiler.FlatSet.fst +++ b/src/data/FStarC.FlatSet.fst @@ -16,14 +16,14 @@ limitations under the License. *) -module FStarC.Compiler.FlatSet +module FStarC.FlatSet open FStarC.Class.Ord -open FStarC.Compiler.Effect -open FStarC.Compiler.Order -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.Order +open FStarC.Util -(* This is a slow implementation that mimics FStarC.Compiler.Util.set, +(* This is a slow implementation that mimics FStarC.Util.set, which is implemented with lists. As it turns out we heavily rely on the exact order of `elems` provided by this list representation, so we cannot (yet) do big changes here. *) diff --git a/src/data/FStarC.Compiler.FlatSet.fsti b/src/data/FStarC.FlatSet.fsti similarity index 96% rename from src/data/FStarC.Compiler.FlatSet.fsti rename to src/data/FStarC.FlatSet.fsti index e26c23e2b52..c9a650a9c99 100644 --- a/src/data/FStarC.Compiler.FlatSet.fsti +++ b/src/data/FStarC.FlatSet.fsti @@ -16,7 +16,7 @@ limitations under the License. *) -module FStarC.Compiler.FlatSet +module FStarC.FlatSet open FStarC.Class.Ord open FStarC.Class.Show diff --git a/src/data/FStarC.Compiler.HashMap.fst b/src/data/FStarC.HashMap.fst similarity index 93% rename from src/data/FStarC.Compiler.HashMap.fst rename to src/data/FStarC.HashMap.fst index 1de46a5e02e..831eb45724e 100644 --- a/src/data/FStarC.Compiler.HashMap.fst +++ b/src/data/FStarC.HashMap.fst @@ -1,11 +1,11 @@ -module FStarC.Compiler.HashMap +module FStarC.HashMap (* This is implemented with a red black tree. We should use an actual hash table *) open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Class.Hashable -module BU = FStarC.Compiler.Util +module BU = FStarC.Util let hashmap (k v : Type) : Tot Type0 = BU.pimap (k & v) diff --git a/src/data/FStarC.Compiler.HashMap.fsti b/src/data/FStarC.HashMap.fsti similarity index 97% rename from src/data/FStarC.Compiler.HashMap.fsti rename to src/data/FStarC.HashMap.fsti index f5801a15890..48053fe7d04 100644 --- a/src/data/FStarC.Compiler.HashMap.fsti +++ b/src/data/FStarC.HashMap.fsti @@ -1,4 +1,4 @@ -module FStarC.Compiler.HashMap +module FStarC.HashMap (* NOTE: THIS IS A CACHE. COLLISIONS WILL BE DROPPED/OVERWRITTEN. diff --git a/src/data/FStarC.Compiler.Path.fst b/src/data/FStarC.Path.fst similarity index 97% rename from src/data/FStarC.Compiler.Path.fst rename to src/data/FStarC.Path.fst index 3449a059ca9..894da655a02 100644 --- a/src/data/FStarC.Compiler.Path.fst +++ b/src/data/FStarC.Path.fst @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Path +module FStarC.Path open FStarC.Class.Deq diff --git a/src/data/FStarC.Compiler.Path.fsti b/src/data/FStarC.Path.fsti similarity index 97% rename from src/data/FStarC.Compiler.Path.fsti rename to src/data/FStarC.Path.fsti index db7af195392..25185dbb201 100644 --- a/src/data/FStarC.Compiler.Path.fsti +++ b/src/data/FStarC.Path.fsti @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. *) -module FStarC.Compiler.Path +module FStarC.Path open FStarC.Class.Deq open FStarC.Class.Show diff --git a/src/data/FStarC.Compiler.RBSet.fst b/src/data/FStarC.RBSet.fst similarity index 99% rename from src/data/FStarC.Compiler.RBSet.fst rename to src/data/FStarC.RBSet.fst index d0470d7c5bd..a1a0ccd95f8 100644 --- a/src/data/FStarC.Compiler.RBSet.fst +++ b/src/data/FStarC.RBSet.fst @@ -16,7 +16,7 @@ limitations under the License. *) -module FStarC.Compiler.RBSet +module FStarC.RBSet open FStarC.Class.Ord open FStarC.Class.Show diff --git a/src/data/FStarC.Compiler.RBSet.fsti b/src/data/FStarC.RBSet.fsti similarity index 97% rename from src/data/FStarC.Compiler.RBSet.fsti rename to src/data/FStarC.RBSet.fsti index 98a74adb33c..20763fbd993 100644 --- a/src/data/FStarC.Compiler.RBSet.fsti +++ b/src/data/FStarC.RBSet.fsti @@ -16,7 +16,7 @@ limitations under the License. *) -module FStarC.Compiler.RBSet +module FStarC.RBSet open FStarC.Class.Ord open FStarC.Class.Show diff --git a/src/data/FStarC.Compiler.Writer.fst b/src/data/FStarC.Writer.fst similarity index 95% rename from src/data/FStarC.Compiler.Writer.fst rename to src/data/FStarC.Writer.fst index 15c7beb186f..4636d27109f 100644 --- a/src/data/FStarC.Compiler.Writer.fst +++ b/src/data/FStarC.Writer.fst @@ -1,4 +1,4 @@ -module FStarC.Compiler.Writer +module FStarC.Writer open FStarC.Class.Monoid open FStarC.Class.Monad diff --git a/src/data/FStarC.Compiler.Writer.fsti b/src/data/FStarC.Writer.fsti similarity index 91% rename from src/data/FStarC.Compiler.Writer.fsti rename to src/data/FStarC.Writer.fsti index 2074f053514..d7d4c92c1fa 100644 --- a/src/data/FStarC.Compiler.Writer.fsti +++ b/src/data/FStarC.Writer.fsti @@ -1,4 +1,4 @@ -module FStarC.Compiler.Writer +module FStarC.Writer open FStarC.Class.Monoid open FStarC.Class.Monad diff --git a/src/extraction/FStarC.Extraction.Krml.fst b/src/extraction/FStarC.Extraction.Krml.fst index 9f95efe8086..064cf86e5f6 100644 --- a/src/extraction/FStarC.Extraction.Krml.fst +++ b/src/extraction/FStarC.Extraction.Krml.fst @@ -16,11 +16,11 @@ (* -------------------------------------------------------------------- *) module FStarC.Extraction.Krml -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Extraction open FStarC.Extraction.ML open FStarC.Extraction.ML.Syntax @@ -32,7 +32,7 @@ open FStarC.Class.Show open FStarC.Class.PP open FStarC.Pprint -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module FC = FStarC.Const (** CHANGELOG diff --git a/src/extraction/FStarC.Extraction.ML.Code.fst b/src/extraction/FStarC.Extraction.ML.Code.fst index 7e6f62a1e21..887bd52d3be 100644 --- a/src/extraction/FStarC.Extraction.ML.Code.fst +++ b/src/extraction/FStarC.Extraction.ML.Code.fst @@ -15,17 +15,17 @@ *) (* -------------------------------------------------------------------- *) module FStarC.Extraction.ML.Code -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Extraction.ML open FStarC.Extraction.ML.Syntax open FStarC.Pprint open FStarC.Const open FStarC.BaseTypes -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (* This is the old printer used exclusively for the F# build of F*. It will not * evolve in the future. *) @@ -298,7 +298,7 @@ let string_of_mlconstant (sctt : mlconstant) = | MLC_Bytes bytes -> (* A byte buffer. Not meant to be readable. *) - "\"" ^ FStarC.Compiler.Bytes.f_encode escape_byte_hex bytes ^ "\"" + "\"" ^ FStarC.Bytes.f_encode escape_byte_hex bytes ^ "\"" | MLC_String chars -> (* It was a string literal. Escape what was (likely) escaped originally. @@ -437,7 +437,7 @@ let rec doc_of_expr (currentModule : mlsymbol) (outer : level) (e : mlexpr) : do | MLE_Name p, [ ({ expr = MLE_Fun ([ _ ], scrutinee) }); ({ expr = MLE_Fun ([ {mlbinder_name=arg} ], possible_match)}) - ] when (string_of_mlpath p = "FStarC.Compiler.Effect.try_with" || + ] when (string_of_mlpath p = "FStarC.Effect.try_with" || string_of_mlpath p = "FStar.All.try_with") -> let branches = match possible_match with diff --git a/src/extraction/FStarC.Extraction.ML.Code.fsti b/src/extraction/FStarC.Extraction.ML.Code.fsti index 7c964b19c27..49eadf54dca 100644 --- a/src/extraction/FStarC.Extraction.ML.Code.fsti +++ b/src/extraction/FStarC.Extraction.ML.Code.fsti @@ -15,7 +15,7 @@ *) (* -------------------------------------------------------------------- *) module FStarC.Extraction.ML.Code -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Extraction.ML.Syntax open FStarC.Class.Show diff --git a/src/extraction/FStarC.Extraction.ML.Modul.fst b/src/extraction/FStarC.Extraction.ML.Modul.fst index 1a96f34e481..4c80aa0888c 100644 --- a/src/extraction/FStarC.Extraction.ML.Modul.fst +++ b/src/extraction/FStarC.Extraction.ML.Modul.fst @@ -16,10 +16,10 @@ module FStarC.Extraction.ML.Modul open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Const open FStarC.Extraction.ML open FStarC.Extraction.ML.RegEmb @@ -36,7 +36,7 @@ open FStarC.Class.Show module Term = FStarC.Extraction.ML.Term module MLS = FStarC.Extraction.ML.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst module UF = FStarC.Syntax.Unionfind @@ -64,14 +64,14 @@ type iface = { let extension_extractor_table : BU.smap extension_extractor - = FStarC.Compiler.Util.smap_create 20 + = FStarC.Util.smap_create 20 let register_extension_extractor (ext:string) (callback:extension_extractor) = - FStarC.Compiler.Util.smap_add extension_extractor_table ext callback + FStarC.Util.smap_add extension_extractor_table ext callback let lookup_extension_extractor (ext:string) = (* Try to find a plugin if lookup fails *) - let do () = FStarC.Compiler.Util.smap_try_find extension_extractor_table ext in + let do () = FStarC.Util.smap_try_find extension_extractor_table ext in match do () with | None -> if Plugins.autoload_plugin ext @@ -897,7 +897,7 @@ let extract_iface (g:env_t) modul = let g, iface = UF.with_uf_enabled (fun () -> if Debug.any() - then FStarC.Compiler.Util.measure_execution_time + then FStarC.Util.measure_execution_time (BU.format1 "Extracted interface of %s" (string_of_lid modul.name)) (fun () -> extract_iface' g modul) else extract_iface' g modul) @@ -1319,7 +1319,7 @@ let extract' (g:uenv) (m:modul) : uenv & option mllib = if Debug.any () then let nm = FStarC.Syntax.Util.lids_of_sigelt se |> List.map Ident.string_of_lid |> String.concat ", " in BU.print1 "+++About to extract {%s}\n" nm; - let r = FStarC.Compiler.Util.measure_execution_time + let r = FStarC.Util.measure_execution_time (BU.format1 "---Extracted {%s}" nm) (fun () -> extract_sig g se) in diff --git a/src/extraction/FStarC.Extraction.ML.Modul.fsti b/src/extraction/FStarC.Extraction.ML.Modul.fsti index a983e17544d..7cf17d3e142 100644 --- a/src/extraction/FStarC.Extraction.ML.Modul.fsti +++ b/src/extraction/FStarC.Extraction.ML.Modul.fsti @@ -16,7 +16,7 @@ *) module FStarC.Extraction.ML.Modul open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Extraction.ML.Syntax open FStarC.Extraction.ML.UEnv diff --git a/src/extraction/FStarC.Extraction.ML.PrintML.fst b/src/extraction/FStarC.Extraction.ML.PrintML.fst index e4606b8b746..41c3c55e887 100644 --- a/src/extraction/FStarC.Extraction.ML.PrintML.fst +++ b/src/extraction/FStarC.Extraction.ML.PrintML.fst @@ -15,8 +15,8 @@ *) module FStarC.Extraction.ML.PrintML -open FStarC.Compiler.Effect -open FStarC.Compiler +open FStarC.Effect +open FStarC open FStarC.Extraction.ML.Syntax open FStarC.Extraction.ML.Code @@ -29,4 +29,4 @@ This file is here for the F# build. *) let print (_: option string) (ext: string) (l: mllib) = let newDoc = FStarC.Extraction.ML.Code.doc_of_mllib l in List.iter (fun (n,d) -> - FStarC.Compiler.Util.write_file (FStarC.Find.prepend_output_dir (n^ext)) (FStarC.Extraction.ML.Code.pretty 120 d)) newDoc + FStarC.Util.write_file (FStarC.Find.prepend_output_dir (n^ext)) (FStarC.Extraction.ML.Code.pretty 120 d)) newDoc diff --git a/src/extraction/FStarC.Extraction.ML.RegEmb.fst b/src/extraction/FStarC.Extraction.ML.RegEmb.fst index f320973195e..e2bf174491f 100644 --- a/src/extraction/FStarC.Extraction.ML.RegEmb.fst +++ b/src/extraction/FStarC.Extraction.ML.RegEmb.fst @@ -19,15 +19,15 @@ module FStarC.Extraction.ML.RegEmb embeddings for their types. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Const open FStarC.Extraction.ML.Syntax open FStarC.Extraction.ML.UEnv open FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Code = FStarC.Extraction.ML.Code module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env @@ -100,7 +100,7 @@ let cons_lid = Ident.lid_of_str "Prims.Cons" let embed = mk (MLE_Name (splitlast ["Fstarcompiler.FStarC"; "Syntax"; "Embeddings"; "Base"; "extracted_embed"])) let unembed = mk (MLE_Name (splitlast ["Fstarcompiler.FStarC"; "Syntax"; "Embeddings"; "Base"; "extracted_unembed"])) -let bind_opt = mk (MLE_Name (splitlast ["Fstarcompiler.FStarC"; "Compiler"; "Util"; "bind_opt"])) +let bind_opt = mk (MLE_Name (splitlast ["Fstarcompiler.FStarC"; "Util"; "bind_opt"])) let ml_nbe_unsupported : mlexpr = (* extraction thunks this definition *) diff --git a/src/extraction/FStarC.Extraction.ML.RegEmb.fsti b/src/extraction/FStarC.Extraction.ML.RegEmb.fsti index af01ea8f485..9bdca9d8ed1 100644 --- a/src/extraction/FStarC.Extraction.ML.RegEmb.fsti +++ b/src/extraction/FStarC.Extraction.ML.RegEmb.fsti @@ -20,8 +20,8 @@ module FStarC.Extraction.ML.RegEmb embeddings for their types. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Extraction.ML diff --git a/src/extraction/FStarC.Extraction.ML.RemoveUnusedParameters.fst b/src/extraction/FStarC.Extraction.ML.RemoveUnusedParameters.fst index 4aa03018094..9df12bfba50 100644 --- a/src/extraction/FStarC.Extraction.ML.RemoveUnusedParameters.fst +++ b/src/extraction/FStarC.Extraction.ML.RemoveUnusedParameters.fst @@ -16,12 +16,12 @@ (* -------------------------------------------------------------------- *) module FStarC.Extraction.ML.RemoveUnusedParameters open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Ident -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const open FStarC.BaseTypes open FStarC.Extraction.ML.Syntax @@ -37,7 +37,7 @@ open FStarC.Class.Show parameters. However, this transformation may also be useful for use with OCaml, since it may lead to nicer code. *) -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (** The transformation maintains an environment recording which diff --git a/src/extraction/FStarC.Extraction.ML.Syntax.fst b/src/extraction/FStarC.Extraction.ML.Syntax.fst index 68063f1fa4f..f9d314bf211 100644 --- a/src/extraction/FStarC.Extraction.ML.Syntax.fst +++ b/src/extraction/FStarC.Extraction.ML.Syntax.fst @@ -17,12 +17,12 @@ *) (* -------------------------------------------------------------------- *) module FStarC.Extraction.ML.Syntax -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Ident -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const open FStarC.BaseTypes @@ -110,7 +110,7 @@ let pop_unit (ts : mltyscheme) : e_tag & mltyscheme = else failwith "unexpected: pop_unit: domain was not unit" | _ -> failwith "unexpected: pop_unit: not a function type" -module BU = FStarC.Compiler.Util +module BU = FStarC.Util let ctor' (n: string) (args: list document) = nest 2 (group (parens (flow (break_ 1) (doc_of_string n :: args)))) diff --git a/src/extraction/FStarC.Extraction.ML.Syntax.fsti b/src/extraction/FStarC.Extraction.ML.Syntax.fsti index 6ca5d5a9258..3d4240fab0f 100644 --- a/src/extraction/FStarC.Extraction.ML.Syntax.fsti +++ b/src/extraction/FStarC.Extraction.ML.Syntax.fsti @@ -17,12 +17,12 @@ *) (* -------------------------------------------------------------------- *) module FStarC.Extraction.ML.Syntax -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Ident -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const open FStarC.BaseTypes @@ -105,8 +105,8 @@ type meta = | CIfDef | CMacro | Deprecated of string - | RemoveUnusedTypeParameters of list int & FStarC.Compiler.Range.range //positional - | HasValDecl of FStarC.Compiler.Range.range //this symbol appears in the interface of a module + | RemoveUnusedTypeParameters of list int & FStarC.Range.range //positional + | HasValDecl of FStarC.Range.range //this symbol appears in the interface of a module | CNoInline // rename diff --git a/src/extraction/FStarC.Extraction.ML.Term.fst b/src/extraction/FStarC.Extraction.ML.Term.fst index 0cef9418eb7..ad47cbfa828 100644 --- a/src/extraction/FStarC.Extraction.ML.Term.fst +++ b/src/extraction/FStarC.Extraction.ML.Term.fst @@ -15,12 +15,12 @@ *) module FStarC.Extraction.ML.Term open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const open FStarC.Ident open FStarC.Extraction @@ -31,7 +31,7 @@ open FStarC.Extraction.ML.Util open FStarC.Syntax.Syntax open FStarC.Errors -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Code = FStarC.Extraction.ML.Code module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env @@ -135,7 +135,7 @@ let effect_as_etag = then E_ERASABLE else // Reifiable effects should be pure. Added guard because some effect declarations - // don't seem to be in the environment at this point, in particular FStarC.Compiler.Effect.ML + // don't seem to be in the environment at this point, in particular FStarC.Effect.ML // (maybe because it's primitive?) let ed_opt = TcEnv.effect_decl_opt (tcenv_of_uenv g) l in match ed_opt with diff --git a/src/extraction/FStarC.Extraction.ML.UEnv.fst b/src/extraction/FStarC.Extraction.ML.UEnv.fst index 650e83228ea..64e10d4ee89 100644 --- a/src/extraction/FStarC.Extraction.ML.UEnv.fst +++ b/src/extraction/FStarC.Extraction.ML.UEnv.fst @@ -37,18 +37,18 @@ module FStarC.Extraction.ML.UEnv *) open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Ident open FStarC.Extraction.ML.Syntax open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.TypeChecker module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Const = FStarC.Parser.Const open FStarC.Class.Show @@ -688,7 +688,7 @@ let new_uenv (e:TypeChecker.Env.env) currentModule = ([], ""); } in (* We handle [failwith] specially, extracting it to OCaml's 'failwith' - rather than FStarC.Compiler.Effect.failwith. Not sure this is necessary *) + rather than FStarC.Effect.failwith. Not sure this is necessary *) let a = "'a" in let failwith_ty = ([{ty_param_name=a; ty_param_attrs=[]}], MLTY_Fun(MLTY_Named([], (["Prims"], "string")), E_IMPURE, MLTY_Var a)) in diff --git a/src/extraction/FStarC.Extraction.ML.UEnv.fsti b/src/extraction/FStarC.Extraction.ML.UEnv.fsti index 70a1ac437a8..aceee375242 100644 --- a/src/extraction/FStarC.Extraction.ML.UEnv.fsti +++ b/src/extraction/FStarC.Extraction.ML.UEnv.fsti @@ -17,9 +17,9 @@ module FStarC.Extraction.ML.UEnv open FStar.Pervasives open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Ident open FStarC.Extraction.ML.Syntax open FStarC.Syntax diff --git a/src/extraction/FStarC.Extraction.ML.Util.fst b/src/extraction/FStarC.Extraction.ML.Util.fst index 784133c9034..04f2c55cec4 100644 --- a/src/extraction/FStarC.Extraction.ML.Util.fst +++ b/src/extraction/FStarC.Extraction.ML.Util.fst @@ -16,11 +16,11 @@ module FStarC.Extraction.ML.Util open Prims open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings @@ -29,11 +29,11 @@ open FStarC.Extraction.ML.Syntax open FStarC.Const open FStarC.Ident open FStarC.Errors -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module UEnv = FStarC.Extraction.ML.UEnv module PC = FStarC.Parser.Const -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module S = FStarC.Syntax.Syntax module N = FStarC.TypeChecker.Normalize module Env = FStarC.TypeChecker.Env diff --git a/src/extraction/FStarC.Extraction.ML.Util.fsti b/src/extraction/FStarC.Extraction.ML.Util.fsti index f69bbec4da0..0a549c41b6f 100644 --- a/src/extraction/FStarC.Extraction.ML.Util.fsti +++ b/src/extraction/FStarC.Extraction.ML.Util.fsti @@ -17,12 +17,12 @@ module FStarC.Extraction.ML.Util open Prims open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives open FStarC.Ident open FStarC.Extraction.ML.Syntax module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util val codegen_fsharp : unit -> bool val pruneNones : list (option 'a) -> list 'a diff --git a/src/fstar/FStarC.CheckedFiles.fst b/src/fstar/FStarC.CheckedFiles.fst index 5a9b6a2ba03..4d81f660509 100644 --- a/src/fstar/FStarC.CheckedFiles.fst +++ b/src/fstar/FStarC.CheckedFiles.fst @@ -16,9 +16,9 @@ module FStarC.CheckedFiles open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Class.Show @@ -26,7 +26,7 @@ open FStarC.Class.Show module Syntax = FStarC.Syntax.Syntax module TcEnv = FStarC.TypeChecker.Env module SMT = FStarC.SMTEncoding.Solver -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Dep = FStarC.Parser.Dep let dbg = Debug.get_toggle "CheckedFiles" @@ -138,7 +138,7 @@ let hash_dependences (deps:Dep.deps) (fn:string) :either string (list (string & not (Dep.is_interface fn && Dep.lowercase_module_name fn = module_name)) in let binary_deps = - FStarC.Compiler.List.sortWith + FStarC.List.sortWith (fun fn1 fn2 -> String.compare (Dep.lowercase_module_name fn1) (Dep.lowercase_module_name fn2)) @@ -482,8 +482,8 @@ let store_module_to_cache env fn parsing_data tc_result = let open FStarC.Errors in let open FStarC.Errors.Msg in let open FStarC.Pprint in - log_issue (FStarC.Compiler.Range.mk_range fn (FStarC.Compiler.Range.mk_pos 0 0) - (FStarC.Compiler.Range.mk_pos 0 0)) + log_issue (FStarC.Range.mk_range fn (FStarC.Range.mk_pos 0 0) + (FStarC.Range.mk_pos 0 0)) Errors.Warning_FileNotWritten [ text <| BU.format1 "Checked file %s was not written." cache_file; prefix 2 1 (doc_of_string "Reason:") (text msg) diff --git a/src/fstar/FStarC.CheckedFiles.fsti b/src/fstar/FStarC.CheckedFiles.fsti index 3c0d41e83f6..9d1a51d350f 100644 --- a/src/fstar/FStarC.CheckedFiles.fsti +++ b/src/fstar/FStarC.CheckedFiles.fsti @@ -15,10 +15,10 @@ *) module FStarC.CheckedFiles -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.TypeChecker.Env open FStarC.Syntax diff --git a/src/fstar/FStarC.Dependencies.fst b/src/fstar/FStarC.Dependencies.fst index ca282a5dfde..1672c3ab16e 100644 --- a/src/fstar/FStarC.Dependencies.fst +++ b/src/fstar/FStarC.Dependencies.fst @@ -17,8 +17,7 @@ // A dependency-finding routine module FStarC.Dependencies open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC.Effect (***********************************************************************) (* Finding the transitive dependencies of a list of files *) diff --git a/src/fstar/FStarC.Dependencies.fsti b/src/fstar/FStarC.Dependencies.fsti index 9a63a426766..64c291b27ee 100644 --- a/src/fstar/FStarC.Dependencies.fsti +++ b/src/fstar/FStarC.Dependencies.fsti @@ -16,7 +16,7 @@ // A dependency-finding routine module FStarC.Dependencies -open FStarC.Compiler.Effect +open FStarC.Effect (***********************************************************************) (* Finding the transitive dependencies of a list of files *) diff --git a/src/fstar/FStarC.Hooks.fst b/src/fstar/FStarC.Hooks.fst index d09e3f17520..21bcde42e9d 100644 --- a/src/fstar/FStarC.Hooks.fst +++ b/src/fstar/FStarC.Hooks.fst @@ -16,9 +16,9 @@ module FStarC.Hooks open FStarC -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Ident open FStarC.Class.Show diff --git a/src/fstar/FStarC.Hooks.fsti b/src/fstar/FStarC.Hooks.fsti index 4cdee23b3f0..9b9a56835da 100644 --- a/src/fstar/FStarC.Hooks.fsti +++ b/src/fstar/FStarC.Hooks.fsti @@ -15,7 +15,7 @@ *) module FStarC.Hooks -open FStarC.Compiler.Effect +open FStarC.Effect (* This function sets ties some know between modules in the compiler source tree, enabling more recursion and breaking some dependencies. diff --git a/src/fstar/FStarC.Interactive.CompletionTable.fst b/src/fstar/FStarC.Interactive.CompletionTable.fst index bbc0fa5cc49..cd09ee4a14d 100644 --- a/src/fstar/FStarC.Interactive.CompletionTable.fst +++ b/src/fstar/FStarC.Interactive.CompletionTable.fst @@ -17,8 +17,8 @@ module FStarC.Interactive.CompletionTable open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect let string_compare s1 s2 = String.compare s1 s2 @@ -379,7 +379,7 @@ let empty : table = // completion of opens and includes, and these take full module paths. // Inclusions handling would have to be reinstated should we wish to also // complete partial names of unloaded (e.g. [open FStar // let x = List._] when -// FStarC.Compiler.List isn't loaded). +// FStarC.List isn't loaded). let insert (tbl: table) (host_query: query) (id: string) (c: lid_symbol) : table = { tbl with tbl_lids = trie_insert tbl.tbl_lids host_query id c } diff --git a/src/fstar/FStarC.Interactive.Ide.Types.fst b/src/fstar/FStarC.Interactive.Ide.Types.fst index d40d3d116c8..90b534d9568 100644 --- a/src/fstar/FStarC.Interactive.Ide.Types.fst +++ b/src/fstar/FStarC.Interactive.Ide.Types.fst @@ -15,11 +15,11 @@ *) module FStarC.Interactive.Ide.Types -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Range +open FStarC.Util open FStarC.Getopt open FStarC.Ident open FStarC.Errors @@ -38,7 +38,7 @@ module DsEnv = FStarC.Syntax.DsEnv module TcErr = FStarC.TypeChecker.Err module CTable = FStarC.Interactive.CompletionTable module PI = FStarC.Parser.ParseIt -module U = FStarC.Compiler.Util +module U = FStarC.Util let initial_range = Range.mk_range "" (Range.mk_pos 1 0) (Range.mk_pos 1 0) @@ -71,7 +71,7 @@ let string_of_repl_task = function Util.format1 "PushFragment { decl = %s }" (show d) | Noop -> "Noop {}" -module BU = FStarC.Compiler.Util +module BU = FStarC.Util let string_of_repl_stack_entry : repl_stack_entry_t -> string @@ -116,7 +116,7 @@ let push_query_to_string pq = | Inl code -> code | Inr (_decl, code) -> code.code in - FStarC.Compiler.Util.format "{ push_kind = %s; push_line = %s; \ + FStarC.Util.format "{ push_kind = %s; push_line = %s; \ push_column = %s; push_peek_only = %s; push_code_or_decl = %s }" [pk; string_of_int pq.push_line; string_of_int pq.push_column; diff --git a/src/fstar/FStarC.Interactive.Ide.Types.fsti b/src/fstar/FStarC.Interactive.Ide.Types.fsti index 2bbc0987ead..f0516eaf719 100644 --- a/src/fstar/FStarC.Interactive.Ide.Types.fsti +++ b/src/fstar/FStarC.Interactive.Ide.Types.fsti @@ -17,10 +17,10 @@ module FStarC.Interactive.Ide.Types open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util -open FStarC.Compiler.Range +open FStarC +open FStarC.Effect +open FStarC.Util +open FStarC.Range module PI = FStarC.Parser.ParseIt module TcEnv = FStarC.TypeChecker.Env module CTable = FStarC.Interactive.CompletionTable diff --git a/src/fstar/FStarC.Interactive.Ide.fst b/src/fstar/FStarC.Interactive.Ide.fst index 08bc0656589..cdcce539f6e 100644 --- a/src/fstar/FStarC.Interactive.Ide.fst +++ b/src/fstar/FStarC.Interactive.Ide.fst @@ -16,11 +16,10 @@ module FStarC.Interactive.Ide open FStarC -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Range +open FStarC.Util open FStarC.Getopt open FStarC.Ident open FStarC.Errors @@ -28,7 +27,7 @@ open FStarC.Interactive.JsonHelper open FStarC.Interactive.QueryHelper open FStarC.Interactive.PushHelper open FStarC.Interactive.Ide.Types -module BU = FStarC.Compiler.Util +module BU = FStarC.Util let dbg = Debug.get_toggle "IDE" @@ -1237,7 +1236,7 @@ let interactive_printer printer = forward_message printer label (get_json ())) } let install_ide_mode_hooks printer = - FStarC.Compiler.Util.set_printer (interactive_printer printer); + FStarC.Util.set_printer (interactive_printer printer); FStarC.Errors.set_handler interactive_error_handler diff --git a/src/fstar/FStarC.Interactive.Ide.fsti b/src/fstar/FStarC.Interactive.Ide.fsti index 2da4a6c0ef4..48c1e92968f 100644 --- a/src/fstar/FStarC.Interactive.Ide.fsti +++ b/src/fstar/FStarC.Interactive.Ide.fsti @@ -16,6 +16,6 @@ module FStarC.Interactive.Ide -open FStarC.Compiler.Effect +open FStarC.Effect val interactive_mode (filename:string): unit diff --git a/src/fstar/FStarC.Interactive.Incremental.fst b/src/fstar/FStarC.Interactive.Incremental.fst index 551ff5716f3..dab0f039a97 100644 --- a/src/fstar/FStarC.Interactive.Incremental.fst +++ b/src/fstar/FStarC.Interactive.Incremental.fst @@ -16,12 +16,12 @@ module FStarC.Interactive.Incremental open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Range +open FStarC.Util open FStarC.Getopt open FStarC.Ident open FStarC.Errors @@ -40,7 +40,7 @@ module TcEnv = FStarC.TypeChecker.Env module CTable = FStarC.Interactive.CompletionTable open FStarC.Interactive.Ide.Types module P = FStarC.Parser.ParseIt -module BU = FStarC.Compiler.Util +module BU = FStarC.Util open FStarC.Parser.AST open FStarC.Parser.AST.Util @@ -120,7 +120,7 @@ let push_decl (push_kind:push_kind) (write_full_buffer_fragment_progress: fragment_progress -> unit) (ds:decl & code_fragment) : qst (list query) - = let open FStarC.Compiler.Range in + = let open FStarC.Range in let d, s = ds in let pq = { push_kind; diff --git a/src/fstar/FStarC.Interactive.Incremental.fsti b/src/fstar/FStarC.Interactive.Incremental.fsti index 3682d01c02b..1704f5ac797 100644 --- a/src/fstar/FStarC.Interactive.Incremental.fsti +++ b/src/fstar/FStarC.Interactive.Incremental.fsti @@ -16,14 +16,14 @@ module FStarC.Interactive.Incremental open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Parser.AST open FStarC.Errors open FStarC.Interactive.Ide.Types -open FStarC.Compiler.Util +open FStarC.Util (* Various kinds of progress messages to print back to the client *) type fragment_progress = diff --git a/src/fstar/FStarC.Interactive.JsonHelper.fst b/src/fstar/FStarC.Interactive.JsonHelper.fst index a9b952acf56..3e45ad009f9 100644 --- a/src/fstar/FStarC.Interactive.JsonHelper.fst +++ b/src/fstar/FStarC.Interactive.JsonHelper.fst @@ -19,16 +19,16 @@ module FStarC.Interactive.JsonHelper open FStar open FStarC -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC +open FStarC.Util open FStarC.Errors -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Json open FStarC.TypeChecker.Env -module U = FStarC.Compiler.Util +module U = FStarC.Util module PI = FStarC.Parser.ParseIt module TcEnv = FStarC.TypeChecker.Env module CTable = FStarC.Interactive.CompletionTable diff --git a/src/fstar/FStarC.Interactive.JsonHelper.fsti b/src/fstar/FStarC.Interactive.JsonHelper.fsti index 9b20833e5cb..120b4ae5a7a 100644 --- a/src/fstar/FStarC.Interactive.JsonHelper.fsti +++ b/src/fstar/FStarC.Interactive.JsonHelper.fsti @@ -19,10 +19,10 @@ module FStarC.Interactive.JsonHelper open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Errors open FStarC.Json -open FStarC.Compiler.Util +open FStarC.Util // Type of an associative array type assoct = list (string & json) diff --git a/src/fstar/FStarC.Interactive.Legacy.fst b/src/fstar/FStarC.Interactive.Legacy.fst index ec9ccc81708..3d39824402e 100644 --- a/src/fstar/FStarC.Interactive.Legacy.fst +++ b/src/fstar/FStarC.Interactive.Legacy.fst @@ -16,10 +16,10 @@ module FStarC.Interactive.Legacy open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Getopt open FStarC.Ident @@ -398,12 +398,12 @@ let rec go (line_col:(int&int)) //Q: isn't the output list ident always the same as the candidate? // About the degree of the match, cpitclaudel says: // Because we're measuring the length of the match and we allow partial - // matches. Say we're matching FS.Li.app against FStarC.Compiler.List.Append. Then + // matches. Say we're matching FS.Li.app against FStarC.List.Append. Then // the length we want is (length "FStar" + 1 + length "List" + 1 + length // "app"), not (length "FStar" + 1 + length "List" + 1 + length // "append"). This length is used to know how much of the candidate to // highlight in the company-mode popup (we want to display the candidate - // as FStarC.Compiler.List.append. + // as FStarC.List.append. = fun search_term candidate -> match search_term, candidate with | [], _ -> Some ([], 0) diff --git a/src/fstar/FStarC.Interactive.Legacy.fsti b/src/fstar/FStarC.Interactive.Legacy.fsti index 635227dc55c..6b036da914e 100644 --- a/src/fstar/FStarC.Interactive.Legacy.fsti +++ b/src/fstar/FStarC.Interactive.Legacy.fsti @@ -15,6 +15,6 @@ *) module FStarC.Interactive.Legacy -open FStarC.Compiler.Effect +open FStarC.Effect val interactive_mode (filename:string) : unit diff --git a/src/fstar/FStarC.Interactive.Lsp.fst b/src/fstar/FStarC.Interactive.Lsp.fst index a5b4401ed2b..a7ebcbb1d3f 100644 --- a/src/fstar/FStarC.Interactive.Lsp.fst +++ b/src/fstar/FStarC.Interactive.Lsp.fst @@ -16,17 +16,17 @@ module FStarC.Interactive.Lsp open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.Util -open FStarC.Compiler.Range +open FStarC.Effect +open FStarC.Util +open FStarC.Range open FStarC.Errors open FStarC.Universal open FStarC.Interactive.Ide.Types open FStarC.Interactive.JsonHelper -module U = FStarC.Compiler.Util +module U = FStarC.Util module QH = FStarC.Interactive.QueryHelper module PH = FStarC.Interactive.PushHelper module PI = FStarC.Parser.ParseIt diff --git a/src/fstar/FStarC.Interactive.Lsp.fsti b/src/fstar/FStarC.Interactive.Lsp.fsti index b167a02893d..5d6e1e586b8 100644 --- a/src/fstar/FStarC.Interactive.Lsp.fsti +++ b/src/fstar/FStarC.Interactive.Lsp.fsti @@ -15,6 +15,6 @@ *) module FStarC.Interactive.Lsp -open FStarC.Compiler.Effect +open FStarC.Effect val start_server () : unit diff --git a/src/fstar/FStarC.Interactive.PushHelper.fst b/src/fstar/FStarC.Interactive.PushHelper.fst index 8f3f34bc9d9..d04aa6216cd 100644 --- a/src/fstar/FStarC.Interactive.PushHelper.fst +++ b/src/fstar/FStarC.Interactive.PushHelper.fst @@ -19,11 +19,11 @@ module FStarC.Interactive.PushHelper open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Ident open FStarC.Errors open FStarC.Universal @@ -32,7 +32,7 @@ open FStarC.TypeChecker.Env open FStarC.Interactive.JsonHelper open FStarC.Interactive.Ide.Types -module U = FStarC.Compiler.Util +module U = FStarC.Util module SS = FStarC.Syntax.Syntax module DsEnv = FStarC.Syntax.DsEnv module TcErr = FStarC.TypeChecker.Err diff --git a/src/fstar/FStarC.Interactive.PushHelper.fsti b/src/fstar/FStarC.Interactive.PushHelper.fsti index 7858a8abfb5..551ed1917ca 100644 --- a/src/fstar/FStarC.Interactive.PushHelper.fsti +++ b/src/fstar/FStarC.Interactive.PushHelper.fsti @@ -19,10 +19,10 @@ module FStarC.Interactive.PushHelper open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.Util open FStarC.Ident open FStarC.TypeChecker.Env open FStarC.Interactive.JsonHelper diff --git a/src/fstar/FStarC.Interactive.QueryHelper.fst b/src/fstar/FStarC.Interactive.QueryHelper.fst index fe32f40d39b..a7c5db17e8e 100644 --- a/src/fstar/FStarC.Interactive.QueryHelper.fst +++ b/src/fstar/FStarC.Interactive.QueryHelper.fst @@ -18,19 +18,19 @@ * queries; this file collects helpers for them *) module FStarC.Interactive.QueryHelper -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC.Range +open FStarC.Util open FStarC.TypeChecker.Env open FStarC.TypeChecker.Common open FStarC.Interactive.JsonHelper open FStarC.Interactive.CompletionTable -module U = FStarC.Compiler.Util +module U = FStarC.Util module PI = FStarC.Parser.ParseIt module DsEnv = FStarC.Syntax.DsEnv module TcErr = FStarC.TypeChecker.Err diff --git a/src/fstar/FStarC.Interactive.QueryHelper.fsti b/src/fstar/FStarC.Interactive.QueryHelper.fsti index feb83433d07..57680e6b436 100644 --- a/src/fstar/FStarC.Interactive.QueryHelper.fsti +++ b/src/fstar/FStarC.Interactive.QueryHelper.fsti @@ -19,9 +19,9 @@ module FStarC.Interactive.QueryHelper open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Range +open FStarC.Util open FStarC.TypeChecker.Env open FStarC.Interactive.JsonHelper open FStarC.Interactive.Ide.Types diff --git a/src/fstar/FStarC.Main.fst b/src/fstar/FStarC.Main.fst index 942914eb108..6a73d653fb5 100644 --- a/src/fstar/FStarC.Main.fst +++ b/src/fstar/FStarC.Main.fst @@ -15,14 +15,14 @@ *) module FStarC.Main open FStarC -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Getopt open FStarC.Ident open FStarC.CheckedFiles open FStarC.Universal -open FStarC.Compiler +open FStarC open FStarC.Class.Show @@ -366,7 +366,7 @@ let main () = let _, time = Util.record_time_ms go in if FStarC.Options.query_stats() then Util.print2_error "TOTAL TIME %s ms: %s\n" - (FStarC.Compiler.Util.string_of_int time) + (FStarC.Util.string_of_int time) (String.concat " " (FStarC.Getopt.cmdline())); cleanup (); exit 0 diff --git a/src/fstar/FStarC.OCaml.fst b/src/fstar/FStarC.OCaml.fst index 82aa41b4dc3..d455fbcc70c 100644 --- a/src/fstar/FStarC.OCaml.fst +++ b/src/fstar/FStarC.OCaml.fst @@ -17,8 +17,8 @@ module FStarC.OCaml open FStarC open FStar.List.Tot.Base -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect let shellescape (s:string) : string = String.list_of_string s |> diff --git a/src/fstar/FStarC.OCaml.fsti b/src/fstar/FStarC.OCaml.fsti index 5f41b0cf2d1..7c7e63a0a92 100644 --- a/src/fstar/FStarC.OCaml.fsti +++ b/src/fstar/FStarC.OCaml.fsti @@ -15,7 +15,7 @@ *) module FStarC.OCaml -open FStarC.Compiler.Effect +open FStarC.Effect (* Escape a string for use in a shell command, expecting to be wrapped in SINGLE quotes. *) val shellescape (s:string) : string diff --git a/src/fstar/FStarC.Prettyprint.fst b/src/fstar/FStarC.Prettyprint.fst index c105ed82912..c76e9667483 100644 --- a/src/fstar/FStarC.Prettyprint.fst +++ b/src/fstar/FStarC.Prettyprint.fst @@ -15,11 +15,11 @@ *) module FStarC.Prettyprint -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Parser.ToDocument -module List = FStarC.Compiler.List +module List = FStarC.List module D = FStarC.Parser.Driver module P = FStarC.Pprint @@ -48,7 +48,7 @@ let generate (m: printing_mode) filenames = comments in let left_over_doc = - if not (FStarC.Compiler.List.isEmpty leftover_comments) then + if not (FStarC.List.isEmpty leftover_comments) then P.concat [P.hardline ; P.hardline ; comments_to_document leftover_comments] else if m = FromTempToStdout then // This isn't needed for FromTempToFile, when using `append_to_file` a newline is added to EoF diff --git a/src/fstar/FStarC.Prettyprint.fsti b/src/fstar/FStarC.Prettyprint.fsti index 8bd6b7f74e3..ba31030134d 100644 --- a/src/fstar/FStarC.Prettyprint.fsti +++ b/src/fstar/FStarC.Prettyprint.fsti @@ -16,7 +16,7 @@ module FStarC.Prettyprint -open FStarC.Compiler.Effect +open FStarC.Effect type printing_mode = | ToTempFile diff --git a/src/fstar/FStarC.Universal.fst b/src/fstar/FStarC.Universal.fst index 6927900beac..575a2ec4d13 100644 --- a/src/fstar/FStarC.Universal.fst +++ b/src/fstar/FStarC.Universal.fst @@ -17,12 +17,12 @@ //Top-level invocations into the universal type-checker FStarC.TypeChecker module FStarC.Universal open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Errors -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Getopt open FStarC.Ident open FStarC.Syntax.Syntax @@ -47,7 +47,7 @@ module Const = FStarC.Parser.Const module Pars = FStarC.Parser.ParseIt module Tc = FStarC.TypeChecker.Tc module TcTerm = FStarC.TypeChecker.TcTerm -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Dep = FStarC.Parser.Dep module NBE = FStarC.TypeChecker.NBE module Ch = FStarC.CheckedFiles @@ -382,7 +382,7 @@ let tc_one_file | Some tgt -> if not (Options.should_extract (string_of_lid tcmod.name) tgt) then None, 0 - else FStarC.Compiler.Util.record_time_ms (fun () -> + else FStarC.Util.record_time_ms (fun () -> with_env env (fun env -> let _, defs = FStarC.Extraction.ML.Modul.extract env tcmod in defs) @@ -392,7 +392,7 @@ let tc_one_file if Options.codegen() = None then env, 0 else - FStarC.Compiler.Util.record_time_ms (fun () -> + FStarC.Util.record_time_ms (fun () -> let env, _ = with_env env (fun env -> FStarC.Extraction.ML.Modul.extract_iface env tcmod) in env @@ -560,8 +560,8 @@ let needs_interleaving intf impl = let m1 = Parser.Dep.lowercase_module_name intf in let m2 = Parser.Dep.lowercase_module_name impl in m1 = m2 && - List.mem (FStarC.Compiler.Util.get_file_extension intf) ["fsti"; "fsi"] && - List.mem (FStarC.Compiler.Util.get_file_extension impl) ["fst"; "fs"] + List.mem (FStarC.Util.get_file_extension intf) ["fsti"; "fsi"] && + List.mem (FStarC.Util.get_file_extension impl) ["fst"; "fs"] let tc_one_file_from_remaining (remaining:list string) (env:uenv) (deps:FStarC.Parser.Dep.deps) //used to query parsing data @@ -606,10 +606,10 @@ let rec tc_fold_interleave (deps:FStarC.Parser.Dep.deps) //used to query parsin let dbg_dep = Debug.get_toggle "Dep" let batch_mode_tc filenames dep_graph = if !dbg_dep then begin - FStarC.Compiler.Util.print_endline "Auto-deps kicked in; here's some info."; - FStarC.Compiler.Util.print1 "Here's the list of filenames we will process: %s\n" + FStarC.Util.print_endline "Auto-deps kicked in; here's some info."; + FStarC.Util.print1 "Here's the list of filenames we will process: %s\n" (String.concat " " filenames); - FStarC.Compiler.Util.print1 "Here's the list of modules we will verify: %s\n" + FStarC.Util.print1 "Here's the list of modules we will verify: %s\n" (String.concat " " (filenames |> List.filter Options.should_verify_file)) end; let env = FStarC.Extraction.ML.UEnv.new_uenv (init_env dep_graph) in diff --git a/src/fstar/FStarC.Universal.fsti b/src/fstar/FStarC.Universal.fsti index 01eee7432ea..e6dcd6ac709 100644 --- a/src/fstar/FStarC.Universal.fsti +++ b/src/fstar/FStarC.Universal.fsti @@ -17,7 +17,7 @@ //Top-level invocations into the universal type-checker FStarC.TypeChecker module FStarC.Universal -open FStar open FStarC.Compiler +open FStar open FStarC open FStarC.Ident open FStarC.CheckedFiles module DsEnv = FStarC.Syntax.DsEnv diff --git a/src/ml/bare/FStarC_Compiler_Bytes.ml b/src/ml/bare/FStarC_Bytes.ml similarity index 91% rename from src/ml/bare/FStarC_Compiler_Bytes.ml rename to src/ml/bare/FStarC_Bytes.ml index c9ed427771d..7815e7b6e3d 100644 --- a/src/ml/bare/FStarC_Compiler_Bytes.ml +++ b/src/ml/bare/FStarC_Bytes.ml @@ -17,15 +17,15 @@ let zero_create n : bytes = BatArray.make n 0 let sub ( b:bytes) s l = BatArray.sub b s l let set = BatArray.set let blit (a:bytes) b c d e = BatArray.blit a b c d e -let string_as_unicode_bytes (s:string) = FStarC_Compiler_Util.unicode_of_string s -let utf8_bytes_as_string (b:bytes) = FStarC_Compiler_Util.string_of_unicode b -let unicode_bytes_as_string (b:bytes) = FStarC_Compiler_Util.string_of_unicode b +let string_as_unicode_bytes (s:string) = FStarC_Util.unicode_of_string s +let utf8_bytes_as_string (b:bytes) = FStarC_Util.string_of_unicode b +let unicode_bytes_as_string (b:bytes) = FStarC_Util.string_of_unicode b let compare (b1:bytes) (b2:bytes) = compare b1 b2 let to_intarray (b:bytes) = b let of_intarray (arr:int array) = arr -let string_as_utf8_bytes (s:string) = FStarC_Compiler_Util.unicode_of_string s +let string_as_utf8_bytes (s:string) = FStarC_Util.unicode_of_string s let append (b1: bytes) (b2:bytes) = BatArray.append b1 b2 diff --git a/src/ml/bare/FStarC_Compiler_Range.ml b/src/ml/bare/FStarC_Compiler_Range.ml deleted file mode 100644 index 7d3435eed24..00000000000 --- a/src/ml/bare/FStarC_Compiler_Range.ml +++ /dev/null @@ -1,2 +0,0 @@ -include FStarC_Compiler_Range_Type -include FStarC_Compiler_Range_Ops diff --git a/src/ml/bare/FStarC_Compiler_Effect.ml b/src/ml/bare/FStarC_Effect.ml similarity index 100% rename from src/ml/bare/FStarC_Compiler_Effect.ml rename to src/ml/bare/FStarC_Effect.ml diff --git a/src/ml/bare/FStarC_Extraction_ML_PrintML.ml b/src/ml/bare/FStarC_Extraction_ML_PrintML.ml index a777ff5a37d..74b57826fd9 100644 --- a/src/ml/bare/FStarC_Extraction_ML_PrintML.ml +++ b/src/ml/bare/FStarC_Extraction_ML_PrintML.ml @@ -93,8 +93,8 @@ let mk_top_mllb (e: mlexpr): mllb = print_typ=false } (* Find the try_with in the default effect module. For instance this can be -FStar.All.try_with (for most users) or FStarC.Compiler.Effect.try_with (during -bootstrapping with "--MLish --MLish_effect FStarC.Compiler.Effect"). *) +FStar.All.try_with (for most users) or FStarC.Effect.try_with (during +bootstrapping with "--MLish --MLish_effect FStarC.Effect"). *) let try_with_ident () = let lid = FStarC_Parser_Const.try_with_lid () in let ns = FStarC_Ident.ns_of_lid lid in @@ -559,7 +559,7 @@ let print (out_dir: string option) (ext: string) (ml: mllib) = (* Use the old printer for F# extraction *) let new_doc = FStarC_Extraction_ML_Code.doc_of_mllib ml in iter (fun (n, d) -> - FStarC_Compiler_Util.write_file + FStarC_Util.write_file (FStarC_Find.prepend_output_dir (BatString.concat "" [n;ext])) (FStarC_Extraction_ML_Code.pretty (Prims.parse_int "120") d) ) new_doc diff --git a/src/ml/bare/FStarC_Hash.ml b/src/ml/bare/FStarC_Hash.ml index 4ece1088b4a..34756a1a0e1 100644 --- a/src/ml/bare/FStarC_Hash.ml +++ b/src/ml/bare/FStarC_Hash.ml @@ -1,4 +1,4 @@ -module BU = FStarC_Compiler_Util +module BU = FStarC_Util module Z = FStarC_BigInt type hash_code = int diff --git a/src/ml/bare/FStarC_Compiler_Hints.ml b/src/ml/bare/FStarC_Hints.ml similarity index 100% rename from src/ml/bare/FStarC_Compiler_Hints.ml rename to src/ml/bare/FStarC_Hints.ml diff --git a/src/ml/bare/FStarC_Compiler_List.ml b/src/ml/bare/FStarC_List.ml similarity index 100% rename from src/ml/bare/FStarC_Compiler_List.ml rename to src/ml/bare/FStarC_List.ml diff --git a/src/ml/bare/FStarC_Parser_LexFStar.ml b/src/ml/bare/FStarC_Parser_LexFStar.ml index 25be6188616..20b5ca750d4 100644 --- a/src/ml/bare/FStarC_Parser_LexFStar.ml +++ b/src/ml/bare/FStarC_Parser_LexFStar.ml @@ -8,7 +8,7 @@ module Sedlexing = FStarC_Sedlexing module L = Sedlexing module E = FStarC_Errors module Codes = FStarC_Errors_Codes -module BU = FStarC_Compiler_Util +module BU = FStarC_Util let ba_of_string s = Array.init (String.length s) (fun i -> Char.code (String.get s i)) let array_trim_both a n m = Array.sub a n (Array.length a - n - m) diff --git a/src/ml/bare/FStarC_Parser_Parse.mly b/src/ml/bare/FStarC_Parser_Parse.mly index ccf4d38af78..46ef5124ff0 100644 --- a/src/ml/bare/FStarC_Parser_Parse.mly +++ b/src/ml/bare/FStarC_Parser_Parse.mly @@ -21,9 +21,9 @@ open Prims open FStar_Pervasives open FStarC_Errors -open FStarC_Compiler_List -open FStarC_Compiler_Util -open FStarC_Compiler_Range +open FStarC_List +open FStarC_Util +open FStarC_Range (* TODO : these files should be deprecated and removed *) open FStarC_Parser_Const diff --git a/src/ml/bare/FStarC_Parser_ParseIt.ml b/src/ml/bare/FStarC_Parser_ParseIt.ml index 792cd095f58..707bb89a0c1 100644 --- a/src/ml/bare/FStarC_Parser_ParseIt.ml +++ b/src/ml/bare/FStarC_Parser_ParseIt.ml @@ -1,4 +1,4 @@ -module U = FStarC_Compiler_Util +module U = FStarC_Util open FStarC_Errors open FStarC_Syntax_Syntax open Lexing @@ -37,7 +37,7 @@ let find_file filename = | Some s -> s | None -> - raise_error_text FStarC_Compiler_Range.dummyRange Fatal_ModuleOrFileNotFound (U.format1 "Unable to find file: %s\n" filename) + raise_error_text FStarC_Range.dummyRange Fatal_ModuleOrFileNotFound (U.format1 "Unable to find file: %s\n" filename) let vfs_entries : (U.time_of_day * string) U.smap = U.smap_create (Z.of_int 1) @@ -62,10 +62,10 @@ let read_physical_file (filename: string) = (fun channel -> really_input_string channel (in_channel_length channel)) channel with e -> - raise_error_text FStarC_Compiler_Range.dummyRange Fatal_UnableToReadFile (U.format1 "Unable to read file %s\n" filename) + raise_error_text FStarC_Range.dummyRange Fatal_UnableToReadFile (U.format1 "Unable to read file %s\n" filename) let read_file (filename:string) = - let debug = FStarC_Compiler_Debug.any () in + let debug = FStarC_Debug.any () in match read_vfs_entry filename with | Some (_mtime, contents) -> if debug then U.print1 "Reading in-memory file %s\n" filename; @@ -88,7 +88,7 @@ let has_extension file extensions = let check_extension fn = if (not (has_extension fn (valid_extensions ()))) then let message = U.format1 "Unrecognized extension '%s'" fn in - raise_error_text FStarC_Compiler_Range.dummyRange Fatal_UnrecognizedExtension + raise_error_text FStarC_Range.dummyRange Fatal_UnrecognizedExtension (if has_extension fn fs_extensions then message ^ " (pass --MLish to process .fs and .fsi files)" else message) @@ -99,31 +99,31 @@ type parse_frag = | Incremental of input_frag | Fragment of input_frag -type parse_error = (Codes.error_code * Msg.error_message * FStarC_Compiler_Range.range) +type parse_error = (Codes.error_code * Msg.error_message * FStarC_Range.range) type code_fragment = { - range: FStarC_Compiler_Range.range; + range: FStarC_Range.range; code: string; } type 'a incremental_result = - ('a * code_fragment) list * (string * FStarC_Compiler_Range.range) list * parse_error option + ('a * code_fragment) list * (string * FStarC_Range.range) list * parse_error option type parse_result = - | ASTFragment of (FStarC_Parser_AST.inputFragment * (string * FStarC_Compiler_Range.range) list) + | ASTFragment of (FStarC_Parser_AST.inputFragment * (string * FStarC_Range.range) list) | IncrementalFragment of FStarC_Parser_AST.decl incremental_result | Term of FStarC_Parser_AST.term | ParseError of parse_error -module BU = FStarC_Compiler_Util -module Range = FStarC_Compiler_Range +module BU = FStarC_Util +module Range = FStarC_Range module MHL = MenhirLib.Convert let range_of_positions filename start fin = let start_pos = FStarC_Parser_Util.pos_of_lexpos start in let end_pos = FStarC_Parser_Util.pos_of_lexpos fin in - FStarC_Compiler_Range.mk_range filename start_pos end_pos + FStarC_Range.mk_range filename start_pos end_pos let err_of_parse_error filename lexbuf tag = let pos = lexbuf.cur_p in @@ -138,14 +138,14 @@ let err_of_parse_error filename lexbuf tag = let string_of_lexpos lp = let r = range_of_positions "" lp lp in - FStarC_Compiler_Range.string_of_range r + FStarC_Range.string_of_range r let parse_incremental_decls filename (contents:string) lexbuf (lexer:unit -> 'token * Lexing.position * Lexing.position) - (range_of: 'semantic_value -> FStarC_Compiler_Range.range) + (range_of: 'semantic_value -> FStarC_Range.range) (parse_one: (Lexing.lexbuf -> 'token) -> Lexing.lexbuf -> @@ -205,7 +205,7 @@ let contents_at contents = let chars = FStar_String.list_of_string line in if col <= List.length chars then ( - let prefix, suffix = FStarC_Compiler_Util.first_N (Z.of_int col) chars in + let prefix, suffix = FStarC_Util.first_N (Z.of_int col) chars in Some (FStar_String.string_of_list prefix, FStar_String.string_of_list suffix) ) @@ -237,13 +237,13 @@ let contents_at contents = let end_line = Z.to_int (Range.line_of_pos end_pos) in let end_col = Z.to_int (Range.col_of_pos end_pos) in let suffix = - FStarC_Compiler_Util.nth_tail + FStarC_Util.nth_tail (Z.of_int (if start_line > 0 then start_line - 1 else 0)) lines in (* Take all the lines between the start and end lines *) let text, rest = - FStarC_Compiler_Util.first_N + FStarC_Util.first_N (Z.of_int (end_line - start_line)) suffix in @@ -283,7 +283,7 @@ let parse_incremental_fragment (contents:string) lexbuf (lexer:unit -> 'token * Lexing.position * Lexing.position) - (range_of: 'semantic_value -> FStarC_Compiler_Range.range) + (range_of: 'semantic_value -> FStarC_Range.range) (parse_one: (Lexing.lexbuf -> 'token) -> Lexing.lexbuf -> @@ -299,9 +299,9 @@ let parse_incremental_fragment let parse_fstar_incrementally : FStarC_Parser_AST_Util.extension_lang_parser = let f = - fun (s:string) (r:FStarC_Compiler_Range.range) -> + fun (s:string) (r:FStarC_Range.range) -> let open FStar_Pervasives in - let open FStarC_Compiler_Range in + let open FStarC_Range in let lexbuf = create s (file_of_range r) @@ -337,7 +337,7 @@ let parse_fstar_incrementally Inl err | e -> let pos = FStarC_Parser_Util.pos_of_lexpos (lexbuf.cur_p) in - let r = FStarC_Compiler_Range.mk_range filename pos pos in + let r = FStarC_Range.mk_range filename pos pos in let err : FStarC_Parser_AST_Util.error_message = { message = "Syntax error parsing #lang-fstar block: "; range = r } in Inl err in @@ -354,8 +354,8 @@ let parse_lang lang fn = | Toplevel s | Fragment s -> try - let frag_pos = FStarC_Compiler_Range.mk_pos s.frag_line s.frag_col in - let rng = FStarC_Compiler_Range.mk_range s.frag_fname frag_pos frag_pos in + let frag_pos = FStarC_Range.mk_pos s.frag_line s.frag_col in + let rng = FStarC_Range.mk_range s.frag_fname frag_pos frag_pos in let decls = FStarC_Parser_AST_Util.parse_extension_lang lang s.frag_text rng in let comments = FStarC_Parser_Util.flush_comments () in ASTFragment (Inr decls, comments) @@ -375,7 +375,7 @@ let parse (lang_opt:lang_opts) fn = check_extension f; let f', contents = read_file f in (try create contents f' 1 0, f', contents - with _ -> raise_error_text FStarC_Compiler_Range.dummyRange Fatal_InvalidUTF8Encoding (U.format1 "File %s has invalid UTF-8 encoding." f')) + with _ -> raise_error_text FStarC_Range.dummyRange Fatal_InvalidUTF8Encoding (U.format1 "File %s has invalid UTF-8 encoding." f')) | Incremental s | Toplevel s | Fragment s -> diff --git a/src/ml/bare/FStarC_Parser_Util.ml b/src/ml/bare/FStarC_Parser_Util.ml index c6c03febb0f..0364c3b07b6 100644 --- a/src/ml/bare/FStarC_Parser_Util.ml +++ b/src/ml/bare/FStarC_Parser_Util.ml @@ -1,4 +1,4 @@ -open FStarC_Compiler_Range +open FStarC_Range open Lexing (* This brings into scope enough the translation of F# type names into the @@ -28,16 +28,16 @@ exception ReportedError exception StopProcessing let warningHandler = ref (fun (e:exn) -> - FStarC_Compiler_Util.print_string "no warning handler installed\n" ; - FStarC_Compiler_Util.print_any e; ()) + FStarC_Util.print_string "no warning handler installed\n" ; + FStarC_Util.print_any e; ()) let errorHandler = ref (fun (e:exn) -> - FStarC_Compiler_Util.print_string "no warning handler installed\n" ; - FStarC_Compiler_Util.print_any e; ()) + FStarC_Util.print_string "no warning handler installed\n" ; + FStarC_Util.print_any e; ()) let errorAndWarningCount = ref 0 let errorR exn = incr errorAndWarningCount; match exn with StopProcessing | ReportedError -> raise exn | _ -> !errorHandler exn let warning exn = incr errorAndWarningCount; match exn with StopProcessing | ReportedError -> raise exn | _ -> !warningHandler exn -let comments : (string * FStarC_Compiler_Range.range) list ref = ref [] +let comments : (string * FStarC_Range.range) list ref = ref [] let add_comment x = comments := x :: !comments let flush_comments () = let lexed_comments = !comments in diff --git a/src/ml/bare/FStarC_Compiler_Plugins_Base.ml b/src/ml/bare/FStarC_Plugins_Base.ml similarity index 100% rename from src/ml/bare/FStarC_Compiler_Plugins_Base.ml rename to src/ml/bare/FStarC_Plugins_Base.ml diff --git a/src/ml/bare/FStarC_Range.ml b/src/ml/bare/FStarC_Range.ml new file mode 100644 index 00000000000..3b56db3b3f8 --- /dev/null +++ b/src/ml/bare/FStarC_Range.ml @@ -0,0 +1,2 @@ +include FStarC_Range_Type +include FStarC_Range_Ops diff --git a/src/ml/bare/FStarC_Compiler_String.ml b/src/ml/bare/FStarC_String.ml similarity index 100% rename from src/ml/bare/FStarC_Compiler_String.ml rename to src/ml/bare/FStarC_String.ml diff --git a/src/ml/bare/FStarC_Syntax_TermHashTable.ml b/src/ml/bare/FStarC_Syntax_TermHashTable.ml index 3e018dd7a62..ad91fed00b0 100644 --- a/src/ml/bare/FStarC_Syntax_TermHashTable.ml +++ b/src/ml/bare/FStarC_Syntax_TermHashTable.ml @@ -1,6 +1,6 @@ module S = FStarC_Syntax_Syntax module P = FStarC_Profiling -module BU = FStarC_Compiler_Util +module BU = FStarC_Util let now () = BatUnix.gettimeofday () let record_time f = let start = now () in diff --git a/src/ml/bare/FStarC_Tactics_Native.ml b/src/ml/bare/FStarC_Tactics_Native.ml index 10c405034fb..7c74bc4ae36 100644 --- a/src/ml/bare/FStarC_Tactics_Native.ml +++ b/src/ml/bare/FStarC_Tactics_Native.ml @@ -1,4 +1,4 @@ -open FStarC_Compiler_Range +open FStarC_Range open FStarC_Tactics_Types open FStarC_Tactics_Result open FStarC_Tactics_Monad @@ -6,7 +6,7 @@ open FStarC_Syntax_Syntax module N = FStarC_TypeChecker_Normalize module C = FStarC_TypeChecker_Cfg -module BU = FStarC_Compiler_Util +module BU = FStarC_Util module NBETerm = FStarC_TypeChecker_NBETerm module O = FStarC_Options module PO = FStarC_TypeChecker_Primops @@ -30,8 +30,8 @@ type native_primitive_step = strong_reduction_ok: bool; tactic: itac} -let perr s = if FStarC_Compiler_Debug.any () then BU.print_error s -let perr1 s x = if FStarC_Compiler_Debug.any () then BU.print1_error s x +let perr s = if FStarC_Debug.any () then BU.print_error s +let perr1 s x = if FStarC_Debug.any () then BU.print1_error s x let compiled_tactics: native_primitive_step list ref = ref [] diff --git a/src/ml/bare/FStarC_Unionfind.ml b/src/ml/bare/FStarC_Unionfind.ml index aa13f1e8d8d..798a07f5dd7 100644 --- a/src/ml/bare/FStarC_Unionfind.ml +++ b/src/ml/bare/FStarC_Unionfind.ml @@ -1,8 +1,8 @@ (* Persistent union-find implementation adapted from https://www.lri.fr/~filliatr/puf/ *) -open FStarC_Compiler_Effect -open FStarC_Compiler_Util +open FStarC_Effect +open FStarC_Util (* Persistent arrays *) type 'a pa_t = 'a data ref diff --git a/src/ml/bare/FStarC_Compiler_Util.ml b/src/ml/bare/FStarC_Util.ml similarity index 100% rename from src/ml/bare/FStarC_Compiler_Util.ml rename to src/ml/bare/FStarC_Util.ml diff --git a/src/parser/FStarC.Parser.AST.Util.fst b/src/parser/FStarC.Parser.AST.Util.fst index 7b10da1be41..6bc7681d4e0 100644 --- a/src/parser/FStarC.Parser.AST.Util.fst +++ b/src/parser/FStarC.Parser.AST.Util.fst @@ -17,15 +17,15 @@ *) module FStarC.Parser.AST.Util open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStarC.Errors module C = FStarC.Parser.Const -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Ident open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Const open FStarC.Parser.AST @@ -743,13 +743,13 @@ and lidents_of_effect_decl (ed:effect_decl) = concat_map lidents_of_binder bs @ lidents_of_term t -module BU = FStarC.Compiler.Util -let extension_parser_table : BU.smap extension_parser = FStarC.Compiler.Util.smap_create 20 +module BU = FStarC.Util +let extension_parser_table : BU.smap extension_parser = FStarC.Util.smap_create 20 let register_extension_parser (ext:string) (parser:extension_parser) = - FStarC.Compiler.Util.smap_add extension_parser_table ext parser + FStarC.Util.smap_add extension_parser_table ext parser let lookup_extension_parser (ext:string) = - let do () = FStarC.Compiler.Util.smap_try_find extension_parser_table ext in + let do () = FStarC.Util.smap_try_find extension_parser_table ext in match do () with | None -> if Plugins.autoload_plugin ext @@ -768,15 +768,15 @@ let as_open_namespaces_and_abbrevs (ls:list decl) ls {open_namespaces = []; module_abbreviations = []} -let extension_lang_parser_table : BU.smap extension_lang_parser = FStarC.Compiler.Util.smap_create 20 +let extension_lang_parser_table : BU.smap extension_lang_parser = FStarC.Util.smap_create 20 let register_extension_lang_parser (ext:string) (parser:extension_lang_parser) = - FStarC.Compiler.Util.smap_add extension_lang_parser_table ext parser + FStarC.Util.smap_add extension_lang_parser_table ext parser let lookup_extension_lang_parser (ext:string) = - let r = FStarC.Compiler.Util.smap_try_find extension_lang_parser_table ext in + let r = FStarC.Util.smap_try_find extension_lang_parser_table ext in match r with | None -> if Plugins.autoload_plugin ext - then FStarC.Compiler.Util.smap_try_find extension_lang_parser_table ext + then FStarC.Util.smap_try_find extension_lang_parser_table ext else None | _ -> r diff --git a/src/parser/FStarC.Parser.AST.Util.fsti b/src/parser/FStarC.Parser.AST.Util.fsti index adfc5f47e21..cd9a678631f 100644 --- a/src/parser/FStarC.Parser.AST.Util.fsti +++ b/src/parser/FStarC.Parser.AST.Util.fsti @@ -17,8 +17,8 @@ *) module FStarC.Parser.AST.Util open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStarC.Parser.AST (* Check if two decls are equal, ignoring range metadata. @@ -37,19 +37,19 @@ type open_namespaces_and_abbreviations = { type error_message = { message: string; - range: FStarC.Compiler.Range.range; + range: FStarC.Range.range; } type extension_parser = { parse_decl_name: (contents:string -> - FStarC.Compiler.Range.range -> + FStarC.Range.range -> either error_message FStarC.Ident.ident); parse_decl: (open_namespaces_and_abbreviations -> contents:string -> - p:FStarC.Compiler.Range.range -> + p:FStarC.Range.range -> either error_message decl) } @@ -60,11 +60,11 @@ val lookup_extension_parser (extension_name:string) : option extension_parser type extension_lang_parser = { parse_decls: (contents:string -> - p:FStarC.Compiler.Range.range -> + p:FStarC.Range.range -> either error_message (list decl)) } val as_open_namespaces_and_abbrevs (ls:list decl) : open_namespaces_and_abbreviations val register_extension_lang_parser (extension_name:string) (parser:extension_lang_parser) : unit val lookup_extension_lang_parser (extension_name:string) : option extension_lang_parser -val parse_extension_lang (lang_name:string) (raw_text:string) (raw_text_pos:FStarC.Compiler.Range.range) : list decl +val parse_extension_lang (lang_name:string) (raw_text:string) (raw_text_pos:FStarC.Range.range) : list decl diff --git a/src/parser/FStarC.Parser.AST.fst b/src/parser/FStarC.Parser.AST.fst index c2501ed4b27..2c9e6e75f35 100644 --- a/src/parser/FStarC.Parser.AST.fst +++ b/src/parser/FStarC.Parser.AST.fst @@ -16,11 +16,11 @@ module FStarC.Parser.AST open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Range +open FStarC.Util open FStarC.Const open FStarC.Errors open FStarC.Ident @@ -281,7 +281,7 @@ let as_frag (ds:list decl) : inputFragment = ) ds; Inr ds -// TODO: Move to something like FStarC.Compiler.Util +// TODO: Move to something like FStarC.Util let strip_prefix (prefix s: string): option string = if starts_with s prefix then Some (substring_from s (String.length prefix)) diff --git a/src/parser/FStarC.Parser.AST.fsti b/src/parser/FStarC.Parser.AST.fsti index 163cd7ce80a..6b9083771a5 100644 --- a/src/parser/FStarC.Parser.AST.fsti +++ b/src/parser/FStarC.Parser.AST.fsti @@ -16,9 +16,9 @@ module FStarC.Parser.AST open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Range +open FStarC +open FStarC.Effect +open FStarC.Range open FStarC.Const open FStarC.Ident open FStarC.Class.Show @@ -335,7 +335,7 @@ val extract_named_refinement : bool -> term -> option (ident & term & option ter val as_frag : list decl -> inputFragment -// TODO: Move to something like FStarC.Compiler.Util +// TODO: Move to something like FStarC.Util val strip_prefix : string -> string -> option string val compile_op : int -> string -> range -> string diff --git a/src/parser/FStarC.Parser.Const.fst b/src/parser/FStarC.Parser.Const.fst index d698f4819b7..dc2717a6d26 100644 --- a/src/parser/FStarC.Parser.Const.fst +++ b/src/parser/FStarC.Parser.Const.fst @@ -17,15 +17,15 @@ module FStarC.Parser.Const open FStar.String open FStarC -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.Util open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Const -open FStarC.Compiler.List -module U = FStarC.Compiler.Util +open FStarC.List +module U = FStarC.Util module Options = FStarC.Options -module List = FStarC.Compiler.List +module List = FStarC.List let p2l l = lid_of_path l dummyRange @@ -399,7 +399,7 @@ let const_to_string x = match x with | Const_string(s, _) -> U.format1 "\"%s\"" s | Const_int (x, _) -> x | Const_char c -> "'" ^ U.string_of_char c ^ "'" - | Const_range r -> FStarC.Compiler.Range.string_of_range r + | Const_range r -> FStarC.Range.string_of_range r | Const_range_of -> "range_of" | Const_set_range_of -> "set_range_of" | Const_reify lopt -> @@ -482,8 +482,8 @@ let is_name (lid:lident) = let term_view_lid = p2l ["FStar"; "Reflection"; "V1"; "Data"; "term_view"] (* tactic constants *) -let fstar_tactics_lid' s : lid = FStarC.Ident.lid_of_path (["FStar"; "Tactics"]@s) FStarC.Compiler.Range.dummyRange -let fstar_stubs_tactics_lid' s : lid = FStarC.Ident.lid_of_path (["FStar"; "Stubs"; "Tactics"]@s) FStarC.Compiler.Range.dummyRange +let fstar_tactics_lid' s : lid = FStarC.Ident.lid_of_path (["FStar"; "Tactics"]@s) FStarC.Range.dummyRange +let fstar_stubs_tactics_lid' s : lid = FStarC.Ident.lid_of_path (["FStar"; "Stubs"; "Tactics"]@s) FStarC.Range.dummyRange let fstar_tactics_lid s = fstar_tactics_lid' [s] let tac_lid = fstar_tactics_lid' ["Effect"; "tac"] let tactic_lid = fstar_tactics_lid' ["Effect"; "tactic"] @@ -507,10 +507,10 @@ let rewrite_by_tactic_lid = fstar_tactics_lid' ["Effect"; "rewrite_with_tactic"] let synth_lid = fstar_tactics_lid' ["Effect"; "synth_by_tactic"] let assert_by_tactic_lid = fstar_tactics_lid' ["Effect"; "assert_by_tactic"] let fstar_syntax_syntax_term = FStarC.Ident.lid_of_str "FStarC.Syntax.Syntax.term" -let binder_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "binder"]) FStarC.Compiler.Range.dummyRange -let binders_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "binders"]) FStarC.Compiler.Range.dummyRange -let bv_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "bv"]) FStarC.Compiler.Range.dummyRange -let fv_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "fv"]) FStarC.Compiler.Range.dummyRange +let binder_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "binder"]) FStarC.Range.dummyRange +let binders_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "binders"]) FStarC.Range.dummyRange +let bv_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "bv"]) FStarC.Range.dummyRange +let fv_lid = lid_of_path (["FStar"; "Stubs"; "Reflection"; "Types"; "fv"]) FStarC.Range.dummyRange let norm_step_lid = psconst "norm_step" let postprocess_with = p2l ["FStar"; "Tactics"; "Effect"; "postprocess_with"] let preprocess_with = p2l ["FStar"; "Tactics"; "Effect"; "preprocess_with"] @@ -518,24 +518,24 @@ let postprocess_extr_with = p2l ["FStar"; "Tactics"; "Effect"; "postprocess_for_ let term_lid = p2l ["FStar"; "Stubs"; "Reflection"; "Types"; "term"] let ctx_uvar_and_subst_lid = p2l ["FStar"; "Stubs"; "Reflection"; "Types"; "ctx_uvar_and_subst"] let universe_uvar_lid = p2l ["FStar"; "Stubs"; "Reflection"; "Types"; "universe_uvar"] -let check_with_lid = lid_of_path (["FStar"; "Stubs"; "VConfig"; "check_with"]) FStarC.Compiler.Range.dummyRange +let check_with_lid = lid_of_path (["FStar"; "Stubs"; "VConfig"; "check_with"]) FStarC.Range.dummyRange let decls_lid = p2l ["FStar"; "Stubs"; "Reflection"; "Types"; "decls"] // meta dsl constants -let dsl_typing_builtin s = lid_of_path (["FStar"; "Reflection"; "Typing"; "Builtins"]@[s]) FStarC.Compiler.Range.dummyRange -let dsl_tac_typ_lid = lid_of_path ["FStar"; "Reflection"; "Typing"; "dsl_tac_t"] FStarC.Compiler.Range.dummyRange +let dsl_typing_builtin s = lid_of_path (["FStar"; "Reflection"; "Typing"; "Builtins"]@[s]) FStarC.Range.dummyRange +let dsl_tac_typ_lid = lid_of_path ["FStar"; "Reflection"; "Typing"; "dsl_tac_t"] FStarC.Range.dummyRange (* Calculational proofs, from FStar.Calc *) -let calc_lid i : lid = lid_of_path ["FStar"; "Calc"; i] FStarC.Compiler.Range.dummyRange +let calc_lid i : lid = lid_of_path ["FStar"; "Calc"; i] FStarC.Range.dummyRange let calc_init_lid = calc_lid "calc_init" let calc_step_lid = calc_lid "calc_step" let calc_finish_lid = calc_lid "calc_finish" let calc_push_impl_lid = calc_lid "calc_push_impl" (* Classical proofs, from FStar.Classical *) -let classical_sugar_lid i : lid = lid_of_path ["FStar"; "Classical"; "Sugar"; i] FStarC.Compiler.Range.dummyRange +let classical_sugar_lid i : lid = lid_of_path ["FStar"; "Classical"; "Sugar"; i] FStarC.Range.dummyRange let forall_intro_lid = classical_sugar_lid "forall_intro" let exists_intro_lid = classical_sugar_lid "exists_intro" @@ -553,20 +553,20 @@ let and_elim_lid = classical_sugar_lid "and_elim" let match_returns_def_name = reserved_prefix ^ "_ret_" -let steel_memory_inv_lid = FStarC.Ident.lid_of_path ["Steel"; "Memory"; "inv"] FStarC.Compiler.Range.dummyRange +let steel_memory_inv_lid = FStarC.Ident.lid_of_path ["Steel"; "Memory"; "inv"] FStarC.Range.dummyRange -let steel_new_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "Effect"; "Atomic"; "new_invariant"] FStarC.Compiler.Range.dummyRange -let steel_st_new_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "ST"; "Util"; "new_invariant"] FStarC.Compiler.Range.dummyRange +let steel_new_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "Effect"; "Atomic"; "new_invariant"] FStarC.Range.dummyRange +let steel_st_new_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "ST"; "Util"; "new_invariant"] FStarC.Range.dummyRange -let steel_with_invariant_g_lid = FStarC.Ident.lid_of_path ["Steel"; "Effect"; "Atomic"; "with_invariant_g"] FStarC.Compiler.Range.dummyRange -let steel_st_with_invariant_g_lid = FStarC.Ident.lid_of_path ["Steel"; "ST"; "Util"; "with_invariant_g"] FStarC.Compiler.Range.dummyRange +let steel_with_invariant_g_lid = FStarC.Ident.lid_of_path ["Steel"; "Effect"; "Atomic"; "with_invariant_g"] FStarC.Range.dummyRange +let steel_st_with_invariant_g_lid = FStarC.Ident.lid_of_path ["Steel"; "ST"; "Util"; "with_invariant_g"] FStarC.Range.dummyRange -let steel_with_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "Effect"; "Atomic"; "with_invariant"] FStarC.Compiler.Range.dummyRange -let steel_st_with_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "ST"; "Util"; "with_invariant"] FStarC.Compiler.Range.dummyRange +let steel_with_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "Effect"; "Atomic"; "with_invariant"] FStarC.Range.dummyRange +let steel_st_with_invariant_lid = FStarC.Ident.lid_of_path ["Steel"; "ST"; "Util"; "with_invariant"] FStarC.Range.dummyRange (* on_domain_lids are constant, so compute them once *) -let fext_lid s = Ident.lid_of_path ["FStar"; "FunctionalExtensionality"; s] FStarC.Compiler.Range.dummyRange +let fext_lid s = Ident.lid_of_path ["FStar"; "FunctionalExtensionality"; s] FStarC.Range.dummyRange let fext_on_domain_lid = fext_lid "on_domain" let fext_on_dom_lid = fext_lid "on_dom" let fext_on_domain_g_lid = fext_lid "on_domain_g" diff --git a/src/parser/FStarC.Parser.Dep.fst b/src/parser/FStarC.Parser.Dep.fst index 1d535975038..0765704fda9 100644 --- a/src/parser/FStarC.Parser.Dep.fst +++ b/src/parser/FStarC.Parser.Dep.fst @@ -23,12 +23,11 @@ module FStarC.Parser.Dep open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect //for ref, failwith etc -open FStarC.Compiler.List +open FStarC.Effect //for ref, failwith etc +open FStarC.List open FStarC.Parser open FStarC.Parser.AST -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const open FStar.String open FStarC.Ident @@ -36,7 +35,7 @@ open FStarC.Errors open FStarC.Class.Show module Const = FStarC.Parser.Const -module BU = FStarC.Compiler.Util +module BU = FStarC.Util let dbg = Debug.get_toggle "Dep" let dbg_CheckedFiles = Debug.get_toggle "CheckedFiles" diff --git a/src/parser/FStarC.Parser.Dep.fsti b/src/parser/FStarC.Parser.Dep.fsti index c5c6b59935a..4b2578b191b 100644 --- a/src/parser/FStarC.Parser.Dep.fsti +++ b/src/parser/FStarC.Parser.Dep.fsti @@ -14,18 +14,18 @@ limitations under the License. *) module FStarC.Parser.Dep -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Parser open FStarC.Parser.AST -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const open FStar.String open FStarC.Ident open FStarC.Errors module Const = FStarC.Parser.Const -module BU = FStarC.Compiler.Util +module BU = FStarC.Util type open_kind = | Open_module | Open_namespace type module_name = string diff --git a/src/parser/FStarC.Parser.Driver.fst b/src/parser/FStarC.Parser.Driver.fst index 5a1826db5b3..c9d6ae551be 100644 --- a/src/parser/FStarC.Parser.Driver.fst +++ b/src/parser/FStarC.Parser.Driver.fst @@ -15,14 +15,14 @@ *) module FStarC.Parser.Driver open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Parser open FStarC.Parser.AST open FStarC.Parser.ParseIt -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Errors open FStarC.Class.Show diff --git a/src/parser/FStarC.Parser.Driver.fsti b/src/parser/FStarC.Parser.Driver.fsti index 9f0cebef3ca..bf92ecde96f 100644 --- a/src/parser/FStarC.Parser.Driver.fsti +++ b/src/parser/FStarC.Parser.Driver.fsti @@ -15,7 +15,7 @@ *) module FStarC.Parser.Driver -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module AST = FStarC.Parser.AST module AU = FStarC.Parser.AST.Util module ParseIt = FStarC.Parser.ParseIt diff --git a/src/parser/FStarC.Parser.ParseIt.fsti b/src/parser/FStarC.Parser.ParseIt.fsti index 0b8e2250a66..05b09cf95fb 100644 --- a/src/parser/FStarC.Parser.ParseIt.fsti +++ b/src/parser/FStarC.Parser.ParseIt.fsti @@ -14,11 +14,11 @@ limitations under the License. *) module FStarC.Parser.ParseIt -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Parser -open FStarC.Compiler.Util +open FStarC.Util open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Errors module AU = FStarC.Parser.AST.Util type filename = string @@ -46,7 +46,7 @@ type parse_error = (error_code & error_message & Range.range) type code_fragment = { code: string; - range: FStarC.Compiler.Range.range; + range: FStarC.Range.range; } type incremental_result 'a = diff --git a/src/parser/FStarC.Parser.ToDocument.fst b/src/parser/FStarC.Parser.ToDocument.fst index 4b123695cf5..f734a1f35c9 100644 --- a/src/parser/FStarC.Parser.ToDocument.fst +++ b/src/parser/FStarC.Parser.ToDocument.fst @@ -18,21 +18,21 @@ module FStarC.Parser.ToDocument open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Parser.AST open FStarC.Ident open FStarC.Const open FStarC.Pprint -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Class.Show module C = FStarC.Parser.Const -module BU = FStarC.Compiler.Util +module BU = FStarC.Util @@ -48,7 +48,7 @@ let maybe_unthunk t = let min x y = if x > y then y else x let max x y = if x > y then x else y -// VD: copied over from NBE, should both probably go in FStarC.Compiler.List +// VD: copied over from NBE, should both probably go in FStarC.List let map_rev (f: 'a -> 'b) (l: list 'a): list 'b = let rec aux (l:list 'a) (acc:list 'b) = match l with @@ -305,9 +305,9 @@ let is_non_latin_char (s:Char.char): bool = int_of_char s > 0x024f let matches_token (s:string) = function - | StartsWith c -> FStarC.Compiler.String.get s 0 = c + | StartsWith c -> FStarC.String.get s 0 = c | Exact s' -> s = s' - | UnicodeOperator -> is_non_latin_char (FStarC.Compiler.String.get s 0) + | UnicodeOperator -> is_non_latin_char (FStarC.String.get s 0) let matches_level s (assoc_levels, tokens) = List.tryFind (matches_token s) tokens <> None @@ -674,7 +674,7 @@ let p_char_literal' quote_char (c: FStarC.BaseTypes.char): document = | '\r' -> "\\r" | '\v' -> "\\v" | '\0' -> "\\0" - | c -> let s = FStarC.Compiler.Util.string_of_char c in + | c -> let s = FStarC.Util.string_of_char c in if quote_char = c then "\\" ^ s else s) |> str let p_char_literal (c: FStarC.BaseTypes.char): document = @@ -2292,7 +2292,7 @@ let modul_to_document (m:modul) = | Interface (_, decls, _) -> decls |> List.map decl_to_document |> separate hardline -let comments_to_document (comments : list (string & FStarC.Compiler.Range.range)) = +let comments_to_document (comments : list (string & FStarC.Range.range)) = separate_map hardline (fun (comment, range) -> str comment) comments let extract_decl_range (d: decl): decl_meta = diff --git a/src/parser/FStarC.Parser.ToDocument.fsti b/src/parser/FStarC.Parser.ToDocument.fsti index 42f64da6889..fcc2c73d38c 100644 --- a/src/parser/FStarC.Parser.ToDocument.fsti +++ b/src/parser/FStarC.Parser.ToDocument.fsti @@ -16,7 +16,7 @@ (** Convert Parser.Ast to Pprint.document for prettyprinting. *) module FStarC.Parser.ToDocument -open FStarC.Compiler.Effect +open FStarC.Effect val term_to_document : FStarC.Parser.AST.term -> FStarC.Pprint.document val decl_to_document : FStarC.Parser.AST.decl -> FStarC.Pprint.document @@ -24,7 +24,7 @@ val signature_to_document : FStarC.Parser.AST.decl -> FStarC.Pprint.document val pat_to_document : FStarC.Parser.AST.pattern -> FStarC.Pprint.document val binder_to_document : FStarC.Parser.AST.binder -> FStarC.Pprint.document val modul_to_document : FStarC.Parser.AST.modul -> FStarC.Pprint.document -val comments_to_document : list (string & FStarC.Compiler.Range.range) -> FStarC.Pprint.document -val modul_with_comments_to_document : FStarC.Parser.AST.modul -> list (string & FStarC.Compiler.Range.range) -> FStarC.Pprint.document & list (string & FStarC.Compiler.Range.range) +val comments_to_document : list (string & FStarC.Range.range) -> FStarC.Pprint.document +val modul_with_comments_to_document : FStarC.Parser.AST.modul -> list (string & FStarC.Range.range) -> FStarC.Pprint.document & list (string & FStarC.Range.range) val handleable_args_length : FStarC.Ident.ident -> int -val decl_with_comments_to_document : FStarC.Parser.AST.decl -> list (string & FStarC.Compiler.Range.range) -> FStarC.Pprint.document & list (string & FStarC.Compiler.Range.range) \ No newline at end of file +val decl_with_comments_to_document : FStarC.Parser.AST.decl -> list (string & FStarC.Range.range) -> FStarC.Pprint.document & list (string & FStarC.Range.range) \ No newline at end of file diff --git a/src/prettyprint/FStarC.Pprint.fsti b/src/prettyprint/FStarC.Pprint.fsti index eae67c58ef1..96969916bc7 100644 --- a/src/prettyprint/FStarC.Pprint.fsti +++ b/src/prettyprint/FStarC.Pprint.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.Pprint -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.BaseTypes (** A pretty-printing engine and a set of basic document combinators. *) @@ -380,7 +380,7 @@ val surround_separate_map: int -> int -> document -> document -> document -> doc // [pretty_string] uses ToBuffer:RENDERER implementation; // [print_out_channel] uses the ToChannel:RENDERER one. val pretty_string : float -> int -> document -> string -val pretty_out_channel : float -> int -> document -> FStarC.Compiler.Util.out_channel -> unit +val pretty_out_channel : float -> int -> document -> FStarC.Util.out_channel -> unit (* Simple renderer, defined as [pretty_string 1.0 80] *) val render : document -> string diff --git a/src/reflection/FStarC.Reflection.V1.Builtins.fst b/src/reflection/FStarC.Reflection.V1.Builtins.fst index 99562b5f344..0300fff44c1 100644 --- a/src/reflection/FStarC.Reflection.V1.Builtins.fst +++ b/src/reflection/FStarC.Reflection.V1.Builtins.fst @@ -16,9 +16,9 @@ module FStarC.Reflection.V1.Builtins open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Reflection.V1.Data open FStarC.Syntax.Syntax open FStarC.Errors @@ -31,8 +31,8 @@ open FStarC.Class.Tagged module C = FStarC.Const module PC = FStarC.Parser.Const module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util -module Range = FStarC.Compiler.Range +module BU = FStarC.Util +module Range = FStarC.Range module U = FStarC.Syntax.Util module UF = FStarC.Syntax.Unionfind module Print = FStarC.Syntax.Print diff --git a/src/reflection/FStarC.Reflection.V1.Builtins.fsti b/src/reflection/FStarC.Reflection.V1.Builtins.fsti index b9abc4e0aac..25290f58858 100644 --- a/src/reflection/FStarC.Reflection.V1.Builtins.fsti +++ b/src/reflection/FStarC.Reflection.V1.Builtins.fsti @@ -15,9 +15,9 @@ *) module FStarC.Reflection.V1.Builtins -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Order +open FStarC +open FStarC.Effect +open FStarC.Order open FStarC.Reflection.V1.Data open FStarC.Syntax.Embeddings open FStarC.Syntax.Syntax @@ -91,5 +91,5 @@ val compare_string : string -> string -> Z.t val push_binder : Env.env -> binder -> Env.env -val range_of_term : term -> FStarC.Compiler.Range.range -val range_of_sigelt : sigelt -> FStarC.Compiler.Range.range +val range_of_term : term -> FStarC.Range.range +val range_of_sigelt : sigelt -> FStarC.Range.range diff --git a/src/reflection/FStarC.Reflection.V1.Constants.fst b/src/reflection/FStarC.Reflection.V1.Constants.fst index de4d9eaf2b9..79312de6313 100644 --- a/src/reflection/FStarC.Reflection.V1.Constants.fst +++ b/src/reflection/FStarC.Reflection.V1.Constants.fst @@ -15,10 +15,10 @@ *) module FStarC.Reflection.V1.Constants -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax module Ident = FStarC.Ident -module Range = FStarC.Compiler.Range +module Range = FStarC.Range (* Contains all lids and terms needed for embedding/unembedding *) diff --git a/src/reflection/FStarC.Reflection.V1.Data.fst b/src/reflection/FStarC.Reflection.V1.Data.fst index 1a4f217cd32..9f3738b69e5 100644 --- a/src/reflection/FStarC.Reflection.V1.Data.fst +++ b/src/reflection/FStarC.Reflection.V1.Data.fst @@ -21,10 +21,10 @@ taken by the dependency analysis to be the interface of the .fs. We also cannot ditch the .fs, since out bootstrapping process does not extract any .ml file from an interface. Hence we keep both, exactly equal to each other. *) -open FStarC.Compiler.List +open FStarC.List open FStarC.Syntax.Syntax module Ident = FStarC.Ident -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt open FStarC.Ident @@ -38,7 +38,7 @@ open FStarC.Ident functions in the interface are not supported for extraction. So, we include them in this module implementation file to force them to be extracted *) -let as_ppname (x:string) : Tot ppname_t = FStarC.Compiler.Sealed.seal x +let as_ppname (x:string) : Tot ppname_t = FStarC.Sealed.seal x let notAscription (tv:term_view) : Tot bool = not (Tv_AscribedT? tv) && not (Tv_AscribedC? tv) diff --git a/src/reflection/FStarC.Reflection.V1.Data.fsti b/src/reflection/FStarC.Reflection.V1.Data.fsti index 2d1e198bf8f..7616b226aeb 100644 --- a/src/reflection/FStarC.Reflection.V1.Data.fsti +++ b/src/reflection/FStarC.Reflection.V1.Data.fsti @@ -21,11 +21,11 @@ taken by the dependency analysis to be the interface of the .fs. We also cannot ditch the .fs, since out bootstrapping process does not extract any .ml file from an interface. Hence we keep both, exactly equal to each other. *) -open FStarC.Compiler.List +open FStarC.List open FStarC.Syntax.Syntax -open FStarC.Compiler.Sealed +open FStarC.Sealed module Ident = FStarC.Ident -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt open FStarC.Ident diff --git a/src/reflection/FStarC.Reflection.V1.Embeddings.fst b/src/reflection/FStarC.Reflection.V1.Embeddings.fst index 98457abad39..a31c18e81ef 100644 --- a/src/reflection/FStarC.Reflection.V1.Embeddings.fst +++ b/src/reflection/FStarC.Reflection.V1.Embeddings.fst @@ -15,24 +15,24 @@ *) module FStarC.Reflection.V1.Embeddings -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Reflection.V1.Data open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStar.Order open FStarC.Errors -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env module Err = FStarC.Errors module I = FStarC.Ident -module List = FStarC.Compiler.List +module List = FStarC.List module NBETerm = FStarC.TypeChecker.NBETerm module O = FStarC.Options module PC = FStarC.Parser.Const module Print = FStarC.Syntax.Print -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module RD = FStarC.Reflection.V1.Data module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst diff --git a/src/reflection/FStarC.Reflection.V1.Embeddings.fsti b/src/reflection/FStarC.Reflection.V1.Embeddings.fsti index ce9f4f36aa0..5ef116df37b 100644 --- a/src/reflection/FStarC.Reflection.V1.Embeddings.fsti +++ b/src/reflection/FStarC.Reflection.V1.Embeddings.fsti @@ -15,7 +15,7 @@ *) module FStarC.Reflection.V1.Embeddings -open FStar open FStarC.Compiler +open FStar open FStarC open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStar.Order diff --git a/src/reflection/FStarC.Reflection.V1.Interpreter.fst b/src/reflection/FStarC.Reflection.V1.Interpreter.fst index a0f428cfd78..92ddc829967 100644 --- a/src/reflection/FStarC.Reflection.V1.Interpreter.fst +++ b/src/reflection/FStarC.Reflection.V1.Interpreter.fst @@ -15,7 +15,7 @@ *) module FStarC.Reflection.V1.Interpreter -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env @@ -26,9 +26,9 @@ module RB = FStarC.Reflection.V1.Builtins module RD = FStarC.Reflection.V1.Data module RE = FStarC.Reflection.V1.Embeddings module Z = FStarC.BigInt -module Range = FStarC.Compiler.Range -open FStarC.Compiler -open FStarC.Compiler.List +module Range = FStarC.Range +open FStarC +open FStarC.List open FStarC.Ident open FStarC.Syntax.Syntax open FStarC.Reflection.V1.Constants diff --git a/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fst b/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fst index e9c34e2ff3b..5a19e5075ad 100644 --- a/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fst +++ b/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fst @@ -15,25 +15,25 @@ *) module FStarC.Reflection.V1.NBEEmbeddings open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStar.Pervasives open FStarC.Reflection.V1.Data open FStarC.Syntax.Syntax open FStarC.TypeChecker.NBETerm -open FStarC.Compiler.Order +open FStarC.Order open FStarC.Errors module O = FStarC.Options module S = FStarC.Syntax.Syntax // TODO: remove, it's open -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Env = FStarC.TypeChecker.Env module Err = FStarC.Errors module I = FStarC.Ident module NBETerm = FStarC.TypeChecker.NBETerm module PC = FStarC.Parser.Const -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module RD = FStarC.Reflection.V1.Data module SS = FStarC.Syntax.Subst module Thunk = FStarC.Thunk diff --git a/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fsti b/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fsti index ffac6752608..eb3ae1b1969 100644 --- a/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fsti +++ b/src/reflection/FStarC.Reflection.V1.NBEEmbeddings.fsti @@ -17,7 +17,7 @@ module FStarC.Reflection.V1.NBEEmbeddings open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker.NBETerm open FStarC.Syntax.Syntax open FStar.Order diff --git a/src/reflection/FStarC.Reflection.V2.Builtins.fst b/src/reflection/FStarC.Reflection.V2.Builtins.fst index 599c110d3a2..8bb7cd94988 100644 --- a/src/reflection/FStarC.Reflection.V2.Builtins.fst +++ b/src/reflection/FStarC.Reflection.V2.Builtins.fst @@ -16,9 +16,9 @@ module FStarC.Reflection.V2.Builtins open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Reflection.V2.Data open FStarC.Syntax.Syntax open FStarC.Errors @@ -32,8 +32,8 @@ open FStarC.Class.Tagged module C = FStarC.Const module PC = FStarC.Parser.Const module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util -module Range = FStarC.Compiler.Range +module BU = FStarC.Util +module Range = FStarC.Range module U = FStarC.Syntax.Util module UF = FStarC.Syntax.Unionfind module Print = FStarC.Syntax.Print diff --git a/src/reflection/FStarC.Reflection.V2.Builtins.fsti b/src/reflection/FStarC.Reflection.V2.Builtins.fsti index 1d32bd1b1f0..b9ee6be2297 100644 --- a/src/reflection/FStarC.Reflection.V2.Builtins.fsti +++ b/src/reflection/FStarC.Reflection.V2.Builtins.fsti @@ -15,9 +15,9 @@ *) module FStarC.Reflection.V2.Builtins -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Order +open FStarC +open FStarC.Effect +open FStarC.Order open FStarC.Reflection.V2.Data open FStarC.Syntax.Embeddings open FStarC.Syntax.Syntax diff --git a/src/reflection/FStarC.Reflection.V2.Constants.fst b/src/reflection/FStarC.Reflection.V2.Constants.fst index 881df616892..e87d42df0ad 100644 --- a/src/reflection/FStarC.Reflection.V2.Constants.fst +++ b/src/reflection/FStarC.Reflection.V2.Constants.fst @@ -15,10 +15,10 @@ *) module FStarC.Reflection.V2.Constants -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax module Ident = FStarC.Ident -module Range = FStarC.Compiler.Range +module Range = FStarC.Range (* Contains all lids and terms needed for embedding/unembedding *) diff --git a/src/reflection/FStarC.Reflection.V2.Data.fst b/src/reflection/FStarC.Reflection.V2.Data.fst index 73d33b1b4ec..ee5d2ca605f 100644 --- a/src/reflection/FStarC.Reflection.V2.Data.fst +++ b/src/reflection/FStarC.Reflection.V2.Data.fst @@ -21,10 +21,10 @@ taken by the dependency analysis to be the interface of the .fs. We also cannot ditch the .fs, since out bootstrapping process does not extract any .ml file from an interface. Hence we keep both, exactly equal to each other. *) -open FStarC.Compiler.List +open FStarC.List open FStarC.Syntax.Syntax module Ident = FStarC.Ident -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt open FStarC.Ident @@ -38,7 +38,7 @@ open FStarC.Ident functions in the interface are not supported for extraction. So, we include them in this module implementation file to force them to be extracted *) -let as_ppname (x:string) : Tot ppname_t = FStarC.Compiler.Sealed.seal x +let as_ppname (x:string) : Tot ppname_t = FStarC.Sealed.seal x let notAscription (tv:term_view) : Tot bool = not (Tv_AscribedT? tv) && not (Tv_AscribedC? tv) diff --git a/src/reflection/FStarC.Reflection.V2.Data.fsti b/src/reflection/FStarC.Reflection.V2.Data.fsti index 7b0f781d8b8..5cddb53e909 100644 --- a/src/reflection/FStarC.Reflection.V2.Data.fsti +++ b/src/reflection/FStarC.Reflection.V2.Data.fsti @@ -21,13 +21,13 @@ taken by the dependency analysis to be the interface of the .fs. We also cannot ditch the .fs, since out bootstrapping process does not extract any .ml file from an interface. Hence we keep both, exactly equal to each other. *) -open FStarC.Compiler.List +open FStarC.List open FStarC.Syntax.Syntax module Ident = FStarC.Ident -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt open FStarC.Ident -open FStarC.Compiler.Sealed +open FStarC.Sealed type name = list string type typ = term diff --git a/src/reflection/FStarC.Reflection.V2.Embeddings.fst b/src/reflection/FStarC.Reflection.V2.Embeddings.fst index 2bee9b70b0b..a9a659931f1 100644 --- a/src/reflection/FStarC.Reflection.V2.Embeddings.fst +++ b/src/reflection/FStarC.Reflection.V2.Embeddings.fst @@ -15,24 +15,24 @@ *) module FStarC.Reflection.V2.Embeddings -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Reflection.V2.Data open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStar.Order open FStarC.Errors -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env module Err = FStarC.Errors module I = FStarC.Ident -module List = FStarC.Compiler.List +module List = FStarC.List module NBETerm = FStarC.TypeChecker.NBETerm module O = FStarC.Options module PC = FStarC.Parser.Const module Print = FStarC.Syntax.Print -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module RD = FStarC.Reflection.V2.Data module S = FStarC.Syntax.Syntax // TODO: remove, it's open module SS = FStarC.Syntax.Subst diff --git a/src/reflection/FStarC.Reflection.V2.Embeddings.fsti b/src/reflection/FStarC.Reflection.V2.Embeddings.fsti index f266e362a06..95dfe99054e 100644 --- a/src/reflection/FStarC.Reflection.V2.Embeddings.fsti +++ b/src/reflection/FStarC.Reflection.V2.Embeddings.fsti @@ -16,7 +16,7 @@ module FStarC.Reflection.V2.Embeddings open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStar.Order diff --git a/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fst b/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fst index e4340f339f7..fa57972e7d5 100644 --- a/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fst +++ b/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fst @@ -15,25 +15,25 @@ *) module FStarC.Reflection.V2.NBEEmbeddings open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStar.Pervasives open FStarC.Reflection.V2.Data open FStarC.Syntax.Syntax open FStarC.TypeChecker.NBETerm -open FStarC.Compiler.Order +open FStarC.Order open FStarC.Errors open FStarC.Dyn open FStarC.Reflection.V2.Constants -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Env = FStarC.TypeChecker.Env module Err = FStarC.Errors module I = FStarC.Ident module NBETerm = FStarC.TypeChecker.NBETerm module O = FStarC.Options module PC = FStarC.Parser.Const -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module S = FStarC.Syntax.Syntax // TODO: remove, it's open module SS = FStarC.Syntax.Subst module U = FStarC.Syntax.Util diff --git a/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fsti b/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fsti index 316b4622c8a..df4e4f0328a 100644 --- a/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fsti +++ b/src/reflection/FStarC.Reflection.V2.NBEEmbeddings.fsti @@ -17,7 +17,7 @@ module FStarC.Reflection.V2.NBEEmbeddings open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax.Syntax open FStarC.TypeChecker.NBETerm open FStarC.Reflection.V2.Data diff --git a/src/smtencoding/FStarC.SMTEncoding.Encode.fst b/src/smtencoding/FStarC.SMTEncoding.Encode.fst index f3f86800565..6a414bc8185 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Encode.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Encode.fst @@ -17,9 +17,9 @@ module FStarC.SMTEncoding.Encode open Prims open FStar open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler +open FStarC.Effect +open FStarC.List +open FStarC open FStarC.TypeChecker.Env open FStarC.Syntax open FStarC.Syntax.Syntax @@ -33,7 +33,7 @@ open FStarC.SMTEncoding.Env open FStarC.SMTEncoding.EncodeTerm open FStarC.Class.Show -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Const = FStarC.Parser.Const module Env = FStarC.TypeChecker.Env module N = FStarC.TypeChecker.Normalize @@ -798,7 +798,7 @@ let encode_top_level_let : | _ -> false in let is_smt_theory_symbol = - let fv = FStarC.Compiler.Util.right lbn in + let fv = FStarC.Util.right lbn in Env.fv_has_attr env.tcenv fv FStarC.Parser.Const.smt_theory_symbol_attr_lid in let is_sub_singleton = U.is_sub_singleton body in @@ -1256,7 +1256,7 @@ let encode_datacon (env:env_t) (se:sigelt) in (env, xv::arg_vars, eqns, i + 1)) (env', [], [], 0) - (FStarC.Compiler.List.zip args encoded_args) + (FStarC.List.zip args encoded_args) in let arg_vars = List.rev arg_vars in let arg_params, _ = List.splitAt n_tps arg_vars in diff --git a/src/smtencoding/FStarC.SMTEncoding.Encode.fsti b/src/smtencoding/FStarC.SMTEncoding.Encode.fsti index 7923f45d0ae..21593752f5a 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Encode.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.Encode.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.SMTEncoding.Encode -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.SMTEncoding.Term module ErrorReporting = FStarC.SMTEncoding.ErrorReporting module S = FStarC.Syntax.Syntax diff --git a/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fst b/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fst index a151568d04a..5ec46464592 100644 --- a/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fst +++ b/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fst @@ -17,10 +17,10 @@ module FStarC.SMTEncoding.EncodeTerm open Prims open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Defensive open FStarC.TypeChecker.Env open FStarC.Syntax @@ -33,7 +33,7 @@ open FStarC.SMTEncoding open FStarC.SMTEncoding.Util open FStarC.SMTEncoding.Env -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Const = FStarC.Parser.Const module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env @@ -320,7 +320,7 @@ let isInteger (tm: Syntax.term') : bool = let getInteger (tm : Syntax.term') = match tm with - | Tm_constant (Const_int (n,None)) -> FStarC.Compiler.Util.int_of_string n + | Tm_constant (Const_int (n,None)) -> FStarC.Util.int_of_string n | _ -> failwith "Expected an Integer term" (* We only want to encode a term as a bitvector term (not an uninterpreted function) @@ -473,7 +473,7 @@ and encode_arith_term env head args_e = we do not want to encode this*) let (tm_sz, _) : arg = List.hd args_e in let sz = getInteger tm_sz.n in - let sz_key = FStarC.Compiler.Util.format1 "BitVector_%s" (string_of_int sz) in + let sz_key = FStarC.Util.format1 "BitVector_%s" (string_of_int sz) in let sz_decls = let t_decls, constr_name, discriminator_name = mkBvConstructor sz in //Typing inversion for bv_t n @@ -505,7 +505,7 @@ and encode_arith_term env head args_e = | Tm_fvar fv, [_;(sz_arg, _);_] when (S.fv_eq_lid fv Const.bv_uext_lid) -> (*fail if extension size is not a constant*) - failwith (FStarC.Compiler.Util.format1 "Not a constant bitvector extend size: %s" + failwith (FStarC.Util.format1 "Not a constant bitvector extend size: %s" (show sz_arg)) | _ -> (List.tail args_e, None) in diff --git a/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fsti b/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fsti index ba87dffb7f2..e1cc1813b80 100644 --- a/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.EncodeTerm.fsti @@ -17,9 +17,9 @@ module FStarC.SMTEncoding.EncodeTerm open Prims open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker.Env open FStarC.Syntax open FStarC.Syntax.Syntax @@ -30,7 +30,7 @@ open FStarC.Const open FStarC.SMTEncoding open FStarC.SMTEncoding.Util open FStarC.SMTEncoding.Env -module BU = FStarC.Compiler.Util +module BU = FStarC.Util val isTotFun_axioms: Range.range -> head:term -> vars:fvs -> guards:list term -> bool -> term val mk_Apply : e:term -> vars:fvs -> term val maybe_curry_app : rng:Range.range -> head:either op term -> arity:int -> args:list term -> term diff --git a/src/smtencoding/FStarC.SMTEncoding.Env.fst b/src/smtencoding/FStarC.SMTEncoding.Env.fst index 1bf4d2dbd91..2234a3fca00 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Env.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Env.fst @@ -16,9 +16,9 @@ module FStarC.SMTEncoding.Env open Prims open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker.Env open FStarC.Syntax open FStarC.Syntax.Syntax @@ -28,7 +28,7 @@ open FStarC.Ident open FStarC.SMTEncoding.Util module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util open FStarC.Class.Show diff --git a/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fst b/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fst index de156b908c7..95c2bd5bf7f 100644 --- a/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fst +++ b/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fst @@ -15,19 +15,19 @@ *) module FStarC.SMTEncoding.ErrorReporting -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.BaseTypes -open FStarC.Compiler.Util +open FStarC.Util open FStarC.SMTEncoding.Term open FStarC.SMTEncoding.Util open FStarC.SMTEncoding.Z3 open FStarC.SMTEncoding -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Class.Setlike -module BU = FStarC.Compiler.Util +module BU = FStarC.Util exception Not_a_wp_implication of string let sort_labels (l:(list (error_label & bool))) = List.sortWith (fun ((_, _, r1), _) ((_, _, r2), _) -> Range.compare r1 r2) l diff --git a/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fsti b/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fsti index f9e747a1c63..c97c71c5642 100644 --- a/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.ErrorReporting.fsti @@ -15,16 +15,16 @@ *) module FStarC.SMTEncoding.ErrorReporting -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.BaseTypes -open FStarC.Compiler.Util +open FStarC.Util open FStarC.SMTEncoding.Term open FStarC.SMTEncoding.Util open FStarC.SMTEncoding -open FStarC.Compiler.Range -module BU = FStarC.Compiler.Util +open FStarC.Range +module BU = FStarC.Util type label = error_label type labels = list label diff --git a/src/smtencoding/FStarC.SMTEncoding.Pruning.fst b/src/smtencoding/FStarC.SMTEncoding.Pruning.fst index 48a489310db..48c87fc48bf 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Pruning.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Pruning.fst @@ -14,15 +14,15 @@ limitations under the License. *) module FStarC.SMTEncoding.Pruning -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC open FStar.List.Tot -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term open FStarC.Class.Setlike open FStarC.Class.Show open FStarC.Class.Monad -module BU = FStarC.Compiler.Util +module BU = FStarC.Util type triggers = list (list string) type triggers_set = list (RBSet.t string) @@ -332,7 +332,7 @@ let add_decls (ds:list decl) (p:pruning_state) = List.fold_left (fun p d -> add_decl d p) p ds let sym = string -let reached_assumption_names = FStarC.Compiler.RBSet.rbset string +let reached_assumption_names = FStarC.RBSet.rbset string // The main pruning algorithm is expresses as a state monad over the ctxt type ctxt = { diff --git a/src/smtencoding/FStarC.SMTEncoding.Pruning.fsti b/src/smtencoding/FStarC.SMTEncoding.Pruning.fsti index 0df08764ec2..45a6a2a9427 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Pruning.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.Pruning.fsti @@ -45,9 +45,9 @@ module FStarC.SMTEncoding.Pruning Thanks to Chris Hawblitzel and Guido Martínez for design and discussions. *) -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term (* The main abstract type of this module, representing the set of all assumptions *) diff --git a/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fst b/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fst index 45741c96ed7..6ed9026c609 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fst @@ -17,13 +17,13 @@ module FStarC.SMTEncoding.Solver.Cache open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util -open FStarC.Compiler.RBSet +module BU = FStarC.Util +open FStarC.RBSet open FStarC.Class.Show open FStarC.Class.Hashable diff --git a/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fsti b/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fsti index 79b00499271..a854029ed06 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.Solver.Cache.fsti @@ -17,8 +17,8 @@ module FStarC.SMTEncoding.Solver.Cache open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax diff --git a/src/smtencoding/FStarC.SMTEncoding.Solver.fst b/src/smtencoding/FStarC.SMTEncoding.Solver.fst index d371032b40b..91b6337a299 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Solver.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Solver.fst @@ -16,14 +16,14 @@ module FStarC.SMTEncoding.Solver open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Z3 open FStarC.SMTEncoding.Term -open FStarC.Compiler.Util -open FStarC.Compiler.Hints +open FStarC.Util +open FStarC.Hints open FStarC.TypeChecker open FStarC.TypeChecker.Env open FStarC.SMTEncoding @@ -33,9 +33,9 @@ open FStarC.SMTEncoding.Env open FStarC.Class.Show open FStarC.Class.PP open FStarC.Class.Hashable -open FStarC.Compiler.RBSet +open FStarC.RBSet -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Env = FStarC.TypeChecker.Env module Err = FStarC.Errors module Print = FStarC.Syntax.Print @@ -52,7 +52,7 @@ let dbg_SMTFail = Debug.get_toggle "SMTFail" (* Hint databases for record and replay (private) *) (****************************************************************************) -// The type definition is now in [FStarC.Compiler.Util], since it needs to be visible to +// The type definition is now in [FStarC.Util], since it needs to be visible to // both the F# and OCaml implementations. type z3_replay_result = either (option UC.unsat_core), error_labels diff --git a/src/smtencoding/FStarC.SMTEncoding.Solver.fsti b/src/smtencoding/FStarC.SMTEncoding.Solver.fsti index 245e5f2de42..c04fa5c6782 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Solver.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.Solver.fsti @@ -15,7 +15,7 @@ *) module FStarC.SMTEncoding.Solver -open FStarC.Compiler.Effect +open FStarC.Effect val with_hints_db : string -> (unit -> 'a) -> 'a val dummy: FStarC.TypeChecker.Env.solver_t diff --git a/src/smtencoding/FStarC.SMTEncoding.SolverState.fst b/src/smtencoding/FStarC.SMTEncoding.SolverState.fst index 7f38f098d06..31b38d51e10 100644 --- a/src/smtencoding/FStarC.SMTEncoding.SolverState.fst +++ b/src/smtencoding/FStarC.SMTEncoding.SolverState.fst @@ -14,16 +14,16 @@ limitations under the License. *) module FStarC.SMTEncoding.SolverState -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term open FStarC.BaseTypes -open FStarC.Compiler.Util +open FStarC.Util open FStar.List.Tot open FStarC.Class.Show open FStarC.Class.Setlike -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Pruning = FStarC.SMTEncoding.Pruning module U = FStarC.SMTEncoding.UnsatCore module TcEnv = FStarC.TypeChecker.Env diff --git a/src/smtencoding/FStarC.SMTEncoding.SolverState.fsti b/src/smtencoding/FStarC.SMTEncoding.SolverState.fsti index 6f3a8666c57..95a2b888556 100644 --- a/src/smtencoding/FStarC.SMTEncoding.SolverState.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.SolverState.fsti @@ -32,13 +32,13 @@ module FStarC.SMTEncoding.SolverState handled in FStarC.SMTEncoding.Z3.fst. Instead, it buffers all Term.decls to be sent to the solver and a call to flush returns all the decls to be sent. *) -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term open FStarC.BaseTypes -open FStarC.Compiler.Util -module BU = FStarC.Compiler.Util +open FStarC.Util +module BU = FStarC.Util module U = FStarC.SMTEncoding.UnsatCore type using_facts_from_setting = list (list string & bool) diff --git a/src/smtencoding/FStarC.SMTEncoding.Term.fst b/src/smtencoding/FStarC.SMTEncoding.Term.fst index b692d4884d3..9e16948c369 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Term.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Term.fst @@ -16,11 +16,11 @@ module FStarC.SMTEncoding.Term open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util let escape (s:string) = BU.replace_char s '\'' '_' @@ -1118,7 +1118,7 @@ let mk_Valid t = match t.tm with | App(Var "Prims.b2t", [{tm=App(Var "Prims.op_Negation", [t])}]) -> mkNot (unboxBool t) t.rng | App(Var "Prims.b2t", [{tm=App(Var "FStar.BV.bvult", [t0; t1;t2])}]) | App(Var "Prims.equals", [_; {tm=App(Var "FStar.BV.bvult", [t0; t1;t2])}; _]) - when (FStarC.Compiler.Util.is_some (getBoxedInteger t0))-> + when (FStarC.Util.is_some (getBoxedInteger t0))-> // sometimes b2t gets needlessly normalized... let sz = match getBoxedInteger t0 with | Some sz -> sz | _ -> failwith "impossible" in mkBvUlt (unboxBitVec sz t1, unboxBitVec sz t2) t.rng diff --git a/src/smtencoding/FStarC.SMTEncoding.Term.fsti b/src/smtencoding/FStarC.SMTEncoding.Term.fsti index 20a295af45f..2832bfc517d 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Term.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.Term.fsti @@ -17,11 +17,11 @@ module FStarC.SMTEncoding.Term open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Class.Show -open FStarC.Compiler.List +open FStarC.List open FStarC.Class.Ord module S = FStarC.Syntax.Syntax diff --git a/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fst b/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fst index 96358574334..7e1c9928cd6 100644 --- a/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fst +++ b/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fst @@ -14,11 +14,11 @@ limitations under the License. *) module FStarC.SMTEncoding.UnsatCore -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term -module BU = FStarC.Compiler.Util +module BU = FStarC.Util let filter (core:unsat_core) (decls:list decl) : list decl diff --git a/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fsti b/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fsti index 6aa8daf7891..2acce24c4b9 100644 --- a/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.UnsatCore.fsti @@ -14,9 +14,9 @@ limitations under the License. *) module FStarC.SMTEncoding.UnsatCore -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term type unsat_core = list string diff --git a/src/smtencoding/FStarC.SMTEncoding.Util.fst b/src/smtencoding/FStarC.SMTEncoding.Util.fst index 451911b7600..aa5de15ff25 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Util.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Util.fst @@ -15,10 +15,9 @@ *) module FStarC.SMTEncoding.Util -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC -open FStarC.Compiler open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax open FStarC.SMTEncoding.Term diff --git a/src/smtencoding/FStarC.SMTEncoding.Z3.fst b/src/smtencoding/FStarC.SMTEncoding.Z3.fst index 5a6aea5e8ab..a20469feddb 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Z3.fst +++ b/src/smtencoding/FStarC.SMTEncoding.Z3.fst @@ -14,17 +14,17 @@ limitations under the License. *) module FStarC.SMTEncoding.Z3 -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term open FStarC.BaseTypes -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Class.Show module SolverState = FStarC.SMTEncoding.SolverState -module M = FStarC.Compiler.Misc -module BU = FStarC.Compiler.Util +module M = FStarC.Misc +module BU = FStarC.Util (****************************************************************************) (* Z3 Specifics *) (****************************************************************************) @@ -457,7 +457,7 @@ let doZ3Exe (log_file:_) (r:Range.range) (fresh:bool) (input:string) (label_mess let reason_unknown = BU.map_opt smt_output.smt_reason_unknown (fun x -> let ru = String.concat " " x in if BU.starts_with ru "(:reason-unknown \"" - then let reason = FStarC.Compiler.Util.substring_from ru (String.length "(:reason-unknown \"" ) in + then let reason = FStarC.Util.substring_from ru (String.length "(:reason-unknown \"" ) in let res = String.substring reason 0 (String.length reason - 2) in //it ends with '")' res else ru) in diff --git a/src/smtencoding/FStarC.SMTEncoding.Z3.fsti b/src/smtencoding/FStarC.SMTEncoding.Z3.fsti index 3acb4312659..40de7f26437 100644 --- a/src/smtencoding/FStarC.SMTEncoding.Z3.fsti +++ b/src/smtencoding/FStarC.SMTEncoding.Z3.fsti @@ -14,13 +14,13 @@ limitations under the License. *) module FStarC.SMTEncoding.Z3 -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.SMTEncoding.Term open FStarC.BaseTypes -open FStarC.Compiler.Util -module BU = FStarC.Compiler.Util +open FStarC.Util +module BU = FStarC.Util module U = FStarC.SMTEncoding.UnsatCore module SolverState = FStarC.SMTEncoding.SolverState diff --git a/src/syntax/FStarC.Syntax.CheckLN.fst b/src/syntax/FStarC.Syntax.CheckLN.fst index 6789ee5eb13..cd5077b22f8 100644 --- a/src/syntax/FStarC.Syntax.CheckLN.fst +++ b/src/syntax/FStarC.Syntax.CheckLN.fst @@ -2,7 +2,7 @@ module FStarC.Syntax.CheckLN open FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module L = FStarC.Compiler.List +module L = FStarC.List (* Computes the binding amount of a pattern. Anywhere where this is defined already? *) diff --git a/src/syntax/FStarC.Syntax.Compress.fst b/src/syntax/FStarC.Syntax.Compress.fst index ed1e4497320..1613ae20a50 100644 --- a/src/syntax/FStarC.Syntax.Compress.fst +++ b/src/syntax/FStarC.Syntax.Compress.fst @@ -2,16 +2,16 @@ module FStarC.Syntax.Compress open FStarC open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.Effect +open FStarC +open FStarC.Util +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Syntax.Subst open FStarC.Syntax.Visit open FStarC.Class.Show -module List = FStarC.Compiler.List +module List = FStarC.List module Err = FStarC.Errors (* This function really just checks for bad(tm) things happening, the diff --git a/src/syntax/FStarC.Syntax.DsEnv.fst b/src/syntax/FStarC.Syntax.DsEnv.fst index 9bb723c7607..e6a331d6f71 100644 --- a/src/syntax/FStarC.Syntax.DsEnv.fst +++ b/src/syntax/FStarC.Syntax.DsEnv.fst @@ -16,11 +16,11 @@ module FStarC.Syntax.DsEnv open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Util @@ -37,7 +37,7 @@ let ugly_sigelt_to_string (se:sigelt) : string = !ugly_sigelt_to_string_hook se module S = FStarC.Syntax.Syntax module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Const = FStarC.Parser.Const type local_binding = (ident & bv & used_marker) (* local name binding for name resolution, paired with an env-generated unique name *) @@ -150,7 +150,7 @@ let iface_decls env l = | Some (_, decls) -> Some decls let set_iface_decls env l ds = let _, rest = - FStarC.Compiler.List.partition + FStarC.List.partition (fun (m, _) -> Ident.lid_equals l m) env.remaining_iface_decls in {env with remaining_iface_decls=(l, ds)::rest} @@ -1073,7 +1073,7 @@ let find_data_constructors_for_typ env (lid:lident) = resolve_in_open_namespaces' env lid (fun _ -> None) (fun _ -> None) k_global_def let find_binders_for_datacons: env -> lident -> option (list ident) = - let debug = FStarC.Compiler.Debug.get_toggle "open_include_restrictions" in + let debug = FStarC.Debug.get_toggle "open_include_restrictions" in fun env lid -> let ns = ns_of_lid lid in let k_global_def lid = function @@ -1251,7 +1251,7 @@ let push_include' env ns restriction = in env | None -> - (* module to be included was not prepared, so forbid the 'include'. It may be the case for modules such as FStarC.Compiler.Effect, etc. *) + (* module to be included was not prepared, so forbid the 'include'. It may be the case for modules such as FStarC.Effect, etc. *) raise_error ns Errors.Fatal_IncludeModuleNotPrepared (BU.format1 "include: Module %s was not prepared" (string_of_lid ns)) end diff --git a/src/syntax/FStarC.Syntax.DsEnv.fsti b/src/syntax/FStarC.Syntax.DsEnv.fsti index a22483432fa..41da2b4dd52 100644 --- a/src/syntax/FStarC.Syntax.DsEnv.fsti +++ b/src/syntax/FStarC.Syntax.DsEnv.fsti @@ -15,18 +15,18 @@ *) module FStarC.Syntax.DsEnv -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.Effect +open FStarC +open FStarC.Util +open FStarC.Effect open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Util open FStarC.Parser open FStarC.Ident -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module S = FStarC.Syntax.Syntax module U = FStarC.Syntax.Util diff --git a/src/syntax/FStarC.Syntax.Embeddings.Base.fst b/src/syntax/FStarC.Syntax.Embeddings.Base.fst index 7e9816e13ce..2cc8e2a4222 100644 --- a/src/syntax/FStarC.Syntax.Embeddings.Base.fst +++ b/src/syntax/FStarC.Syntax.Embeddings.Base.fst @@ -17,16 +17,16 @@ module FStarC.Syntax.Embeddings.Base open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Range +open FStarC +open FStarC.Effect +open FStarC.Range open FStar.Pervasives open FStarC.Syntax.Syntax open FStarC.Class.Show open FStarC.Class.PP open FStarC.Class.Deq -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Err = FStarC.Errors module Ident = FStarC.Ident module PC = FStarC.Parser.Const diff --git a/src/syntax/FStarC.Syntax.Embeddings.Base.fsti b/src/syntax/FStarC.Syntax.Embeddings.Base.fsti index 53e6c27a529..6b57a73cdc2 100644 --- a/src/syntax/FStarC.Syntax.Embeddings.Base.fsti +++ b/src/syntax/FStarC.Syntax.Embeddings.Base.fsti @@ -17,13 +17,13 @@ module FStarC.Syntax.Embeddings.Base open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStar.Pervasives open FStarC.Syntax.Syntax module S = FStarC.Syntax.Syntax -module Range = FStarC.Compiler.Range +module Range = FStarC.Range type norm_cb = either Ident.lident term -> term // a callback to the normalizer diff --git a/src/syntax/FStarC.Syntax.Embeddings.fst b/src/syntax/FStarC.Syntax.Embeddings.fst index f8c6e13d094..52b1fed4b2c 100644 --- a/src/syntax/FStarC.Syntax.Embeddings.fst +++ b/src/syntax/FStarC.Syntax.Embeddings.fst @@ -16,17 +16,17 @@ module FStarC.Syntax.Embeddings -open FStar open FStarC -open FStarC.Compiler +open FStar +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax -open FStarC.Compiler.Range +open FStarC.Range open FStarC.VConfig open FStarC.Class.Show -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module C = FStarC.Const module Err = FStarC.Errors module Ident = FStarC.Ident @@ -307,7 +307,7 @@ let e_string = (fun () -> emb_t_string) let e_real = - let open FStarC.Compiler.Real in + let open FStarC.Real in let ty = S.t_real in let emb_t_real = ET_app(PC.real_lid |> Ident.string_of_lid, []) in let em (r:real) (rng:range) _shadow _norm : term = @@ -1068,7 +1068,7 @@ let e_vconfig = (fun () -> ET_app (PC.vconfig_lid |> Ident.string_of_lid, [])) let e_order = - let open FStarC.Compiler.Order in + let open FStarC.Order in let ord_Lt_lid = Ident.lid_of_path (["FStar"; "Order"; "Lt"]) Range.dummyRange in let ord_Eq_lid = Ident.lid_of_path (["FStar"; "Order"; "Eq"]) Range.dummyRange in let ord_Gt_lid = Ident.lid_of_path (["FStar"; "Order"; "Gt"]) Range.dummyRange in diff --git a/src/syntax/FStarC.Syntax.Embeddings.fsti b/src/syntax/FStarC.Syntax.Embeddings.fsti index 1ccf3273536..82366cccb67 100644 --- a/src/syntax/FStarC.Syntax.Embeddings.fsti +++ b/src/syntax/FStarC.Syntax.Embeddings.fsti @@ -16,19 +16,19 @@ module FStarC.Syntax.Embeddings -open FStar open FStarC -open FStarC.Compiler +open FStar +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStar.Char open FStarC.VConfig include FStarC.Syntax.Embeddings.Base -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (* Embeddings, both ways and containing type information *) val e_any : embedding term @@ -41,10 +41,10 @@ instance val e_char : embedding char instance val e_int : embedding Z.t instance val e_fsint : embedding int instance val e_string : embedding string -instance val e_real : embedding Compiler.Real.real +instance val e_real : embedding Real.real instance val e_norm_step : embedding Pervasives.norm_step instance val e_vconfig : embedding FStarC.VConfig.vconfig -instance val e_order : embedding FStarC.Compiler.Order.order +instance val e_order : embedding FStarC.Order.order instance val e_option : embedding 'a -> Tot (embedding (option 'a)) instance val e_list : embedding 'a -> Tot (embedding (list 'a)) diff --git a/src/syntax/FStarC.Syntax.Formula.fst b/src/syntax/FStarC.Syntax.Formula.fst index 452b64ee0ca..92ff2a77be8 100644 --- a/src/syntax/FStarC.Syntax.Formula.fst +++ b/src/syntax/FStarC.Syntax.Formula.fst @@ -17,17 +17,17 @@ module FStarC.Syntax.Formula open Prims open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Ident open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Print -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module PC = FStarC.Parser.Const module U = FStarC.Syntax.Util module SS = FStarC.Syntax.Subst diff --git a/src/syntax/FStarC.Syntax.Formula.fsti b/src/syntax/FStarC.Syntax.Formula.fsti index d4860e3f187..1d38db1f0f6 100644 --- a/src/syntax/FStarC.Syntax.Formula.fsti +++ b/src/syntax/FStarC.Syntax.Formula.fsti @@ -15,7 +15,7 @@ *) module FStarC.Syntax.Formula -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Ident open FStarC.Syntax.Syntax open FStarC.Class.Show diff --git a/src/syntax/FStarC.Syntax.Free.fst b/src/syntax/FStarC.Syntax.Free.fst index a63daf253ef..dc9420d25d2 100644 --- a/src/syntax/FStarC.Syntax.Free.fst +++ b/src/syntax/FStarC.Syntax.Free.fst @@ -16,15 +16,15 @@ module FStarC.Syntax.Free open Prims open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax -module Util = FStarC.Compiler.Util +module Util = FStarC.Util module UF = FStarC.Syntax.Unionfind open FStarC.Class.Ord diff --git a/src/syntax/FStarC.Syntax.Free.fsti b/src/syntax/FStarC.Syntax.Free.fsti index 2ecd0934308..05b04eca4d9 100644 --- a/src/syntax/FStarC.Syntax.Free.fsti +++ b/src/syntax/FStarC.Syntax.Free.fsti @@ -14,12 +14,12 @@ limitations under the License. *) module FStarC.Syntax.Free -open FStarC.Compiler.Effect +open FStarC.Effect open Prims open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.FlatSet +open FStarC +open FStarC.Util +open FStarC.FlatSet open FStarC.Syntax open FStarC.Syntax.Syntax diff --git a/src/syntax/FStarC.Syntax.Hash.fst b/src/syntax/FStarC.Syntax.Hash.fst index f30b387de46..1e9230d327f 100644 --- a/src/syntax/FStarC.Syntax.Hash.fst +++ b/src/syntax/FStarC.Syntax.Hash.fst @@ -15,14 +15,14 @@ *) module FStarC.Syntax.Hash open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Const module SS = FStarC.Syntax.Subst module UU = FStarC.Syntax.Unionfind -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (* maybe memo *) let mm (t:Type) = bool -> t & bool @@ -100,7 +100,7 @@ and hash_comp c and hash_term' (t:term) : mm H.hash_code = // if Debug.any () - // then FStarC.Compiler.Util.print1 "Hash_term %s\n" (FStarC.Syntax.show t); + // then FStarC.Util.print1 "Hash_term %s\n" (FStarC.Syntax.show t); match (SS.compress t).n with | Tm_bvar bv -> mix (of_int 3) (of_int bv.index) | Tm_name bv -> mix (of_int 5) (of_int bv.index) diff --git a/src/syntax/FStarC.Syntax.Hash.fsti b/src/syntax/FStarC.Syntax.Hash.fsti index db196cd92be..6444d5da0a9 100644 --- a/src/syntax/FStarC.Syntax.Hash.fsti +++ b/src/syntax/FStarC.Syntax.Hash.fsti @@ -17,9 +17,9 @@ *) module FStarC.Syntax.Hash open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Const module H = FStarC.Hash diff --git a/src/syntax/FStarC.Syntax.InstFV.fst b/src/syntax/FStarC.Syntax.InstFV.fst index d4464a577b3..956b730eb5e 100644 --- a/src/syntax/FStarC.Syntax.InstFV.fst +++ b/src/syntax/FStarC.Syntax.InstFV.fst @@ -15,15 +15,15 @@ *) module FStarC.Syntax.InstFV open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident -open FStarC.Compiler.Util -open FStarC.Compiler +open FStarC.Util +open FStarC module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module U = FStarC.Compiler.Util +module U = FStarC.Util let mk t s = S.mk s t.pos @@ -125,7 +125,7 @@ and inst_decreases_order s = function and inst_lcomp_opt s l = match l with | None -> None - | Some rc -> Some ({rc with residual_typ = FStarC.Compiler.Util.map_opt rc.residual_typ (inst s)}) + | Some rc -> Some ({rc with residual_typ = FStarC.Util.map_opt rc.residual_typ (inst s)}) and inst_ascription s (asc:ascription) = let annot, topt, use_eq = asc in @@ -133,7 +133,7 @@ and inst_ascription s (asc:ascription) = match annot with | Inl t -> Inl (inst s t) | Inr c -> Inr (inst_comp s c) in - let topt = FStarC.Compiler.Util.map_opt topt (inst s) in + let topt = FStarC.Util.map_opt topt (inst s) in annot, topt, use_eq let instantiate i t = match i with diff --git a/src/syntax/FStarC.Syntax.InstFV.fsti b/src/syntax/FStarC.Syntax.InstFV.fsti index 8f0e30fda6f..1117099f6c1 100644 --- a/src/syntax/FStarC.Syntax.InstFV.fsti +++ b/src/syntax/FStarC.Syntax.InstFV.fsti @@ -14,7 +14,7 @@ limitations under the License. *) module FStarC.Syntax.InstFV -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident type inst_t = list (lident & universes) diff --git a/src/syntax/FStarC.Syntax.MutRecTy.fst b/src/syntax/FStarC.Syntax.MutRecTy.fst index 5b39115b397..3b783529abb 100644 --- a/src/syntax/FStarC.Syntax.MutRecTy.fst +++ b/src/syntax/FStarC.Syntax.MutRecTy.fst @@ -16,17 +16,17 @@ module FStarC.Syntax.MutRecTy open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Errors open FStarC.Syntax.InstFV module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module U = FStarC.Compiler.Util +module U = FStarC.Util @@ -42,7 +42,7 @@ let disentangle_abbrevs_from_bundle (sigelts: list sigelt) (quals: list qualifier) (members: list lident) - (rng: FStarC.Compiler.Range.range) + (rng: FStarC.Range.range) : sigelt & list sigelt = (* NS: Attributes on the type constructors and abbreviation are gathered, @@ -131,7 +131,7 @@ let disentangle_abbrevs_from_bundle | None -> begin match U.find_map type_abbrev_sigelts replacee with | Some se -> - if FStarC.Compiler.List.existsb (fun x -> lid_equals x fv.fv_name.v) !in_progress + if FStarC.List.existsb (fun x -> lid_equals x fv.fv_name.v) !in_progress then let msg = U.format1 "Cycle on %s in mutually recursive type abbreviations" (string_of_lid fv.fv_name.v) in raise_error fv.fv_name.v Errors.Fatal_CycleInRecTypeAbbreviation msg else unfold_abbrev se @@ -174,7 +174,7 @@ let disentangle_abbrevs_from_bundle (* Now, unfold in inductive types and data constructors *) let filter_out_type_abbrevs l = - List.filter (fun lid -> FStarC.Compiler.List.for_all (fun lid' -> not (lid_equals lid lid')) type_abbrevs) l + List.filter (fun lid -> FStarC.List.for_all (fun lid' -> not (lid_equals lid lid')) type_abbrevs) l in let inductives_with_abbrevs_unfolded = diff --git a/src/syntax/FStarC.Syntax.MutRecTy.fsti b/src/syntax/FStarC.Syntax.MutRecTy.fsti index e4786f19688..8545b68647b 100644 --- a/src/syntax/FStarC.Syntax.MutRecTy.fsti +++ b/src/syntax/FStarC.Syntax.MutRecTy.fsti @@ -15,9 +15,9 @@ *) // (c) Microsoft Corporation. All rights reserved module FStarC.Syntax.MutRecTy -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident val disentangle_abbrevs_from_bundle: list sigelt -> list qualifier -> list lident -> - FStarC.Compiler.Range.range -> sigelt & list sigelt + FStarC.Range.range -> sigelt & list sigelt diff --git a/src/syntax/FStarC.Syntax.Resugar.fst b/src/syntax/FStarC.Syntax.Resugar.fst index b00f874ebf2..de239bfc176 100644 --- a/src/syntax/FStarC.Syntax.Resugar.fst +++ b/src/syntax/FStarC.Syntax.Resugar.fst @@ -17,14 +17,14 @@ *) module FStarC.Syntax.Resugar //we should rename FStarC.ToSyntax to something else open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const -open FStarC.Compiler.List +open FStarC.List open FStarC.Parser.AST open FStarC.Class.Monad open FStarC.Class.Setlike @@ -36,7 +36,7 @@ module SS = FStarC.Syntax.Subst module A = FStarC.Parser.AST module C = FStarC.Parser.Const module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module D = FStarC.Parser.ToDocument module UF = FStarC.Syntax.Unionfind module E = FStarC.Errors diff --git a/src/syntax/FStarC.Syntax.Resugar.fsti b/src/syntax/FStarC.Syntax.Resugar.fsti index b0b15b5ce92..4c2599f5d5b 100644 --- a/src/syntax/FStarC.Syntax.Resugar.fsti +++ b/src/syntax/FStarC.Syntax.Resugar.fsti @@ -15,13 +15,13 @@ *) module FStarC.Syntax.Resugar //we should rename FStarC.ToSyntax to something else -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Const -open FStarC.Compiler.Range +open FStarC.Range module I = FStarC.Ident module S = FStarC.Syntax.Syntax @@ -29,8 +29,8 @@ module SS = FStarC.Syntax.Subst module A = FStarC.Parser.AST module C = FStarC.Parser.Const module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util -module Range = FStarC.Compiler.Range +module BU = FStarC.Util +module Range = FStarC.Range module DsEnv = FStarC.Syntax.DsEnv val resugar_term: S.term -> A.term diff --git a/src/syntax/FStarC.Syntax.Subst.fst b/src/syntax/FStarC.Syntax.Subst.fst index 80bf56d443e..70f671f110a 100644 --- a/src/syntax/FStarC.Syntax.Subst.fst +++ b/src/syntax/FStarC.Syntax.Subst.fst @@ -15,19 +15,19 @@ *) module FStarC.Syntax.Subst open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Range +open FStarC +open FStarC.Range open FStarC.Syntax open FStarC.Syntax.Syntax -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident module Err = FStarC.Errors -module U = FStarC.Compiler.Util +module U = FStarC.Util module S = FStarC.Syntax.Syntax /////////////////////////////////////////////////////////////////////////// diff --git a/src/syntax/FStarC.Syntax.Subst.fsti b/src/syntax/FStarC.Syntax.Subst.fsti index 48701cb7225..caf21434781 100644 --- a/src/syntax/FStarC.Syntax.Subst.fsti +++ b/src/syntax/FStarC.Syntax.Subst.fsti @@ -14,13 +14,13 @@ limitations under the License. *) module FStarC.Syntax.Subst -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax open FStarC.Syntax.Syntax -open FStarC.Compiler.Util +open FStarC.Util val shift_subst: int -> subst_t -> subst_t val subst: list subst_elt -> term -> term diff --git a/src/syntax/FStarC.Syntax.Syntax.fst b/src/syntax/FStarC.Syntax.Syntax.fst index 8c45901d78a..fcf299faf34 100644 --- a/src/syntax/FStarC.Syntax.Syntax.fst +++ b/src/syntax/FStarC.Syntax.Syntax.fst @@ -14,14 +14,14 @@ limitations under the License. *) module FStarC.Syntax.Syntax -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List (* Type definitions for the core AST *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.Range +open FStarC +open FStarC.Util +open FStarC.Range open FStarC.Ident open FStarC.Const open FStarC.Dyn @@ -30,13 +30,13 @@ open FStarC.VConfig open FStarC.Class.Ord open FStarC.Class.HasRange open FStarC.Class.Setlike -open FStarC.Compiler.Order +open FStarC.Order module O = FStarC.Options module PC = FStarC.Parser.Const module Err = FStarC.Errors module GS = FStarC.GenSym -module FlatSet = FStarC.Compiler.FlatSet +module FlatSet = FStarC.FlatSet let pragma_to_string (p:pragma) : string = match p with @@ -86,7 +86,7 @@ instance showable_should_check_uvar = { // This is set in FStarC.Main.main, where all modules are in-scope. let lazy_chooser : ref (option (lazy_kind -> lazyinfo -> term)) = mk_ref None -let cmp_qualifier (q1 q2 : qualifier) : FStarC.Compiler.Order.order = +let cmp_qualifier (q1 q2 : qualifier) : FStarC.Order.order = match q1, q2 with | Assumption, Assumption -> Eq | New, New -> Eq @@ -588,7 +588,7 @@ let is_ident_allowed_by_restriction' id ) allow_list) fst let is_ident_allowed_by_restriction - = let debug = FStarC.Compiler.Debug.get_toggle "open_include_restrictions" in + = let debug = FStarC.Debug.get_toggle "open_include_restrictions" in fun id restriction -> let result = is_ident_allowed_by_restriction' id restriction in if !debug then print_endline ( "is_ident_allowed_by_restriction(" ^ show id ^ ", " diff --git a/src/syntax/FStarC.Syntax.Syntax.fsti b/src/syntax/FStarC.Syntax.Syntax.fsti index 2ff1febe171..3f14daaa291 100644 --- a/src/syntax/FStarC.Syntax.Syntax.fsti +++ b/src/syntax/FStarC.Syntax.Syntax.fsti @@ -14,13 +14,13 @@ limitations under the License. *) module FStarC.Syntax.Syntax -open FStarC.Compiler.Effect +open FStarC.Effect (* Type definitions for the core AST *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.Range +open FStarC +open FStarC.Util +open FStarC.Range open FStarC.Ident open FStarC.Dyn open FStarC.Const diff --git a/src/syntax/FStarC.Syntax.TermHashTable.fsti b/src/syntax/FStarC.Syntax.TermHashTable.fsti index f4d0c88a9f6..66a56c5808e 100644 --- a/src/syntax/FStarC.Syntax.TermHashTable.fsti +++ b/src/syntax/FStarC.Syntax.TermHashTable.fsti @@ -1,5 +1,5 @@ module FStarC.Syntax.TermHashTable -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax module H = FStarC.Hash diff --git a/src/syntax/FStarC.Syntax.Unionfind.fst b/src/syntax/FStarC.Syntax.Unionfind.fst index 91f9d5453d2..4714c936b37 100644 --- a/src/syntax/FStarC.Syntax.Unionfind.fst +++ b/src/syntax/FStarC.Syntax.Unionfind.fst @@ -15,15 +15,15 @@ *) module FStarC.Syntax.Unionfind -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Errors open FStarC.Syntax.Syntax -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module S = FStarC.Syntax.Syntax module PU = FStarC.Unionfind -module BU = FStarC.Compiler.Util -module L = FStarC.Compiler.List +module BU = FStarC.Util +module L = FStarC.List module O = FStarC.Options type vops_t = { diff --git a/src/syntax/FStarC.Syntax.Unionfind.fsti b/src/syntax/FStarC.Syntax.Unionfind.fsti index 7ddcae88b3c..406a1cdb96c 100644 --- a/src/syntax/FStarC.Syntax.Unionfind.fsti +++ b/src/syntax/FStarC.Syntax.Unionfind.fsti @@ -19,8 +19,8 @@ module FStarC.Syntax.Unionfind (* This module offers a transactional interface specialized for terms and * universes on top of the existing union-find implementation. *) -open FStarC.Compiler.Effect -module Range = FStarC.Compiler.Range +open FStarC.Effect +module Range = FStarC.Range module S = FStarC.Syntax.Syntax val uf : Type0 diff --git a/src/syntax/FStarC.Syntax.Util.fst b/src/syntax/FStarC.Syntax.Util.fst index f0e0d88c944..7c7e9630014 100644 --- a/src/syntax/FStarC.Syntax.Util.fst +++ b/src/syntax/FStarC.Syntax.Util.fst @@ -16,20 +16,20 @@ module FStarC.Syntax.Util open Prims open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Const open FStarC.Dyn -module U = FStarC.Compiler.Util -module List = FStarC.Compiler.List +module U = FStarC.Util +module List = FStarC.List module PC = FStarC.Parser.Const open FStarC.Class.Show @@ -688,7 +688,7 @@ let qualifier_equal q1 q2 = match q1, q2 with let abs bs t lopt = let close_lopt lopt = match lopt with | None -> None - | Some rc -> Some ({rc with residual_typ=FStarC.Compiler.Util.map_opt rc.residual_typ (close bs)}) + | Some rc -> Some ({rc with residual_typ=FStarC.Util.map_opt rc.residual_typ (close bs)}) in match bs with | [] -> t @@ -832,7 +832,7 @@ let let_rec_arity (lb:letbinding) : int & option (list bool) = let abs_formals_maybe_unascribe_body maybe_unascribe t = let subst_lcomp_opt s l = match l with | Some rc -> - Some ({rc with residual_typ=FStarC.Compiler.Util.map_opt rc.residual_typ (Subst.subst s)}) + Some ({rc with residual_typ=FStarC.Util.map_opt rc.residual_typ (Subst.subst s)}) | _ -> l in let rec aux t abs_body_lcomp = @@ -1560,7 +1560,7 @@ let is_synth_by_tactic t = is_fvar PC.synth_lid t let has_attribute (attrs:list Syntax.attribute) (attr:lident) = - FStarC.Compiler.Util.for_some (is_fvar attr) attrs + FStarC.Util.for_some (is_fvar attr) attrs (* Checks whether the list of attrs contains an application of `attr`, and * returns the arguments if so. If there's more than one, the first one @@ -2142,7 +2142,7 @@ let is_binder_unused (b:binder) = b.binder_positivity = Some BinderUnused let deduplicate_terms (l:list term) = - FStarC.Compiler.List.deduplicate (fun x y -> term_eq x y) l + FStarC.List.deduplicate (fun x y -> term_eq x y) l let eq_binding b1 b2 = match b1, b2 with diff --git a/src/syntax/FStarC.Syntax.Util.fsti b/src/syntax/FStarC.Syntax.Util.fsti index 7cfb00cb8c4..8cc1cafb304 100644 --- a/src/syntax/FStarC.Syntax.Util.fsti +++ b/src/syntax/FStarC.Syntax.Util.fsti @@ -15,20 +15,19 @@ *) module FStarC.Syntax.Util -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Const open FStarC.Dyn -module U = FStarC.Compiler.Util -module List = FStarC.Compiler.List +module U = FStarC.Util +module List = FStarC.List module PC = FStarC.Parser.Const open FStarC.Syntax.Subst diff --git a/src/syntax/FStarC.Syntax.Visit.fst b/src/syntax/FStarC.Syntax.Visit.fst index e9c9cb332c9..656030141ed 100644 --- a/src/syntax/FStarC.Syntax.Visit.fst +++ b/src/syntax/FStarC.Syntax.Visit.fst @@ -1,8 +1,8 @@ module FStarC.Syntax.Visit -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Syntax.VisitM open FStarC.Class.Monad diff --git a/src/syntax/FStarC.Syntax.VisitM.fst b/src/syntax/FStarC.Syntax.VisitM.fst index ba608304061..19331dd2cd3 100644 --- a/src/syntax/FStarC.Syntax.VisitM.fst +++ b/src/syntax/FStarC.Syntax.VisitM.fst @@ -1,8 +1,8 @@ module FStarC.Syntax.VisitM -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Class.Monad @@ -523,7 +523,7 @@ let visitM_sigelt #m {| md : monad m |} (proc_quotes : bool) vt vu (tm : sigelt) let open FStarC.Class.Show in let open FStarC.Class.Monad in -let open FStarC.Compiler.Writer in +let open FStarC.Writer in type mymon = writer (list lident) diff --git a/src/syntax/print/FStarC.Syntax.Print.Pretty.fst b/src/syntax/print/FStarC.Syntax.Print.Pretty.fst index 778945bc81b..553981c709b 100644 --- a/src/syntax/print/FStarC.Syntax.Print.Pretty.fst +++ b/src/syntax/print/FStarC.Syntax.Print.Pretty.fst @@ -17,9 +17,9 @@ module FStarC.Syntax.Print.Pretty open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax.Syntax -open FStarC.Compiler.Util +open FStarC.Util module Resugar = FStarC.Syntax.Resugar module ToDocument = FStarC.Parser.ToDocument module Pp = FStarC.Pprint diff --git a/src/syntax/print/FStarC.Syntax.Print.Pretty.fsti b/src/syntax/print/FStarC.Syntax.Print.Pretty.fsti index 6a1c088a7fd..ccb1d8935f1 100644 --- a/src/syntax/print/FStarC.Syntax.Print.Pretty.fsti +++ b/src/syntax/print/FStarC.Syntax.Print.Pretty.fsti @@ -17,7 +17,7 @@ module FStarC.Syntax.Print.Pretty open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax open FStarC.Syntax.Syntax diff --git a/src/syntax/print/FStarC.Syntax.Print.Ugly.fst b/src/syntax/print/FStarC.Syntax.Print.Ugly.fst index 7230d159f1e..fa91a3e42a4 100644 --- a/src/syntax/print/FStarC.Syntax.Print.Ugly.fst +++ b/src/syntax/print/FStarC.Syntax.Print.Ugly.fst @@ -16,12 +16,12 @@ module FStarC.Syntax.Print.Ugly open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Syntax.Subst open FStarC.Ident @@ -32,7 +32,7 @@ open FStarC.Class.Tagged open FStarC.Class.Show module Errors = FStarC.Errors -module U = FStarC.Compiler.Util +module U = FStarC.Util module A = FStarC.Parser.AST module Unionfind = FStarC.Syntax.Unionfind module C = FStarC.Parser.Const diff --git a/src/syntax/print/FStarC.Syntax.Print.Ugly.fsti b/src/syntax/print/FStarC.Syntax.Print.Ugly.fsti index 81a131bfb09..c9b7153822a 100644 --- a/src/syntax/print/FStarC.Syntax.Print.Ugly.fsti +++ b/src/syntax/print/FStarC.Syntax.Print.Ugly.fsti @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and *) module FStarC.Syntax.Print.Ugly -open FStarC.Compiler.Effect -open FStarC.Compiler +open FStarC.Effect +open FStarC open FStarC.Syntax.Syntax val term_to_string : term -> string diff --git a/src/syntax/print/FStarC.Syntax.Print.fst b/src/syntax/print/FStarC.Syntax.Print.fst index ba76e292a0a..201e8e994ae 100644 --- a/src/syntax/print/FStarC.Syntax.Print.fst +++ b/src/syntax/print/FStarC.Syntax.Print.fst @@ -16,13 +16,13 @@ module FStarC.Syntax.Print open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Range +open FStarC +open FStarC.Range open FStarC.Syntax -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Syntax.Subst open FStarC.Ident @@ -30,7 +30,7 @@ open FStarC.Const open FStarC.Json module Errors = FStarC.Errors -module U = FStarC.Compiler.Util +module U = FStarC.Util module A = FStarC.Parser.AST module Unionfind = FStarC.Syntax.Unionfind module C = FStarC.Parser.Const diff --git a/src/syntax/print/FStarC.Syntax.Print.fsti b/src/syntax/print/FStarC.Syntax.Print.fsti index 903d9142531..25a2a526003 100644 --- a/src/syntax/print/FStarC.Syntax.Print.fsti +++ b/src/syntax/print/FStarC.Syntax.Print.fsti @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and module FStarC.Syntax.Print open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Class.Show open FStarC.Class.PP diff --git a/src/tactics/FStarC.Tactics.Common.fst b/src/tactics/FStarC.Tactics.Common.fst index ed075f9c7e0..8a23a306358 100644 --- a/src/tactics/FStarC.Tactics.Common.fst +++ b/src/tactics/FStarC.Tactics.Common.fst @@ -10,6 +10,6 @@ each other. *) open FStarC.Syntax.Syntax exception NotAListLiteral -exception TacticFailure of FStarC.Errors.Msg.error_message & option FStarC.Compiler.Range.range +exception TacticFailure of FStarC.Errors.Msg.error_message & option FStarC.Range.range exception EExn of term exception SKIP (* used by ctrl_rewrite *) diff --git a/src/tactics/FStarC.Tactics.Common.fsti b/src/tactics/FStarC.Tactics.Common.fsti index ed075f9c7e0..8a23a306358 100644 --- a/src/tactics/FStarC.Tactics.Common.fsti +++ b/src/tactics/FStarC.Tactics.Common.fsti @@ -10,6 +10,6 @@ each other. *) open FStarC.Syntax.Syntax exception NotAListLiteral -exception TacticFailure of FStarC.Errors.Msg.error_message & option FStarC.Compiler.Range.range +exception TacticFailure of FStarC.Errors.Msg.error_message & option FStarC.Range.range exception EExn of term exception SKIP (* used by ctrl_rewrite *) diff --git a/src/tactics/FStarC.Tactics.CtrlRewrite.fst b/src/tactics/FStarC.Tactics.CtrlRewrite.fst index 1cd38b4541d..2929f24f764 100644 --- a/src/tactics/FStarC.Tactics.CtrlRewrite.fst +++ b/src/tactics/FStarC.Tactics.CtrlRewrite.fst @@ -17,10 +17,10 @@ module FStarC.Tactics.CtrlRewrite open FStarC -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC +open FStarC.Util open FStarC.Reflection.V2.Data open FStarC.Reflection.V2.Builtins open FStarC.Tactics.Result @@ -34,7 +34,7 @@ open FStarC.Class.Show open FStarC.Class.Monad module Print = FStarC.Syntax.Print -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module S = FStarC.Syntax.Syntax module U = FStarC.Syntax.Util module SS = FStarC.Syntax.Subst diff --git a/src/tactics/FStarC.Tactics.Embedding.fst b/src/tactics/FStarC.Tactics.Embedding.fst index 9a7d7dfa362..5eb2c871aea 100644 --- a/src/tactics/FStarC.Tactics.Embedding.fst +++ b/src/tactics/FStarC.Tactics.Embedding.fst @@ -17,20 +17,20 @@ module FStarC.Tactics.Embedding open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings -open FStarC.Compiler.Util -open FStarC.Compiler.List +open FStarC.Util +open FStarC.List open FStarC.Class.Show open FStarC.Tactics.Common open FStarC.Tactics.Types open FStarC.Tactics.Result -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Err = FStarC.Errors module NBE = FStarC.TypeChecker.NBE module NBETerm = FStarC.TypeChecker.NBETerm diff --git a/src/tactics/FStarC.Tactics.Hooks.fst b/src/tactics/FStarC.Tactics.Hooks.fst index 3c995f7beee..4da9568b5f7 100644 --- a/src/tactics/FStarC.Tactics.Hooks.fst +++ b/src/tactics/FStarC.Tactics.Hooks.fst @@ -17,11 +17,11 @@ module FStarC.Tactics.Hooks open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util -open FStarC.Compiler.Range +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Util +open FStarC.Range open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStarC.TypeChecker.Env @@ -31,8 +31,8 @@ open FStarC.Tactics.Interpreter open FStarC.Class.Show module Listlike = FStarC.Class.Listlike -module BU = FStarC.Compiler.Util -module Range = FStarC.Compiler.Range +module BU = FStarC.Util +module Range = FStarC.Range module Err = FStarC.Errors module O = FStarC.Options module PC = FStarC.Parser.Const diff --git a/src/tactics/FStarC.Tactics.Hooks.fsti b/src/tactics/FStarC.Tactics.Hooks.fsti index 4a2512010a2..8e48f829b30 100644 --- a/src/tactics/FStarC.Tactics.Hooks.fsti +++ b/src/tactics/FStarC.Tactics.Hooks.fsti @@ -18,7 +18,7 @@ module FStarC.Tactics.Hooks open FStarC open FStarC.Syntax.Syntax -open FStarC.Compiler.Range +open FStarC.Range module O = FStarC.Options module Env = FStarC.TypeChecker.Env diff --git a/src/tactics/FStarC.Tactics.InterpFuns.fst b/src/tactics/FStarC.Tactics.InterpFuns.fst index d868a1e03db..6e6b29cb534 100644 --- a/src/tactics/FStarC.Tactics.InterpFuns.fst +++ b/src/tactics/FStarC.Tactics.InterpFuns.fst @@ -19,10 +19,10 @@ module FStarC.Tactics.InterpFuns (* This module is awful, don't even look at it please. *) open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Tactics.Types open FStarC.Tactics.Result @@ -33,7 +33,7 @@ open FStarC.Tactics.Monad module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst module PC = FStarC.Parser.Const -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Print = FStarC.Syntax.Print module Cfg = FStarC.TypeChecker.Cfg module E = FStarC.Tactics.Embedding diff --git a/src/tactics/FStarC.Tactics.InterpFuns.fsti b/src/tactics/FStarC.Tactics.InterpFuns.fsti index 18f408d130f..87467a6e8c5 100644 --- a/src/tactics/FStarC.Tactics.InterpFuns.fsti +++ b/src/tactics/FStarC.Tactics.InterpFuns.fsti @@ -18,8 +18,8 @@ module FStarC.Tactics.InterpFuns (* This module is awful, don't even look at it please. *) -open FStar open FStarC.Compiler -open FStarC.Compiler.Effect +open FStar open FStarC +open FStarC.Effect open FStarC.Syntax.Embeddings open FStarC.Tactics.Monad diff --git a/src/tactics/FStarC.Tactics.Interpreter.fst b/src/tactics/FStarC.Tactics.Interpreter.fst index c1acd4f4fb9..f26eaf2a641 100644 --- a/src/tactics/FStarC.Tactics.Interpreter.fst +++ b/src/tactics/FStarC.Tactics.Interpreter.fst @@ -20,11 +20,11 @@ module FStarC.Tactics.Interpreter into this module for all of that. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Range +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStarC.TypeChecker.Common @@ -41,7 +41,7 @@ open FStarC.Class.PP open FStarC.Class.Monad module Listlike = FStarC.Class.Listlike -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module E = FStarC.Tactics.Embedding module Env = FStarC.TypeChecker.Env @@ -211,7 +211,7 @@ let unembed_tactic_nbe_0 (eb:NBET.embedding 'b) (cb:NBET.nbe_cbs) (embedded_tac_ let unembed_tactic_1 (ea:embedding 'a) (er:embedding 'r) (f:term) (ncb:norm_cb) : 'a -> tac 'r = fun x -> - let rng = FStarC.Compiler.Range.dummyRange in + let rng = FStarC.Range.dummyRange in let x_tm = embed rng x ncb in let app = S.mk_Tm_app f [as_arg x_tm] rng in unembed_tactic_0 er app ncb @@ -252,7 +252,7 @@ let e_tactic_nbe_1 (ea : NBET.embedding 'a) (er : NBET.embedding 'r) : NBET.embe let unembed_tactic_1_alt (ea:embedding 'a) (er:embedding 'r) (f:term) (ncb:norm_cb) : option ('a -> tac 'r) = Some (fun x -> - let rng = FStarC.Compiler.Range.dummyRange in + let rng = FStarC.Range.dummyRange in let x_tm = embed rng x ncb in let app = S.mk_Tm_app f [as_arg x_tm] rng in unembed_tactic_0 er app ncb) diff --git a/src/tactics/FStarC.Tactics.Interpreter.fsti b/src/tactics/FStarC.Tactics.Interpreter.fsti index afe9dfbd6c6..0a86515868a 100644 --- a/src/tactics/FStarC.Tactics.Interpreter.fsti +++ b/src/tactics/FStarC.Tactics.Interpreter.fsti @@ -15,8 +15,8 @@ *) module FStarC.Tactics.Interpreter -open FStarC.Compiler.Effect -open FStarC.Compiler.Range +open FStarC.Effect +open FStarC.Range open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStarC.Tactics.Types diff --git a/src/tactics/FStarC.Tactics.Monad.fst b/src/tactics/FStarC.Tactics.Monad.fst index 72c096b7638..d7d3ab36786 100644 --- a/src/tactics/FStarC.Tactics.Monad.fst +++ b/src/tactics/FStarC.Tactics.Monad.fst @@ -17,10 +17,10 @@ module FStarC.Tactics.Monad open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStarC.Syntax.Syntax open FStarC.TypeChecker.Common open FStarC.TypeChecker.Env @@ -37,9 +37,9 @@ module Setlike = FStarC.Class.Setlike module Listlike = FStarC.Class.Listlike module O = FStarC.Options -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Err = FStarC.Errors -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module S = FStarC.Syntax.Syntax module U = FStarC.Syntax.Util module UF = FStarC.Syntax.Unionfind diff --git a/src/tactics/FStarC.Tactics.Monad.fsti b/src/tactics/FStarC.Tactics.Monad.fsti index abfd2d0180e..df85e464db4 100644 --- a/src/tactics/FStarC.Tactics.Monad.fsti +++ b/src/tactics/FStarC.Tactics.Monad.fsti @@ -23,8 +23,8 @@ open FStarC.Tactics.Types open FStarC.Class.Monad open FStarC.Errors.Msg -module Range = FStarC.Compiler.Range -module BU = FStarC.Compiler.Util +module Range = FStarC.Range +module BU = FStarC.Util module O = FStarC.Options (* Type of tactics *) diff --git a/src/tactics/FStarC.Tactics.Native.fsti b/src/tactics/FStarC.Tactics.Native.fsti index 50093086f3f..eb5243e9d3c 100644 --- a/src/tactics/FStarC.Tactics.Native.fsti +++ b/src/tactics/FStarC.Tactics.Native.fsti @@ -16,7 +16,7 @@ module FStarC.Tactics.Native -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Syntax.Syntax open FStarC.Tactics.Types diff --git a/src/tactics/FStarC.Tactics.Printing.fst b/src/tactics/FStarC.Tactics.Printing.fst index 062c6af20e9..949f25454ba 100644 --- a/src/tactics/FStarC.Tactics.Printing.fst +++ b/src/tactics/FStarC.Tactics.Printing.fst @@ -16,10 +16,10 @@ module FStarC.Tactics.Printing open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Util +open FStarC.Effect +open FStarC.List open FStarC.Ident open FStarC.Syntax.Syntax open FStarC.TypeChecker.Common @@ -27,8 +27,8 @@ open FStarC.TypeChecker.Env open FStarC.Tactics.Types open FStarC.Class.Show -module BU = FStarC.Compiler.Util -module Range = FStarC.Compiler.Range +module BU = FStarC.Util +module Range = FStarC.Range module Options = FStarC.Options module Print = FStarC.Syntax.Print module SS = FStarC.Syntax.Subst diff --git a/src/tactics/FStarC.Tactics.Types.fst b/src/tactics/FStarC.Tactics.Types.fst index 32eede7b62f..c64be891874 100644 --- a/src/tactics/FStarC.Tactics.Types.fst +++ b/src/tactics/FStarC.Tactics.Types.fst @@ -16,15 +16,15 @@ module FStarC.Tactics.Types open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.TypeChecker.Env open FStarC.TypeChecker.Common module Env = FStarC.TypeChecker.Env module O = FStarC.Options -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module U = FStarC.Syntax.Util let goal_env g = g.goal_main_env diff --git a/src/tactics/FStarC.Tactics.Types.fsti b/src/tactics/FStarC.Tactics.Types.fsti index e598c4ba5f3..25dc3b7dc5e 100644 --- a/src/tactics/FStarC.Tactics.Types.fsti +++ b/src/tactics/FStarC.Tactics.Types.fsti @@ -16,16 +16,16 @@ module FStarC.Tactics.Types open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.TypeChecker.Env open FStarC.Tactics.Common -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module Core = FStarC.TypeChecker.Core module PO = FStarC.TypeChecker.Primops -module Range = FStarC.Compiler.Range +module Range = FStarC.Range (* f: x:int -> P diff --git a/src/tactics/FStarC.Tactics.V1.Basic.fst b/src/tactics/FStarC.Tactics.V1.Basic.fst index e0732922d7a..075b724bbd2 100644 --- a/src/tactics/FStarC.Tactics.V1.Basic.fst +++ b/src/tactics/FStarC.Tactics.V1.Basic.fst @@ -16,11 +16,11 @@ module FStarC.Tactics.V1.Basic open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Ident open FStarC.TypeChecker.Env open FStarC.TypeChecker.Common @@ -38,7 +38,7 @@ module Listlike = FStarC.Class.Listlike friend FStar.Pervasives (* to use Delta below *) -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module EMB = FStarC.Syntax.Embeddings module Env = FStarC.TypeChecker.Env @@ -2212,7 +2212,7 @@ let string_to_term (e: Env.env) (s: string): tac term | ParseError (_, err, _) -> fail ("string_to_term: got error " ^ Errors.rendermsg err) // FIXME let push_bv_dsenv (e: Env.env) (i: string): tac (env & bv) - = let ident = Ident.mk_ident (i, FStarC.Compiler.Range.dummyRange) in + = let ident = Ident.mk_ident (i, FStarC.Range.dummyRange) in let dsenv, bv = FStarC.Syntax.DsEnv.push_bv e.dsenv ident in ret ({ e with dsenv }, bv) @@ -2224,7 +2224,7 @@ let comp_to_string (c:comp) : tac string = let s = show c in ret s -let range_to_string (r:FStarC.Compiler.Range.range) : tac string +let range_to_string (r:FStarC.Range.range) : tac string = ret (show r) let term_eq_old (t1:term) (t2:term) : tac bool diff --git a/src/tactics/FStarC.Tactics.V1.Basic.fsti b/src/tactics/FStarC.Tactics.V1.Basic.fsti index ef5e47879e4..b9cca6df1d3 100644 --- a/src/tactics/FStarC.Tactics.V1.Basic.fsti +++ b/src/tactics/FStarC.Tactics.V1.Basic.fsti @@ -29,9 +29,9 @@ open FStarC.Reflection.V1.Data open FStarC.Tactics.Types open FStarC.Tactics.Monad -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module O = FStarC.Options -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt module TcComm = FStarC.TypeChecker.Common module Core = FStarC.TypeChecker.Core diff --git a/src/tactics/FStarC.Tactics.V1.Primops.fst b/src/tactics/FStarC.Tactics.V1.Primops.fst index adf12d7507a..63c897a679d 100644 --- a/src/tactics/FStarC.Tactics.V1.Primops.fst +++ b/src/tactics/FStarC.Tactics.V1.Primops.fst @@ -1,11 +1,11 @@ module FStarC.Tactics.V1.Primops open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Range +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStarC.TypeChecker.Common @@ -23,7 +23,7 @@ open FStarC.Class.Show open FStarC.Class.Monad open FStarC.Class.HasRange -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module E = FStarC.Tactics.Embedding module Env = FStarC.TypeChecker.Env diff --git a/src/tactics/FStarC.Tactics.V2.Basic.fst b/src/tactics/FStarC.Tactics.V2.Basic.fst index 1f4b6428c61..f22d8dd8207 100644 --- a/src/tactics/FStarC.Tactics.V2.Basic.fst +++ b/src/tactics/FStarC.Tactics.V2.Basic.fst @@ -16,11 +16,11 @@ module FStarC.Tactics.V2.Basic open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Ident open FStarC.TypeChecker.Env open FStarC.TypeChecker.Common @@ -38,7 +38,7 @@ module Listlike = FStarC.Class.Listlike friend FStar.Pervasives (* to expose norm_step *) -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module Env = FStarC.TypeChecker.Env module Err = FStarC.Errors @@ -2118,7 +2118,7 @@ let string_to_term (e: Env.env) (s: string): tac term | ParseError (_, err, _) -> fail ("string_to_term: got error " ^ Errors.rendermsg err) // FIXME let push_bv_dsenv (e: Env.env) (i: string): tac (env & RD.binding) - = let ident = Ident.mk_ident (i, FStarC.Compiler.Range.dummyRange) in + = let ident = Ident.mk_ident (i, FStarC.Range.dummyRange) in let dsenv, bv = FStarC.Syntax.DsEnv.push_bv e.dsenv ident in return ({ e with dsenv }, bv_to_binding bv) @@ -2142,7 +2142,7 @@ let comp_to_doc (c:comp) : tac Pprint.document let s = Print.comp_to_doc' g.dsenv c in return s -let range_to_string (r:FStarC.Compiler.Range.range) : tac string +let range_to_string (r:FStarC.Range.range) : tac string = return (show r) let term_eq_old (t1:term) (t2:term) : tac bool diff --git a/src/tactics/FStarC.Tactics.V2.Basic.fsti b/src/tactics/FStarC.Tactics.V2.Basic.fsti index 4bf11e3b8c0..9a36b5126a4 100644 --- a/src/tactics/FStarC.Tactics.V2.Basic.fsti +++ b/src/tactics/FStarC.Tactics.V2.Basic.fsti @@ -30,9 +30,9 @@ open FStarC.Reflection.V2.Data open FStarC.Tactics.Types open FStarC.Tactics.Monad -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module O = FStarC.Options -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module Z = FStarC.BigInt module TcComm = FStarC.TypeChecker.Common module Core = FStarC.TypeChecker.Core diff --git a/src/tactics/FStarC.Tactics.V2.Primops.fst b/src/tactics/FStarC.Tactics.V2.Primops.fst index 5ddc8c4db72..6251c6cbff3 100644 --- a/src/tactics/FStarC.Tactics.V2.Primops.fst +++ b/src/tactics/FStarC.Tactics.V2.Primops.fst @@ -20,11 +20,11 @@ module FStarC.Tactics.V2.Primops into this module for all of that. *) open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Range -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Range +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Syntax.Embeddings open FStarC.TypeChecker.Common @@ -41,7 +41,7 @@ open FStarC.Tactics.InterpFuns open FStarC.Class.Show open FStarC.Class.Monad -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Cfg = FStarC.TypeChecker.Cfg module E = FStarC.Tactics.Embedding module Env = FStarC.TypeChecker.Env diff --git a/src/tests/FStarC.Tests.Data.fst b/src/tests/FStarC.Tests.Data.fst index 07f22ca9947..aa405dcbf64 100644 --- a/src/tests/FStarC.Tests.Data.fst +++ b/src/tests/FStarC.Tests.Data.fst @@ -18,12 +18,12 @@ module FStarC.Tests.Data open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -module BU = FStarC.Compiler.Util +open FStarC +open FStarC.Effect +module BU = FStarC.Util -module FlatSet = FStarC.Compiler.FlatSet -module RBSet = FStarC.Compiler.RBSet +module FlatSet = FStarC.FlatSet +module RBSet = FStarC.RBSet open FStarC.Class.Setlike open FStarC.Class.Show diff --git a/src/tests/FStarC.Tests.Norm.fst b/src/tests/FStarC.Tests.Norm.fst index 87fe91fa9d0..ed2c8c98c66 100644 --- a/src/tests/FStarC.Tests.Norm.fst +++ b/src/tests/FStarC.Tests.Norm.fst @@ -17,8 +17,8 @@ module FStarC.Tests.Norm //Normalization tests open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStar.Pervasives open FStarC.Syntax.Syntax open FStarC.Tests.Pars @@ -28,11 +28,11 @@ module SS = FStarC.Syntax.Subst module I = FStarC.Ident module P = FStarC.Syntax.Print module Const = FStarC.Parser.Const -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module N = FStarC.TypeChecker.Normalize module Env = FStarC.TypeChecker.Env open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Tests.Util open FStarC.Class.Show @@ -282,15 +282,15 @@ let run_interpreter i r expected = run_either i r expected (N.normalize [Env.Bet let run_nbe i r expected = run_either i r expected (FStarC.TypeChecker.NBE.normalize_for_unit_test [FStarC.TypeChecker.Env.UnfoldUntil delta_constant]) let run_interpreter_with_time i r expected = let interp () = run_interpreter i r expected in - (i, snd (FStarC.Compiler.Util.return_execution_time interp)) + (i, snd (FStarC.Util.return_execution_time interp)) let run_whnf_with_time i r expected = let whnf () = run_whnf i r expected in - (i, snd (FStarC.Compiler.Util.return_execution_time whnf)) + (i, snd (FStarC.Util.return_execution_time whnf)) let run_nbe_with_time i r expected = let nbe () = run_nbe i r expected in - (i, snd (FStarC.Compiler.Util.return_execution_time nbe)) + (i, snd (FStarC.Util.return_execution_time nbe)) let run_tests tests run = Options.__set_unit_tests(); @@ -354,9 +354,9 @@ let run_all_interpreter_with_time () = let run_both_with_time i r expected = let nbe () = run_nbe i r expected in let norm () = run_interpreter i r expected in - FStarC.Compiler.Util.measure_execution_time "nbe" nbe; + FStarC.Util.measure_execution_time "nbe" nbe; BU.print_string "\n"; - FStarC.Compiler.Util.measure_execution_time "normalizer" norm; + FStarC.Util.measure_execution_time "normalizer" norm; BU.print_string "\n" let compare () = diff --git a/src/tests/FStarC.Tests.Pars.fst b/src/tests/FStarC.Tests.Pars.fst index 032f572068c..415f774776d 100644 --- a/src/tests/FStarC.Tests.Pars.fst +++ b/src/tests/FStarC.Tests.Pars.fst @@ -15,12 +15,12 @@ *) module FStarC.Tests.Pars open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.Range +open FStarC.Effect +open FStarC.Range open FStarC.Parser -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Errors @@ -32,7 +32,7 @@ module SMT = FStarC.SMTEncoding.Solver module Tc = FStarC.TypeChecker.Tc module TcTerm = FStarC.TypeChecker.TcTerm module ToSyntax = FStarC.ToSyntax.ToSyntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module D = FStarC.Parser.Driver module Rel = FStarC.TypeChecker.Rel module NBE = FStarC.TypeChecker.NBE @@ -47,7 +47,7 @@ let parse_mod mod_name dsenv = match parse None (Filename mod_name) with | ASTFragment (Inl m, _) -> let m, env'= ToSyntax.ast_modul_to_modul m dsenv in - let env' , _ = DsEnv.prepare_module_or_interface false false env' (FStarC.Ident.lid_of_path ["Test"] (FStarC.Compiler.Range.dummyRange)) DsEnv.default_mii in + let env' , _ = DsEnv.prepare_module_or_interface false false env' (FStarC.Ident.lid_of_path ["Test"] (FStarC.Range.dummyRange)) DsEnv.default_mii in env', m | ParseError (err, msg, r) -> raise (Error(err, msg, r, [])) @@ -85,15 +85,15 @@ let init_once () : unit = let _prims_mod, env = Tc.check_module env prims_mod false in // needed to run tests with chars // let dsenv, env = add_mods ["FStar.Pervasives.Native.fst"; "FStar.Pervasives.fst"; "FStar.Mul.fst"; "FStar.Squash.fsti"; - // "FStar.Classical.fst"; "FStarC.Compiler.List.Tot.Base.fst"; "FStarC.Compiler.List.Tot.Properties.fst"; "FStarC.Compiler.List.Tot.fst"; + // "FStar.Classical.fst"; "FStarC.List.Tot.Base.fst"; "FStarC.List.Tot.Properties.fst"; "FStarC.List.Tot.fst"; // "FStar.StrongExcludedMiddle.fst"; "FStar.Seq.Base.fst"; "FStar.Seq.Properties.fst"; "FStar.Seq.fst"; // "FStar.BitVector.fst"; "FStar.Math.Lib.fst"; "FStar.Math.Lemmas.fst"; "FStar.UInt.fst"; "FStar.UInt32.fst"; // "FStar.Char.fsti"; "FStar.String.fsti"] dsenv env in // only needed to test tatic normalization - // let dsenv, env = add_mods ["FStarC.Compiler.Range.fsti"; "FStar.Pervasives.Native.fst"; "FStar.Pervasives.fst"; "FStarC.Reflection.Types.fsti"; "FStar.Order.fst"; + // let dsenv, env = add_mods ["FStarC.Range.fsti"; "FStar.Pervasives.Native.fst"; "FStar.Pervasives.fst"; "FStarC.Reflection.Types.fsti"; "FStar.Order.fst"; // "FStarC.Reflection.Data.fst"; "FStarC.Reflection.Basic.fst"; "FStar.Squash.fsti"; "FStar.Classical.fst"; - // "FStarC.Compiler.List.Tot.Base.fst"; "FStarC.Compiler.List.Tot.Properties.fst"; "FStarC.Compiler.List.Tot.fst"; "FStar.Char.fsti"; + // "FStarC.List.Tot.Base.fst"; "FStarC.List.Tot.Properties.fst"; "FStarC.List.Tot.fst"; "FStar.Char.fsti"; // "FStar.String.fsti"; "FStarC.Reflection.Syntax.fst"; "FStarC.Reflection.Syntax.Lemmas.fst"; // "FStarC.Reflection.Formula.fst"; "FStarC.Tactics.Types.fsti"; "FStarC.Tactics.Result.fst"; // "FStarC.Tactics.Effect.fst"; "FStarC.Tactics.Builtins.fst"; "FStarC.Tactics.Derived.fst"; @@ -129,9 +129,9 @@ let pars s = failwith "Impossible: parsing a Fragment always results in a Term" with | Error(err, msg, r, _ctx) when not <| FStarC.Options.trace_error() -> - if r = FStarC.Compiler.Range.dummyRange + if r = FStarC.Range.dummyRange then BU.print_string (Errors.rendermsg msg) - else BU.print2 "%s: %s\n" (FStarC.Compiler.Range.string_of_range r) (Errors.rendermsg msg); + else BU.print2 "%s: %s\n" (FStarC.Range.string_of_range r) (Errors.rendermsg msg); exit 1 | e when not ((Options.trace_error())) -> raise e @@ -236,7 +236,7 @@ let parse_incremental_decls () = frag_text = source1; frag_line = 1; frag_col = 0 } in - let open FStarC.Compiler.Range in + let open FStarC.Range in match parse None input0, parse None input1 with | IncrementalFragment (decls0, _, parse_err0), IncrementalFragment (decls1, _, parse_err1) -> ( @@ -305,7 +305,7 @@ let parse_incremental_decls_use_lang () = frag_text = source0; frag_line = 1; frag_col = 0 } in - let open FStarC.Compiler.Range in + let open FStarC.Range in match parse None input0 with | IncrementalFragment (decls0, _, parse_err0) -> ( let _ = diff --git a/src/tests/FStarC.Tests.Test.fst b/src/tests/FStarC.Tests.Test.fst index 41822ee156b..bb58c95e6a1 100644 --- a/src/tests/FStarC.Tests.Test.fst +++ b/src/tests/FStarC.Tests.Test.fst @@ -15,13 +15,13 @@ *) module FStarC.Tests.Test open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax open FStarC.Errors module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module O = FStarC.Options module G = FStarC.Getopt @@ -53,9 +53,9 @@ let main argv = exit 0 with | Error(err, msg, r, _ctx) when not <| O.trace_error() -> - if r = FStarC.Compiler.Range.dummyRange + if r = FStarC.Range.dummyRange then BU.print_string (Errors.rendermsg msg) - else BU.print2 "%s: %s\n" (FStarC.Compiler.Range.string_of_range r) (Errors.rendermsg msg); + else BU.print2 "%s: %s\n" (FStarC.Range.string_of_range r) (Errors.rendermsg msg); exit 1 | e -> BU.print2_error "Error\n%s\n%s\n" (BU.message_of_exn e) (BU.trace_of_exn e); diff --git a/src/tests/FStarC.Tests.Unif.fst b/src/tests/FStarC.Tests.Unif.fst index 0be8ff3c541..4781a0271fe 100644 --- a/src/tests/FStarC.Tests.Unif.fst +++ b/src/tests/FStarC.Tests.Unif.fst @@ -19,10 +19,10 @@ module FStarC.Tests.Unif open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Errors -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.Tests.Pars module S = FStarC.Syntax.Syntax @@ -33,11 +33,11 @@ module P = FStarC.Syntax.Print module N = FStarC.TypeChecker.Normalize module Rel = FStarC.TypeChecker.Rel module Env = FStarC.TypeChecker.Env -module BU = FStarC.Compiler.Util +module BU = FStarC.Util open FStarC.TypeChecker.Common open FStarC.TypeChecker.Env open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Tests.Util open FStarC.Class.Show diff --git a/src/tests/FStarC.Tests.Util.fst b/src/tests/FStarC.Tests.Util.fst index 746caeb675d..9e4712036f9 100644 --- a/src/tests/FStarC.Tests.Util.fst +++ b/src/tests/FStarC.Tests.Util.fst @@ -17,11 +17,11 @@ module FStarC.Tests.Util open FStar open FStarC -open FStarC.Compiler +open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Errors -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax module S = FStarC.Syntax.Syntax @@ -30,10 +30,10 @@ module SS = FStarC.Syntax.Subst module I = FStarC.Ident module UF = FStarC.Syntax.Unionfind module Const = FStarC.Parser.Const -module BU = FStarC.Compiler.Util +module BU = FStarC.Util open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Class.Tagged open FStarC.Class.Show open FStarC.Syntax.Print {} diff --git a/src/tosyntax/FStarC.ToSyntax.Interleave.fst b/src/tosyntax/FStarC.ToSyntax.Interleave.fst index f9f6e76c971..7a2912c1ae6 100644 --- a/src/tosyntax/FStarC.ToSyntax.Interleave.fst +++ b/src/tosyntax/FStarC.ToSyntax.Interleave.fst @@ -14,13 +14,13 @@ limitations under the License. *) module FStarC.ToSyntax.Interleave -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List //Reorders the top-level definitions/declarations in a file //in a proper order for consistent type-checking open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Ident open FStarC.Errors open FStarC.Syntax.Syntax @@ -29,7 +29,7 @@ open FStarC.Class.Show open FStarC.Pprint open FStarC.Class.PP -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (* Some basic utilities *) let id_eq_lid i (l:lident) = (string_of_id i) = (string_of_id (ident_of_lid l)) @@ -421,7 +421,7 @@ let interleave_module (a:modul) (expect_complete_modul:bool) : E.withenv modul = impls in let iface_lets, remaining_iface_vals = - match FStarC.Compiler.Util.prefix_until (function {d=Val _} -> true + match FStarC.Util.prefix_until (function {d=Val _} -> true | {d=Splice _} -> true | _ -> false) iface with | None -> iface, [] diff --git a/src/tosyntax/FStarC.ToSyntax.Interleave.fsti b/src/tosyntax/FStarC.ToSyntax.Interleave.fsti index 0c84301c9a5..ae97d33cdec 100644 --- a/src/tosyntax/FStarC.ToSyntax.Interleave.fsti +++ b/src/tosyntax/FStarC.ToSyntax.Interleave.fsti @@ -14,8 +14,8 @@ limitations under the License. *) module FStarC.ToSyntax.Interleave -open FStarC.Compiler.Effect -open FStarC.Compiler.Effect +open FStarC.Effect +open FStarC.Effect open FStarC.Ident open FStarC.Parser.AST module DsEnv = FStarC.Syntax.DsEnv diff --git a/src/tosyntax/FStarC.ToSyntax.ToSyntax.fst b/src/tosyntax/FStarC.ToSyntax.ToSyntax.fst index 080808ea591..37316d0af7f 100644 --- a/src/tosyntax/FStarC.ToSyntax.ToSyntax.fst +++ b/src/tosyntax/FStarC.ToSyntax.ToSyntax.fst @@ -15,11 +15,11 @@ *) module FStarC.ToSyntax.ToSyntax open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Util @@ -36,7 +36,7 @@ open FStarC.Class.Show module C = FStarC.Parser.Const module S = FStarC.Syntax.Syntax module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Env = FStarC.Syntax.DsEnv module P = FStarC.Syntax.Print module EMB = FStarC.Syntax.Embeddings @@ -44,16 +44,16 @@ module SS = FStarC.Syntax.Subst let extension_tosyntax_table : BU.smap extension_tosyntax_decl_t -= FStarC.Compiler.Util.smap_create 20 += FStarC.Util.smap_create 20 let register_extension_tosyntax (lang_name:string) (cb:extension_tosyntax_decl_t) -= FStarC.Compiler.Util.smap_add extension_tosyntax_table lang_name cb += FStarC.Util.smap_add extension_tosyntax_table lang_name cb let lookup_extension_tosyntax (lang_name:string) -= FStarC.Compiler.Util.smap_try_find extension_tosyntax_table lang_name += FStarC.Util.smap_try_find extension_tosyntax_table lang_name let dbg_attrs = Debug.get_toggle "attrs" let dbg_ToSyntax = Debug.get_toggle "ToSyntax" @@ -3592,7 +3592,7 @@ and desugar_redefine_effect env d d_attrs trans_qual quals eff_name eff_binders let nparam = List.length action.action_params in { // Since we called enter_monad_env before, this is going to generate - // a name of the form FStarC.Compiler.Effect.uu___proj__STATE__item__get + // a name of the form FStarC.Effect.uu___proj__STATE__item__get action_name = Env.qualify env (action.action_unqualified_name); action_unqualified_name = action.action_unqualified_name; action_univs = action.action_univs ; diff --git a/src/tosyntax/FStarC.ToSyntax.ToSyntax.fsti b/src/tosyntax/FStarC.ToSyntax.ToSyntax.fsti index 7bb8b17cad1..2250f104a3a 100644 --- a/src/tosyntax/FStarC.ToSyntax.ToSyntax.fsti +++ b/src/tosyntax/FStarC.ToSyntax.ToSyntax.fsti @@ -14,11 +14,11 @@ limitations under the License. *) module FStarC.ToSyntax.ToSyntax -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Util diff --git a/src/typechecker/FStarC.TypeChecker.Cfg.fst b/src/typechecker/FStarC.TypeChecker.Cfg.fst index 16d03eb98e4..f2b7593dfa3 100644 --- a/src/typechecker/FStarC.TypeChecker.Cfg.fst +++ b/src/typechecker/FStarC.TypeChecker.Cfg.fst @@ -2,10 +2,10 @@ module FStarC.TypeChecker.Cfg open FStar open FStarC open FStar.Char -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.String +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.String open FStarC.Const open FStarC.Syntax open FStarC.Syntax.Syntax @@ -16,7 +16,7 @@ open FStarC.Class.Show module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module FC = FStarC.Const module PC = FStarC.Parser.Const module U = FStarC.Syntax.Util diff --git a/src/typechecker/FStarC.TypeChecker.Cfg.fsti b/src/typechecker/FStarC.TypeChecker.Cfg.fsti index dfe2ed86774..e8e771d5b90 100644 --- a/src/typechecker/FStarC.TypeChecker.Cfg.fsti +++ b/src/typechecker/FStarC.TypeChecker.Cfg.fsti @@ -15,10 +15,10 @@ *) module FStarC.TypeChecker.Cfg -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStar.String open FStarC.Const open FStar.Char @@ -36,7 +36,7 @@ open FStarC.Class.Deq module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module FC = FStarC.Const module PC = FStarC.Parser.Const module U = FStarC.Syntax.Util diff --git a/src/typechecker/FStarC.TypeChecker.Common.fst b/src/typechecker/FStarC.TypeChecker.Common.fst index 666af95e4a7..99ae5efe2c3 100644 --- a/src/typechecker/FStarC.TypeChecker.Common.fst +++ b/src/typechecker/FStarC.TypeChecker.Common.fst @@ -16,12 +16,12 @@ module FStarC.TypeChecker.Common open Prims open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Ident @@ -29,7 +29,7 @@ module S = FStarC.Syntax.Syntax module Print = FStarC.Syntax.Print module U = FStarC.Syntax.Util -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module PC = FStarC.Parser.Const module C = FStarC.Parser.Const @@ -113,7 +113,7 @@ let id_info_table_empty = id_info_db = BU.psmap_empty (); id_info_buffer = [] } -open FStarC.Compiler.Range +open FStarC.Range let print_identifier_info info = BU.format3 "id info { %s, %s : %s}" @@ -285,7 +285,7 @@ let mk_lcomp eff_name res_typ cflags comp_thunk = { eff_name = eff_name; res_typ = res_typ; cflags = cflags; - comp_thunk = FStarC.Compiler.Util.mk_ref (Inl comp_thunk) } + comp_thunk = FStarC.Util.mk_ref (Inl comp_thunk) } let lcomp_comp lc = match !(lc.comp_thunk) with diff --git a/src/typechecker/FStarC.TypeChecker.Common.fsti b/src/typechecker/FStarC.TypeChecker.Common.fsti index a7fd49405e4..e8f0ad5ace4 100644 --- a/src/typechecker/FStarC.TypeChecker.Common.fsti +++ b/src/typechecker/FStarC.TypeChecker.Common.fsti @@ -16,26 +16,26 @@ module FStarC.TypeChecker.Common open Prims open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Ident open FStarC.Class.Show open FStarC.Class.Monoid -open FStarC.Compiler.CList -module CList = FStarC.Compiler.CList +open FStarC.CList +module CList = FStarC.CList (* Bring instances in scope *) open FStarC.Syntax.Print {} module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util (* relations on types, kinds, etc. *) type rel = diff --git a/src/typechecker/FStarC.TypeChecker.Core.fst b/src/typechecker/FStarC.TypeChecker.Core.fst index f1f355e0808..ead8d527dac 100644 --- a/src/typechecker/FStarC.TypeChecker.Core.fst +++ b/src/typechecker/FStarC.TypeChecker.Core.fst @@ -1,20 +1,20 @@ module FStarC.TypeChecker.Core open FStarC open FStar.List.Tot -open FStarC.Compiler -open FStarC.Compiler.Util -open FStarC.Compiler.Effect +open FStarC +open FStarC.Util +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.TypeChecker module Env = FStarC.TypeChecker.Env module S = FStarC.Syntax.Syntax -module R = FStarC.Compiler.Range +module R = FStarC.Range module U = FStarC.Syntax.Util module N = FStarC.TypeChecker.Normalize module PC = FStarC.Parser.Const module I = FStarC.Ident module P = FStarC.Syntax.Print -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module TcUtil = FStarC.TypeChecker.Util module Hash = FStarC.Syntax.Hash module Subst = FStarC.Syntax.Subst @@ -462,7 +462,7 @@ let check_positivity_qual (rel:relation) (p0 p1:option positivity_qualifier) let mk_forall_l (us:universes) (xs:binders) (t:term) : term - = FStarC.Compiler.List.fold_right2 + = FStarC.List.fold_right2 (fun u x t -> U.mk_forall u x.binder_bv t) us xs diff --git a/src/typechecker/FStarC.TypeChecker.Core.fsti b/src/typechecker/FStarC.TypeChecker.Core.fsti index 70864d3129a..4a7abcc8a5c 100644 --- a/src/typechecker/FStarC.TypeChecker.Core.fsti +++ b/src/typechecker/FStarC.TypeChecker.Core.fsti @@ -1,11 +1,11 @@ module FStarC.TypeChecker.Core open FStarC -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Syntax.Syntax open FStarC.TypeChecker.Common module Env = FStarC.TypeChecker.Env module S = FStarC.Syntax.Syntax -module R = FStarC.Compiler.Range +module R = FStarC.Range module U = FStarC.Syntax.Util type tot_or_ghost = diff --git a/src/typechecker/FStarC.TypeChecker.DMFF.fst b/src/typechecker/FStarC.TypeChecker.DMFF.fst index 97c4940b73a..2d7ad0b4927 100644 --- a/src/typechecker/FStarC.TypeChecker.DMFF.fst +++ b/src/typechecker/FStarC.TypeChecker.DMFF.fst @@ -15,14 +15,14 @@ *) module FStarC.TypeChecker.DMFF open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker open FStarC.TypeChecker.Common open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Errors open FStarC.Syntax @@ -49,7 +49,7 @@ module N = FStarC.TypeChecker.Normalize module TcComm = FStarC.TypeChecker.Common module TcUtil = FStarC.TypeChecker.Util module TcTerm = FStarC.TypeChecker.TcTerm -module BU = FStarC.Compiler.Util //basic util +module BU = FStarC.Util //basic util module U = FStarC.Syntax.Util module PC = FStarC.Parser.Const module TEQ = FStarC.TypeChecker.TermEqAndSimplify diff --git a/src/typechecker/FStarC.TypeChecker.DMFF.fsti b/src/typechecker/FStarC.TypeChecker.DMFF.fsti index faafe9f6e91..a7d498095cc 100644 --- a/src/typechecker/FStarC.TypeChecker.DMFF.fsti +++ b/src/typechecker/FStarC.TypeChecker.DMFF.fsti @@ -16,7 +16,7 @@ limitations under the License. *) module FStarC.TypeChecker.DMFF -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.TypeChecker open FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fst b/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fst index f0d3fbe073e..181e99115e6 100644 --- a/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fst +++ b/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fst @@ -17,11 +17,11 @@ *) module FStarC.TypeChecker.DeferredImplicits -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Errors open FStarC.TypeChecker open FStarC.Syntax @@ -31,7 +31,7 @@ open FStarC.Syntax.Subst open FStarC.Ident open FStarC.TypeChecker.Common open FStarC.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module S = FStarC.Syntax.Syntax module U = FStarC.Syntax.Util module SS = FStarC.Syntax.Subst diff --git a/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fsti b/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fsti index 291c1032669..bd695a6b08d 100644 --- a/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fsti +++ b/src/typechecker/FStarC.TypeChecker.DeferredImplicits.fsti @@ -21,7 +21,7 @@ ////////////////////////////////////////////////////////////////////////// module FStarC.TypeChecker.DeferredImplicits -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.TypeChecker.Env open FStarC.TypeChecker.Common diff --git a/src/typechecker/FStarC.TypeChecker.Env.fst b/src/typechecker/FStarC.TypeChecker.Env.fst index e6c9206ac78..7a6a62084e9 100644 --- a/src/typechecker/FStarC.TypeChecker.Env.fst +++ b/src/typechecker/FStarC.TypeChecker.Env.fst @@ -15,17 +15,17 @@ *) module FStarC.TypeChecker.Env open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Syntax.Subst open FStarC.Syntax.Util -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Errors open FStarC.TypeChecker.Common open FStarC.Class.Setlike @@ -36,7 +36,7 @@ module Listlike = FStarC.Class.Listlike module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module UF = FStarC.Syntax.Unionfind module Const = FStarC.Parser.Const @@ -1825,7 +1825,7 @@ let should_enc_path proof_ns path = | x::xs, y::ys -> String.lowercase x = String.lowercase y && str_i_prefix xs ys | _, _ -> false in - match FStarC.Compiler.List.tryFind (fun (p, _) -> str_i_prefix p path) proof_ns with + match FStarC.List.tryFind (fun (p, _) -> str_i_prefix p path) proof_ns with | None -> false | Some (_, b) -> b diff --git a/src/typechecker/FStarC.TypeChecker.Env.fsti b/src/typechecker/FStarC.TypeChecker.Env.fsti index bd7920b35bc..4b949d1c8b1 100644 --- a/src/typechecker/FStarC.TypeChecker.Env.fsti +++ b/src/typechecker/FStarC.TypeChecker.Env.fsti @@ -15,9 +15,9 @@ *) module FStarC.TypeChecker.Env open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax.Syntax open FStarC.Ident open FStarC.TypeChecker.Common @@ -26,7 +26,7 @@ open FStarC.Class.Deq open FStarC.Class.Show open FStarC.Class.Setlike -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module S = FStarC.Syntax.Syntax module TcComm = FStarC.TypeChecker.Common @@ -170,7 +170,7 @@ and env = { curmodule :lident; (* Name of this module *) gamma :list binding; (* Local typing environment *) gamma_sig :list sig_binding; (* and signature elements *) - gamma_cache :FStarC.Compiler.Util.smap cached_elt; (* Memo table for the global gamma_sig environment *) + gamma_cache :FStarC.Util.smap cached_elt; (* Memo table for the global gamma_sig environment *) modules :list modul; (* already fully type checked modules *) expected_typ :option (typ & bool); (* type expected by the context *) (* a true bool will check for type equality (else subtyping) *) diff --git a/src/typechecker/FStarC.TypeChecker.Err.fst b/src/typechecker/FStarC.TypeChecker.Err.fst index f2c543a1ff7..679554b740d 100644 --- a/src/typechecker/FStarC.TypeChecker.Err.fst +++ b/src/typechecker/FStarC.TypeChecker.Err.fst @@ -14,14 +14,13 @@ limitations under the License. *) module FStarC.TypeChecker.Err -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC -open FStarC.Compiler open FStarC.Syntax.Syntax -open FStarC.Compiler.Util +open FStarC.Util open FStarC.TypeChecker.Env -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Ident open FStarC.Pprint module N = FStarC.TypeChecker.Normalize diff --git a/src/typechecker/FStarC.TypeChecker.Generalize.fst b/src/typechecker/FStarC.TypeChecker.Generalize.fst index 6f622bcac5a..2614151ce36 100644 --- a/src/typechecker/FStarC.TypeChecker.Generalize.fst +++ b/src/typechecker/FStarC.TypeChecker.Generalize.fst @@ -16,10 +16,10 @@ module FStarC.TypeChecker.Generalize open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List -open FStarC.Compiler.Util +open FStarC +open FStarC.Effect +open FStarC.List +open FStarC.Util open FStarC.Errors open FStarC.Syntax open FStarC.Syntax.Syntax @@ -28,7 +28,7 @@ open FStarC.TypeChecker.Env open FStarC.Class.Show open FStarC.Class.Setlike -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst module Free = FStarC.Syntax.Free diff --git a/src/typechecker/FStarC.TypeChecker.Generalize.fsti b/src/typechecker/FStarC.TypeChecker.Generalize.fsti index 23da7cac5b9..e141cac75ba 100644 --- a/src/typechecker/FStarC.TypeChecker.Generalize.fsti +++ b/src/typechecker/FStarC.TypeChecker.Generalize.fsti @@ -16,7 +16,7 @@ module FStarC.TypeChecker.Generalize -open FStar open FStarC.Compiler +open FStar open FStarC open FStarC.Syntax.Syntax open FStarC.TypeChecker.Env diff --git a/src/typechecker/FStarC.TypeChecker.NBE.fst b/src/typechecker/FStarC.TypeChecker.NBE.fst index be91269b552..75aae82b855 100644 --- a/src/typechecker/FStarC.TypeChecker.NBE.fst +++ b/src/typechecker/FStarC.TypeChecker.NBE.fst @@ -17,10 +17,10 @@ *) module FStarC.TypeChecker.NBE open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker.Cfg open FStarC.TypeChecker open FStarC.TypeChecker.Env @@ -32,10 +32,10 @@ open FStarC.TypeChecker.NBETerm module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module Range = FStarC.Compiler.Range +module Range = FStarC.Range module U = FStarC.Syntax.Util module P = FStarC.Syntax.Print -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module Env = FStarC.TypeChecker.Env module Z = FStarC.BigInt module C = FStarC.Const @@ -82,7 +82,7 @@ let dbg_NBETop = Debug.get_toggle "NBETop" //////////////////////////////////////////////////////////////////////////////// -// Utilities: Many of these should just move to FStarC.Compiler.List, if it's +// Utilities: Many of these should just move to FStarC.List, if it's // not already there //////////////////////////////////////////////////////////////////////////////// @@ -1244,7 +1244,7 @@ and readback (cfg:config) (x:t) : term = | Constant (String (s, r)) -> mk (S.Tm_constant (C.Const_string (s, r))) | Constant (Char c) -> with_range (U.exp_char c) | Constant (Range r) -> PO.embed_simple #_ #EMB.e___range x.nbe_r r - | Constant (Real r) -> PO.embed_simple x.nbe_r (Compiler.Real.Real r) + | Constant (Real r) -> PO.embed_simple x.nbe_r (Real.Real r) | Constant (SConst c) -> mk (S.Tm_constant c) | Meta(t, m) -> diff --git a/src/typechecker/FStarC.TypeChecker.NBE.fsti b/src/typechecker/FStarC.TypeChecker.NBE.fsti index 9178f6df60b..2e8f940ae25 100644 --- a/src/typechecker/FStarC.TypeChecker.NBE.fsti +++ b/src/typechecker/FStarC.TypeChecker.NBE.fsti @@ -17,9 +17,9 @@ *) module FStarC.TypeChecker.NBE open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.NBETerm.fst b/src/typechecker/FStarC.TypeChecker.NBETerm.fst index 57b3219d247..79137b5106a 100644 --- a/src/typechecker/FStarC.TypeChecker.NBETerm.fst +++ b/src/typechecker/FStarC.TypeChecker.NBETerm.fst @@ -16,8 +16,8 @@ module FStarC.TypeChecker.NBETerm open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Errors open FStar.Char @@ -28,7 +28,7 @@ friend FStar.Pervasives (* To expose norm_step *) module PC = FStarC.Parser.Const module S = FStarC.Syntax.Syntax module P = FStarC.Syntax.Print -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module C = FStarC.Const module SE = FStarC.Syntax.Embeddings module TEQ = FStarC.TypeChecker.TermEqAndSimplify @@ -374,14 +374,14 @@ let e_int : embedding Z.t = in mk_emb' em un (fun () -> lid_as_typ PC.int_lid [] []) (SE.emb_typ_of int) -let e_real : embedding Compiler.Real.real = - let em _cb (Compiler.Real.Real c) = Constant (Real c) in +let e_real : embedding Real.real = + let em _cb (Real.Real c) = Constant (Real c) in let un _cb c = match c with - | Constant (Real a) -> Some (Compiler.Real.Real a) + | Constant (Real a) -> Some (Real.Real a) | _ -> None in - mk_emb' em un (fun () -> lid_as_typ PC.real_lid [] []) (SE.emb_typ_of Compiler.Real.real) + mk_emb' em un (fun () -> lid_as_typ PC.real_lid [] []) (SE.emb_typ_of Real.real) let e_fsint = embed_as e_int Z.to_int_fs Z.of_int_fs None @@ -919,7 +919,7 @@ let e_order = let ord_Lt_fv = lid_as_fv ord_Lt_lid (Some Data_ctor) in let ord_Eq_fv = lid_as_fv ord_Eq_lid (Some Data_ctor) in let ord_Gt_fv = lid_as_fv ord_Gt_lid (Some Data_ctor) in - let open FStarC.Compiler.Order in + let open FStarC.Order in let embed_order cb (o:order) : t = match o with | Lt -> mkConstruct ord_Lt_fv [] [] diff --git a/src/typechecker/FStarC.TypeChecker.NBETerm.fsti b/src/typechecker/FStarC.TypeChecker.NBETerm.fsti index 5b4d54b7c49..79afeba8437 100644 --- a/src/typechecker/FStarC.TypeChecker.NBETerm.fsti +++ b/src/typechecker/FStarC.TypeChecker.NBETerm.fsti @@ -19,8 +19,8 @@ module FStarC.TypeChecker.NBETerm open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.Ident open FStarC.VConfig @@ -279,7 +279,7 @@ instance val e_bool : embedding bool instance val e_string : embedding string instance val e_char : embedding char instance val e_int : embedding Z.t -instance val e_real : embedding Compiler.Real.real +instance val e_real : embedding Real.real instance val e_unit : embedding unit val e_any : embedding t val mk_any_emb : t -> embedding t @@ -296,12 +296,12 @@ instance val e_tuple3 : embedding 'a -> embedding 'b -> embedding 'c -> Prims.To instance val e_tuple4 : embedding 'a -> embedding 'b -> embedding 'c -> embedding 'd -> Prims.Tot (embedding ('a & 'b & 'c & 'd)) instance val e_tuple5 : embedding 'a -> embedding 'b -> embedding 'c -> embedding 'd -> embedding 'e -> Prims.Tot (embedding ('a & 'b & 'c & 'd & 'e)) instance val e_either : embedding 'a -> embedding 'b -> Prims.Tot (embedding (either 'a 'b)) -instance val e_sealed : embedding 'a -> Prims.Tot (embedding (FStarC.Compiler.Sealed.sealed 'a)) +instance val e_sealed : embedding 'a -> Prims.Tot (embedding (FStarC.Sealed.sealed 'a)) instance val e_string_list : embedding (list string) val e_arrow : embedding 'a -> embedding 'b -> embedding ('a -> 'b) instance val e_abstract_nbe_term : embedding abstract_nbe_term -instance val e_order : embedding FStarC.Compiler.Order.order +instance val e_order : embedding FStarC.Order.order (* Unconditionally fails raising an exception when called *) val e_unsupported : #a:Type -> embedding a diff --git a/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fst b/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fst index 3c36512f6c7..7bacf99803a 100644 --- a/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fst +++ b/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fst @@ -1,16 +1,16 @@ module FStarC.TypeChecker.Normalize.Unfolding open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.TypeChecker.Cfg open FStarC.TypeChecker.Env open FStarC.Syntax.Print module Common = FStarC.TypeChecker.Common -module BU = FStarC.Compiler.Util -module Path = FStarC.Compiler.Path +module BU = FStarC.Util +module Path = FStarC.Path module PC = FStarC.Parser.Const module Print = FStarC.Syntax.Print module S = FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fsti b/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fsti index afc391bbed1..923363f0c7e 100644 --- a/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fsti +++ b/src/typechecker/FStarC.TypeChecker.Normalize.Unfolding.fsti @@ -1,6 +1,6 @@ module FStarC.TypeChecker.Normalize.Unfolding -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.TypeChecker open FStarC.Syntax.Syntax open FStarC.TypeChecker.Cfg diff --git a/src/typechecker/FStarC.TypeChecker.Normalize.fst b/src/typechecker/FStarC.TypeChecker.Normalize.fst index 678dc03a734..a6e4d211347 100644 --- a/src/typechecker/FStarC.TypeChecker.Normalize.fst +++ b/src/typechecker/FStarC.TypeChecker.Normalize.fst @@ -16,12 +16,12 @@ module FStarC.TypeChecker.Normalize open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Defensive -open FStarC.Compiler.Util +open FStarC.Util open FStar.String open FStarC.Const open FStar.Char @@ -41,7 +41,7 @@ open FStarC.Class.Deq module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module FC = FStarC.Const module PC = FStarC.Parser.Const module U = FStarC.Syntax.Util diff --git a/src/typechecker/FStarC.TypeChecker.Normalize.fsti b/src/typechecker/FStarC.TypeChecker.Normalize.fsti index 8a66b5062ae..537da275347 100644 --- a/src/typechecker/FStarC.TypeChecker.Normalize.fsti +++ b/src/typechecker/FStarC.TypeChecker.Normalize.fsti @@ -16,7 +16,7 @@ module FStarC.TypeChecker.Normalize open FStarC -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.TypeChecker open FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.PatternUtils.fst b/src/typechecker/FStarC.TypeChecker.PatternUtils.fst index eea2cf67665..b012e5542ef 100644 --- a/src/typechecker/FStarC.TypeChecker.PatternUtils.fst +++ b/src/typechecker/FStarC.TypeChecker.PatternUtils.fst @@ -15,10 +15,10 @@ *) module FStarC.TypeChecker.PatternUtils -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Errors open FStarC.TypeChecker open FStarC.Syntax @@ -32,7 +32,7 @@ type lcomp_with_binder = option bv & lcomp module SS = FStarC.Syntax.Subst module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module P = FStarC.Syntax.Print module C = FStarC.Parser.Const diff --git a/src/typechecker/FStarC.TypeChecker.PatternUtils.fsti b/src/typechecker/FStarC.TypeChecker.PatternUtils.fsti index b77e8c5a4d8..d42cc83d8e7 100644 --- a/src/typechecker/FStarC.TypeChecker.PatternUtils.fsti +++ b/src/typechecker/FStarC.TypeChecker.PatternUtils.fsti @@ -15,10 +15,10 @@ *) module FStarC.TypeChecker.PatternUtils -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Errors open FStarC.TypeChecker open FStarC.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.Positivity.fst b/src/typechecker/FStarC.TypeChecker.Positivity.fst index 78ffc1ee43f..d34e4a90228 100644 --- a/src/typechecker/FStarC.TypeChecker.Positivity.fst +++ b/src/typechecker/FStarC.TypeChecker.Positivity.fst @@ -19,8 +19,8 @@ module FStarC.TypeChecker.Positivity open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.TypeChecker.Env open FStarC.Syntax open FStarC.Syntax.Syntax @@ -29,10 +29,10 @@ open FStarC.Errors open FStar.List.Tot module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module N = FStarC.TypeChecker.Normalize -module L = FStarC.Compiler.List +module L = FStarC.List module C = FStarC.Parser.Const open FStarC.Class.Setlike @@ -812,7 +812,7 @@ let rec ty_strictly_positive_in_type (env:env) | Some (Inl (fv, us)) -> begin - if FStarC.Compiler.List.existsML (Ident.lid_equals fv.fv_name.v) mutuals + if FStarC.List.existsML (Ident.lid_equals fv.fv_name.v) mutuals then ( //if the head is one of the mutually inductive types //then check that ty_lid does not occur in the arguments diff --git a/src/typechecker/FStarC.TypeChecker.Positivity.fsti b/src/typechecker/FStarC.TypeChecker.Positivity.fsti index 0c545a2b803..703a3b1a24c 100644 --- a/src/typechecker/FStarC.TypeChecker.Positivity.fsti +++ b/src/typechecker/FStarC.TypeChecker.Positivity.fsti @@ -17,7 +17,7 @@ *) module FStarC.TypeChecker.Positivity -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax open FStarC.Ident diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Array.fst b/src/typechecker/FStarC.TypeChecker.Primops.Array.fst index 490e3ec0832..12dc6fa8810 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Array.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Array.fst @@ -1,8 +1,8 @@ module FStarC.TypeChecker.Primops.Array open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Errors open FStarC.Class.Monad open FStarC.Syntax.Syntax @@ -10,7 +10,7 @@ open FStarC.Syntax.Embeddings open FStarC.TypeChecker.Primops.Base -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module EMB = FStarC.Syntax.Embeddings module NBETerm = FStarC.TypeChecker.NBETerm module PC = FStarC.Parser.Const diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Base.fst b/src/typechecker/FStarC.TypeChecker.Primops.Base.fst index 5dac0932a51..6d37c1eaa1f 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Base.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Base.fst @@ -3,9 +3,9 @@ module FStarC.TypeChecker.Primops.Base (* This module defines the type of primitive steps and some helpers. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Syntax.Syntax open FStarC.Class.Monad diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Base.fsti b/src/typechecker/FStarC.TypeChecker.Primops.Base.fsti index 063154f23cf..5c41ae80c2c 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Base.fsti +++ b/src/typechecker/FStarC.TypeChecker.Primops.Base.fsti @@ -2,21 +2,21 @@ module FStarC.TypeChecker.Primops.Base (* This module defines the type of primitive steps and some helpers. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Syntax.Syntax module Env = FStarC.TypeChecker.Env module EMB = FStarC.Syntax.Embeddings module NBE = FStarC.TypeChecker.NBETerm type psc = { - psc_range : FStarC.Compiler.Range.range; + psc_range : FStarC.Range.range; psc_subst : unit -> subst_t // potentially expensive, so thunked } val null_psc : psc -val psc_range : psc -> FStarC.Compiler.Range.range +val psc_range : psc -> FStarC.Range.range val psc_subst : psc -> subst_t type interp_t = diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Docs.fst b/src/typechecker/FStarC.TypeChecker.Primops.Docs.fst index c9481cf9e2c..6f20ad2f605 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Docs.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Docs.fst @@ -1,9 +1,9 @@ module FStarC.TypeChecker.Primops.Docs open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Class.Monad module Z = FStarC.BigInt diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Eq.fst b/src/typechecker/FStarC.TypeChecker.Primops.Eq.fst index 1162e8ca03c..e902044410f 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Eq.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Eq.fst @@ -1,9 +1,9 @@ module FStarC.TypeChecker.Primops.Eq open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Syntax.Syntax open FStarC.TypeChecker open FStarC.Class.Monad diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Erased.fst b/src/typechecker/FStarC.TypeChecker.Primops.Erased.fst index 0ba615199f4..a0e22d2658d 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Erased.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Erased.fst @@ -1,9 +1,9 @@ module FStarC.TypeChecker.Primops.Erased open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Syntax.Syntax open FStarC.TypeChecker open FStarC.Class.Monad diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Errors.Msg.fst b/src/typechecker/FStarC.TypeChecker.Primops.Errors.Msg.fst index e000a215bdd..6ef93c13685 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Errors.Msg.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Errors.Msg.fst @@ -1,9 +1,9 @@ module FStarC.TypeChecker.Primops.Errors.Msg open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Class.Monad module Z = FStarC.BigInt diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Issue.fst b/src/typechecker/FStarC.TypeChecker.Primops.Issue.fst index 59624fb9678..94c33538a60 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Issue.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Issue.fst @@ -1,8 +1,8 @@ module FStarC.TypeChecker.Primops.Issue open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Errors open FStarC.Class.Monad diff --git a/src/typechecker/FStarC.TypeChecker.Primops.MachineInts.fst b/src/typechecker/FStarC.TypeChecker.Primops.MachineInts.fst index 161a141729f..9f030229831 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.MachineInts.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.MachineInts.fst @@ -3,8 +3,8 @@ module FStarC.TypeChecker.Primops.MachineInts (* Primops about machine integers *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStar.Char open FStarC.TypeChecker.Primops.Base module PC = FStarC.Parser.Const @@ -12,10 +12,10 @@ module Z = FStarC.BigInt (* We're going full Haskell in this module *) open FStarC.Class.Monad -open FStarC.Compiler.Writer +open FStarC.Writer open FStarC.Class.Show -open FStarC.Compiler.MachineInts +open FStarC.MachineInts (* NB: Eta expanding trips typeclass resolution *) let mymon = writer (list primitive_step) @@ -89,6 +89,6 @@ let ops : list primitive_step = (iterM bounded_arith_ops_for all_machint_kinds ;! emit [ (* Single extra op that returns a U32 *) - mk1 0 PC.char_u32_of_char (fun (c : char) -> let n = Compiler.Util.int_of_char c |> Z.of_int_fs in + mk1 0 PC.char_u32_of_char (fun (c : char) -> let n = Util.int_of_char c |> Z.of_int_fs in MachineInts.mk #UInt32 n None); ]) diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Range.fst b/src/typechecker/FStarC.TypeChecker.Primops.Range.fst index d4f254eff93..8a7cf08848e 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Range.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Range.fst @@ -1,13 +1,13 @@ module FStarC.TypeChecker.Primops.Range open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Class.Monad open FStarC.TypeChecker.Primops.Base -open FStarC.Compiler.Range +open FStarC.Range module PC = FStarC.Parser.Const module Z = FStarC.BigInt @@ -27,7 +27,7 @@ let __mk_range (fn : string) (from_l from_c to_l to_c : Z.t) : unsealedRange = let explode (r : unsealedRange) : (string & Z.t & Z.t & Z.t & Z.t) = match r with | U r -> - let open FStarC.Compiler.Range.Type in + let open FStarC.Range.Type in (file_of_range r, Z.of_int_fs (line_of_pos (start_of_range r)), Z.of_int_fs (col_of_pos (start_of_range r)), @@ -52,5 +52,5 @@ let ops = [ mk5 0 PC.__mk_range_lid __mk_range; mk5 0 PC.mk_range_lid mk_range; mk1 0 PC.__explode_range_lid explode; - mk2 0 PC.join_range_lid FStarC.Compiler.Range.union_ranges; + mk2 0 PC.join_range_lid FStarC.Range.union_ranges; ] diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Real.fst b/src/typechecker/FStarC.TypeChecker.Primops.Real.fst index a7a21e80d68..357332483b2 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Real.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Real.fst @@ -1,11 +1,11 @@ module FStarC.TypeChecker.Primops.Real open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStarC.Class.Monad -open FStarC.Compiler.Order +open FStarC.Order open FStarC.TypeChecker.Primops.Base open FStarC.Syntax.Syntax @@ -61,7 +61,7 @@ instance nbe_e_tf : TypeChecker.NBETerm.embedding tf = in mk_emb em un (fun () -> lid_as_typ PC.bool_lid [] []) (Syntax.Embeddings.emb_typ_of tf) -let cmp (r1 r2 : Compiler.Real.real) : option order = +let cmp (r1 r2 : Real.real) : option order = match r1._0, r2._0 with | "0.0", "0.0" -> Some Eq | "0.0", "0.5" -> Some Lt @@ -74,17 +74,17 @@ let cmp (r1 r2 : Compiler.Real.real) : option order = | "1.0", "1.0" -> Some Eq | _ -> None -let lt (r1 r2 : Compiler.Real.real) : option tf = +let lt (r1 r2 : Real.real) : option tf = cmp r1 r2 |> Class.Monad.fmap (function Lt -> T | _ -> F) -let le (r1 r2 : Compiler.Real.real) : option tf = +let le (r1 r2 : Real.real) : option tf = cmp r1 r2 |> Class.Monad.fmap (function Lt | Eq -> T | _ -> F) -let gt (r1 r2 : Compiler.Real.real) : option tf = +let gt (r1 r2 : Real.real) : option tf = cmp r1 r2 |> Class.Monad.fmap (function Gt -> T | _ -> F) -let ge (r1 r2 : Compiler.Real.real) : option tf = +let ge (r1 r2 : Real.real) : option tf = cmp r1 r2 |> Class.Monad.fmap (function Gt | Eq -> T | _ -> F) -let of_int (i:Z.t) : Compiler.Real.real = - Compiler.Real.Real (string_of_int (Z.to_int_fs i) ^ ".0") +let of_int (i:Z.t) : Real.real = + Real.Real (string_of_int (Z.to_int_fs i) ^ ".0") let ops = [ mk1 0 PC.real_of_int of_int; diff --git a/src/typechecker/FStarC.TypeChecker.Primops.Sealed.fst b/src/typechecker/FStarC.TypeChecker.Primops.Sealed.fst index 6e7c8437a1d..ea262dc2c04 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.Sealed.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.Sealed.fst @@ -1,8 +1,8 @@ module FStarC.TypeChecker.Primops.Sealed open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.TypeChecker.Primops.Base diff --git a/src/typechecker/FStarC.TypeChecker.Primops.fst b/src/typechecker/FStarC.TypeChecker.Primops.fst index 3e222569609..1be8551b9e4 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.fst +++ b/src/typechecker/FStarC.TypeChecker.Primops.fst @@ -4,16 +4,16 @@ module FStarC.TypeChecker.Primops with their implementations. *) open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC +open FStarC.Effect +open FStarC.List open FStar.String open FStarC.Syntax open FStarC.Syntax.Syntax open FStarC.Class.Monad module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module PC = FStarC.Parser.Const module EMB = FStarC.Syntax.Embeddings module Z = FStarC.BigInt diff --git a/src/typechecker/FStarC.TypeChecker.Primops.fsti b/src/typechecker/FStarC.TypeChecker.Primops.fsti index 8236610bdbb..b9d4c35ae6f 100644 --- a/src/typechecker/FStarC.TypeChecker.Primops.fsti +++ b/src/typechecker/FStarC.TypeChecker.Primops.fsti @@ -1,6 +1,6 @@ module FStarC.TypeChecker.Primops -open FStarC.Compiler.Effect +open FStarC.Effect include FStarC.TypeChecker.Primops.Base (* This module just contains the list of all builtin primitive steps diff --git a/src/typechecker/FStarC.TypeChecker.Quals.fst b/src/typechecker/FStarC.TypeChecker.Quals.fst index 00b347d2065..016ca9e0360 100644 --- a/src/typechecker/FStarC.TypeChecker.Quals.fst +++ b/src/typechecker/FStarC.TypeChecker.Quals.fst @@ -16,8 +16,8 @@ module FStarC.TypeChecker.Quals open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Effect +open FStarC +open FStarC.Effect open FStarC.Errors open FStarC.Errors.Msg open FStarC.Pprint @@ -29,7 +29,7 @@ open FStarC.Class.PP module SS = FStarC.Syntax.Subst module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module N = FStarC.TypeChecker.Normalize module C = FStarC.Parser.Const diff --git a/src/typechecker/FStarC.TypeChecker.Quals.fsti b/src/typechecker/FStarC.TypeChecker.Quals.fsti index 9a23f2e8de1..28871759265 100644 --- a/src/typechecker/FStarC.TypeChecker.Quals.fsti +++ b/src/typechecker/FStarC.TypeChecker.Quals.fsti @@ -17,7 +17,7 @@ module FStarC.TypeChecker.Quals open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax.Syntax open FStarC.TypeChecker.Env diff --git a/src/typechecker/FStarC.TypeChecker.Rel.fst b/src/typechecker/FStarC.TypeChecker.Rel.fst index d6c2ae1ab47..b51bb586032 100644 --- a/src/typechecker/FStarC.TypeChecker.Rel.fst +++ b/src/typechecker/FStarC.TypeChecker.Rel.fst @@ -20,11 +20,11 @@ module FStarC.TypeChecker.Rel open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Errors open FStarC.Defensive open FStarC.TypeChecker @@ -45,10 +45,10 @@ open FStarC.Class.Listlike open FStarC.Class.Monoid module Setlike = FStarC.Class.Setlike open FStarC.Class.Listlike -open FStarC.Compiler.CList +open FStarC.CList module Listlike = FStarC.Class.Listlike -module BU = FStarC.Compiler.Util //basic util +module BU = FStarC.Util //basic util module U = FStarC.Syntax.Util module S = FStarC.Syntax.Syntax module SS = FStarC.Syntax.Subst @@ -58,7 +58,7 @@ module PC = FStarC.Parser.Const module FC = FStarC.Const module TcComm = FStarC.TypeChecker.Common module TEQ = FStarC.TypeChecker.TermEqAndSimplify -module CList = FStarC.Compiler.CList +module CList = FStarC.CList let dbg_Disch = Debug.get_toggle "Disch" let dbg_Discharge = Debug.get_toggle "Discharge" diff --git a/src/typechecker/FStarC.TypeChecker.Rel.fsti b/src/typechecker/FStarC.TypeChecker.Rel.fsti index 8f58dfac52c..66e040613ca 100644 --- a/src/typechecker/FStarC.TypeChecker.Rel.fsti +++ b/src/typechecker/FStarC.TypeChecker.Rel.fsti @@ -16,17 +16,17 @@ module FStarC.TypeChecker.Rel open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.TypeChecker open FStarC.Syntax open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax open FStarC.TypeChecker.Common -open FStarC.Compiler.Range +open FStarC.Range open FStarC.Class.Show type match_result = diff --git a/src/typechecker/FStarC.TypeChecker.Tc.fst b/src/typechecker/FStarC.TypeChecker.Tc.fst index 666d19baeb6..b7562bcfe65 100644 --- a/src/typechecker/FStarC.TypeChecker.Tc.fst +++ b/src/typechecker/FStarC.TypeChecker.Tc.fst @@ -16,15 +16,15 @@ module FStarC.TypeChecker.Tc open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Errors open FStarC.TypeChecker open FStarC.TypeChecker.Common open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Syntax open FStarC.Syntax.Syntax @@ -46,7 +46,7 @@ module UF = FStarC.Syntax.Unionfind module N = FStarC.TypeChecker.Normalize module TcComm = FStarC.TypeChecker.Common module TcUtil = FStarC.TypeChecker.Util -module BU = FStarC.Compiler.Util //basic util +module BU = FStarC.Util //basic util module U = FStarC.Syntax.Util module Gen = FStarC.TypeChecker.Generalize module TcInductive = FStarC.TypeChecker.TcInductive diff --git a/src/typechecker/FStarC.TypeChecker.Tc.fsti b/src/typechecker/FStarC.TypeChecker.Tc.fsti index 7aa6e1b4afd..2b6f46e5c68 100644 --- a/src/typechecker/FStarC.TypeChecker.Tc.fsti +++ b/src/typechecker/FStarC.TypeChecker.Tc.fsti @@ -14,8 +14,8 @@ limitations under the License. *) module FStarC.TypeChecker.Tc -open FStarC.Compiler.Effect -open FStarC.Compiler.Effect +open FStarC.Effect +open FStarC.Effect open FStarC.Syntax.Syntax open FStarC.TypeChecker.Env open FStarC.TypeChecker.Common diff --git a/src/typechecker/FStarC.TypeChecker.TcEffect.fst b/src/typechecker/FStarC.TypeChecker.TcEffect.fst index 152c5110ef0..c5e454e69d0 100644 --- a/src/typechecker/FStarC.TypeChecker.TcEffect.fst +++ b/src/typechecker/FStarC.TypeChecker.TcEffect.fst @@ -15,14 +15,14 @@ *) module FStarC.TypeChecker.TcEffect open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Syntax open FStarC.TypeChecker -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Errors open FStarC.Syntax.Syntax @@ -40,7 +40,7 @@ module TcUtil = FStarC.TypeChecker.Util module Gen = FStarC.TypeChecker.Generalize module TEQ = FStarC.TypeChecker.TermEqAndSimplify -module BU = FStarC.Compiler.Util +module BU = FStarC.Util open FStarC.Class.Show open FStarC.Class.Tagged diff --git a/src/typechecker/FStarC.TypeChecker.TcEffect.fsti b/src/typechecker/FStarC.TypeChecker.TcEffect.fsti index b6449e38809..9310dde8ac1 100644 --- a/src/typechecker/FStarC.TypeChecker.TcEffect.fsti +++ b/src/typechecker/FStarC.TypeChecker.TcEffect.fsti @@ -15,10 +15,10 @@ *) module FStarC.TypeChecker.TcEffect -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Ident module S = FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.TcInductive.fst b/src/typechecker/FStarC.TypeChecker.TcInductive.fst index e337895a1ce..ff24df44b47 100644 --- a/src/typechecker/FStarC.TypeChecker.TcInductive.fst +++ b/src/typechecker/FStarC.TypeChecker.TcInductive.fst @@ -17,14 +17,14 @@ *) module FStarC.TypeChecker.TcInductive open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Errors open FStarC.TypeChecker open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Syntax open FStarC.Syntax.Syntax @@ -39,7 +39,7 @@ module SS = FStarC.Syntax.Subst module N = FStarC.TypeChecker.Normalize module TcUtil = FStarC.TypeChecker.Util module Gen = FStarC.TypeChecker.Generalize -module BU = FStarC.Compiler.Util //basic util +module BU = FStarC.Util //basic util module U = FStarC.Syntax.Util module PP = FStarC.Syntax.Print module C = FStarC.Parser.Const diff --git a/src/typechecker/FStarC.TypeChecker.TcInductive.fsti b/src/typechecker/FStarC.TypeChecker.TcInductive.fsti index 53b6ca291de..9700d95706a 100644 --- a/src/typechecker/FStarC.TypeChecker.TcInductive.fsti +++ b/src/typechecker/FStarC.TypeChecker.TcInductive.fsti @@ -15,12 +15,12 @@ *) module FStarC.TypeChecker.TcInductive -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Syntax open FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.TcTerm.fst b/src/typechecker/FStarC.TypeChecker.TcTerm.fst index 28e7720dec6..9c071ca7689 100644 --- a/src/typechecker/FStarC.TypeChecker.TcTerm.fst +++ b/src/typechecker/FStarC.TypeChecker.TcTerm.fst @@ -16,16 +16,16 @@ module FStarC.TypeChecker.TcTerm open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.Errors open FStarC.Defensive open FStarC.TypeChecker open FStarC.TypeChecker.Common open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Syntax open FStarC.Syntax.Syntax @@ -47,7 +47,7 @@ module TcComm = FStarC.TypeChecker.Common module N = FStarC.TypeChecker.Normalize module TcUtil = FStarC.TypeChecker.Util module Gen = FStarC.TypeChecker.Generalize -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module PP = FStarC.Syntax.Print module UF = FStarC.Syntax.Unionfind diff --git a/src/typechecker/FStarC.TypeChecker.TcTerm.fsti b/src/typechecker/FStarC.TypeChecker.TcTerm.fsti index 3c1b03af993..245641dcb02 100644 --- a/src/typechecker/FStarC.TypeChecker.TcTerm.fsti +++ b/src/typechecker/FStarC.TypeChecker.TcTerm.fsti @@ -16,12 +16,12 @@ module FStarC.TypeChecker.TcTerm open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker open FStarC.TypeChecker.Env -open FStarC.Compiler.Util +open FStarC.Util open FStarC.Ident open FStarC.Syntax open FStarC.Syntax.Syntax @@ -32,7 +32,7 @@ open FStarC.TypeChecker.Rel open FStarC.TypeChecker.Common val level_of_type: env -> term -> typ -> universe //the term argument is for error reporting only -val tc_constant: env -> FStarC.Compiler.Range.range -> sconst -> typ +val tc_constant: env -> FStarC.Range.range -> sconst -> typ val tc_binders: env -> binders -> binders & env & guard_t & universes val tc_term: env -> term -> term & lcomp & guard_t val tc_maybe_toplevel_term: env -> term -> term & lcomp & guard_t diff --git a/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fst b/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fst index 2a9b017480c..7f93d17a00c 100644 --- a/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fst +++ b/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fst @@ -1,9 +1,9 @@ module FStarC.TypeChecker.TermEqAndSimplify open FStarC open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC.Effect +open FStarC +open FStarC.Util open FStarC.Syntax open FStarC.Const open FStarC.Ident @@ -14,7 +14,7 @@ module SS = FStarC.Syntax.Subst module U = FStarC.Syntax.Util module PC = FStarC.Parser.Const module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util open FStarC.Class.Tagged open FStarC.Class.Show diff --git a/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fsti b/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fsti index 1d31266665f..53f2d304faa 100644 --- a/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fsti +++ b/src/typechecker/FStarC.TypeChecker.TermEqAndSimplify.fsti @@ -1,6 +1,6 @@ module FStarC.TypeChecker.TermEqAndSimplify open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStarC.TypeChecker.Env open FStarC.Syntax.Syntax diff --git a/src/typechecker/FStarC.TypeChecker.Util.fst b/src/typechecker/FStarC.TypeChecker.Util.fst index d2eca1faae6..05e7e464a56 100644 --- a/src/typechecker/FStarC.TypeChecker.Util.fst +++ b/src/typechecker/FStarC.TypeChecker.Util.fst @@ -16,11 +16,11 @@ module FStarC.TypeChecker.Util open FStar.Pervasives -open FStarC.Compiler.Effect -open FStarC.Compiler.List +open FStarC.Effect +open FStarC.List open FStar open FStarC -open FStarC.Compiler -open FStarC.Compiler.Util +open FStarC +open FStarC.Util open FStarC.Errors open FStarC.Errors.Msg open FStarC.Pprint @@ -42,7 +42,7 @@ module Listlike = FStarC.Class.Listlike module SS = FStarC.Syntax.Subst module S = FStarC.Syntax.Syntax -module BU = FStarC.Compiler.Util +module BU = FStarC.Util module U = FStarC.Syntax.Util module N = FStarC.TypeChecker.Normalize module TcComm = FStarC.TypeChecker.Common diff --git a/src/typechecker/FStarC.TypeChecker.Util.fsti b/src/typechecker/FStarC.TypeChecker.Util.fsti index af2e8733647..c191240052a 100644 --- a/src/typechecker/FStarC.TypeChecker.Util.fsti +++ b/src/typechecker/FStarC.TypeChecker.Util.fsti @@ -16,10 +16,10 @@ module FStarC.TypeChecker.Util open FStar.Pervasives -open FStarC.Compiler.Effect +open FStarC.Effect open FStar open FStarC -open FStarC.Compiler +open FStarC open FStarC.TypeChecker open FStarC.Syntax open FStarC.TypeChecker.Env diff --git a/ulib/ml/plugin/FStar_Issue.ml b/ulib/ml/plugin/FStar_Issue.ml index 7a1c49b10ed..a01130994e8 100644 --- a/ulib/ml/plugin/FStar_Issue.ml +++ b/ulib/ml/plugin/FStar_Issue.ml @@ -33,7 +33,7 @@ let render_issue (i:issue) : string = FStarC_Errors.format_issue i let mk_issue_doc (i:issue_level_string) (msg:FStarC_Pprint.document list) - (range:FStarC_Compiler_Range.range option) + (range:FStarC_Range.range option) (number:Z.t option) (ctx:string list) = { issue_level = mk_issue_level i; @@ -45,7 +45,7 @@ let mk_issue_doc (i:issue_level_string) (* repeated... could be extracted *) let mk_issue (i:issue_level_string) (msg:string) - (range:FStarC_Compiler_Range.range option) + (range:FStarC_Range.range option) (number:Z.t option) (ctx:string list) = { issue_level = mk_issue_level i; diff --git a/ulib/ml/plugin/FStar_Range.ml b/ulib/ml/plugin/FStar_Range.ml index f0b0bce3405..c615d145464 100644 --- a/ulib/ml/plugin/FStar_Range.ml +++ b/ulib/ml/plugin/FStar_Range.ml @@ -1,9 +1,9 @@ -type __range = Fstarcompiler.FStarC_Compiler_Range_Type.range +type __range = Fstarcompiler.FStarC_Range_Type.range type range = __range -let mk_range f a b c d = Fstarcompiler.FStarC_Compiler_Range_Type.mk_range f {line=a;col=b} {line=c;col=d} +let mk_range f a b c d = Fstarcompiler.FStarC_Range_Type.mk_range f {line=a;col=b} {line=c;col=d} let range_0 : range = let z = Prims.parse_int "0" in mk_range "dummy" z z z z -let join_range r1 r2 = Fstarcompiler.FStarC_Compiler_Range_Ops.union_ranges r1 r2 +let join_range r1 r2 = Fstarcompiler.FStarC_Range_Ops.union_ranges r1 r2 let explode (r:__range) = (r.use_range.file_name, diff --git a/ulib/ml/plugin/FStar_Reflection_Typing_Builtins.ml b/ulib/ml/plugin/FStar_Reflection_Typing_Builtins.ml index beff4838244..c0ad1c3e3c0 100644 --- a/ulib/ml/plugin/FStar_Reflection_Typing_Builtins.ml +++ b/ulib/ml/plugin/FStar_Reflection_Typing_Builtins.ml @@ -1,6 +1,6 @@ open Fstarcompiler open FStarC_Syntax_Syntax -module R = FStarC_Compiler_Range +module R = FStarC_Range let dummy_range = R.dummyRange let underscore = FStarC_Ident.mk_ident ("_", R.dummyRange)