Add support for eval in parser.

JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov [email protected]

Author: sand1k

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

@@ -20,6 +20,8 @@
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
 #include "ecma-lex-env.h"
+#include "parser.h"
+#include "serializer.h"
 #include "vm.h"
 
 /** \addtogroup ecma ECMA
@@ -54,15 +56,15 @@ ecma_op_eval (ecma_string_t *code_p, /**< code string */
                                                       buf_size);
   JERRY_ASSERT (buffer_size_req == buf_size);
 
-  // FIXME: Get parser feedback about syntax correctness
-  bool is_syntax_correct = true;
-  bool is_strict_prologue;
-
-  // FIXME: Call parser
-  JERRY_UNIMPLEMENTED ("eval operation is not implemented");
+  parser_init ();
+  bool is_syntax_correct = parser_parse_eval ((const char *) code_p, (size_t) buf_size);
+  const opcode_t* opcodes_p = (const opcode_t*) serializer_get_bytecode ();
+  serializer_print_opcodes ();
+  parser_free ();
 
   // FIXME:
-  is_strict_prologue = false;
+  bool is_strict_prologue = false;
+  (void) is_strict_prologue;
 
   if (!is_syntax_correct)
   {
@@ -95,6 +97,7 @@ ecma_op_eval (ecma_string_t *code_p, /**< code string */
     }
 
     // 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");
 

jerry-core/jerry.cpp

@@ -1215,8 +1215,9 @@ jerry_parse (const char* source_p, /**< script source */
 
   bool is_show_opcodes = ((jerry_flags & JERRY_FLAG_SHOW_OPCODES) != 0);
 
-  parser_init (source_p, source_size, is_show_opcodes);
-  parser_parse_program ();
+  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 ();
 

jerry-core/parser/js/bytecode-data.h

@@ -34,12 +34,30 @@
  */
 #define BLOCK_SIZE 64
 
+/**
+ * Pointer to lit_id_hash_table precedes every independent bytecode region
+ */
+typedef struct __attribute__ ((aligned (MEM_ALIGNMENT)))
+{
+  lit_id_hash_table *lit_id_hash;
+} opcodes_header_t;
+
 typedef struct
 {
   const ecma_char_t *strings_buffer;
   const opcode_t *opcodes;
-  lit_id_hash_table *lit_id_hash;
   opcode_counter_t opcodes_count;
 } bytecode_data_t;
 
+/**
+ * Macros to get a hash table corresponding to a bytecode region
+ */
+#define GET_HASH_TABLE_FOR_BYTECODE(opcodes) (((opcodes_header_t *) (((uint8_t *) (opcodes)) - \
+                                                                     sizeof (opcodes_header_t)))->lit_id_hash)
+
+/**
+ * Macros to get a pointer to bytecode header by pointer to opcodes start
+ */
+#define GET_BYTECODE_HEADER(opcodes) ((opcodes_header_t *) (((uint8_t *) (opcodes)) - sizeof (opcodes_header_t)))
+
 #endif // BYTECODE_DATA_H

jerry-core/parser/js/lexer.cpp

@@ -1466,26 +1466,37 @@ lexer_are_tokens_with_same_identifier (token id1, /**< identifier token (TOK_NAM
   return (id1.uid == id2.uid);
 } /* lexer_are_tokens_with_same_identifier */
 
+/**
+ * Initialize lexer to start parsing of a new source
+ */
 void
-lexer_init (const char *source, size_t source_size, bool show_opcodes)
+lexer_init_source (const char *source, /**< script source */
+                   size_t source_size) /**< script source size in bytes */
+{
+  saved_token = prev_token = sent_token = empty_token;
+
+  buffer_size = source_size;
+  lexer_set_source (source);
+  lexer_set_strict_mode (false);
+} /* lexer_init_source */
+
+/**
+ * Intitialize lexer
+ */
+void
+lexer_init (bool show_opcodes) /**< flag indicating if to dump opcodes */
 {
   empty_token.type = TOK_EMPTY;
   empty_token.uid = 0;
   empty_token.loc = 0;
 
-  saved_token = prev_token = sent_token = empty_token;
-
 #ifndef JERRY_NDEBUG
   allow_dump_lines = show_opcodes;
 #else /* JERRY_NDEBUG */
   (void) show_opcodes;
   allow_dump_lines = false;
 #endif /* JERRY_NDEBUG */
-
-  buffer_size = source_size;
-  lexer_set_source (source);
-  lexer_set_strict_mode (false);
-}
+} /* lexer_init */
 
 void
 lexer_free (void)

jerry-core/parser/js/lexer.h

@@ -19,6 +19,7 @@
 #include "lit-literal.h"
 
 #define INVALID_VALUE 255
+#define EVAL_RET_VALUE 128
 #define INVALID_LITERAL (rcs_cpointer_t::null_cp ())
 
 /* Keywords.  */
@@ -168,7 +169,8 @@ typedef struct
  */
 #define TOKEN_EMPTY_INITIALIZER {0, TOK_EMPTY, 0}
 
-void lexer_init (const char *, size_t, bool);
+void lexer_init (bool);
+void lexer_init_source (const char *, size_t);
 void lexer_free (void);
 
 token lexer_next_token (void);

jerry-core/parser/js/opcodes-dumper.cpp

@@ -695,6 +695,22 @@ literal_operand (lit_cpointer_t lit_cp)
   return ret;
 }
 
+/**
+ * Creates operand for eval's return value
+ *
+ * @return constructed operand
+ */
+operand
+eval_ret_operand (void)
+{
+  operand ret;
+
+  ret.type = OPERAND_TMP;
+  ret.data.uid = EVAL_RET_VALUE;
+
+  return ret;
+} /* eval_ret_operand */
+
 bool
 operand_is_empty (operand op)
 {

jerry-core/parser/js/opcodes-dumper.h

@@ -48,6 +48,7 @@ typedef enum __attr_packed___
 
 operand empty_operand (void);
 operand literal_operand (lit_cpointer_t);
+operand eval_ret_operand (void);
 bool operand_is_empty (operand);
 
 void dumper_init (void);