give HaskWeak its own type representation, fix numerous bugs

[coq-hetmet.git] / src / HaskCoreVars.v

diff --git a/src/HaskCoreVars.v b/src/HaskCoreVars.v
index a55c09b..6e61128 100644 (file)
--- a/src/HaskCoreVars.v
+++ b/src/HaskCoreVars.v
@@ -5,14 +5,10 @@
 Generalizable All Variables.
 Require Import Preamble.
 Require Import General.
 Generalizable All Variables.
 Require Import Preamble.
 Require Import General.

-Require Import HaskGeneral.

 
 (* GHC uses a single type for expression variables, type variables, and coercion variables; this is that type *)
 Variable CoreVar          : Type.                                               Extract Inlined Constant CoreVar    => "Var.Var".
 Variable coreVar_eq       : forall (a b:CoreVar), sumbool (a=b) (not (a=b)).    Extract Inlined Constant coreVar_eq => "(==)".
 Axiom    coreVar_eq_refl  : forall v, (coreVar_eq v v) = (left _ (refl_equal v)).
 
 (* GHC uses a single type for expression variables, type variables, and coercion variables; this is that type *)
 Variable CoreVar          : Type.                                               Extract Inlined Constant CoreVar    => "Var.Var".
 Variable coreVar_eq       : forall (a b:CoreVar), sumbool (a=b) (not (a=b)).    Extract Inlined Constant coreVar_eq => "(==)".
 Axiom    coreVar_eq_refl  : forall v, (coreVar_eq v v) = (left _ (refl_equal v)).

-Instance CoreVarEqDecidable : EqDecidable CoreVar :=
-{ eqd_dec            := coreVar_eq
-(*; eqd_dec_reflexive  := coreVar_eq_refl*)
-}.
+Instance CoreVarEqDecidable : EqDecidable CoreVar := { eqd_dec            := coreVar_eq }.