Adding interpreter invocation to ecma_op_eval_chars_buffer.

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected]

Author: ruben-ayrapetyan

jerry-core/ecma/operations/ecma-eval.cpp

@@ -92,9 +92,16 @@ ecma_op_eval_chars_buffer (const ecma_char_t *code_p, /**< code characters buffe
   serializer_print_opcodes ();
   parser_free ();
 
-  // FIXME:
+  opcode_counter_t first_opcode_index = 0u;
   bool is_strict_prologue = false;
-  (void) is_strict_prologue;
+  opcode_scope_code_flags_t scope_flags = vm_get_scope_flags (opcodes_p,
+                                                              first_opcode_index++);
+  if (scope_flags & OPCODE_SCOPE_CODE_FLAGS_STRICT)
+  {
+    is_strict_prologue = true;
+  }
+
+  bool is_strict = (is_strict_prologue || (is_direct && is_called_from_strict_mode_code));
 
   if (!is_syntax_correct)
   {
@@ -117,19 +124,20 @@ ecma_op_eval_chars_buffer (const ecma_char_t *code_p, /**< code characters buffe
       lex_env_p = ecma_get_global_environment ();
     }
 
-    if (is_strict_prologue
-        || (is_direct && is_called_from_strict_mode_code))
+    if (is_strict)
     {
       ecma_object_t *strict_lex_env_p = ecma_create_decl_lex_env (lex_env_p);
       ecma_deref_object (lex_env_p);
 
       lex_env_p = strict_lex_env_p;
     }
 
-    // FIXME: Call interpreter
-    (void) opcodes_p;
-    completion = ecma_make_return_completion_value (ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED));
-    JERRY_UNIMPLEMENTED ("eval operation is not implemented");
+    completion = vm_run_from_pos (opcodes_p,
+                                  first_opcode_index,
+                                  this_binding,
+                                  lex_env_p,
+                                  is_strict,
+                                  true);
 
     if (ecma_is_completion_value_return (completion))
     {

tests/unit/test_api.cpp

@@ -438,6 +438,26 @@ main (void)
   jerry_api_release_value (&val_t);
   jerry_api_release_value (&res);
 
+  const char *eval_code_src_p = "(function () { return 123; })";
+  jerry_completion_code_t status = jerry_api_eval (eval_code_src_p,
+                                                   strlen (eval_code_src_p),
+                                                   false,
+                                                   true,
+                                                   &val_t);
+  assert (status == JERRY_COMPLETION_CODE_OK);
+  assert (val_t.type == JERRY_API_DATA_TYPE_OBJECT);
+  assert (jerry_api_is_function (val_t.v_object));
+
+  is_ok = jerry_api_call_function (val_t.v_object,
+                                   NULL,
+                                   &res,
+                                   NULL, 0);
+  assert (is_ok);
+  assert (res.type == JERRY_API_DATA_TYPE_FLOAT64
+          && res.v_float64 == 123.0);
+  jerry_api_release_value (&res);
+
+  jerry_api_release_value (&val_t);
 
   // cleanup.
   jerry_api_release_object (global_obj_p);