git.iko.soy/elk
on master help sign in
Minor edits for DeclareRec change (guaranteeing one Def)
5f1d0f5Evan Czaplicki
compiler/src/Nitpick/PatternMatches.hs+2−2
compare with master
unifiedsplit
@@ -222,8 +222,8 @@ checkDecls decls errors =
222 Can.Declare def subDecls ->
222 Can.Declare def subDecls ->
223 checkDef def $ checkDecls subDecls errors
223 checkDef def $ checkDecls subDecls errors
224
224
225− Can.DeclareRec defs subDecls ->
225+ Can.DeclareRec def defs subDecls ->
226− foldr checkDef (checkDecls subDecls errors) defs
226+ checkDef def (foldr checkDef (checkDecls subDecls errors) defs)
227
227
228 Can.SaveTheEnvironment ->
228 Can.SaveTheEnvironment ->
229 errors
229 errors
compiler/src/Type/Constrain/Module.hs+2−2
@@ -57,8 +57,8 @@ constrainDecls decls finalConstraint =
57 Can.Declare def otherDecls ->
57 Can.Declare def otherDecls ->
58 Expr.constrainDef Map.empty def =<< constrainDecls otherDecls finalConstraint
58 Expr.constrainDef Map.empty def =<< constrainDecls otherDecls finalConstraint
59
59
60− Can.DeclareRec defs otherDecls ->
60+ Can.DeclareRec def defs otherDecls ->
61− Expr.constrainRecursiveDefs Map.empty defs =<< constrainDecls otherDecls finalConstraint
61+ Expr.constrainRecursiveDefs Map.empty (def:defs) =<< constrainDecls otherDecls finalConstraint
62
62
63 Can.SaveTheEnvironment ->
63 Can.SaveTheEnvironment ->
64 return finalConstraint
64 return finalConstraint