From a24ea4d6be0a92f9d2d8e937d08f6ea5575021ef Mon Sep 17 00:00:00 2001 From: martin dobrev Date: Sun, 14 Oct 2018 17:49:22 +0300 Subject: Clean up main.cpp --- JSImpl/src/main.cpp | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'JSImpl/src/main.cpp') diff --git a/JSImpl/src/main.cpp b/JSImpl/src/main.cpp index 4263bfa..b51d1a9 100644 --- a/JSImpl/src/main.cpp +++ b/JSImpl/src/main.cpp @@ -1,12 +1,11 @@ #include "Lexer.h" #include "Parser.h" +#include "ASTPrinter.h" #include #define LOG(msg) std::cout << msg << std::endl #define EXECUTE_TEST(test) std::cout << #test << " "; test(); #define CHECK(cond) if (cond) {LOG("PASS");} else {LOG(#cond " FAIL");} -#define CHECK(cond) cond ? LOG("PASS") : LOG("FAIL") - // Lexer Tests void TestLess() { @@ -23,13 +22,13 @@ void TestNumber() void TestNumberStartWithNine() { auto tokens = Tokenize("999"); - CHECK(tokens.size() == 2 && tokens[0].Type == TokenType::Number && tokens[0].Number == 999) + CHECK(tokens.size() == 2 && tokens[0].Type == TokenType::Number && tokens[0].Number == 999); } void TestNumberStartWithZero() { auto tokens = Tokenize("0999"); - CHECK(tokens.size() == 2 && tokens[0].Type == TokenType::Number && tokens[0].Number == 999) + CHECK(tokens.size() == 2 && tokens[0].Type == TokenType::Number && tokens[0].Number == 999); } void TestSpaceNewLineSpace() @@ -73,25 +72,27 @@ void TestVariableDeclaration() void TestParseUnaryExpr() { // TODO make actual test :D - auto expr = Parse(Tokenize("function pesho() { var a = 0; return a; }")); + auto expr = Parse(Tokenize("function pesho(v1) { var a = 0; return a; }")); + ASTPrinter p(std::cout); + expr->Accept(p); } int main() { - EXECUTE_TEST(TestLess); - EXECUTE_TEST(TestNumber); - EXECUTE_TEST(TestNumberStartWithNine); - EXECUTE_TEST(TestNumberStartWithZero); - EXECUTE_TEST(TestString); - EXECUTE_TEST(TestSpaceNewLineSpace); - EXECUTE_TEST(TestStringSingleQuotedStrings); - EXECUTE_TEST(TestKeyWord); - EXECUTE_TEST(TestVariableDeclaration); + //EXECUTE_TEST(TestLess); + //EXECUTE_TEST(TestNumber); + //EXECUTE_TEST(TestNumberStartWithNine); + //EXECUTE_TEST(TestNumberStartWithZero); + //EXECUTE_TEST(TestString); + //EXECUTE_TEST(TestSpaceNewLineSpace); + //EXECUTE_TEST(TestStringSingleQuotedStrings); + //EXECUTE_TEST(TestKeyWord); + //EXECUTE_TEST(TestVariableDeclaration); - //EXECUTE_TEST(TestParseUnaryExpr); + EXECUTE_TEST(TestParseUnaryExpr); #if defined(_WIN32) - std::system("pause"); + //std::system("pause"); #endif return 0; } -- cgit v1.3.1-23-gd82d From 0c666088bdf8ad15bbdfbc687cef38532dff96b4 Mon Sep 17 00:00:00 2001 From: martin dobrev Date: Sun, 14 Oct 2018 18:27:53 +0300 Subject: Split expression definitions in different file. --- JSImpl/solution/JSImpl.vcxproj | 1 + JSImpl/solution/JSImpl.vcxproj.filters | 57 +++++++++--------- JSImpl/src/Expression.h | 104 +-------------------------------- JSImpl/src/ExpressionDefinitions.h | 100 +++++++++++++++++++++++++++++++ JSImpl/src/main.cpp | 2 +- 5 files changed, 134 insertions(+), 130 deletions(-) create mode 100644 JSImpl/src/ExpressionDefinitions.h (limited to 'JSImpl/src/main.cpp') diff --git a/JSImpl/solution/JSImpl.vcxproj b/JSImpl/solution/JSImpl.vcxproj index e55b38d..99b34cc 100644 --- a/JSImpl/solution/JSImpl.vcxproj +++ b/JSImpl/solution/JSImpl.vcxproj @@ -115,6 +115,7 @@ + diff --git a/JSImpl/solution/JSImpl.vcxproj.filters b/JSImpl/solution/JSImpl.vcxproj.filters index d56f6a1..314e0f3 100644 --- a/JSImpl/solution/JSImpl.vcxproj.filters +++ b/JSImpl/solution/JSImpl.vcxproj.filters @@ -1,53 +1,56 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {9e65384d-2e18-4a3f-9b02-4abf632f9f06} - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd + + {177dbff8-a919-4a03-89ba-cb0a96e9e21e} + + + {948e229c-5a7a-4b3c-a75a-4b1b299c9e38} + + + {cf3787a3-5a0e-49f9-9a9f-99e14b57f391} - - Header Files + + Expressions + + + Expressions + + + Expressions - Header Files + Lexer - Header Files - - - Header Files + Parser - Header Files - - - Header Files + Visitors - Header Files + Visitors + - - Source Files + + Expressions - - Source Files + + Lexer - Source Files - - - Source Files + Parser - Source Files + Visitors + \ No newline at end of file diff --git a/JSImpl/src/Expression.h b/JSImpl/src/Expression.h index 30405f7..01c9b68 100644 --- a/JSImpl/src/Expression.h +++ b/JSImpl/src/Expression.h @@ -3,6 +3,7 @@ #include "CommonTypes.h" #include "Lexer.h" #include "ExpressionVisitor.h" +#include "ExpressionDefinitions.h" class Expression : public IPLEnableShared { @@ -40,108 +41,7 @@ class Expression : public IPLEnableShared bool m_dummy; \ }; - -#define NO_MEMBERS(MACRO) - -#define LITERAL_BOOLEAN_MEMBERS(MACRO)\ - MACRO(bool, Value, false) - -#define LITERAL_NUMBER_MEMBERS(MACRO)\ - MACRO(double, Value, 0.0) - -#define LITERAL_STRING_MEMBERS(MACRO)\ - MACRO(IPLString, Value, "") - -#define BINARY_EXPRESSION_MEMBERS(MACRO)\ - MACRO(ExpressionPtr, Left, nullptr)\ - MACRO(ExpressionPtr, Right, nullptr)\ - MACRO(TokenType, Operator, TokenType::Invalid) - -#define UNARY_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLSharedPtr, Expr, nullptr)\ - MACRO(TokenType, Operator, TokenType::Invalid)\ - MACRO(bool, Suffix, false) - -#define LITERAL_EXPRESSION_MEMBERS(MACRO)\ - MACRO(double, NumValue, 0.)\ - MACRO(IPLString, StringValue, "")\ - MACRO(bool, BooleanValue, false)\ - MACRO(LiteralType, Type, LiteralType::Undefined) - -#define IDENTIFIER_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLString, Name, "") - -#define VARIABLEDEFINITION_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLString, Name, "")\ - MACRO(ExpressionPtr, Value, nullptr) - -#define LIST_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLVector, Values, IPLVector()) - -#define BLOCK_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLVector, Values, IPLVector()) - -#define LABELED_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLString, Identifier, "")\ - MACRO(ExpressionPtr, Statement, nullptr) - -#define IF_EXPRESSION_MEMBERS(MACRO)\ - MACRO(ExpressionPtr, Condition, nullptr)\ - MACRO(ExpressionPtr, IfStatement, nullptr)\ - MACRO(ExpressionPtr, ElseStatement, nullptr) - -#define CASE_EXPRESSION_MEMBERS(MACRO)\ - MACRO(ExpressionPtr, Condition, nullptr)\ - MACRO(ExpressionPtr, Body, nullptr) - -#define SWITCH_EXPRESSION_MEMBERS(MACRO)\ - MACRO(ExpressionPtr, Condition, nullptr)\ - MACRO(IPLVector, Cases, IPLVector())\ - MACRO(ExpressionPtr, DefaultCase, nullptr) - -#define WHILE_EXPRESSION_MEMBERS(MACRO)\ - MACRO(ExpressionPtr, Condition, nullptr)\ - MACRO(ExpressionPtr, Body, nullptr)\ - MACRO(bool, DoWhile, false) - -#define FOR_EXPRESSION_MEMBERS(MACRO)\ - MACRO(ExpressionPtr, Initialization, nullptr)\ - MACRO(ExpressionPtr, Condition, nullptr)\ - MACRO(ExpressionPtr, Iteration, nullptr)\ - MACRO(ExpressionPtr, Body, nullptr) - -#define FUNCTION_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLString, Name, "")\ - MACRO(IPLVector, ArgumentsIdentifiers, IPLVector())\ - MACRO(ExpressionPtr, Body, nullptr) - -#define TOP_EXPRESSION_MEMBERS(MACRO)\ - MACRO(IPLVector, Values, IPLVector()) - -#define EMPTY_EXPRESSION_MEMBERS(MACRO) - -#define EXPRESSION_DEFINITION_ITERATOR(MACRO)\ - MACRO(LiteralNull, Expression, NO_MEMBERS)\ - MACRO(LiteralUndefined, Expression, NO_MEMBERS)\ - MACRO(LiteralBoolean, Expression, LITERAL_BOOLEAN_MEMBERS)\ - MACRO(LiteralNumber, Expression, LITERAL_NUMBER_MEMBERS)\ - MACRO(LiteralString, Expression, LITERAL_STRING_MEMBERS)\ - MACRO(BinaryExpression, Expression, BINARY_EXPRESSION_MEMBERS)\ - MACRO(UnaryExpression, Expression, UNARY_EXPRESSION_MEMBERS)\ - MACRO(IdentifierExpression, Expression, IDENTIFIER_EXPRESSION_MEMBERS)\ - MACRO(VariableDefinitionExpression, Expression, VARIABLEDEFINITION_EXPRESSION_MEMBERS)\ - MACRO(ListExpression, Expression, LIST_EXPRESSION_MEMBERS)\ - MACRO(BlockStatement, Expression, BLOCK_EXPRESSION_MEMBERS)\ - MACRO(LabeledStatement, Expression, LABELED_EXPRESSION_MEMBERS)\ - MACRO(IfStatement, Expression, IF_EXPRESSION_MEMBERS)\ - MACRO(SwitchStatement, Expression, SWITCH_EXPRESSION_MEMBERS)\ - MACRO(CaseStatement, Expression, CASE_EXPRESSION_MEMBERS)\ - MACRO(WhileStatement, Expression, WHILE_EXPRESSION_MEMBERS)\ - MACRO(ForStatement, Expression, FOR_EXPRESSION_MEMBERS)\ - MACRO(FunctionDeclaration, Expression, FUNCTION_EXPRESSION_MEMBERS)\ - MACRO(TopStatements, Expression, TOP_EXPRESSION_MEMBERS)\ - MACRO(EmptyExpression, Expression, EMPTY_EXPRESSION_MEMBERS) - EXPRESSION_DEFINITION_ITERATOR(GENERATE_EXPRESSION); +#undef GENERATE_EXPRESSION inline ExpressionPtr CreateEmptyExpression() { return IPLMakeSharePtr(); } diff --git a/JSImpl/src/ExpressionDefinitions.h b/JSImpl/src/ExpressionDefinitions.h new file mode 100644 index 0000000..b1b2595 --- /dev/null +++ b/JSImpl/src/ExpressionDefinitions.h @@ -0,0 +1,100 @@ +#pragma once + +#define NO_MEMBERS(MACRO) + +#define LITERAL_BOOLEAN_MEMBERS(MACRO)\ + MACRO(bool, Value, false) + +#define LITERAL_NUMBER_MEMBERS(MACRO)\ + MACRO(double, Value, 0.0) + +#define LITERAL_STRING_MEMBERS(MACRO)\ + MACRO(IPLString, Value, "") + +#define BINARY_EXPRESSION_MEMBERS(MACRO)\ + MACRO(ExpressionPtr, Left, nullptr)\ + MACRO(ExpressionPtr, Right, nullptr)\ + MACRO(TokenType, Operator, TokenType::Invalid) + +#define UNARY_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLSharedPtr, Expr, nullptr)\ + MACRO(TokenType, Operator, TokenType::Invalid)\ + MACRO(bool, Suffix, false) + +#define LITERAL_EXPRESSION_MEMBERS(MACRO)\ + MACRO(double, NumValue, 0.)\ + MACRO(IPLString, StringValue, "")\ + MACRO(bool, BooleanValue, false)\ + MACRO(LiteralType, Type, LiteralType::Undefined) + +#define IDENTIFIER_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLString, Name, "") + +#define VARIABLEDEFINITION_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLString, Name, "")\ + MACRO(ExpressionPtr, Value, nullptr) + +#define LIST_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLVector, Values, IPLVector()) + +#define BLOCK_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLVector, Values, IPLVector()) + +#define LABELED_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLString, Identifier, "")\ + MACRO(ExpressionPtr, Statement, nullptr) + +#define IF_EXPRESSION_MEMBERS(MACRO)\ + MACRO(ExpressionPtr, Condition, nullptr)\ + MACRO(ExpressionPtr, IfStatement, nullptr)\ + MACRO(ExpressionPtr, ElseStatement, nullptr) + +#define CASE_EXPRESSION_MEMBERS(MACRO)\ + MACRO(ExpressionPtr, Condition, nullptr)\ + MACRO(ExpressionPtr, Body, nullptr) + +#define SWITCH_EXPRESSION_MEMBERS(MACRO)\ + MACRO(ExpressionPtr, Condition, nullptr)\ + MACRO(IPLVector, Cases, IPLVector())\ + MACRO(ExpressionPtr, DefaultCase, nullptr) + +#define WHILE_EXPRESSION_MEMBERS(MACRO)\ + MACRO(ExpressionPtr, Condition, nullptr)\ + MACRO(ExpressionPtr, Body, nullptr)\ + MACRO(bool, DoWhile, false) + +#define FOR_EXPRESSION_MEMBERS(MACRO)\ + MACRO(ExpressionPtr, Initialization, nullptr)\ + MACRO(ExpressionPtr, Condition, nullptr)\ + MACRO(ExpressionPtr, Iteration, nullptr)\ + MACRO(ExpressionPtr, Body, nullptr) + +#define FUNCTION_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLString, Name, "")\ + MACRO(IPLVector, ArgumentsIdentifiers, IPLVector())\ + MACRO(ExpressionPtr, Body, nullptr) + +#define TOP_EXPRESSION_MEMBERS(MACRO)\ + MACRO(IPLVector, Values, IPLVector()) + +#define EXPRESSION_DEFINITION_ITERATOR(MACRO)\ + MACRO(LiteralNull, Expression, NO_MEMBERS)\ + MACRO(LiteralUndefined, Expression, NO_MEMBERS)\ + MACRO(LiteralBoolean, Expression, LITERAL_BOOLEAN_MEMBERS)\ + MACRO(LiteralNumber, Expression, LITERAL_NUMBER_MEMBERS)\ + MACRO(LiteralString, Expression, LITERAL_STRING_MEMBERS)\ + MACRO(BinaryExpression, Expression, BINARY_EXPRESSION_MEMBERS)\ + MACRO(UnaryExpression, Expression, UNARY_EXPRESSION_MEMBERS)\ + MACRO(IdentifierExpression, Expression, IDENTIFIER_EXPRESSION_MEMBERS)\ + MACRO(VariableDefinitionExpression, Expression, VARIABLEDEFINITION_EXPRESSION_MEMBERS)\ + MACRO(ListExpression, Expression, LIST_EXPRESSION_MEMBERS)\ + MACRO(BlockStatement, Expression, BLOCK_EXPRESSION_MEMBERS)\ + MACRO(LabeledStatement, Expression, LABELED_EXPRESSION_MEMBERS)\ + MACRO(IfStatement, Expression, IF_EXPRESSION_MEMBERS)\ + MACRO(SwitchStatement, Expression, SWITCH_EXPRESSION_MEMBERS)\ + MACRO(CaseStatement, Expression, CASE_EXPRESSION_MEMBERS)\ + MACRO(WhileStatement, Expression, WHILE_EXPRESSION_MEMBERS)\ + MACRO(ForStatement, Expression, FOR_EXPRESSION_MEMBERS)\ + MACRO(FunctionDeclaration, Expression, FUNCTION_EXPRESSION_MEMBERS)\ + MACRO(TopStatements, Expression, TOP_EXPRESSION_MEMBERS)\ + MACRO(EmptyExpression, Expression, NO_MEMBERS) diff --git a/JSImpl/src/main.cpp b/JSImpl/src/main.cpp index b51d1a9..586eef1 100644 --- a/JSImpl/src/main.cpp +++ b/JSImpl/src/main.cpp @@ -90,7 +90,7 @@ int main() //EXECUTE_TEST(TestVariableDeclaration); - EXECUTE_TEST(TestParseUnaryExpr); + TestParseUnaryExpr(); #if defined(_WIN32) //std::system("pause"); #endif -- cgit v1.3.1-23-gd82d