@@ -357,12 +357,12 @@ entails env moduleName context = solve (sortedNubBy canonicalizeDictionary (filt
357 -- Turn a DictionaryValue into a Expr
357 -- Turn a DictionaryValue into a Expr
358 dictionaryValueToValue :: DictionaryValue -> Expr
358 dictionaryValueToValue :: DictionaryValue -> Expr
359 dictionaryValueToValue (LocalDictionaryValue fnName) = Var fnName
359 dictionaryValueToValue (LocalDictionaryValue fnName) = Var fnName
360− dictionaryValueToValue (GlobalDictionaryValue fnName) = App (Var fnName) valUnit
360+ dictionaryValueToValue (GlobalDictionaryValue fnName) = App (Var fnName) valUndefined
361 dictionaryValueToValue (DependentDictionaryValue fnName dicts) = foldl App (Var fnName) (map dictionaryValueToValue dicts)
361 dictionaryValueToValue (DependentDictionaryValue fnName dicts) = foldl App (Var fnName) (map dictionaryValueToValue dicts)
362 dictionaryValueToValue (SubclassDictionaryValue dict superclassName index) =
362 dictionaryValueToValue (SubclassDictionaryValue dict superclassName index) =
363 App (Accessor (C.__superclass_ ++ show superclassName ++ "_" ++ show index)
363 App (Accessor (C.__superclass_ ++ show superclassName ++ "_" ++ show index)
364 (dictionaryValueToValue dict))
364 (dictionaryValueToValue dict))
365− valUnit
365+ valUndefined
366 -- Ensure that a substitution is valid
366 -- Ensure that a substitution is valid
367 verifySubstitution :: [(String, Type)] -> Maybe [(String, Type)]
367 verifySubstitution :: [(String, Type)] -> Maybe [(String, Type)]
368 verifySubstitution subst = do
368 verifySubstitution subst = do
@@ -393,8 +393,8 @@ entails env moduleName context = solve (sortedNubBy canonicalizeDictionary (filt
393 dictTrace (SubclassDictionaryValue dict _ _) = dictTrace dict
393 dictTrace (SubclassDictionaryValue dict _ _) = dictTrace dict
394 dictTrace other = other
394 dictTrace other = other
396− valUnit :: Expr
396+ valUndefined :: Expr
397− valUnit = Var (Qualified (Just (ModuleName [ProperName C.prim])) (Ident C.undefined))
397+ valUndefined = Var (Qualified (Just (ModuleName [ProperName C.prim])) (Ident C.undefined))
400-- Check all values in a list pairwise match a predicate
400-- Check all values in a list pairwise match a predicate