From ffed37084cd0d529a5be98266ed4946cd251e645 Mon Sep 17 00:00:00 2001 From: Thomas Bauereiss Date: Fri, 21 Jul 2017 13:32:37 +0100 Subject: Switch to new typechecker (almost) Initial typecheck still uses previous typechecker --- src/spec_analysis.mli | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/spec_analysis.mli') diff --git a/src/spec_analysis.mli b/src/spec_analysis.mli index fa8dad3b..7c6f3685 100644 --- a/src/spec_analysis.mli +++ b/src/spec_analysis.mli @@ -42,13 +42,7 @@ open Ast open Util -open Big_int -open Type_internal - -type typ = Type_internal.t - -(*Returns the declared default order of a set of definitions, defaulting to Inc if no default is provided *) -val default_order : tannot defs -> order +open Type_check_new (*Determines if the first typ is within the range of the the second typ, using the constraints provided when the first typ contains variables. @@ -58,19 +52,19 @@ val default_order : tannot defs -> order to be anything other than a vector, a range, an atom, or a bit (after suitable unwrapping of abbreviations, reg, and registers). *) -val is_within_range: typ -> typ -> nexp_range list -> triple -val is_within_machine64 : typ -> nexp_range list -> triple +(* val is_within_range: typ -> typ -> nexp_range list -> triple +val is_within_machine64 : typ -> nexp_range list -> triple *) (* free variables and dependencies *) (*fv_of_def consider_ty_vars consider_scatter_as_one all_defs all_defs def -> (bound_by_def, free_in_def) *) -val fv_of_def: bool -> bool -> (tannot def) list -> tannot def -> Nameset.t * Nameset.t +(* val fv_of_def: bool -> bool -> ('a def) list -> 'a def -> Nameset.t * Nameset.t *) (*group_defs consider_scatter_as_one all_defs -> ((bound_by_def, free_in_def), def) list *) -val group_defs : bool -> tannot defs -> ((Nameset.t * Nameset.t) * (tannot def)) list +(* val group_defs : bool -> 'a defs -> ((Nameset.t * Nameset.t) * ('a def)) list *) (*reodering definitions, initial functions *) (* produce a new ordering for defs, limiting to those listed in the list, which respects dependencies *) -val restrict_defs : tannot defs -> string list -> tannot defs +(* val restrict_defs : 'a defs -> string list -> 'a defs *) val top_sort_defs : tannot defs -> tannot defs -- cgit v1.2.3