From 2b0b62b44a87536597050c525322c7bcc745bdb2 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 3 Jun 2020 22:57:10 +0200 Subject: Added polynom solver from computorv1, Added matrix multipilcation --- src/parser/Statement.hs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/parser/Statement.hs') diff --git a/src/parser/Statement.hs b/src/parser/Statement.hs index ca16eca..889f24f 100644 --- a/src/parser/Statement.hs +++ b/src/parser/Statement.hs @@ -9,19 +9,22 @@ import Parser.Expr data Statement = Evaluation Expr + | PolynomEvaluation Expr Expr | VariableDeclaration String Expr | FunctionDeclaration String String Expr statementP :: Parser Statement -statementP = functionDeclarationP <|> variableDeclarationP <|> evaluationP +statementP = functionDeclarationP <|> variableDeclarationP <|> polynomEvaluationP <|> evaluationP where functionDeclarationP = FunctionDeclaration - <$> alphaStringP - <*> parenthesis alphaStringP + <$> labelP + <*> parenthesis labelP <*> (char '=' *> exprP) variableDeclarationP = VariableDeclaration - <$> alphaStringP + <$> labelP <*> (char '=' *> exprP) + polynomEvaluationP = PolynomEvaluation <$> exprP <*> (char '=' *> exprP <* char '?') + evaluationP = Evaluation <$> exprP <* char '=' <* char '?' -- cgit