[when converting to E from Hs, don't convert types to schemes and back when using the boxy typechecker
John Meacham <john@repetae.net>**20060308061237] hunk ./DataConstructors.hs 46
+import FrontEnd.Tc.Type
hunk ./DataConstructors.hs 49
+import Type(typeToScheme)
hunk ./DataConstructors.hs 51
-import Type(schemeToType)
hunk ./DataConstructors.hs 338
-toDataTable :: (Map Name Kind) -> (Map Name Scheme) -> [HsDecl] -> DataTable
+toDataTable :: (Map Name Kind) -> (Map Name Type) -> [HsDecl] -> DataTable
hunk ./DataConstructors.hs 389
-            Just (Forall _ (_ :=> ty)) = Map.lookup dataConsName cm
+            Just (Forall _ (_ :=> ty)) = fmap typeToScheme $ Map.lookup dataConsName cm
+            --Just (_,_,ty) = fmap fromType $ Map.lookup dataConsName cm
hunk ./E/FromHs.hs 66
-import Type(schemeToType)
hunk ./E/FromHs.hs 165
-        Just z -> fromSigma $ schemeToType z
+        Just z -> fromSigma  z
hunk ./E/FromHs.hs 302
-convertRules :: TiData -> ClassHierarchy -> Map.Map Name Scheme -> DataTable -> [HsDecl] -> IO [(String,[TVr],E,E)]
+convertRules :: TiData -> ClassHierarchy -> Map.Map Name Type -> DataTable -> [HsDecl] -> IO [(String,[TVr],E,E)]
hunk ./E/FromHs.hs 326
-convertE :: Monad m => TiData -> ClassHierarchy -> Map.Map Name Scheme -> DataTable -> SrcLoc -> HsExp -> m E
+convertE :: Monad m => TiData -> ClassHierarchy -> Map.Map Name Type -> DataTable -> SrcLoc -> HsExp -> m E
hunk ./E/FromHs.hs 363
-convertDecls :: Monad m => TiData -> ClassHierarchy -> Map.Map Name Scheme -> DataTable -> [HsDecl] -> m [(Name,TVr,E)]
+convertDecls :: Monad m => TiData -> ClassHierarchy -> Map.Map Name Type -> DataTable -> [HsDecl] -> m [(Name,TVr,E)]
hunk ./E/FromHs.hs 367
-        ceAssumps = Map.map schemeToType assumps,
+        ceAssumps = assumps,
hunk ./E/FromHs.hs 540
-        Just z -> schemeToType z
+        Just z -> z
hunk ./E/FromHs.hs 543
-        Just z -> schemeToType z
+        Just z -> z
hunk ./FrontEnd/TI/Module.hs 40
+import Type
hunk ./FrontEnd/TI/Module.hs 115
-    let importVarEnv = Map.fromList [ (x,y) | (x,y) <- Map.toList $ hoAssumps me, nameType x == Name.Val ]
-        importDConsEnv = Map.fromList [ (x,y) | (x,y) <- Map.toList $ hoAssumps me, nameType x ==  Name.DataConstructor ]
+    let importVarEnv = Map.fromList [ (x,typeToScheme y) | (x,y) <- Map.toList $ hoAssumps me, nameType x == Name.Val ]
+        importDConsEnv = Map.fromList [ (x,typeToScheme y) | (x,y) <- Map.toList $ hoAssumps me, nameType x ==  Name.DataConstructor ]
hunk ./FrontEnd/TI/Module.hs 266
-        hoAssumps = expAssumps,
+        hoAssumps = Map.map schemeToType expAssumps,
hunk ./FrontEnd/TI/Module.hs 283
-            tiAllAssumptions = allAssumps
+            tiAllAssumptions = Map.map schemeToType allAssumps
hunk ./FrontEnd/Tc/Module.hs 103
-    let importVarEnv = Map.fromList [ (x,y) | (x,y) <- Map.toList $ hoAssumps me, nameType x == Name.Val ]
-        importDConsEnv = Map.fromList [ (x,y) | (x,y) <- Map.toList $ hoAssumps me, nameType x ==  Name.DataConstructor ]
+    let importVarEnv = Map.fromList [ (x,typeToScheme y) | (x,y) <- Map.toList $ hoAssumps me, nameType x == Name.Val ]
+        importDConsEnv = Map.fromList [ (x,typeToScheme y) | (x,y) <- Map.toList $ hoAssumps me, nameType x ==  Name.DataConstructor ]
hunk ./FrontEnd/Tc/Module.hs 192
-        noDefaultSigs = Map.fromList [ (n,maybe (error $ "sigEnv:"  ++ show n) id $ Map.lookup n sigEnv) | n <- classNoDefaults ]
+        noDefaultSigs = Map.fromList [ (n,schemeToType $ maybe (error $ "sigEnv:"  ++ show n) id $ Map.lookup n sigEnv) | n <- classNoDefaults ]
hunk ./FrontEnd/Tc/Module.hs 242
-    localVarEnv <- return $ Map.map typeToScheme localVarEnv
-
hunk ./FrontEnd/Tc/Module.hs 248
-    let allAssumps = localDConsEnv `Map.union` localVarEnv
-        expAssumps = localDConsEnv `Map.union` externalEnv
+    let allAssumps = Map.map schemeToType localDConsEnv `Map.union` localVarEnv
+        expAssumps = Map.map schemeToType localDConsEnv `Map.union` externalEnv
hunk ./FrontEnd/TiData.hs 19
-    tiAllAssumptions :: Map.Map Name Scheme
+    tiAllAssumptions :: Map.Map Name Type
hunk ./Ho/Type.hs 18
-import Representation(Scheme)
+import Representation(Type())
hunk ./Ho/Type.hs 49
-    hoAssumps :: Map.Map Name Scheme,        -- used for typechecking
+    hoAssumps :: Map.Map Name Type,        -- used for typechecking
hunk ./Interactive.hs 41
-import qualified FrontEnd.TI.Main as TI(tiProgram)
hunk ./Interactive.hs 42
-import Type(schemeToType)
hunk ./Interactive.hs 43
+import Type(schemeToType)
hunk ./Interactive.hs 188
-    tcStatement stmt'''
+    tcStatementTc stmt'''
hunk ./Interactive.hs 190
+{-
hunk ./Interactive.hs 216
+    -}
hunk ./Interactive.hs 225
-        tcInfoEnv = Map.map schemeToType (hoAssumps ho),
+        tcInfoEnv = (hoAssumps ho),
hunk ./Main.hs 230
+
+    Stats.print "PostProcess" stats
+    Stats.clear stats