jerryscript-project · ruben-ayrapetyan · Jun 19, 2015 · Jun 18, 2015 · Jun 18, 2015 · Jun 18, 2015
diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
@@ -100,8 +100,8 @@ project (JerryCore CXX C ASM)
      ${CMAKE_SOURCE_DIR}/jerry-core/ecma/builtin-objects
      ${CMAKE_SOURCE_DIR}/jerry-core/ecma/base
      ${CMAKE_SOURCE_DIR}/jerry-core/ecma/operations
-     ${CMAKE_SOURCE_DIR}/jerry-core/parser/collections
      ${CMAKE_SOURCE_DIR}/jerry-core/parser/js
+     ${CMAKE_SOURCE_DIR}/jerry-core/parser/js/collections
      ${CMAKE_SOURCE_DIR}/jerry-core/jrt)
 
  # Third-party
@@ -110,17 +110,17 @@ project (JerryCore CXX C ASM)
 
 # Sources
  # Jerry core
-  file(GLOB SOURCE_CORE_API                *.cpp)
-  file(GLOB SOURCE_CORE_LIT                lit/*.cpp)
-  file(GLOB SOURCE_CORE_RCS                rcs/*.cpp)
-  file(GLOB SOURCE_CORE_MEM                mem/*.cpp)
-  file(GLOB SOURCE_CORE_VM                 vm/*.cpp)
-  file(GLOB SOURCE_CORE_ECMA_BUILTINS      ecma/builtin-objects/*.cpp)
-  file(GLOB SOURCE_CORE_ECMA_BASE          ecma/base/*.cpp)
-  file(GLOB SOURCE_CORE_ECMA_OPERATIONS    ecma/operations/*.cpp)
-  file(GLOB SOURCE_CORE_PARSER_COLLECTIONS parser/collections/*.cpp)
-  file(GLOB SOURCE_CORE_PARSER_JS          parser/js/*.cpp)
-  file(GLOB SOURCE_CORE_JRT                jrt/*.cpp)
+  file(GLOB SOURCE_CORE_API                   *.cpp)
+  file(GLOB SOURCE_CORE_LIT                   lit/*.cpp)
+  file(GLOB SOURCE_CORE_RCS                   rcs/*.cpp)
+  file(GLOB SOURCE_CORE_MEM                   mem/*.cpp)
+  file(GLOB SOURCE_CORE_VM                    vm/*.cpp)
+  file(GLOB SOURCE_CORE_ECMA_BUILTINS         ecma/builtin-objects/*.cpp)
+  file(GLOB SOURCE_CORE_ECMA_BASE             ecma/base/*.cpp)
+  file(GLOB SOURCE_CORE_ECMA_OPERATIONS       ecma/operations/*.cpp)
+  file(GLOB SOURCE_CORE_PARSER_JS             parser/js/*.cpp)
+  file(GLOB SOURCE_CORE_PARSER_JS_COLLECTIONS parser/js/collections/*.cpp)
+  file(GLOB SOURCE_CORE_JRT                   jrt/*.cpp)
 
   set(SOURCE_CORE
       jerry.cpp
@@ -132,8 +132,8 @@ project (JerryCore CXX C ASM)
       ${SOURCE_CORE_ECMA_BUILTINS}
       ${SOURCE_CORE_ECMA_BASE}
       ${SOURCE_CORE_ECMA_OPERATIONS}
-      ${SOURCE_CORE_PARSER_COLLECTIONS}
       ${SOURCE_CORE_PARSER_JS}
+      ${SOURCE_CORE_PARSER_JS_COLLECTIONS}
       ${SOURCE_CORE_JRT})
 
 # Per-option configuration

diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-function.cpp
@@ -15,6 +15,7 @@
 
 #include "ecma-alloc.h"
 #include "ecma-conversion.h"
+#include "ecma-exceptions.h"
 #include "ecma-gc.h"
 #include "ecma-function-object.h"
 #include "ecma-lex-env.h"
@@ -130,52 +131,55 @@ ecma_builtin_function_dispatch_construct (const ecma_value_t *arguments_list_p,
       zt_string_buffer_pos += sz;
     }
 
-    parser_init ();
+    const opcode_t* opcodes_p;
+    bool is_syntax_correct;
 
-    /*
-     * FIXME:
-     *       Handle syntax errors
-     */
-    parser_parse_new_function ((const char **) zt_string_params_p, params_count);
-    const opcode_t* opcodes_p = (const opcode_t*) serializer_get_bytecode ();
-    serializer_print_opcodes ();
-    parser_free ();
+    is_syntax_correct = parser_parse_new_function ((const char **) zt_string_params_p,
+                                                   params_count,
+                                                   &opcodes_p);
 
-    bool is_strict = false;
-    bool do_instantiate_arguments_object = true;
-
-    opcode_scope_code_flags_t scope_flags = vm_get_scope_flags (opcodes_p,
-                                                                0);
-
-    if (scope_flags & OPCODE_SCOPE_CODE_FLAGS_STRICT)
+    if (!is_syntax_correct)
     {
-      is_strict = true;
+      ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_SYNTAX));
     }
-
-    if ((scope_flags & OPCODE_SCOPE_CODE_FLAGS_NOT_REF_ARGUMENTS_IDENTIFIER)
-        && (scope_flags & OPCODE_SCOPE_CODE_FLAGS_NOT_REF_EVAL_IDENTIFIER))
+    else
     {
-      /* the code doesn't use 'arguments' identifier
-       * and doesn't perform direct call to eval,
-       * so Arguments object can't be referenced */
-      do_instantiate_arguments_object = false;
+      bool is_strict = false;
+      bool do_instantiate_arguments_object = true;
+
+      opcode_scope_code_flags_t scope_flags = vm_get_scope_flags (opcodes_p,
+                                                                  0);
+
+      if (scope_flags & OPCODE_SCOPE_CODE_FLAGS_STRICT)
+      {
+        is_strict = true;
+      }
+
+      if ((scope_flags & OPCODE_SCOPE_CODE_FLAGS_NOT_REF_ARGUMENTS_IDENTIFIER)
+          && (scope_flags & OPCODE_SCOPE_CODE_FLAGS_NOT_REF_EVAL_IDENTIFIER))
+      {
+        /* the code doesn't use 'arguments' identifier
+         * and doesn't perform direct call to eval,
+         * so Arguments object can't be referenced */
+        do_instantiate_arguments_object = false;
+      }
+
+      /* 11. */
+      ecma_object_t *glob_lex_env_p = ecma_get_global_environment ();
+
+      ecma_object_t *func_obj_p = ecma_op_create_function_object (params_count > 1u ? string_params_p : NULL,
+                                                                  (ecma_length_t) (params_count - 1u),
+                                                                  glob_lex_env_p,
+                                                                  is_strict,
+                                                                  do_instantiate_arguments_object,
+                                                                  opcodes_p,
+                                                                  1);
+
+      ecma_deref_object (glob_lex_env_p);
+
+      ret_value = ecma_make_normal_completion_value (ecma_make_object_value (func_obj_p));
     }
 
-    /* 11. */
-    ecma_object_t *glob_lex_env_p = ecma_get_global_environment ();
-
-    ecma_object_t *func_obj_p = ecma_op_create_function_object (params_count > 1u ? string_params_p : NULL,
-                                                                (ecma_length_t) (params_count - 1u),
-                                                                glob_lex_env_p,
-                                                                is_strict,
-                                                                do_instantiate_arguments_object,
-                                                                opcodes_p,
-                                                                1);
-
-    ecma_deref_object (glob_lex_env_p);
-
-    ret_value = ecma_make_normal_completion_value (ecma_make_object_value (func_obj_p));
-
     MEM_FINALIZE_LOCAL_ARRAY (zt_string_buffer_p);
     MEM_FINALIZE_LOCAL_ARRAY (zt_string_params_p);
   }

diff --git a/jerry-core/ecma/operations/ecma-eval.cpp b/jerry-core/ecma/operations/ecma-eval.cpp
@@ -86,29 +86,30 @@ ecma_op_eval_chars_buffer (const ecma_char_t *code_p, /**< code characters buffe
 
   ecma_completion_value_t completion;
 
-  parser_init ();
-  bool is_syntax_correct = parser_parse_eval ((const char *) code_p, code_buffer_size);
-  const opcode_t* opcodes_p = (const opcode_t*) serializer_get_bytecode ();
-  serializer_print_opcodes ();
-  parser_free ();
-
-  opcode_counter_t first_opcode_index = 0u;
-  bool is_strict_prologue = false;
-  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;
-  }
+  const opcode_t *opcodes_p;
+  bool is_syntax_correct;
 
-  bool is_strict = (is_strict_prologue || (is_direct && is_called_from_strict_mode_code));
+  is_syntax_correct = parser_parse_eval ((const char *) code_p,
+                                         code_buffer_size,
+                                         &opcodes_p);
 
   if (!is_syntax_correct)
   {
     completion = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_SYNTAX));
   }
   else
   {
+    opcode_counter_t first_opcode_index = 0u;
+    bool is_strict_prologue = false;
+    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));
+
     ecma_value_t this_binding;
     ecma_object_t *lex_env_p;
 

diff --git a/jerry-core/jerry.cpp b/jerry-core/jerry.cpp
@@ -1244,6 +1244,9 @@ jerry_reg_err_callback (jerry_error_callback_t callback) /**< pointer to callbac
 
 /**
  * Parse script for specified context
+ *
+ * @return true - if script was parsed successfully,
+ *         false - otherwise (SyntaxError was raised).
  */
 bool
 jerry_parse (const char* source_p, /**< script source */
@@ -1254,13 +1257,18 @@ jerry_parse (const char* source_p, /**< script source */
   bool is_show_opcodes = ((jerry_flags & JERRY_FLAG_SHOW_OPCODES) != 0);
 
   parser_set_show_opcodes (is_show_opcodes);
-  parser_init ();
-  parser_parse_script (source_p, source_size);
 
-  const opcode_t* opcodes = (const opcode_t*) serializer_get_bytecode ();
+  const opcode_t *opcodes_p;
+  bool is_syntax_correct;
+
+  is_syntax_correct = parser_parse_script (source_p,
+                                           source_size,
+                                           &opcodes_p);
 
-  serializer_print_opcodes ();
-  parser_free ();
+  if (!is_syntax_correct)
+  {
+    return false;
+  }
 
 #ifdef MEM_STATS
   if (jerry_flags & JERRY_FLAG_MEM_STATS_SEPARATE)
@@ -1272,7 +1280,7 @@ jerry_parse (const char* source_p, /**< script source */
 
   bool is_show_mem_stats_per_opcode = ((jerry_flags & JERRY_FLAG_MEM_STATS_PER_OPCODE) != 0);
 
-  vm_init (opcodes, is_show_mem_stats_per_opcode);
+  vm_init (opcodes_p, is_show_mem_stats_per_opcode);
 
   return true;
 } /* jerry_parse */

diff --git a/jerry-core/jerry.h b/jerry-core/jerry.h
@@ -49,7 +49,6 @@ typedef enum
 {
   ERR_OUT_OF_MEMORY = 10,
   ERR_SYSCALL = 11,
-  ERR_PARSER = 12,
   ERR_UNIMPLEMENTED_CASE = 118,
   ERR_FAILED_INTERNAL_ASSERTION = 120
 } jerry_fatal_code_t;

diff --git a/jerry-core/jrt/jrt-fatals.cpp b/jerry-core/jrt/jrt-fatals.cpp
@@ -47,11 +47,6 @@ jerry_fatal (jerry_fatal_code_t code) /**< status code */
       /* print nothing as it may invoke syscall recursively */
       break;
     }
-    case ERR_PARSER:
-    {
-      printf ("ERR_PARSER\n");
-      break;
-    }
     case ERR_UNIMPLEMENTED_CASE:
     {
       printf ("ERR_UNIMPLEMENTED_CASE\n");

diff --git a/jerry-core/jrt/jrt-libc-includes.h b/jerry-core/jrt/jrt-libc-includes.h
@@ -17,6 +17,8 @@
 #define JRT_LIBC_INCLUDES_H
 
 #include <ctype.h>
+#include <setjmp.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/jerry-core/parser/collections/lit-id-hash-table.cpp b/jerry-core/parser/collections/lit-id-hash-table.cpp
diff --git a/jerry-core/parser/js/bytecode-data.h b/jerry-core/parser/js/bytecode-data.h
@@ -18,6 +18,7 @@
 
 #include "opcodes.h"
 #include "lit-id-hash-table.h"
+#include "mem-allocator.h"
 
 /*
  * All literals are kept in the 'literals' array.
@@ -35,11 +36,13 @@
 #define BLOCK_SIZE 64
 
 /**
- * Pointer to lit_id_hash_table precedes every independent bytecode region
+ * Header of byte-code memory region, containing byte-code array and literal identifiers hash table
  */
 typedef struct __attribute__ ((aligned (MEM_ALIGNMENT)))
 {
-  lit_id_hash_table *lit_id_hash;
+  mem_cpointer_t lit_id_hash_cp; /**< pointer to literal identifiers hash table
+                                  *   See also: lit_id_hash_table_init */
+  mem_cpointer_t next_opcodes_cp; /**< pointer to next byte-code memory region */
 } opcodes_header_t;
 
 typedef struct
@@ -50,14 +53,15 @@ typedef struct
 } bytecode_data_t;
 
 /**
- * Macros to get a hash table corresponding to a bytecode region
+ * Macros to get a pointer to bytecode header by pointer to opcodes start
  */
-#define GET_HASH_TABLE_FOR_BYTECODE(opcodes) (((opcodes_header_t *) (((uint8_t *) (opcodes)) - \
-                                                                     sizeof (opcodes_header_t)))->lit_id_hash)
+#define GET_BYTECODE_HEADER(opcodes) ((opcodes_header_t *) (((uint8_t *) (opcodes)) - sizeof (opcodes_header_t)))
 
 /**
- * Macros to get a pointer to bytecode header by pointer to opcodes start
+ * Macros to get a hash table corresponding to a bytecode region
  */
-#define GET_BYTECODE_HEADER(opcodes) ((opcodes_header_t *) (((uint8_t *) (opcodes)) - sizeof (opcodes_header_t)))
+#define GET_HASH_TABLE_FOR_BYTECODE(opcodes) (MEM_CP_GET_POINTER (lit_id_hash_table, \
+                                                                  GET_BYTECODE_HEADER (opcodes)->lit_id_hash_cp))
+
 
 #endif // BYTECODE_DATA_H