idris-lang/Idris2
1
1
Fork 0
mirror of https://github.com/idris-lang/Idris2.git synced 2025-01-07 00:07:19 +03:00
Code Issues Projects Releases Wiki Activity

[ cleanup ] parser long lines

Browse Source
This commit is contained in:
Guillaume ALLAIS 2021-02-16 15:49:41 +00:00 committed by G. Allais
parent 7401961425
commit e9f4dc5252
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Idris/Parser.idr
View File

@ -137,7 +137,8 @@ mutual
applyExpImp start end f (UnnamedAutoArg imp :: args) applyExpImp start end f (UnnamedAutoArg imp :: args)
= applyExpImp start end (PAutoApp (MkFC fname start end) f imp) args = applyExpImp start end (PAutoApp (MkFC fname start end) f imp) args
applyExpImp start end f (NamedArg n imp :: args) applyExpImp start end f (NamedArg n imp :: args)
= applyExpImp start end (PNamedApp (MkFC fname start end) f n imp) args = let fc = MkFC fname start end in
applyExpImp start end (PNamedApp fc f n imp) args
applyExpImp start end f (WithArg exp :: args) applyExpImp start end f (WithArg exp :: args)
= applyExpImp start end (PWithApp (MkFC fname start end) f exp) args = applyExpImp start end (PWithApp (MkFC fname start end) f exp) args
@ -157,22 +158,27 @@ mutual
pure [WithArg arg] pure [WithArg arg]
else fail "| not allowed here" else fail "| not allowed here"
where where
underscore : FC -> ArgType
underscore fc = NamedArg (UN "_") (PImplicit fc)
braceArgs : FileName -> IndentInfo -> Rule (List ArgType) braceArgs : FileName -> IndentInfo -> Rule (List ArgType)
braceArgs fname indents braceArgs fname indents
= do start <- bounds (symbol "{") = do start <- bounds (symbol "{")
list <- sepBy (symbol ",") list <- sepBy (symbol ",")
$ do x <- bounds unqualifiedName $ do x <- bounds unqualifiedName
option (NamedArg (UN x.val) $ PRef (boundToFC fname x) (UN x.val)) let fc = boundToFC fname x
option (NamedArg (UN x.val) $ PRef fc (UN x.val))
$ do tm <- symbol "=" *> expr pdef fname indents $ do tm <- symbol "=" *> expr pdef fname indents
pure (NamedArg (UN x.val) tm) pure (NamedArg (UN x.val) tm)
matchAny <- option [] (if isCons list then matchAny <- option [] (if isCons list then
do symbol "," do symbol ","
x <- bounds (symbol "_") x <- bounds (symbol "_")
pure [NamedArg (UN "_") (PImplicit (boundToFC fname x))] pure [underscore (boundToFC fname x)]
else fail "non-empty list required") else fail "non-empty list required")
end <- bounds (symbol "}") end <- bounds (symbol "}")
matchAny <- pure $ if isNil list matchAny <- do let fc = boundToFC fname (mergeBounds start end)
then [NamedArg (UN "_") (PImplicit (boundToFC fname (mergeBounds start end)))] pure $ if isNil list
then [underscore fc]
else matchAny else matchAny
pure $ matchAny ++ list pure $ matchAny ++ list
@ -611,7 +617,8 @@ mutual
caseRHS fname start indents lhs caseRHS fname start indents lhs
= do rhs <- bounds (symbol "=>" *> mustContinue indents Nothing *> expr pdef fname indents) = do rhs <- bounds (symbol "=>" *> mustContinue indents Nothing *> expr pdef fname indents)
atEnd indents atEnd indents
pure (MkPatClause (boundToFC fname (mergeBounds start rhs)) lhs rhs.val []) let fc = boundToFC fname (mergeBounds start rhs)
pure (MkPatClause fc lhs rhs.val [])
<|> do end <- bounds (keyword "impossible") <|> do end <- bounds (keyword "impossible")
atEnd indents atEnd indents
pure (MkImpossible (boundToFC fname (mergeBounds start end)) lhs) pure (MkImpossible (boundToFC fname (mergeBounds start end)) lhs)
@ -679,8 +686,8 @@ mutual
(ns, "do") => (ns, "do") =>
do commit do commit
actions <- bounds (block (doAct fname)) actions <- bounds (block (doAct fname))
pure (PDoBlock (boundToFC fname (mergeBounds nsdo actions)) let fc = boundToFC fname (mergeBounds nsdo actions)
ns (concat actions.val)) pure (PDoBlock fc ns (concat actions.val))
_ => fail "Not a namespaced 'do'" _ => fail "Not a namespaced 'do'"
validPatternVar : Name -> SourceEmptyRule () validPatternVar : Name -> SourceEmptyRule ()
@ -718,7 +725,8 @@ mutual
pure (val, alts)) pure (val, alts))
atEnd indents atEnd indents
(v, alts) <- pure b.val (v, alts) <- pure b.val
pure [DoBindPat (boundToFC fname (mergeBounds e b)) e.val v alts]) let fc = boundToFC fname (mergeBounds e b)
pure [DoBindPat fc e.val v alts])
patAlt : FileName -> IndentInfo -> Rule PClause patAlt : FileName -> IndentInfo -> Rule PClause
patAlt fname indents patAlt fname indents
@ -807,7 +815,8 @@ mutual
pure (rhs, ws))) pure (rhs, ws)))
atEnd indents atEnd indents
(rhs, ws) <- pure b.val (rhs, ws) <- pure b.val
pure (MkPatClause (boundToFC fname (mergeBounds start b)) lhs rhs ws) let fc = boundToFC fname (mergeBounds start b)
pure (MkPatClause fc lhs rhs ws)
<|> do b <- bounds (do keyword "with" <|> do b <- bounds (do keyword "with"
flags <- bounds (withFlags) flags <- bounds (withFlags)
symbol "(" symbol "("
@ -815,7 +824,8 @@ mutual
ws <- nonEmptyBlock (clause (S withArgs) fname) ws <- nonEmptyBlock (clause (S withArgs) fname)
pure (flags, wval, forget ws)) pure (flags, wval, forget ws))
(flags, wval, ws) <- pure b.val (flags, wval, ws) <- pure b.val
pure (MkWithClause (boundToFC fname (mergeBounds start b)) lhs wval flags.val ws) let fc = boundToFC fname (mergeBounds start b)
pure (MkWithClause fc lhs wval flags.val ws)
<|> do end <- bounds (keyword "impossible") <|> do end <- bounds (keyword "impossible")
atEnd indents atEnd indents
pure (MkImpossible (boundToFC fname (mergeBounds start end)) lhs) pure (MkImpossible (boundToFC fname (mergeBounds start end)) lhs)