aboutsummaryrefslogtreecommitdiff
path: root/src/parser/Statement.hs
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-06-05 14:48:14 +0200
committerCharles <sircharlesaze@gmail.com>2020-06-05 14:48:14 +0200
commitf5ddd91d290a0c508e04cce2cb19c4c8bae32835 (patch)
tree3d3082c3d6fa977b12290f4cd2ed6c7ada4e9606 /src/parser/Statement.hs
parent45cada8eade7242eb7f29af7b92858e9a1a7f68b (diff)
downloadcomputorv2-f5ddd91d290a0c508e04cce2cb19c4c8bae32835.tar.gz
computorv2-f5ddd91d290a0c508e04cce2cb19c4c8bae32835.tar.bz2
computorv2-f5ddd91d290a0c508e04cce2cb19c4c8bae32835.zip
Removed Imaginary type, Added variable name check (/= i), Added Matrix check if rectangular
Diffstat (limited to 'src/parser/Statement.hs')
-rw-r--r--src/parser/Statement.hs8
1 files changed, 4 insertions, 4 deletions
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 '?')