samvv/bolt
1
0
Fork 0
Code Issues 24 Pull requests Projects Releases Packages Wiki Activity Actions

Fix type class constraint expressions not being correctly parsed

Browse source
This commit is contained in:
Sam Vervaeck 2023-05-23 20:03:23 +02:00
parent b23dc84f72
commit acbfeb8975
Signed by: samvv
SSH key fingerprint: SHA256:dIg0ywU1OP+ZYifrYxy8c5esO72cIKB+4/9wkZj1VaY
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/bolt/CST.hpp
View file

@ -885,11 +885,11 @@ namespace bolt {
class TypeclassConstraintExpression : public ConstraintExpression { class TypeclassConstraintExpression : public ConstraintExpression {
public: public:
Identifier* Name; IdentifierAlt* Name;
std::vector<VarTypeExpression*> TEs; std::vector<VarTypeExpression*> TEs;
TypeclassConstraintExpression( TypeclassConstraintExpression(
Identifier* Name, IdentifierAlt* Name,
std::vector<VarTypeExpression*> TEs std::vector<VarTypeExpression*> TEs
): ConstraintExpression(NodeKind::TypeclassConstraintExpression), ): ConstraintExpression(NodeKind::TypeclassConstraintExpression),
Name(Name), Name(Name),

4
src/Parser.cc
View file

@ -547,7 +547,7 @@ after_params:
return parseExpressionStatement(); return parseExpressionStatement();
} }
} }
#
ConstraintExpression* Parser::parseConstraintExpression() { ConstraintExpression* Parser::parseConstraintExpression() {
bool HasTilde = false; bool HasTilde = false;
for (std::size_t I = 0; ; I++) { for (std::size_t I = 0; ; I++) {
@ -572,7 +572,7 @@ after_seek:
auto Right = parseArrowTypeExpression(); auto Right = parseArrowTypeExpression();
return new EqualityConstraintExpression { Left, Tilde, Right }; return new EqualityConstraintExpression { Left, Tilde, Right };
} }
auto Name = expectToken<Identifier>(); auto Name = expectToken<IdentifierAlt>();
std::vector<VarTypeExpression*> TEs; std::vector<VarTypeExpression*> TEs;
for (;;) { for (;;) {
auto T1 = Tokens.peek(); auto T1 = Tokens.peek();