diff options
| author | Einhard Leichtfuß <alguien@respiranto.de> | 2025-05-20 19:40:53 +0200 |
|---|---|---|
| committer | Einhard Leichtfuß <alguien@respiranto.de> | 2025-05-20 22:36:30 +0200 |
| commit | fd94a9d8a3e4fc86e5128715a2bc68187c872970 (patch) | |
| tree | acee31c8049cbcd6b8c73c7e55192eca1203486b /src/Language/SimpleShell/Parser/Expr.hs | |
| parent | b40c163b40615ccd46a80d9119262f9c386bac63 (diff) | |
Reduce name parsers to nameP
There is no good reason to have different syntax for variable and
function names, for example.
Diffstat (limited to 'src/Language/SimpleShell/Parser/Expr.hs')
| -rw-r--r-- | src/Language/SimpleShell/Parser/Expr.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Language/SimpleShell/Parser/Expr.hs b/src/Language/SimpleShell/Parser/Expr.hs index 05120ce..1c782bc 100644 --- a/src/Language/SimpleShell/Parser/Expr.hs +++ b/src/Language/SimpleShell/Parser/Expr.hs @@ -17,7 +17,7 @@ import Language.SimpleShell.Parser , lookupVar , lookupFun ) -import Language.SimpleShell.Parser.Name (funNameP, varNameP, keyword) +import Language.SimpleShell.Parser.Name (nameP, keyword) import Language.SimpleShell.Parser.SimpleType (forceType) import Control.Monad.Combinators.FailExpr ( Associativity(..) @@ -70,13 +70,13 @@ literalP varP :: Parser TypedExpr varP = do _ <- char '$' - x <- varNameP + x <- nameP t <- lookupVar x return (t, Var x) funP :: Parser TypedExpr funP = do - fname <- funNameP + fname <- nameP (t', ts) <- lookupFun fname args <- mapM (strongTermP' "Type mismatch with function signature.") ts return (t', FunCall fname args) |