From 56e6d2a380faadd5203a1d9438753d5c4e61a909 Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov <i.usmanov@samsung.com>
Date: Wed, 17 Sep 2014 20:21:17 +0400
Subject: [PATCH] Add if_else.js test. Fix bytecode generation.

---
 src/libjsparser/parser.c | 12 ++++++++++--
 tests/jerry/if_else.js   | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 tests/jerry/if_else.js

diff --git a/src/libjsparser/parser.c b/src/libjsparser/parser.c
index 92585321d..ff65c99af 100644
--- a/src/libjsparser/parser.c
+++ b/src/libjsparser/parser.c
@@ -2145,16 +2145,24 @@ parse_if_statement (void)
   skip_newlines ();
   parse_statement ();
 
-  REWRITE_COND_JMP (HEAD (U16, 1), is_false_jmp_down, OPCODE_COUNTER () - HEAD (U16, 1));
-
   skip_newlines ();
   if (is_keyword (KW_ELSE))
   {
+    PUSH (U16, OPCODE_COUNTER ());
+    DUMP_OPCODE_2 (jmp_down, INVALID_VALUE, INVALID_VALUE);
+
+    REWRITE_COND_JMP (HEAD (U16, 2), is_false_jmp_down, OPCODE_COUNTER () - HEAD (U16, 2));
+
     skip_newlines ();
     parse_statement ();
+
+    REWRITE_JMP (HEAD (U16, 1), jmp_down, OPCODE_COUNTER () - HEAD (U16, 1));
+
+    DROP (U16, 1);
   }
   else
   {
+    REWRITE_COND_JMP (HEAD (U16, 1), is_false_jmp_down, OPCODE_COUNTER () - HEAD (U16, 1));
     lexer_save_token (TOK ());
   }
 
diff --git a/tests/jerry/if_else.js b/tests/jerry/if_else.js
new file mode 100644
index 000000000..c7954b010
--- /dev/null
+++ b/tests/jerry/if_else.js
@@ -0,0 +1,35 @@
+// Copyright 2014 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+var was_then = false, was_else = false;
+
+if (true) {
+  was_then = true;
+} else {
+  was_else = true;
+}
+
+assert (was_then && !was_else);
+
+was_then = false;
+was_else = false;
+
+if (false) {
+  was_then = true;
+} else {
+  was_else = true;
+}
+
+assert (was_else && !was_then);
+