git.iko.soy/elk
on master help sign in
Do not need to give expectedName when def names don't match
90f1d38Evan Czaplicki
compiler/src/Parse/Declaration.hs+3−3
compare with master
unifiedsplit
@@ -108,19 +108,19 @@ chompDefArgsAndBody maybeDocs start name tipe revArgs =
108chompMatchingName :: Name.Name -> Parser E.DeclDef (A.Located Name.Name)
108chompMatchingName :: Name.Name -> Parser E.DeclDef (A.Located Name.Name)
109chompMatchingName expectedName =
109chompMatchingName expectedName =
110 let
110 let
111− (P.Parser parserL) = Var.lower (E.DeclDefNameRepeat expectedName)
111+ (P.Parser parserL) = Var.lower E.DeclDefNameRepeat
112 in
112 in
113 P.Parser $ \state@(P.State _ _ _ sr sc) cok eok cerr eerr ->
113 P.Parser $ \state@(P.State _ _ _ sr sc) cok eok cerr eerr ->
114 let
114 let
115 cokL name newState@(P.State _ _ _ er ec) =
115 cokL name newState@(P.State _ _ _ er ec) =
116 if expectedName == name
116 if expectedName == name
117 then cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState
117 then cok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState
118− else cerr sr sc (E.DeclDefNameMatch expectedName name)
118+ else cerr sr sc (E.DeclDefNameMatch name)
119
119
120 eokL name newState@(P.State _ _ _ er ec) =
120 eokL name newState@(P.State _ _ _ er ec) =
121 if expectedName == name
121 if expectedName == name
122 then eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState
122 then eok (A.At (A.Region (A.Position sr sc) (A.Position er ec)) name) newState
123− else eerr sr sc (E.DeclDefNameMatch expectedName name)
123+ else eerr sr sc (E.DeclDefNameMatch name)
124 in
124 in
125 parserL state cokL eokL cerr eerr
125 parserL state cokL eokL cerr eerr
126
126