From 09e59ae226f2fcb469b944c815b1e1bf46d4c569 Mon Sep 17 00:00:00 2001
From: ValeriHristov <valeri.dhristov@gmail.com>
Date: Sun, 25 Nov 2018 17:49:14 +0200
Subject: Implement comparison operators (#71)

* Implement comparison operators.

* Remove debug code.

* Undo test code.
---
 JSImpl/src/ByteCodeGenerator.cpp | 43 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

(limited to 'JSImpl/src/ByteCodeGenerator.cpp')

diff --git a/JSImpl/src/ByteCodeGenerator.cpp b/JSImpl/src/ByteCodeGenerator.cpp
index dc846f2..fd85326 100644
--- a/JSImpl/src/ByteCodeGenerator.cpp
+++ b/JSImpl/src/ByteCodeGenerator.cpp
@@ -53,7 +53,11 @@ private:
 			SAVE,
 			RESTORE,
 			LESS,
+			LESSEQ,
+			GREATER,
+			GREATEREQ,
 			EQ,
+			NEQ,
 			LEQ,
 			GETG,
 			SETG,
@@ -282,11 +286,20 @@ void ByteCodeGenerator::Visit(BinaryExpression* e)
 	case TokenType::Less:
 		PushInstruction(Instruction::Type::LESS, o, l, r);
 		return;
+	case TokenType::LessEqual:
+		PushInstruction(Instruction::Type::LESSEQ, o, l, r);
+		return;
+	case TokenType::Greater:
+		PushInstruction(Instruction::Type::GREATER, o, l, r);
+		return;
+	case TokenType::GreaterEqual:
+		PushInstruction(Instruction::Type::GREATEREQ, o, l, r);
+		break;
 	case TokenType::EqualEqual:
 		PushInstruction(Instruction::Type::EQ, o, l, r);
 		return;
 	case TokenType::BangEqual:
-		NOT_IMPLEMENTED;
+		PushInstruction(Instruction::Type::NEQ,o,l,r);
 		break;
 	case TokenType::Equal:
 
@@ -378,8 +391,8 @@ void ByteCodeGenerator::Visit(UnaryExpression* e)
 				PushInstruction(Instruction::Type::SUB, reg, reg, one);
 			}
 			return;
-		default:
-			NOT_IMPLEMENTED;
+		default:
+			NOT_IMPLEMENTED;
 			break;
 		}
 	}
@@ -427,8 +440,8 @@ void ByteCodeGenerator::Visit(UnaryExpression* e)
 			case TokenType::Bang:
 				NOT_IMPLEMENTED;
 				return;
-		default:
-			NOT_IMPLEMENTED;
+		default:
+			NOT_IMPLEMENTED;
 			break;
 		}
 	}
@@ -532,11 +545,31 @@ IPLString ByteCodeGenerator::GetCode()
 				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
 				+ " r" + std::to_string(ResolveRegisterName(i.Args[2])) + '\n';
 			break;
+		case ByteCodeGenerator::Instruction::LESSEQ:
+			result += "lesseq r" + std::to_string(ResolveRegisterName(i.Args[0]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[2])) + '\n';
+			break;
+		case ByteCodeGenerator::Instruction::GREATER:
+			result += "greater r" + std::to_string(ResolveRegisterName(i.Args[0]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[2])) + '\n';
+			break;
+		case ByteCodeGenerator::Instruction::GREATEREQ:
+			result += "greatereq r" + std::to_string(ResolveRegisterName(i.Args[0]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[2])) + '\n';
+			break;
 		case ByteCodeGenerator::Instruction::EQ:
 			result += "eq r" + std::to_string(ResolveRegisterName(i.Args[0]))
 				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
 				+ " r" + std::to_string(ResolveRegisterName(i.Args[2])) + '\n';
 			break;
+		case ByteCodeGenerator::Instruction::NEQ:
+			result += "neq r" + std::to_string(ResolveRegisterName(i.Args[0]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
+				+ " r" + std::to_string(ResolveRegisterName(i.Args[2])) + '\n';
+			break;
 		case ByteCodeGenerator::Instruction::LEQ:
 			result += "leq r" + std::to_string(ResolveRegisterName(i.Args[0]))
 				+ " r" + std::to_string(ResolveRegisterName(i.Args[1]))
-- 
cgit v1.3.1-23-gd82d