Remove base class parameter from expression macro iterator.

3 files changed, 25 insertions, 25 deletions

diff --git a/JSImpl/src/ASTPrinter.cpp b/JSImpl/src/ASTPrinter.cpp
index 3d33f0a..db7c106 100644
--- a/JSImpl/src/ASTPrinter.cpp
+++ b/JSImpl/src/ASTPrinter.cpp
@@ -209,7 +209,7 @@ std::ostream& operator<<(std::ostream& os, const TokenType& t)
 #define MEMBERS_COUNT(type, name, def) ++membersCount;
 #define VISIT_MEMBER(type, name, def) ++currentVisitCount; Print(os, *this, #name, e->Get##name(), currentVisitCount == membersCount);
 
-#define GENERATE_AST_PRINTER_FUNCTION(ClassName, Base, MEMBERS_ITERATOR)     \
+#define GENERATE_AST_PRINTER_FUNCTION(ClassName, MEMBERS_ITERATOR)           \
 	void ASTPrinter::Visit(ClassName* e)                                     \
 	{                                                                        \
 		int membersCount = 0, currentVisitCount = 0;                         \
diff --git a/JSImpl/src/Expression.h b/JSImpl/src/Expression.h
index 01c9b68..4d45cc3 100644
--- a/JSImpl/src/Expression.h
+++ b/JSImpl/src/Expression.h
@@ -25,8 +25,8 @@ class Expression : public IPLEnableShared<Expression>
 #define GENERATE_MEMBER_DEFINITIONS(type, name, def)\
 		type m_##name;
 
-#define GENERATE_EXPRESSION(ClassName, Base, MEMBERS_ITERATOR)                 \
-	class ClassName : public Base                                              \
+#define GENERATE_EXPRESSION(ClassName, MEMBERS_ITERATOR)                       \
+	class ClassName : public Expression                                        \
 	{                                                                          \
 		public:                                                                \
 		ClassName(MEMBERS_ITERATOR(EXPAND_ARGUMENT) bool __dummy = 0)          \
diff --git a/JSImpl/src/ExpressionDefinitions.h b/JSImpl/src/ExpressionDefinitions.h
index edf344b..93d8fb9 100644
--- a/JSImpl/src/ExpressionDefinitions.h
+++ b/JSImpl/src/ExpressionDefinitions.h
@@ -79,25 +79,25 @@
 		MACRO(ExpressionPtr, Arguments, ExpressionPtr())
 
 #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(LiteralObject, Expression, LITERAL_OBJECT_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)\
-		MACRO(CallExpression, Expression, CALL_EXPRESSION_MEMBERS)
+		MACRO(LiteralNull, NO_MEMBERS)\
+		MACRO(LiteralUndefined, NO_MEMBERS)\
+		MACRO(LiteralBoolean, LITERAL_BOOLEAN_MEMBERS)\
+		MACRO(LiteralNumber, LITERAL_NUMBER_MEMBERS)\
+		MACRO(LiteralString, LITERAL_STRING_MEMBERS)\
+		MACRO(LiteralObject, LITERAL_OBJECT_MEMBERS)\
+		MACRO(BinaryExpression, BINARY_EXPRESSION_MEMBERS)\
+		MACRO(UnaryExpression, UNARY_EXPRESSION_MEMBERS)\
+		MACRO(IdentifierExpression, IDENTIFIER_EXPRESSION_MEMBERS)\
+		MACRO(VariableDefinitionExpression, VARIABLEDEFINITION_EXPRESSION_MEMBERS)\
+		MACRO(ListExpression, LIST_EXPRESSION_MEMBERS)\
+		MACRO(BlockStatement, BLOCK_EXPRESSION_MEMBERS)\
+		MACRO(LabeledStatement, LABELED_EXPRESSION_MEMBERS)\
+		MACRO(IfStatement, IF_EXPRESSION_MEMBERS)\
+		MACRO(SwitchStatement, SWITCH_EXPRESSION_MEMBERS)\
+		MACRO(CaseStatement, CASE_EXPRESSION_MEMBERS)\
+		MACRO(WhileStatement, WHILE_EXPRESSION_MEMBERS)\
+		MACRO(ForStatement, FOR_EXPRESSION_MEMBERS)\
+		MACRO(FunctionDeclaration, FUNCTION_EXPRESSION_MEMBERS)\
+		MACRO(TopStatements, TOP_EXPRESSION_MEMBERS)\
+		MACRO(EmptyExpression, NO_MEMBERS)\
+		MACRO(CallExpression, CALL_EXPRESSION_MEMBERS)