Fix assignment and logical operators parsing

1 files changed, 6 insertions, 2 deletions

diff --git a/JSImpl/src/Parser.cpp b/JSImpl/src/Parser.cpp
index df2006f..feb302c 100644
--- a/JSImpl/src/Parser.cpp
+++ b/JSImpl/src/Parser.cpp
@@ -592,7 +592,7 @@ ExpressionPtr Parser::ConditionalExpression()
 		// TODO log parsing error
 		assert(false);
 	}
-	return LogicalExpression();
+	return condition;
 }
 
 ExpressionPtr Parser::AssignmentExpression()
@@ -688,7 +688,11 @@ ExpressionPtr Parser::VariableDefinition()
 		if (Match(TokenType::Identifier))
 		{
 			auto id = Prev().Lexeme;
-			auto ae = AssignmentExpression();
+			auto ae = CreateEmptyExpression();
+			if (Match(TokenType::Equal))
+			{
+				auto ae = AssignmentExpression();
+			}
 			return IPLMakeSharePtr<VariableDefinitionExpression>(id, ae);
 		}
 		return nullptr;