2021-09-08 15:18:24 +02:00
|
|
|
#include <hex/pattern_language/parser.hpp>
|
2020-11-10 15:26:38 +01:00
|
|
|
|
|
|
|
#include <optional>
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
|
|
|
|
#define MATCHES(x) (begin() && x)
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// Definition syntax:
|
|
|
|
// [A] : Either A or no token
|
|
|
|
// [A|B] : Either A, B or no token
|
|
|
|
// <A|B> : Either A or B
|
|
|
|
// <A...> : One or more of A
|
|
|
|
// A B C : Sequence of tokens A then B then C
|
|
|
|
// (parseXXXX) : Parsing handled by other function
|
2021-09-08 15:18:24 +02:00
|
|
|
namespace hex::pl {
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
/* Mathematical expressions */
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-01-07 15:37:37 +01:00
|
|
|
// Identifier([(parseMathematicalExpression)|<(parseMathematicalExpression),...>(parseMathematicalExpression)]
|
|
|
|
ASTNode* Parser::parseFunctionCall() {
|
2021-09-03 02:33:45 +02:00
|
|
|
std::string functionName = parseNamespaceResolution();
|
2021-08-25 17:07:01 +02:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETOPEN)))
|
|
|
|
throwParseError("expected '(' after function name");
|
|
|
|
|
2021-01-07 15:37:37 +01:00
|
|
|
std::vector<ASTNode*> params;
|
2021-03-31 22:54:43 +02:00
|
|
|
auto paramCleanup = SCOPE_GUARD {
|
2021-01-07 15:37:37 +01:00
|
|
|
for (auto ¶m : params)
|
|
|
|
delete param;
|
2021-03-31 22:54:43 +02:00
|
|
|
};
|
2021-01-07 15:37:37 +01:00
|
|
|
|
|
|
|
while (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
params.push_back(parseMathematicalExpression());
|
2021-01-07 15:37:37 +01:00
|
|
|
|
|
|
|
if (MATCHES(sequence(SEPARATOR_COMMA, SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
throwParseError("unexpected ',' at end of function parameter list", -1);
|
|
|
|
else if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
break;
|
|
|
|
else if (!MATCHES(sequence(SEPARATOR_COMMA)))
|
|
|
|
throwParseError("missing ',' between parameters", -1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
paramCleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeFunctionCall(functionName, params));
|
2021-01-09 21:47:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ASTNode* Parser::parseStringLiteral() {
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeLiteral(getValue<Token::Literal>(-1)));
|
2021-01-07 15:37:37 +01:00
|
|
|
}
|
|
|
|
|
2021-09-03 02:33:45 +02:00
|
|
|
std::string Parser::parseNamespaceResolution() {
|
2021-08-25 17:07:01 +02:00
|
|
|
std::string name;
|
|
|
|
|
|
|
|
while (true) {
|
2021-09-21 21:29:18 +02:00
|
|
|
name += getValue<Token::Identifier>(-1).get();
|
2021-01-05 14:42:08 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (MATCHES(sequence(OPERATOR_SCOPERESOLUTION, IDENTIFIER))) {
|
|
|
|
name += "::";
|
|
|
|
continue;
|
|
|
|
}
|
2021-01-05 14:42:08 +01:00
|
|
|
else
|
2021-08-25 17:07:01 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return name;
|
2021-01-05 14:42:08 +01:00
|
|
|
}
|
|
|
|
|
2021-09-03 02:33:45 +02:00
|
|
|
ASTNode* Parser::parseScopeResolution() {
|
|
|
|
std::string typeName;
|
|
|
|
|
|
|
|
while (true) {
|
2021-09-21 21:29:18 +02:00
|
|
|
typeName += getValue<Token::Identifier>(-1).get();
|
2021-09-03 02:33:45 +02:00
|
|
|
|
|
|
|
if (MATCHES(sequence(OPERATOR_SCOPERESOLUTION, IDENTIFIER))) {
|
|
|
|
if (peek(OPERATOR_SCOPERESOLUTION, 0) && peek(IDENTIFIER, 1)) {
|
|
|
|
typeName += "::";
|
|
|
|
continue;
|
|
|
|
} else {
|
2021-09-25 14:52:17 +02:00
|
|
|
if (!this->m_types.contains(typeName))
|
|
|
|
throwParseError(hex::format("cannot access scope of invalid type '{}'", typeName), -1);
|
|
|
|
|
|
|
|
return create(new ASTNodeScopeResolution(this->m_types[typeName]->clone(), getValue<Token::Identifier>(-1).get()));
|
2021-09-03 02:33:45 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
throwParseError("failed to parse scope resolution. Expected 'TypeName::Identifier'");
|
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// <Identifier[.]...>
|
2021-04-21 10:17:42 +02:00
|
|
|
ASTNode* Parser::parseRValue(ASTNodeRValue::Path &path) {
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (peek(IDENTIFIER, -1))
|
2021-09-21 21:29:18 +02:00
|
|
|
path.push_back(getValue<Token::Identifier>(-1).get());
|
2021-04-12 20:49:37 +02:00
|
|
|
else if (peek(KEYWORD_PARENT, -1))
|
|
|
|
path.emplace_back("parent");
|
2021-09-21 21:29:18 +02:00
|
|
|
else if (peek(KEYWORD_THIS, -1))
|
|
|
|
path.emplace_back("this");
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-04-21 10:17:42 +02:00
|
|
|
if (MATCHES(sequence(SEPARATOR_SQUAREBRACKETOPEN))) {
|
|
|
|
path.push_back(parseMathematicalExpression());
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ']' at end of array indexing");
|
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (MATCHES(sequence(SEPARATOR_DOT))) {
|
2021-04-12 20:49:37 +02:00
|
|
|
if (MATCHES(oneOf(IDENTIFIER, KEYWORD_PARENT)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return this->parseRValue(path);
|
|
|
|
else
|
2021-04-12 20:49:37 +02:00
|
|
|
throwParseError("expected member name or 'parent' keyword", -1);
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
} else
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeRValue(path));
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// <Integer|((parseMathematicalExpression))>
|
|
|
|
ASTNode* Parser::parseFactor() {
|
|
|
|
if (MATCHES(sequence(INTEGER)))
|
2021-09-21 21:29:18 +02:00
|
|
|
return new ASTNodeLiteral(getValue<Token::Literal>(-1));
|
2021-09-24 01:55:00 +02:00
|
|
|
else if (peek(OPERATOR_PLUS) || peek(OPERATOR_MINUS) || peek(OPERATOR_BITNOT) || peek(OPERATOR_BOOLNOT))
|
|
|
|
return this->parseMathematicalExpression();
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
else if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETOPEN))) {
|
|
|
|
auto node = this->parseMathematicalExpression();
|
2021-04-21 10:17:42 +02:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE))) {
|
|
|
|
delete node;
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
throwParseError("expected closing parenthesis");
|
2021-04-21 10:17:42 +02:00
|
|
|
}
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
2021-08-25 17:07:01 +02:00
|
|
|
} else if (MATCHES(sequence(IDENTIFIER))) {
|
|
|
|
auto originalPos = this->m_curr;
|
2021-09-03 02:33:45 +02:00
|
|
|
parseNamespaceResolution();
|
2021-08-25 17:07:01 +02:00
|
|
|
bool isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
|
|
|
|
this->m_curr = originalPos;
|
|
|
|
|
2021-09-03 02:33:45 +02:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (isFunction) {
|
2021-09-21 21:29:18 +02:00
|
|
|
return this->parseFunctionCall();
|
2021-09-03 02:33:45 +02:00
|
|
|
} else if (peek(OPERATOR_SCOPERESOLUTION, 0)) {
|
2021-09-21 21:29:18 +02:00
|
|
|
return this->parseScopeResolution();
|
2021-09-03 02:33:45 +02:00
|
|
|
} else {
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNodeRValue::Path path;
|
2021-09-21 21:29:18 +02:00
|
|
|
return this->parseRValue(path);
|
2021-08-25 17:07:01 +02:00
|
|
|
}
|
2021-09-21 21:29:18 +02:00
|
|
|
} else if (MATCHES(oneOf(KEYWORD_PARENT, KEYWORD_THIS))) {
|
2021-04-21 10:17:42 +02:00
|
|
|
ASTNodeRValue::Path path;
|
2021-09-21 21:29:18 +02:00
|
|
|
return this->parseRValue(path);
|
2021-01-20 22:56:31 +01:00
|
|
|
} else if (MATCHES(sequence(OPERATOR_DOLLAR))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
return new ASTNodeRValue({ "$" });
|
2021-04-21 10:17:42 +02:00
|
|
|
} else if (MATCHES(oneOf(OPERATOR_ADDRESSOF, OPERATOR_SIZEOF) && sequence(SEPARATOR_ROUNDBRACKETOPEN))) {
|
|
|
|
auto op = getValue<Token::Operator>(-2);
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
if (!MATCHES(oneOf(IDENTIFIER, KEYWORD_PARENT, KEYWORD_THIS))) {
|
2021-04-21 10:17:42 +02:00
|
|
|
throwParseError("expected rvalue identifier");
|
|
|
|
}
|
|
|
|
|
|
|
|
ASTNodeRValue::Path path;
|
2021-09-21 21:29:18 +02:00
|
|
|
auto node = create(new ASTNodeTypeOperator(op, this->parseRValue(path)));
|
2021-04-21 10:17:42 +02:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE))) {
|
|
|
|
delete node;
|
|
|
|
throwParseError("expected closing parenthesis");
|
|
|
|
}
|
2021-09-21 21:29:18 +02:00
|
|
|
return node;
|
2021-01-07 15:37:37 +01:00
|
|
|
} else
|
2021-09-21 21:29:18 +02:00
|
|
|
throwParseError("expected value or parenthesis");
|
|
|
|
}
|
|
|
|
|
|
|
|
ASTNode* Parser::parseCastExpression() {
|
|
|
|
if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY)) {
|
2021-09-21 23:45:45 +02:00
|
|
|
auto type = parseType(true);
|
2021-09-21 21:29:18 +02:00
|
|
|
auto builtinType = dynamic_cast<ASTNodeBuiltinType*>(type->getType());
|
|
|
|
|
|
|
|
if (builtinType == nullptr)
|
|
|
|
throwParseError("invalid type used for pointer size", -1);
|
|
|
|
|
2021-09-24 12:15:50 +02:00
|
|
|
if (!peek(SEPARATOR_ROUNDBRACKETOPEN))
|
2021-09-21 21:29:18 +02:00
|
|
|
throwParseError("expected '(' before cast expression", -1);
|
|
|
|
|
|
|
|
auto node = parseFactor();
|
|
|
|
|
|
|
|
return new ASTNodeCast(node, type);
|
|
|
|
} else return parseFactor();
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
2021-01-07 00:41:06 +01:00
|
|
|
// <+|-|!|~> (parseFactor)
|
|
|
|
ASTNode* Parser::parseUnaryExpression() {
|
2021-01-20 22:55:57 +01:00
|
|
|
if (MATCHES(oneOf(OPERATOR_PLUS, OPERATOR_MINUS, OPERATOR_BOOLNOT, OPERATOR_BITNOT))) {
|
2021-01-07 00:41:06 +01:00
|
|
|
auto op = getValue<Token::Operator>(-1);
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeMathematicalExpression(new ASTNodeLiteral(0), this->parseCastExpression(), op));
|
|
|
|
} else if (MATCHES(sequence(STRING))) {
|
|
|
|
return this->parseStringLiteral();
|
2021-01-07 00:41:06 +01:00
|
|
|
}
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return this->parseCastExpression();
|
2021-01-07 00:41:06 +01:00
|
|
|
}
|
|
|
|
|
2021-01-20 22:55:57 +01:00
|
|
|
// (parseUnaryExpression) <*|/|%> (parseUnaryExpression)
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
ASTNode* Parser::parseMultiplicativeExpression() {
|
2021-01-07 00:41:06 +01:00
|
|
|
auto node = this->parseUnaryExpression();
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-20 22:55:57 +01:00
|
|
|
while (MATCHES(oneOf(OPERATOR_STAR, OPERATOR_SLASH, OPERATOR_PERCENT))) {
|
2021-01-07 00:02:51 +01:00
|
|
|
auto op = getValue<Token::Operator>(-1);
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseUnaryExpression(), op));
|
2020-12-06 21:40:57 +01:00
|
|
|
}
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
|
|
|
}
|
2020-11-21 23:00:09 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseMultiplicativeExpression) <+|-> (parseMultiplicativeExpression)
|
|
|
|
ASTNode* Parser::parseAdditiveExpression() {
|
|
|
|
auto node = this->parseMultiplicativeExpression();
|
2020-11-27 21:20:23 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (MATCHES(variant(OPERATOR_PLUS, OPERATOR_MINUS))) {
|
2021-01-07 00:02:51 +01:00
|
|
|
auto op = getValue<Token::Operator>(-1);
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseMultiplicativeExpression(), op));
|
2020-11-27 21:20:23 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
2020-11-21 23:00:09 +01:00
|
|
|
}
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
// (parseAdditiveExpression) < >>|<< > (parseAdditiveExpression)
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
ASTNode* Parser::parseShiftExpression() {
|
|
|
|
auto node = this->parseAdditiveExpression();
|
2020-11-27 21:20:23 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (MATCHES(variant(OPERATOR_SHIFTLEFT, OPERATOR_SHIFTRIGHT))) {
|
2021-01-07 00:02:51 +01:00
|
|
|
auto op = getValue<Token::Operator>(-1);
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseAdditiveExpression(), op));
|
2020-11-27 21:20:23 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
2020-11-21 23:00:09 +01:00
|
|
|
}
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
// (parseAdditiveExpression) < >=|<=|>|< > (parseAdditiveExpression)
|
|
|
|
ASTNode* Parser::parseRelationExpression() {
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
auto node = this->parseShiftExpression();
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD{ delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BOOLGREATERTHAN) || sequence(OPERATOR_BOOLLESSTHAN) || sequence(OPERATOR_BOOLGREATERTHANOREQUALS) || sequence(OPERATOR_BOOLLESSTHANOREQUALS))) {
|
|
|
|
auto op = getValue<Token::Operator>(-1);
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseShiftExpression(), op));
|
2021-01-07 00:02:51 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
// (parseRelationExpression) <==|!=> (parseRelationExpression)
|
|
|
|
ASTNode* Parser::parseEqualityExpression() {
|
|
|
|
auto node = this->parseRelationExpression();
|
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BOOLEQUALS) || sequence(OPERATOR_BOOLNOTEQUALS))) {
|
|
|
|
auto op = getValue<Token::Operator>(-1);
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseRelationExpression(), op));
|
2021-01-07 00:02:51 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
// (parseEqualityExpression) & (parseEqualityExpression)
|
|
|
|
ASTNode* Parser::parseBinaryAndExpression() {
|
|
|
|
auto node = this->parseEqualityExpression();
|
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BITAND))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseEqualityExpression(), Token::Operator::BitAnd));
|
2020-12-06 21:40:57 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
2020-11-12 23:57:43 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseBinaryAndExpression) ^ (parseBinaryAndExpression)
|
|
|
|
ASTNode* Parser::parseBinaryXorExpression() {
|
|
|
|
auto node = this->parseBinaryAndExpression();
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BITXOR))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseBinaryAndExpression(), Token::Operator::BitXor));
|
2020-12-06 21:40:57 +01:00
|
|
|
}
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
2020-11-21 20:19:33 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseBinaryXorExpression) | (parseBinaryXorExpression)
|
|
|
|
ASTNode* Parser::parseBinaryOrExpression() {
|
|
|
|
auto node = this->parseBinaryXorExpression();
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BITOR))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseBinaryXorExpression(), Token::Operator::BitOr));
|
2020-12-06 21:40:57 +01:00
|
|
|
}
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return node;
|
2020-11-21 20:19:33 +01:00
|
|
|
}
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
// (parseBinaryOrExpression) && (parseBinaryOrExpression)
|
|
|
|
ASTNode* Parser::parseBooleanAnd() {
|
|
|
|
auto node = this->parseBinaryOrExpression();
|
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BOOLAND))) {
|
2021-09-24 12:15:50 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseBinaryOrExpression(), Token::Operator::BoolAnd));
|
2021-01-07 00:02:51 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
// (parseBooleanAnd) ^^ (parseBooleanAnd)
|
|
|
|
ASTNode* Parser::parseBooleanXor() {
|
|
|
|
auto node = this->parseBooleanAnd();
|
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BOOLXOR))) {
|
2021-09-24 12:15:50 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseBooleanAnd(), Token::Operator::BoolXor));
|
2021-01-07 00:02:51 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
// (parseBooleanXor) || (parseBooleanXor)
|
|
|
|
ASTNode* Parser::parseBooleanOr() {
|
|
|
|
auto node = this->parseBooleanXor();
|
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_BOOLOR))) {
|
2021-09-24 12:15:50 +02:00
|
|
|
node = create(new ASTNodeMathematicalExpression(node, this->parseBooleanXor(), Token::Operator::BoolOr));
|
2021-01-07 00:02:51 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
2021-01-07 01:19:54 +01:00
|
|
|
// (parseBooleanOr) ? (parseBooleanOr) : (parseBooleanOr)
|
|
|
|
ASTNode* Parser::parseTernaryConditional() {
|
2021-01-10 22:52:28 +01:00
|
|
|
auto node = this->parseBooleanOr();
|
2021-01-07 01:19:54 +01:00
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto nodeCleanup = SCOPE_GUARD { delete node; };
|
2021-02-22 10:01:58 +01:00
|
|
|
|
2021-01-07 01:19:54 +01:00
|
|
|
while (MATCHES(sequence(OPERATOR_TERNARYCONDITIONAL))) {
|
2021-01-10 22:52:28 +01:00
|
|
|
auto second = this->parseBooleanOr();
|
2021-01-07 01:19:54 +01:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(OPERATOR_INHERIT)))
|
|
|
|
throwParseError("expected ':' in ternary expression");
|
|
|
|
|
2021-01-10 22:52:28 +01:00
|
|
|
auto third = this->parseBooleanOr();
|
2021-09-21 21:29:18 +02:00
|
|
|
node = create(new ASTNodeTernaryExpression(node, second, third, Token::Operator::TernaryConditional));
|
2021-01-07 01:19:54 +01:00
|
|
|
}
|
|
|
|
|
2021-02-22 10:01:58 +01:00
|
|
|
nodeCleanup.release();
|
|
|
|
|
2021-01-07 01:19:54 +01:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
// (parseTernaryConditional)
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
ASTNode* Parser::parseMathematicalExpression() {
|
2021-01-07 01:19:54 +01:00
|
|
|
return this->parseTernaryConditional();
|
2021-01-07 00:02:51 +01:00
|
|
|
}
|
|
|
|
|
2021-01-21 17:49:30 +01:00
|
|
|
// [[ <Identifier[( (parseStringLiteral) )], ...> ]]
|
|
|
|
void Parser::parseAttribute(Attributable *currNode) {
|
|
|
|
if (currNode == nullptr)
|
|
|
|
throwParseError("tried to apply attribute to invalid statement");
|
|
|
|
|
|
|
|
do {
|
|
|
|
if (!MATCHES(sequence(IDENTIFIER)))
|
|
|
|
throwParseError("expected attribute expression");
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
auto attribute = getValue<Token::Identifier>(-1).get();
|
2021-01-21 17:49:30 +01:00
|
|
|
|
|
|
|
if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETOPEN, STRING, SEPARATOR_ROUNDBRACKETCLOSE))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto value = getValue<Token::Literal>(-2);
|
|
|
|
auto string = std::get_if<std::string>(&value);
|
|
|
|
|
|
|
|
if (string == nullptr)
|
|
|
|
throwParseError("expected string attribute argument");
|
|
|
|
|
|
|
|
currNode->addAttribute(create(new ASTNodeAttribute(attribute, *string)));
|
2021-01-21 17:49:30 +01:00
|
|
|
}
|
|
|
|
else
|
2021-09-21 21:29:18 +02:00
|
|
|
currNode->addAttribute(create(new ASTNodeAttribute(attribute)));
|
2021-01-21 17:49:30 +01:00
|
|
|
|
|
|
|
} while (MATCHES(sequence(SEPARATOR_COMMA)));
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE, SEPARATOR_SQUAREBRACKETCLOSE)))
|
|
|
|
throwParseError("unfinished attribute. Expected ']]'");
|
|
|
|
}
|
2021-01-07 00:02:51 +01:00
|
|
|
|
2021-06-20 21:22:31 +02:00
|
|
|
/* Functions */
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
ASTNode* Parser::parseFunctionDefinition() {
|
|
|
|
const auto &functionName = getValue<Token::Identifier>(-2).get();
|
2021-09-24 11:34:06 +02:00
|
|
|
std::vector<std::pair<std::string, ASTNode*>> params;
|
2021-06-20 21:22:31 +02:00
|
|
|
|
|
|
|
// Parse parameter list
|
2021-09-21 21:29:18 +02:00
|
|
|
bool hasParams = !peek(SEPARATOR_ROUNDBRACKETCLOSE);
|
|
|
|
u32 unnamedParamCount = 0;
|
2021-06-22 16:04:47 +02:00
|
|
|
while (hasParams) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto type = parseType(true);
|
2021-06-20 21:22:31 +02:00
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
if (MATCHES(sequence(IDENTIFIER)))
|
2021-09-24 11:34:06 +02:00
|
|
|
params.emplace_back(getValue<Token::Identifier>(-1).get(), type);
|
2021-09-21 21:29:18 +02:00
|
|
|
else {
|
2021-09-24 11:34:06 +02:00
|
|
|
params.emplace_back(std::to_string(unnamedParamCount), type);
|
2021-09-21 21:29:18 +02:00
|
|
|
unnamedParamCount++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_COMMA))) {
|
2021-06-20 21:22:31 +02:00
|
|
|
if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
throwParseError("expected closing ')' after parameter list");
|
|
|
|
}
|
|
|
|
}
|
2021-06-22 16:04:47 +02:00
|
|
|
if (!hasParams) {
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ')' after parameter list");
|
|
|
|
}
|
2021-06-20 21:22:31 +02:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN)))
|
|
|
|
throwParseError("expected opening '{' after function definition");
|
|
|
|
|
|
|
|
|
|
|
|
// Parse function body
|
|
|
|
std::vector<ASTNode*> body;
|
|
|
|
auto bodyCleanup = SCOPE_GUARD {
|
|
|
|
for (auto &node : body)
|
|
|
|
delete node;
|
|
|
|
};
|
|
|
|
|
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
2021-06-20 23:46:13 +02:00
|
|
|
body.push_back(this->parseFunctionStatement());
|
2021-06-20 21:22:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bodyCleanup.release();
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeFunctionDefinition(getNamespacePrefixedName(functionName), params, body));
|
2021-06-20 21:22:31 +02:00
|
|
|
}
|
|
|
|
|
2021-10-10 13:47:48 +02:00
|
|
|
ASTNode* Parser::parseFunctionVariableDecl() {
|
|
|
|
ASTNode *statement;
|
|
|
|
auto type = parseType(true);
|
|
|
|
|
|
|
|
if (MATCHES(sequence(IDENTIFIER))) {
|
|
|
|
auto identifier = getValue<Token::Identifier>(-1).get();
|
|
|
|
statement = parseMemberVariable(type);
|
|
|
|
|
|
|
|
if (MATCHES(sequence(OPERATOR_ASSIGNMENT))) {
|
|
|
|
auto expression = parseMathematicalExpression();
|
|
|
|
|
|
|
|
statement = create(new ASTNodeCompoundStatement({ statement, create(new ASTNodeAssignment(identifier, expression)) }));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
throwParseError("invalid variable declaration");
|
|
|
|
|
|
|
|
return statement;
|
|
|
|
}
|
|
|
|
|
2021-06-20 23:46:13 +02:00
|
|
|
ASTNode* Parser::parseFunctionStatement() {
|
|
|
|
bool needsSemicolon = true;
|
|
|
|
ASTNode *statement;
|
|
|
|
|
2021-08-27 09:54:34 +02:00
|
|
|
if (MATCHES(sequence(IDENTIFIER, OPERATOR_ASSIGNMENT)))
|
|
|
|
statement = parseFunctionVariableAssignment();
|
|
|
|
else if (MATCHES(sequence(KEYWORD_RETURN)))
|
|
|
|
statement = parseFunctionReturnStatement();
|
|
|
|
else if (MATCHES(sequence(KEYWORD_IF, SEPARATOR_ROUNDBRACKETOPEN))) {
|
|
|
|
statement = parseFunctionConditional();
|
|
|
|
needsSemicolon = false;
|
|
|
|
} else if (MATCHES(sequence(KEYWORD_WHILE, SEPARATOR_ROUNDBRACKETOPEN))) {
|
|
|
|
statement = parseFunctionWhileLoop();
|
|
|
|
needsSemicolon = false;
|
2021-10-10 13:47:48 +02:00
|
|
|
} else if (MATCHES(sequence(KEYWORD_FOR, SEPARATOR_ROUNDBRACKETOPEN))) {
|
|
|
|
statement = parseFunctionForLoop();
|
|
|
|
needsSemicolon = false;
|
2021-08-27 09:54:34 +02:00
|
|
|
} else if (MATCHES(sequence(IDENTIFIER))) {
|
2021-08-25 17:07:01 +02:00
|
|
|
auto originalPos = this->m_curr;
|
2021-09-03 02:33:45 +02:00
|
|
|
parseNamespaceResolution();
|
2021-08-25 17:07:01 +02:00
|
|
|
bool isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
|
|
|
|
|
|
|
|
if (isFunction) {
|
2021-10-10 15:38:58 +02:00
|
|
|
this->m_curr = originalPos;
|
2021-08-25 17:07:01 +02:00
|
|
|
statement = parseFunctionCall();
|
|
|
|
}
|
2021-10-10 13:05:32 +02:00
|
|
|
else {
|
2021-10-10 15:38:58 +02:00
|
|
|
this->m_curr = originalPos - 1;
|
2021-10-10 13:47:48 +02:00
|
|
|
statement = parseFunctionVariableDecl();
|
2021-10-10 13:05:32 +02:00
|
|
|
}
|
2021-08-25 17:07:01 +02:00
|
|
|
}
|
2021-08-27 09:54:34 +02:00
|
|
|
else if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY)) {
|
2021-10-10 13:47:48 +02:00
|
|
|
statement = parseFunctionVariableDecl();
|
2021-08-25 17:07:01 +02:00
|
|
|
}
|
|
|
|
else
|
2021-06-20 23:46:13 +02:00
|
|
|
throwParseError("invalid sequence", 0);
|
|
|
|
|
|
|
|
if (needsSemicolon && !MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION))) {
|
|
|
|
delete statement;
|
|
|
|
throwParseError("missing ';' at end of expression", -1);
|
|
|
|
}
|
|
|
|
|
2021-09-13 10:48:45 +02:00
|
|
|
// Consume superfluous semicolons
|
|
|
|
while (needsSemicolon && MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)));
|
|
|
|
|
2021-06-20 23:46:13 +02:00
|
|
|
return statement;
|
|
|
|
}
|
|
|
|
|
|
|
|
ASTNode* Parser::parseFunctionVariableAssignment() {
|
2021-09-21 21:29:18 +02:00
|
|
|
const auto &lvalue = getValue<Token::Identifier>(-2).get();
|
2021-06-20 21:22:31 +02:00
|
|
|
|
|
|
|
auto rvalue = this->parseMathematicalExpression();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeAssignment(lvalue, rvalue));
|
2021-06-20 21:22:31 +02:00
|
|
|
}
|
|
|
|
|
2021-06-20 23:46:13 +02:00
|
|
|
ASTNode* Parser::parseFunctionReturnStatement() {
|
|
|
|
if (peek(SEPARATOR_ENDOFEXPRESSION))
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeReturnStatement(nullptr));
|
2021-06-20 23:46:13 +02:00
|
|
|
else
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeReturnStatement(this->parseMathematicalExpression()));
|
2021-06-20 23:46:13 +02:00
|
|
|
}
|
|
|
|
|
2021-09-26 18:27:18 +02:00
|
|
|
std::vector<ASTNode*> Parser::parseStatementBody() {
|
|
|
|
std::vector<ASTNode*> body;
|
|
|
|
|
|
|
|
auto bodyCleanup = SCOPE_GUARD {
|
|
|
|
for (auto &node : body)
|
|
|
|
delete node;
|
|
|
|
};
|
|
|
|
|
|
|
|
if (MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN))) {
|
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
|
|
|
body.push_back(parseFunctionStatement());
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
body.push_back(parseFunctionStatement());
|
|
|
|
}
|
|
|
|
|
|
|
|
bodyCleanup.release();
|
|
|
|
|
|
|
|
return body;
|
|
|
|
}
|
|
|
|
|
2021-06-20 23:46:13 +02:00
|
|
|
ASTNode* Parser::parseFunctionConditional() {
|
|
|
|
auto condition = parseMathematicalExpression();
|
|
|
|
std::vector<ASTNode*> trueBody, falseBody;
|
|
|
|
|
|
|
|
auto cleanup = SCOPE_GUARD {
|
|
|
|
delete condition;
|
|
|
|
for (auto &statement : trueBody)
|
|
|
|
delete statement;
|
|
|
|
for (auto &statement : falseBody)
|
|
|
|
delete statement;
|
|
|
|
};
|
|
|
|
|
2021-09-26 18:27:18 +02:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ')' after statement head");
|
2021-06-20 23:46:13 +02:00
|
|
|
|
2021-09-26 18:27:18 +02:00
|
|
|
trueBody = parseStatementBody();
|
|
|
|
|
|
|
|
if (MATCHES(sequence(KEYWORD_ELSE)))
|
|
|
|
falseBody = parseStatementBody();
|
2021-06-20 23:46:13 +02:00
|
|
|
|
|
|
|
cleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeConditionalStatement(condition, trueBody, falseBody));
|
2021-06-20 21:22:31 +02:00
|
|
|
}
|
|
|
|
|
2021-06-21 00:21:38 +02:00
|
|
|
ASTNode* Parser::parseFunctionWhileLoop() {
|
|
|
|
auto condition = parseMathematicalExpression();
|
|
|
|
std::vector<ASTNode*> body;
|
|
|
|
|
|
|
|
auto cleanup = SCOPE_GUARD {
|
|
|
|
delete condition;
|
|
|
|
for (auto &statement : body)
|
|
|
|
delete statement;
|
|
|
|
};
|
|
|
|
|
2021-09-26 18:27:18 +02:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ')' after statement head");
|
|
|
|
|
|
|
|
body = parseStatementBody();
|
2021-06-21 00:21:38 +02:00
|
|
|
|
|
|
|
cleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeWhileStatement(condition, body));
|
2021-06-21 00:21:38 +02:00
|
|
|
}
|
|
|
|
|
2021-10-10 13:47:48 +02:00
|
|
|
ASTNode* Parser::parseFunctionForLoop() {
|
|
|
|
auto variable = parseFunctionVariableDecl();
|
|
|
|
auto variableCleanup = SCOPE_GUARD { delete variable; };
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_COMMA)))
|
|
|
|
throwParseError("expected ',' after for loop variable declaration");
|
|
|
|
|
|
|
|
auto condition = parseMathematicalExpression();
|
|
|
|
auto conditionCleanup = SCOPE_GUARD { delete condition; };
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_COMMA)))
|
|
|
|
throwParseError("expected ',' after for loop condition");
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(IDENTIFIER, OPERATOR_ASSIGNMENT)))
|
|
|
|
throwParseError("expected for loop variable assignment");
|
|
|
|
|
|
|
|
auto postExpression = parseFunctionVariableAssignment();
|
|
|
|
auto postExpressionCleanup = SCOPE_GUARD { delete postExpression; };
|
|
|
|
|
|
|
|
std::vector<ASTNode*> body;
|
|
|
|
|
|
|
|
auto bodyCleanup = SCOPE_GUARD {
|
|
|
|
for (auto &statement : body)
|
|
|
|
delete statement;
|
|
|
|
};
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ')' after statement head");
|
|
|
|
|
|
|
|
body = parseStatementBody();
|
|
|
|
|
|
|
|
body.push_back(postExpression);
|
|
|
|
|
|
|
|
variableCleanup.release();
|
|
|
|
conditionCleanup.release();
|
|
|
|
postExpressionCleanup.release();
|
|
|
|
bodyCleanup.release();
|
|
|
|
|
|
|
|
return create(new ASTNodeCompoundStatement({ variable, create(new ASTNodeWhileStatement(condition, body)) }, true));
|
|
|
|
}
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
/* Control flow */
|
|
|
|
|
|
|
|
// if ((parseMathematicalExpression)) { (parseMember) }
|
|
|
|
ASTNode* Parser::parseConditional() {
|
|
|
|
auto condition = parseMathematicalExpression();
|
|
|
|
std::vector<ASTNode*> trueBody, falseBody;
|
|
|
|
|
2021-03-31 22:54:43 +02:00
|
|
|
auto cleanup = SCOPE_GUARD {
|
2021-01-07 00:02:51 +01:00
|
|
|
delete condition;
|
|
|
|
for (auto &statement : trueBody)
|
|
|
|
delete statement;
|
|
|
|
for (auto &statement : falseBody)
|
|
|
|
delete statement;
|
2021-03-31 22:54:43 +02:00
|
|
|
};
|
2021-01-07 00:02:51 +01:00
|
|
|
|
|
|
|
if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE, SEPARATOR_CURLYBRACKETOPEN))) {
|
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
|
|
|
trueBody.push_back(parseMember());
|
|
|
|
}
|
|
|
|
} else if (MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE))) {
|
|
|
|
trueBody.push_back(parseMember());
|
|
|
|
} else
|
|
|
|
throwParseError("expected body of conditional statement");
|
|
|
|
|
|
|
|
if (MATCHES(sequence(KEYWORD_ELSE, SEPARATOR_CURLYBRACKETOPEN))) {
|
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
|
|
|
falseBody.push_back(parseMember());
|
|
|
|
}
|
|
|
|
} else if (MATCHES(sequence(KEYWORD_ELSE))) {
|
|
|
|
falseBody.push_back(parseMember());
|
|
|
|
}
|
|
|
|
|
|
|
|
cleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeConditionalStatement(condition, trueBody, falseBody));
|
2020-11-21 20:19:33 +01:00
|
|
|
}
|
|
|
|
|
2021-06-17 23:13:58 +02:00
|
|
|
// while ((parseMathematicalExpression))
|
|
|
|
ASTNode* Parser::parseWhileStatement() {
|
|
|
|
auto condition = parseMathematicalExpression();
|
|
|
|
|
|
|
|
auto cleanup = SCOPE_GUARD {
|
|
|
|
delete condition;
|
|
|
|
};
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_ROUNDBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ')' after while head");
|
|
|
|
|
|
|
|
cleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeWhileStatement(condition, { }));
|
2021-06-17 23:13:58 +02:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
/* Type declarations */
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
// [be|le] <Identifier|u8|u16|u32|u64|u128|s8|s16|s32|s64|s128|float|double|str>
|
2021-09-23 23:43:16 +02:00
|
|
|
ASTNodeTypeDecl* Parser::parseType(bool allowFunctionTypes) {
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
std::optional<std::endian> endian;
|
2020-11-10 16:24:48 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (MATCHES(sequence(KEYWORD_LE)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
endian = std::endian::little;
|
2021-08-25 17:07:01 +02:00
|
|
|
else if (MATCHES(sequence(KEYWORD_BE)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
endian = std::endian::big;
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (MATCHES(sequence(IDENTIFIER))) { // Custom type
|
2021-09-03 02:33:45 +02:00
|
|
|
std::string typeName = parseNamespaceResolution();
|
2020-11-10 16:24:48 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (this->m_types.contains(typeName))
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeTypeDecl({ }, this->m_types[typeName]->clone(), endian));
|
2021-08-25 17:07:01 +02:00
|
|
|
else if (this->m_types.contains(getNamespacePrefixedName(typeName)))
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeTypeDecl({ }, this->m_types[getNamespacePrefixedName(typeName)]->clone(), endian));
|
2021-08-25 17:07:01 +02:00
|
|
|
else
|
|
|
|
throwParseError(hex::format("unknown type '{}'", typeName));
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
2021-08-25 17:07:01 +02:00
|
|
|
else if (MATCHES(sequence(VALUETYPE_ANY))) { // Builtin type
|
2021-09-21 21:29:18 +02:00
|
|
|
auto type = getValue<Token::ValueType>(-1);
|
2021-09-23 23:43:16 +02:00
|
|
|
if (!allowFunctionTypes) {
|
|
|
|
if (type == Token::ValueType::String)
|
|
|
|
throwParseError("cannot use 'str' in this context. Use a character array instead");
|
|
|
|
else if (type == Token::ValueType::Auto)
|
|
|
|
throwParseError("cannot use 'auto' in this context");
|
|
|
|
}
|
2021-09-21 21:29:18 +02:00
|
|
|
|
|
|
|
return create(new ASTNodeTypeDecl({ }, new ASTNodeBuiltinType(type), endian));
|
2021-08-25 17:07:01 +02:00
|
|
|
} else throwParseError("failed to parse type. Expected identifier or builtin type");
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// using Identifier = (parseType)
|
|
|
|
ASTNode* Parser::parseUsingDeclaration() {
|
2021-10-10 15:38:58 +02:00
|
|
|
auto name = parseNamespaceResolution();
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(OPERATOR_ASSIGNMENT)))
|
|
|
|
throwParseError("expected '=' after type name of using declaration");
|
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
auto *type = dynamic_cast<ASTNodeTypeDecl *>(parseType());
|
2021-01-08 16:56:39 +01:00
|
|
|
if (type == nullptr) throwParseError("invalid type used in variable declaration", -1);
|
2020-11-20 21:29:28 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return addType(name, type, type->getEndian());
|
2020-11-20 21:29:28 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// padding[(parseMathematicalExpression)]
|
|
|
|
ASTNode* Parser::parsePadding() {
|
|
|
|
auto size = parseMathematicalExpression();
|
2020-11-14 14:40:21 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE))) {
|
|
|
|
delete size;
|
|
|
|
throwParseError("expected closing ']' at end of array declaration", -1);
|
2020-11-27 21:20:23 +01:00
|
|
|
}
|
2020-11-14 14:40:21 +01:00
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeArrayVariableDecl({ }, new ASTNodeTypeDecl({ }, new ASTNodeBuiltinType(Token::ValueType::Padding)), size));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-14 14:40:21 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseType) Identifier
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNode* Parser::parseMemberVariable(ASTNodeTypeDecl *type) {
|
2021-08-25 17:54:47 +02:00
|
|
|
if (peek(SEPARATOR_COMMA)) {
|
|
|
|
|
|
|
|
std::vector<ASTNode*> variables;
|
|
|
|
auto variableCleanup = SCOPE_GUARD { for (auto var : variables) delete var; };
|
|
|
|
|
|
|
|
do {
|
2021-10-05 22:08:05 +02:00
|
|
|
variables.push_back(create(new ASTNodeVariableDecl(getValue<Token::Identifier>(-1).get(), type->clone())));
|
2021-08-25 17:54:47 +02:00
|
|
|
} while (MATCHES(sequence(SEPARATOR_COMMA, IDENTIFIER)));
|
2021-10-05 22:08:05 +02:00
|
|
|
delete type;
|
2021-08-25 17:54:47 +02:00
|
|
|
|
|
|
|
variableCleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeMultiVariableDecl(variables));
|
2021-08-25 17:54:47 +02:00
|
|
|
} else
|
2021-09-25 22:03:55 +02:00
|
|
|
return create(new ASTNodeVariableDecl(getValue<Token::Identifier>(-1).get(), type));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-14 14:40:21 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseType) Identifier[(parseMathematicalExpression)]
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNode* Parser::parseMemberArrayVariable(ASTNodeTypeDecl *type) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-2).get();
|
2020-11-14 14:40:21 +01:00
|
|
|
|
2021-01-07 21:16:34 +01:00
|
|
|
ASTNode *size = nullptr;
|
2021-03-31 22:54:43 +02:00
|
|
|
auto sizeCleanup = SCOPE_GUARD { delete size; };
|
2021-01-07 21:16:34 +01:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE))) {
|
2021-06-17 23:13:58 +02:00
|
|
|
if (MATCHES(sequence(KEYWORD_WHILE, SEPARATOR_ROUNDBRACKETOPEN)))
|
|
|
|
size = parseWhileStatement();
|
|
|
|
else
|
|
|
|
size = parseMathematicalExpression();
|
2021-01-07 21:16:34 +01:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ']' at end of array declaration", -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
sizeCleanup.release();
|
2020-11-14 14:40:21 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return create(new ASTNodeArrayVariableDecl(name, type, size));
|
2020-11-14 14:40:21 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseType) *Identifier : (parseType)
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNode* Parser::parseMemberPointerVariable(ASTNodeTypeDecl *type) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-2).get();
|
2020-11-20 20:26:19 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
auto sizeType = parseType();
|
2020-11-27 21:20:23 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
{
|
|
|
|
auto builtinType = dynamic_cast<ASTNodeBuiltinType*>(sizeType->getType());
|
2020-11-20 20:26:19 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (builtinType == nullptr || !Token::isUnsigned(builtinType->getType()))
|
|
|
|
throwParseError("invalid type used for pointer size", -1);
|
|
|
|
}
|
2020-11-20 20:26:19 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return create(new ASTNodePointerVariableDecl(name, type, sizeType));
|
2020-11-20 20:26:19 +01:00
|
|
|
}
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
// [(parsePadding)|(parseMemberVariable)|(parseMemberArrayVariable)|(parseMemberPointerVariable)]
|
|
|
|
ASTNode* Parser::parseMember() {
|
|
|
|
ASTNode *member;
|
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
|
|
|
|
if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY) || peek(IDENTIFIER)) {
|
|
|
|
// Some kind of variable definition
|
|
|
|
|
2021-11-27 12:57:59 +01:00
|
|
|
bool isFunction = false;
|
|
|
|
|
|
|
|
if (peek(IDENTIFIER)) {
|
|
|
|
auto originalPos = this->m_curr;
|
|
|
|
this->m_curr++;
|
|
|
|
parseNamespaceResolution();
|
|
|
|
isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
|
|
|
|
this->m_curr = originalPos;
|
|
|
|
|
|
|
|
if (isFunction) {
|
|
|
|
this->m_curr++;
|
|
|
|
member = parseFunctionCall();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!isFunction) {
|
|
|
|
auto type = parseType();
|
|
|
|
|
|
|
|
if (MATCHES(sequence(IDENTIFIER, SEPARATOR_SQUAREBRACKETOPEN)) && sequence<Not>(SEPARATOR_SQUAREBRACKETOPEN))
|
|
|
|
member = parseMemberArrayVariable(type);
|
|
|
|
else if (MATCHES(sequence(IDENTIFIER)))
|
|
|
|
member = parseMemberVariable(type);
|
|
|
|
else if (MATCHES(sequence(OPERATOR_STAR, IDENTIFIER, OPERATOR_INHERIT)))
|
|
|
|
member = parseMemberPointerVariable(type);
|
|
|
|
else
|
|
|
|
throwParseError("invalid variable declaration");
|
|
|
|
}
|
2021-08-25 17:07:01 +02:00
|
|
|
}
|
|
|
|
else if (MATCHES(sequence(VALUETYPE_PADDING, SEPARATOR_SQUAREBRACKETOPEN)))
|
2021-01-07 00:02:51 +01:00
|
|
|
member = parsePadding();
|
|
|
|
else if (MATCHES(sequence(KEYWORD_IF, SEPARATOR_ROUNDBRACKETOPEN)))
|
|
|
|
return parseConditional();
|
|
|
|
else if (MATCHES(sequence(SEPARATOR_ENDOFPROGRAM)))
|
|
|
|
throwParseError("unexpected end of program", -2);
|
|
|
|
else
|
|
|
|
throwParseError("invalid struct member", 0);
|
|
|
|
|
2021-01-21 17:49:30 +01:00
|
|
|
if (MATCHES(sequence(SEPARATOR_SQUAREBRACKETOPEN, SEPARATOR_SQUAREBRACKETOPEN)))
|
|
|
|
parseAttribute(dynamic_cast<Attributable *>(member));
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)))
|
|
|
|
throwParseError("missing ';' at end of expression", -1);
|
|
|
|
|
2021-09-13 10:48:45 +02:00
|
|
|
// Consume superfluous semicolons
|
|
|
|
while (MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)));
|
|
|
|
|
2021-01-07 00:02:51 +01:00
|
|
|
return member;
|
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// struct Identifier { <(parseMember)...> }
|
|
|
|
ASTNode* Parser::parseStruct() {
|
2021-09-24 00:47:34 +02:00
|
|
|
const auto &typeName = getValue<Token::Identifier>(-1).get();
|
2021-09-25 22:03:55 +02:00
|
|
|
|
|
|
|
const auto structNode = create(new ASTNodeStruct());
|
|
|
|
const auto typeDecl = addType(typeName, structNode);
|
|
|
|
auto structGuard = SCOPE_GUARD { delete structNode; delete typeDecl; };
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
|
2021-09-24 00:47:34 +02:00
|
|
|
if (MATCHES(sequence(OPERATOR_INHERIT, IDENTIFIER))) {
|
|
|
|
// Inheritance
|
|
|
|
|
|
|
|
do {
|
|
|
|
auto inheritedTypeName = getValue<Token::Identifier>(-1).get();
|
|
|
|
if (!this->m_types.contains(inheritedTypeName))
|
|
|
|
throwParseError(hex::format("cannot inherit from unknown type '{}'", inheritedTypeName), -1);
|
|
|
|
|
|
|
|
structNode->addInheritance(this->m_types[inheritedTypeName]->clone());
|
|
|
|
} while (MATCHES(sequence(SEPARATOR_COMMA, IDENTIFIER)));
|
|
|
|
|
|
|
|
} else if (MATCHES(sequence(OPERATOR_INHERIT, VALUETYPE_ANY))) {
|
|
|
|
throwParseError("cannot inherit from builtin type");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN)))
|
|
|
|
throwParseError("expected '{' after struct definition", -1);
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
2021-01-07 00:02:51 +01:00
|
|
|
structNode->addMember(parseMember());
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
structGuard.release();
|
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return typeDecl;
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// union Identifier { <(parseMember)...> }
|
|
|
|
ASTNode* Parser::parseUnion() {
|
2021-09-21 21:29:18 +02:00
|
|
|
const auto &typeName = getValue<Token::Identifier>(-2).get();
|
2021-09-25 22:03:55 +02:00
|
|
|
|
|
|
|
const auto unionNode = create(new ASTNodeUnion());
|
|
|
|
const auto typeDecl = addType(typeName, unionNode);
|
|
|
|
auto unionGuard = SCOPE_GUARD { delete unionNode; delete typeDecl; };
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
2021-01-07 00:02:51 +01:00
|
|
|
unionNode->addMember(parseMember());
|
2020-11-27 21:20:23 +01:00
|
|
|
}
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
unionGuard.release();
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return typeDecl;
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// enum Identifier : (parseType) { <<Identifier|Identifier = (parseMathematicalExpression)[,]>...> }
|
|
|
|
ASTNode* Parser::parseEnum() {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto typeName = getValue<Token::Identifier>(-2).get();
|
2020-11-20 21:29:28 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
auto underlyingType = parseType();
|
2021-01-10 17:14:38 +01:00
|
|
|
if (underlyingType->getEndian().has_value()) throwParseError("underlying type may not have an endian specification", -2);
|
2020-11-20 20:26:19 +01:00
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
const auto enumNode = create(new ASTNodeEnum(underlyingType));
|
2021-09-25 22:03:55 +02:00
|
|
|
const auto typeDecl = addType(typeName, enumNode);
|
|
|
|
auto enumGuard = SCOPE_GUARD { delete enumNode; delete typeDecl; };
|
2020-11-20 20:26:19 +01:00
|
|
|
|
2021-09-03 02:33:45 +02:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN)))
|
|
|
|
throwParseError("expected '{' after enum definition", -1);
|
|
|
|
|
2021-01-06 16:28:41 +01:00
|
|
|
ASTNode *lastEntry = nullptr;
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
|
|
|
if (MATCHES(sequence(IDENTIFIER, OPERATOR_ASSIGNMENT))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-2).get();
|
2021-01-08 11:58:07 +01:00
|
|
|
auto value = parseMathematicalExpression();
|
|
|
|
|
|
|
|
enumNode->addEntry(name, value);
|
|
|
|
lastEntry = value;
|
2020-11-14 14:40:21 +01:00
|
|
|
}
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
else if (MATCHES(sequence(IDENTIFIER))) {
|
|
|
|
ASTNode *valueExpr;
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-1).get();
|
2021-01-08 11:58:07 +01:00
|
|
|
if (enumNode->getEntries().empty())
|
2021-09-21 21:29:18 +02:00
|
|
|
valueExpr = lastEntry = create(new ASTNodeLiteral(u128(0)));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
else
|
2021-09-21 21:29:18 +02:00
|
|
|
valueExpr = lastEntry = create(new ASTNodeMathematicalExpression(lastEntry->clone(), new ASTNodeLiteral(u128(1)), Token::Operator::Plus));
|
2020-11-14 14:40:21 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
enumNode->addEntry(name, valueExpr);
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
else if (MATCHES(sequence(SEPARATOR_ENDOFPROGRAM)))
|
|
|
|
throwParseError("unexpected end of program", -2);
|
|
|
|
else
|
2021-01-10 17:14:38 +01:00
|
|
|
throwParseError("invalid enum entry", -1);
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_COMMA))) {
|
|
|
|
if (MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE)))
|
|
|
|
break;
|
|
|
|
else
|
2021-01-10 17:14:38 +01:00
|
|
|
throwParseError("missing ',' between enum entries", -1);
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
enumGuard.release();
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return typeDecl;
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-10 16:24:48 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// bitfield Identifier { <Identifier : (parseMathematicalExpression)[;]...> }
|
|
|
|
ASTNode* Parser::parseBitfield() {
|
2021-09-21 21:29:18 +02:00
|
|
|
std::string typeName = getValue<Token::Identifier>(-2).get();
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
const auto bitfieldNode = create(new ASTNodeBitfield());
|
2021-09-25 22:03:55 +02:00
|
|
|
const auto typeDecl = addType(typeName, bitfieldNode);
|
|
|
|
|
|
|
|
auto enumGuard = SCOPE_GUARD { delete bitfieldNode; delete typeDecl; };
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
|
|
|
if (MATCHES(sequence(IDENTIFIER, OPERATOR_INHERIT))) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-2).get();
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
bitfieldNode->addEntry(name, parseMathematicalExpression());
|
2021-10-14 20:28:13 +02:00
|
|
|
} else if (MATCHES(sequence(VALUETYPE_PADDING, OPERATOR_INHERIT))) {
|
|
|
|
bitfieldNode->addEntry("padding", parseMathematicalExpression());
|
|
|
|
} else if (MATCHES(sequence(SEPARATOR_ENDOFPROGRAM)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
throwParseError("unexpected end of program", -2);
|
|
|
|
else
|
|
|
|
throwParseError("invalid bitfield member", 0);
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-09-13 10:48:45 +02:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
throwParseError("missing ';' at end of expression", -1);
|
2021-09-13 10:48:45 +02:00
|
|
|
|
|
|
|
// Consume superfluous semicolons
|
|
|
|
while (MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-27 21:20:23 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
enumGuard.release();
|
2020-11-10 16:24:48 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return typeDecl;
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-10 16:24:48 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseType) Identifier @ Integer
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNode* Parser::parseVariablePlacement(ASTNodeTypeDecl *type) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-1).get();
|
2021-08-25 17:07:01 +02:00
|
|
|
|
2021-10-18 22:04:54 +02:00
|
|
|
ASTNode *placementOffset;
|
|
|
|
if (MATCHES(sequence(OPERATOR_AT))) {
|
|
|
|
placementOffset = parseMathematicalExpression();
|
|
|
|
} else {
|
|
|
|
placementOffset = nullptr;
|
|
|
|
}
|
2020-11-10 16:24:48 +01:00
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeVariableDecl(name, type, placementOffset));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-27 21:20:23 +01:00
|
|
|
|
2021-01-07 21:16:34 +01:00
|
|
|
// (parseType) Identifier[[(parseMathematicalExpression)]] @ Integer
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNode* Parser::parseArrayVariablePlacement(ASTNodeTypeDecl *type) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-2).get();
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-01-07 21:16:34 +01:00
|
|
|
ASTNode *size = nullptr;
|
2021-03-31 22:54:43 +02:00
|
|
|
auto sizeCleanup = SCOPE_GUARD { delete size; };
|
2021-01-07 21:16:34 +01:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE))) {
|
2021-06-17 23:13:58 +02:00
|
|
|
if (MATCHES(sequence(KEYWORD_WHILE, SEPARATOR_ROUNDBRACKETOPEN)))
|
|
|
|
size = parseWhileStatement();
|
|
|
|
else
|
|
|
|
size = parseMathematicalExpression();
|
2021-01-07 21:16:34 +01:00
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_SQUAREBRACKETCLOSE)))
|
|
|
|
throwParseError("expected closing ']' at end of array declaration", -1);
|
|
|
|
}
|
2020-12-06 21:40:57 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (!MATCHES(sequence(OPERATOR_AT)))
|
|
|
|
throwParseError("expected placement instruction", -1);
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
auto placementOffset = parseMathematicalExpression();
|
|
|
|
|
2021-01-07 21:16:34 +01:00
|
|
|
sizeCleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodeArrayVariableDecl(name, type, size, placementOffset));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-12-07 23:49:19 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// (parseType) *Identifier : (parseType) @ Integer
|
2021-08-25 17:07:01 +02:00
|
|
|
ASTNode* Parser::parsePointerVariablePlacement(ASTNodeTypeDecl *type) {
|
2021-09-21 21:29:18 +02:00
|
|
|
auto name = getValue<Token::Identifier>(-2).get();
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
auto sizeType = parseType();
|
|
|
|
auto sizeCleanup = SCOPE_GUARD { delete sizeType; };
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
{
|
|
|
|
auto builtinType = dynamic_cast<ASTNodeBuiltinType*>(sizeType->getType());
|
2020-12-06 21:40:57 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
if (builtinType == nullptr || !Token::isUnsigned(builtinType->getType()))
|
|
|
|
throwParseError("invalid type used for pointer size", -1);
|
|
|
|
}
|
2020-12-06 21:40:57 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (!MATCHES(sequence(OPERATOR_AT)))
|
|
|
|
throwParseError("expected placement instruction", -1);
|
2020-12-07 23:49:19 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
auto placementOffset = parseMathematicalExpression();
|
|
|
|
|
|
|
|
sizeCleanup.release();
|
|
|
|
|
2021-09-21 21:29:18 +02:00
|
|
|
return create(new ASTNodePointerVariableDecl(name, type, sizeType, placementOffset));
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
}
|
2020-11-10 16:24:48 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
std::vector<ASTNode*> Parser::parseNamespace() {
|
|
|
|
std::vector<ASTNode*> statements;
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(IDENTIFIER)))
|
|
|
|
throwParseError("expected namespace identifier");
|
|
|
|
|
|
|
|
this->m_currNamespace.push_back(this->m_currNamespace.back());
|
2020-11-10 16:24:48 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
while (true) {
|
2021-09-21 21:29:18 +02:00
|
|
|
this->m_currNamespace.back().push_back(getValue<Token::Identifier>(-1).get());
|
2021-08-25 17:07:01 +02:00
|
|
|
|
|
|
|
if (MATCHES(sequence(OPERATOR_SCOPERESOLUTION, IDENTIFIER)))
|
|
|
|
continue;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!MATCHES(sequence(SEPARATOR_CURLYBRACKETOPEN)))
|
|
|
|
throwParseError("expected '{' at start of namespace");
|
|
|
|
|
|
|
|
while (!MATCHES(sequence(SEPARATOR_CURLYBRACKETCLOSE))) {
|
|
|
|
auto newStatements = parseStatements();
|
|
|
|
std::copy(newStatements.begin(), newStatements.end(), std::back_inserter(statements));
|
|
|
|
}
|
|
|
|
|
|
|
|
this->m_currNamespace.pop_back();
|
|
|
|
|
|
|
|
return statements;
|
|
|
|
}
|
|
|
|
|
|
|
|
ASTNode* Parser::parsePlacement() {
|
|
|
|
auto type = parseType();
|
|
|
|
|
|
|
|
if (MATCHES(sequence(IDENTIFIER, SEPARATOR_SQUAREBRACKETOPEN)))
|
|
|
|
return parseArrayVariablePlacement(type);
|
|
|
|
else if (MATCHES(sequence(IDENTIFIER)))
|
|
|
|
return parseVariablePlacement(type);
|
|
|
|
else if (MATCHES(sequence(OPERATOR_STAR, IDENTIFIER, OPERATOR_INHERIT)))
|
|
|
|
return parsePointerVariablePlacement(type);
|
|
|
|
else throwParseError("invalid sequence", 0);
|
|
|
|
}
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
/* Program */
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
// <(parseUsingDeclaration)|(parseVariablePlacement)|(parseStruct)>
|
2021-08-25 17:07:01 +02:00
|
|
|
std::vector<ASTNode*> Parser::parseStatements() {
|
2021-09-21 21:29:18 +02:00
|
|
|
ASTNode *statement;
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-10-10 15:38:58 +02:00
|
|
|
if (MATCHES(sequence(KEYWORD_USING, IDENTIFIER)))
|
2021-08-25 17:07:01 +02:00
|
|
|
statement = parseUsingDeclaration();
|
|
|
|
else if (peek(IDENTIFIER)) {
|
|
|
|
auto originalPos = this->m_curr;
|
|
|
|
this->m_curr++;
|
2021-09-03 02:33:45 +02:00
|
|
|
parseNamespaceResolution();
|
2021-08-25 17:07:01 +02:00
|
|
|
bool isFunction = peek(SEPARATOR_ROUNDBRACKETOPEN);
|
|
|
|
this->m_curr = originalPos;
|
|
|
|
|
|
|
|
if (isFunction) {
|
|
|
|
this->m_curr++;
|
|
|
|
statement = parseFunctionCall();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
statement = parsePlacement();
|
|
|
|
}
|
|
|
|
else if (peek(KEYWORD_BE) || peek(KEYWORD_LE) || peek(VALUETYPE_ANY))
|
|
|
|
statement = parsePlacement();
|
2021-09-24 00:47:34 +02:00
|
|
|
else if (MATCHES(sequence(KEYWORD_STRUCT, IDENTIFIER)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
statement = parseStruct();
|
|
|
|
else if (MATCHES(sequence(KEYWORD_UNION, IDENTIFIER, SEPARATOR_CURLYBRACKETOPEN)))
|
|
|
|
statement = parseUnion();
|
2021-08-25 17:07:01 +02:00
|
|
|
else if (MATCHES(sequence(KEYWORD_ENUM, IDENTIFIER, OPERATOR_INHERIT)))
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
statement = parseEnum();
|
|
|
|
else if (MATCHES(sequence(KEYWORD_BITFIELD, IDENTIFIER, SEPARATOR_CURLYBRACKETOPEN)))
|
|
|
|
statement = parseBitfield();
|
2021-06-20 21:22:31 +02:00
|
|
|
else if (MATCHES(sequence(KEYWORD_FUNCTION, IDENTIFIER, SEPARATOR_ROUNDBRACKETOPEN)))
|
2021-09-21 21:29:18 +02:00
|
|
|
statement = parseFunctionDefinition();
|
2021-08-25 17:07:01 +02:00
|
|
|
else if (MATCHES(sequence(KEYWORD_NAMESPACE)))
|
|
|
|
return parseNamespace();
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
else throwParseError("invalid sequence", 0);
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-01-21 17:49:30 +01:00
|
|
|
if (MATCHES(sequence(SEPARATOR_SQUAREBRACKETOPEN, SEPARATOR_SQUAREBRACKETOPEN)))
|
|
|
|
parseAttribute(dynamic_cast<Attributable *>(statement));
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (!MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)))
|
|
|
|
throwParseError("missing ';' at end of expression", -1);
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-09-13 10:48:45 +02:00
|
|
|
// Consume superfluous semicolons
|
|
|
|
while (MATCHES(sequence(SEPARATOR_ENDOFEXPRESSION)));
|
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
return { statement };
|
|
|
|
}
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
ASTNodeTypeDecl* Parser::addType(const std::string &name, ASTNode *node, std::optional<std::endian> endian) {
|
|
|
|
auto typeName = getNamespacePrefixedName(name);
|
2021-09-03 10:30:40 +02:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
if (this->m_types.contains(typeName))
|
|
|
|
throwParseError(hex::format("redefinition of type '{}'", typeName));
|
2021-08-25 17:07:01 +02:00
|
|
|
|
2021-09-25 22:03:55 +02:00
|
|
|
auto typeDecl = create(new ASTNodeTypeDecl(typeName, node, endian));
|
|
|
|
this->m_types.insert({ typeName, typeDecl });
|
|
|
|
|
|
|
|
return typeDecl;
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
// <(parseNamespace)...> EndOfProgram
|
2020-12-22 18:10:01 +01:00
|
|
|
std::optional<std::vector<ASTNode*>> Parser::parse(const std::vector<Token> &tokens) {
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
this->m_curr = tokens.begin();
|
|
|
|
|
|
|
|
this->m_types.clear();
|
2020-11-10 15:26:38 +01:00
|
|
|
|
2021-08-25 17:07:01 +02:00
|
|
|
this->m_currNamespace.clear();
|
|
|
|
this->m_currNamespace.emplace_back();
|
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
try {
|
|
|
|
auto program = parseTillToken(SEPARATOR_ENDOFPROGRAM);
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
if (program.empty() || this->m_curr != tokens.end())
|
|
|
|
throwParseError("program is empty!", -1);
|
2020-11-10 15:26:38 +01:00
|
|
|
|
Pattern Language rewrite (#111)
* Initial parser rewrite effort
Lexer and Token cleanup, Parser started over
* Greatly improved parser syntax
* Reimplemented using declarations and variable placement parsing
* Added back unions and structs
* Added enums as well as mathematical expressions (+, -, *, /, <<, >>, &, |, ^)
* Code style improvement
* Implemented arrays and fixed memory issues
* Fixed more memory issues in parser, reimplemented validator, evaluator and patterns
* Fixed builtin types, arrays and reimplemented strings
* Improved error messages
* Made character a distinct type, used for chars and strings
* Implemented padding, fixed arrays
* Added bitfields
* Added rvalue parsing, no evaluating yet
* Added .idea folder to gitignore
* Fixed build on MacOS
* Added custom implementation of integral concept if not available
* Rebased onto master
* Fixed array variable decl crash
* Added rvalues and dot syntax
* Lower case all pattern language error messages
* Fixed typo in variable name
* Fixed bug where preprocessor would not ignore commented out directives
* Reimplemented pointers
* Fixed rebase issues
2021-01-02 20:27:11 +01:00
|
|
|
return program;
|
|
|
|
} catch (ParseError &e) {
|
|
|
|
this->m_error = e;
|
|
|
|
}
|
|
|
|
|
|
|
|
return { };
|
2020-11-10 15:26:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|