YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing break / continue, nested into 'try', 'with' blocks.

Browse Source 
Related issue: #128

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
This commit is contained in:
Ruben Ayrapetyan
2015-06-02 17:06:43 +03:00
parent 8433df3097
commit ac87616f05
13 changed files with 440 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/vm/opcodes.cpp
+4 -6
View File
@@ -1334,22 +1334,20 @@ opfunc_with (opcode_t opdata, /**< operation data */
vm_run_scope_t run_scope_with = { int_data->pos, with_end_oc };
ecma_completion_value_t with_completion = vm_loop (int_data, &run_scope_with);
if (ecma_is_completion_value_normal (with_completion))
if (ecma_is_completion_value_empty (with_completion))
{
JERRY_ASSERT (ecma_is_completion_value_empty (with_completion));
JERRY_ASSERT (int_data->pos == with_end_oc);
int_data->pos++;
ret_value = ecma_make_empty_completion_value ();
}
else
{
JERRY_ASSERT (!ecma_is_completion_value_normal (with_completion));
JERRY_ASSERT (int_data->pos <= with_end_oc);
ret_value = with_completion;
}
ret_value = with_completion;
int_data->lex_env_p = old_env_p;
ecma_deref_object (new_env_p);