X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=blobdiff_plain;f=src%2FHaskCoreVars.v;h=9225974e0dc3e7a2a6db4a52c432495f64ccca9d;hp=be64e5b44634400dac3d5b5db8a105de8fb3aa32;hb=635ee434c9edbad1bc6c9bf5ba2b91cb8c51be8e;hpb=112daf37524662d6d2267d3f7e50ff3522683b8f

diff --git a/src/HaskCoreVars.v b/src/HaskCoreVars.v
index be64e5b..9225974 100644
--- a/src/HaskCoreVars.v
+++ b/src/HaskCoreVars.v
@@ -5,14 +5,12 @@
 Generalizable All Variables.
 Require Import Preamble.
 Require Import General.
-Require Import HaskGeneral.
+Require Import Coq.Strings.String.
 
 (* 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
-}.
-
+Variable coreVarToString  : CoreVar      -> string.  Extract Inlined Constant coreVarToString         => "outputableToString".
+Instance CoreVarEqDecidable : EqDecidable CoreVar := { eqd_dec            := coreVar_eq }.
+Instance CoreVarToString : ToString CoreVar :=
+  { toString := coreVarToString }.