Deukhoofd/PorygonLang
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass parsed block statements as reference instead of value

Browse Source
This commit is contained in:
Deukhoofd
2019-06-11 14:58:43 +02:00
parent 081def0be0
commit ba4fe888fa
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Binder/Binder.cpp
View File

@@ -9,9 +9,9 @@ BoundScriptStatement *Binder::Bind(Script* script, ParsedScriptStatement *s, Bou
binder._scope = scriptScope; binder._scope = scriptScope;
auto statements = s->GetStatements(); auto statements = s->GetStatements();
vector<BoundStatement*> boundStatements (statements.size()); vector<BoundStatement*> boundStatements (statements->size());
for (int i = 0; i < statements.size(); i++){ for (int i = 0; i < statements->size(); i++){
boundStatements[i] = binder.BindStatement(statements[i]); boundStatements[i] = binder.BindStatement(statements->at(i));
} }
return new BoundScriptStatement(boundStatements, scriptScope->GetDeepestScope()); return new BoundScriptStatement(boundStatements, scriptScope->GetDeepestScope());
} }
@@ -36,10 +36,10 @@ BoundStatement* Binder::BindStatement(ParsedStatement* statement){
BoundStatement *Binder::BindBlockStatement(ParsedStatement *statement) { BoundStatement *Binder::BindBlockStatement(ParsedStatement *statement) {
auto statements = ((ParsedBlockStatement*)statement)->GetStatements(); auto statements = ((ParsedBlockStatement*)statement)->GetStatements();
vector<BoundStatement*> boundStatements (statements.size()); vector<BoundStatement*> boundStatements (statements->size());
this->_scope->GoInnerScope(); this->_scope->GoInnerScope();
for (int i = 0; i < statements.size(); i++){ for (int i = 0; i < statements->size(); i++){
boundStatements[i] = this -> BindStatement(statements[i]); boundStatements[i] = this -> BindStatement(statements->at(i));
} }
this->_scope->GoOuterScope(); this->_scope->GoOuterScope();
return new BoundBlockStatement(boundStatements); return new BoundBlockStatement(boundStatements);

4
src/Parser/ParsedStatements/ParsedStatement.hpp
View File

@@ -77,8 +77,8 @@ public:
return ParsedStatementKind ::Block; return ParsedStatementKind ::Block;
} }
std::vector<ParsedStatement*> GetStatements(){ std::vector<ParsedStatement*>* GetStatements(){
return _statements; return &_statements;
} }
}; };

2
src/Parser/Parser.cpp
View File

@@ -399,7 +399,7 @@ ParsedExpression* Parser::ParseTableExpression(IToken* current){
else { else {
auto block = (ParsedBlockStatement*)this -> ParseBlock({TokenKind ::CloseCurlyBracket}); auto block = (ParsedBlockStatement*)this -> ParseBlock({TokenKind ::CloseCurlyBracket});
auto statements = block->GetStatements(); auto statements = block->GetStatements();
statements.insert(statements.begin(), firstItem); statements->insert(statements->begin(), firstItem);
throw "not implemented TODO"; throw "not implemented TODO";
} }
} }

50
tests/parser/ParserTests.cpp
View File

@@ -8,26 +8,26 @@ TEST_CASE( "Parse single true keyword", "[parser]" ) {
vector<IToken*> v {new SimpleToken(TokenKind::TrueKeyword,0,0), new SimpleToken(TokenKind::EndOfFile,0,0)}; vector<IToken*> v {new SimpleToken(TokenKind::TrueKeyword,0,0), new SimpleToken(TokenKind::EndOfFile,0,0)};
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::LiteralBool); REQUIRE(expression -> GetKind() == ParsedExpressionKind::LiteralBool);
auto boolean = ((LiteralBoolExpression*)expression); auto boolean = ((LiteralBoolExpression*)expression);
REQUIRE(boolean->GetValue() == true); REQUIRE(boolean->GetValue());
} }
TEST_CASE( "Parse single false keyword", "[parser]" ) { TEST_CASE( "Parse single false keyword", "[parser]" ) {
vector<IToken*> v {new SimpleToken(TokenKind::FalseKeyword,0,0), new SimpleToken(TokenKind::EndOfFile,0,0)}; vector<IToken*> v {new SimpleToken(TokenKind::FalseKeyword,0,0), new SimpleToken(TokenKind::EndOfFile,0,0)};
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::LiteralBool); REQUIRE(expression -> GetKind() == ParsedExpressionKind::LiteralBool);
auto boolean = ((LiteralBoolExpression*)expression); auto boolean = ((LiteralBoolExpression*)expression);
REQUIRE(boolean->GetValue() == false); REQUIRE_FALSE(boolean->GetValue());
} }
TEST_CASE( "Parse simple addition", "[parser]" ) { TEST_CASE( "Parse simple addition", "[parser]" ) {
@@ -39,8 +39,8 @@ TEST_CASE( "Parse simple addition", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::Binary); REQUIRE(expression -> GetKind() == ParsedExpressionKind::Binary);
@@ -62,8 +62,8 @@ TEST_CASE( "Parse simple negation", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::Unary); REQUIRE(expression -> GetKind() == ParsedExpressionKind::Unary);
@@ -82,8 +82,8 @@ TEST_CASE( "Parse logical negation", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::Unary); REQUIRE(expression -> GetKind() == ParsedExpressionKind::Unary);
@@ -91,7 +91,7 @@ TEST_CASE( "Parse logical negation", "[parser]" ) {
CHECK(unary -> GetOperatorKind() == UnaryOperatorKind::LogicalNegation); CHECK(unary -> GetOperatorKind() == UnaryOperatorKind::LogicalNegation);
auto operand = unary->GetOperand(); auto operand = unary->GetOperand();
REQUIRE(operand->GetKind() == ParsedExpressionKind::LiteralBool); REQUIRE(operand->GetKind() == ParsedExpressionKind::LiteralBool);
CHECK(((LiteralBoolExpression*)operand)->GetValue() == false); CHECK_FALSE(((LiteralBoolExpression*)operand)->GetValue());
} }
TEST_CASE( "Are parenthesized expressions valid", "[parser]" ) { TEST_CASE( "Are parenthesized expressions valid", "[parser]" ) {
@@ -105,8 +105,8 @@ TEST_CASE( "Are parenthesized expressions valid", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::Binary); REQUIRE(expression -> GetKind() == ParsedExpressionKind::Binary);
@@ -132,8 +132,8 @@ TEST_CASE( "Assert binary precedence", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::Parenthesized); REQUIRE(expression -> GetKind() == ParsedExpressionKind::Parenthesized);
@@ -145,8 +145,8 @@ TEST_CASE( "Parse String Tokens", "[parser]" ) {
vector<IToken*> v {new StringToken("foo bar", 0,0), new SimpleToken(TokenKind::EndOfFile,0,0)}; vector<IToken*> v {new StringToken("foo bar", 0,0), new SimpleToken(TokenKind::EndOfFile,0,0)};
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Expression);
auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression(); auto expression = ((ParsedExpressionStatement*)firstStatement)->GetExpression();
REQUIRE(expression -> GetKind() == ParsedExpressionKind::LiteralString); REQUIRE(expression -> GetKind() == ParsedExpressionKind::LiteralString);
@@ -163,8 +163,8 @@ TEST_CASE( "Parse Global Assignment", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Assignment); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Assignment);
auto assignment = (ParsedAssignmentStatement*)firstStatement; auto assignment = (ParsedAssignmentStatement*)firstStatement;
REQUIRE(!assignment -> IsLocal()); REQUIRE(!assignment -> IsLocal());
@@ -182,8 +182,8 @@ TEST_CASE( "Parse local Assignment", "[parser]" ) {
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Assignment); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::Assignment);
auto assignment = (ParsedAssignmentStatement*)firstStatement; auto assignment = (ParsedAssignmentStatement*)firstStatement;
REQUIRE(assignment -> IsLocal()); REQUIRE(assignment -> IsLocal());
@@ -210,8 +210,8 @@ TEST_CASE( "Parse function declaration", "[parser]" ){
}; };
Parser parser = Parser(v, nullptr); Parser parser = Parser(v, nullptr);
auto parsedStatements = parser.Parse() -> GetStatements(); auto parsedStatements = parser.Parse() -> GetStatements();
REQUIRE(parsedStatements.size() == 1); REQUIRE(parsedStatements->size() == 1);
auto firstStatement = parsedStatements[0]; auto firstStatement = parsedStatements -> at(0);
REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::FunctionDeclaration); REQUIRE(firstStatement -> GetKind() == ParsedStatementKind::FunctionDeclaration);
auto functionDeclaration = (ParsedFunctionDeclarationStatement*)firstStatement; auto functionDeclaration = (ParsedFunctionDeclarationStatement*)firstStatement;
REQUIRE(functionDeclaration->GetIdentifier() == HashedString("foo")); REQUIRE(functionDeclaration->GetIdentifier() == HashedString("foo"));