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

Style fixes.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd 2020-11-01 13:50:35 +01:00
parent c4d7c9e2d8
commit e30bfe1686
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CoreData/FuncAttr.hpp
View File

@ -16,7 +16,7 @@ namespace MalachScript {
constexpr inline static bool Contains(FuncAttr set, FuncAttr flag) { constexpr inline static bool Contains(FuncAttr set, FuncAttr flag) {
return (static_cast<uint8_t>(set) & static_cast<uint8_t>(flag)) != 0; return (static_cast<uint8_t>(set) & static_cast<uint8_t>(flag)) != 0;
} }
constexpr inline static FuncAttr Set(FuncAttr set, FuncAttr flag){ constexpr inline static FuncAttr Set(FuncAttr set, FuncAttr flag) {
return static_cast<FuncAttr>(static_cast<uint8_t>(set) | static_cast<uint8_t>(flag)); return static_cast<FuncAttr>(static_cast<uint8_t>(set) | static_cast<uint8_t>(flag));
} }
}; };

2
src/CoreData/TypeMod.hpp
View File

@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
namespace MalachScript{ namespace MalachScript {
enum class TypeMod : uint8_t { enum class TypeMod : uint8_t {
None = 0, None = 0,
RefIn = 1, RefIn = 1,

2
src/Parser/Expressions/ParsedExpression.hpp
View File

@ -2,7 +2,7 @@
#define MALACHSCRIPT_PARSEDEXPRESSION_HPP #define MALACHSCRIPT_PARSEDEXPRESSION_HPP
namespace MalachScript::Parser { namespace MalachScript::Parser {
class ParsedExpression{}; class ParsedExpression {};
} }
#endif // MALACHSCRIPT_PARSEDEXPRESSION_HPP #endif // MALACHSCRIPT_PARSEDEXPRESSION_HPP

3
src/Parser/Lexer/NumericalLexers.cpp
View File

@ -1,6 +1,5 @@
#include <cstdint>
#include "NumericalLexers.hpp" #include "NumericalLexers.hpp"
#include <cstdint>
uint8_t LexDecimalValue(char8_t c) { uint8_t LexDecimalValue(char8_t c) {
switch (c) { switch (c) {

7
src/Parser/Parser.cpp
View File

@ -273,7 +273,7 @@ namespace MalachScript::Parser {
if (ParseIdentifier(identifier, current)) { if (ParseIdentifier(identifier, current)) {
PROGRESS_TOKEN(current); PROGRESS_TOKEN(current);
scope.push_back(identifier); scope.push_back(identifier);
if (current->GetKind() != LexTokenKind::ColonColonSymbol){ if (current->GetKind() != LexTokenKind::ColonColonSymbol) {
return false; return false;
} }
} else { } else {
@ -494,10 +494,9 @@ namespace MalachScript::Parser {
break; break;
} }
} }
if (current->GetKind() != LexTokenKind::CloseCurlyParenthesisSymbol){ if (current->GetKind() != LexTokenKind::CloseCurlyParenthesisSymbol) {
LogError(Diagnostics::DiagnosticType::UnexpectedToken, current->GetSpan()); LogError(Diagnostics::DiagnosticType::UnexpectedToken, current->GetSpan());
} } else {
else{
PROGRESS_TOKEN(current); PROGRESS_TOKEN(current);
} }

3
tests/ParserTests/ParserIntegrationTests.cpp
View File

@ -38,7 +38,8 @@ PARSE_TEST("Parse class with virtprop", "class foobar { private bool foo { get;
REQUIRE(script->GetStatements().size() == 1); REQUIRE(script->GetStatements().size() == 1);
auto firstStatement = script->GetStatements()[0].get(); auto firstStatement = script->GetStatements()[0].get();
REQUIRE(firstStatement->GetKind() == Parser::ParsedStatementKind::Class); REQUIRE(firstStatement->GetKind() == Parser::ParsedStatementKind::Class);
auto firstClassStatement = dynamic_cast<const MalachScript::Parser::ParsedClassStatement*>(firstStatement)->GetBody()[0].get(); auto firstClassStatement =
dynamic_cast<const MalachScript::Parser::ParsedClassStatement*>(firstStatement)->GetBody()[0].get();
REQUIRE(firstClassStatement->GetKind() == Parser::ParsedStatementKind::VirtProp); REQUIRE(firstClassStatement->GetKind() == Parser::ParsedStatementKind::VirtProp);
auto virtPropStatement = dynamic_cast<const MalachScript::Parser::ParsedVirtPropStatement*>(firstClassStatement); auto virtPropStatement = dynamic_cast<const MalachScript::Parser::ParsedVirtPropStatement*>(firstClassStatement);
REQUIRE(virtPropStatement->GetAccess() == MalachScript::AccessModifier::Private); REQUIRE(virtPropStatement->GetAccess() == MalachScript::AccessModifier::Private);