From f5ddd91d290a0c508e04cce2cb19c4c8bae32835 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 5 Jun 2020 14:48:14 +0200 Subject: Removed Imaginary type, Added variable name check (/= i), Added Matrix check if rectangular --- src/parser/Statement.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/parser/Statement.hs') diff --git a/src/parser/Statement.hs b/src/parser/Statement.hs index 889f24f..cfeabe1 100644 --- a/src/parser/Statement.hs +++ b/src/parser/Statement.hs @@ -14,15 +14,15 @@ data Statement | FunctionDeclaration String String Expr statementP :: Parser Statement -statementP = functionDeclarationP <|> variableDeclarationP <|> polynomEvaluationP <|> evaluationP +statementP = functionDeclarationP <|> variableDeclarationP <|> evaluationP <|> polynomEvaluationP where functionDeclarationP = FunctionDeclaration - <$> labelP - <*> parenthesis labelP + <$> funLabelP + <*> parenthesis varLabelP <*> (char '=' *> exprP) variableDeclarationP = VariableDeclaration - <$> labelP + <$> varLabelP <*> (char '=' *> exprP) polynomEvaluationP = PolynomEvaluation <$> exprP <*> (char '=' *> exprP <* char '?') -- cgit