Implement RegExp.prototype.test and RegExp.prototype.toString. Add new test cases to RegExp.

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com

Author: LaszloLango

jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp

@@ -18,6 +18,7 @@
 #include "ecma-conversion.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
+#include "ecma-objects.h"
 #include "ecma-try-catch-macro.h"
 
 #ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
@@ -86,6 +87,133 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */
   return ret_value;
 } /* ecma_builtin_regexp_prototype_exec */
 
+/**
+ * @}
+ * @}
+ * @}
+ */
+
+/**
+ * The RegExp.prototype object's 'test' routine
+ *
+ * See also:
+ *          ECMA-262 v5, 15.10.6.3
+ *
+ * @return completion value
+ *         Returned value must be freed with ecma_free_completion_value.
+ */
+static ecma_completion_value_t
+ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */
+                                    ecma_value_t arg) /**< routine's argument */
+{
+  ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
+
+  ECMA_TRY_CATCH (match_value,
+                  ecma_builtin_regexp_prototype_exec (this_arg, arg),
+                  ret_value);
+  if (ecma_is_value_undefined (match_value))
+  {
+    ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_FALSE);
+  }
+  else
+  {
+    ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
+  }
+  ECMA_FINALIZE (match_value);
+
+  return ret_value;
+} /* ecma_builtin_regexp_prototype_test */
+
+/**
+ * @}
+ * @}
+ * @}
+ */
+
+/**
+ * The RegExp.prototype object's 'toString' routine
+ *
+ * See also:
+ *          ECMA-262 v5, 15.10.6.4
+ *
+ * @return completion value
+ *         Returned value must be freed with ecma_free_completion_value.
+ */
+static ecma_completion_value_t
+ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argument */
+{
+  ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
+
+  ECMA_TRY_CATCH (obj_this,
+                  ecma_op_to_object (this_arg),
+                  ret_value);
+
+  ecma_object_t *obj_p = ecma_get_object_from_value (obj_this);
+
+  /* Get RegExp source from the source property */
+  ecma_string_t *magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_SOURCE);
+  ecma_property_t* source_prop = ecma_op_object_get_property (obj_p, magic_string_p);
+  ecma_deref_ecma_string (magic_string_p);
+
+  ecma_string_t *src_sep_str_p = ecma_new_ecma_string ((ecma_char_t *) "/");
+  ecma_string_t *source_str_p = ecma_get_string_from_value (source_prop->u.named_data_property.value);
+  ecma_string_t *output_str_p = ecma_concat_ecma_strings (src_sep_str_p, ecma_copy_or_ref_ecma_string (source_str_p));
+  ecma_deref_ecma_string (source_str_p);
+
+  ecma_string_t *concat_p = ecma_concat_ecma_strings (output_str_p, src_sep_str_p);
+  ecma_deref_ecma_string (src_sep_str_p);
+  ecma_deref_ecma_string (output_str_p);
+  output_str_p = concat_p;
+
+  /* Check the global flag */
+  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_GLOBAL);
+  ecma_property_t* global_prop = ecma_op_object_get_property (obj_p, magic_string_p);
+  ecma_deref_ecma_string (magic_string_p);
+
+  if (ecma_is_value_true (global_prop->u.named_data_property.value))
+  {
+    ecma_string_t *g_flag_str_p = ecma_new_ecma_string ((ecma_char_t *) "g");
+    concat_p = ecma_concat_ecma_strings (output_str_p, g_flag_str_p);
+    ecma_deref_ecma_string (output_str_p);
+    ecma_deref_ecma_string (g_flag_str_p);
+    output_str_p = concat_p;
+  }
+
+  /* Check the ignoreCase flag */
+  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE);
+  ecma_property_t* ignorecase_prop = ecma_op_object_get_property (obj_p, magic_string_p);
+  ecma_deref_ecma_string (magic_string_p);
+
+  if (ecma_is_value_true (ignorecase_prop->u.named_data_property.value))
+  {
+    ecma_string_t *ic_flag_str_p = ecma_new_ecma_string ((ecma_char_t *) "i");
+    concat_p = ecma_concat_ecma_strings (output_str_p, ic_flag_str_p);
+    ecma_deref_ecma_string (output_str_p);
+    ecma_deref_ecma_string (ic_flag_str_p);
+    output_str_p = concat_p;
+  }
+
+  /* Check the global flag */
+  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_MULTILINE);
+  ecma_property_t* multiline_prop = ecma_op_object_get_property (obj_p, magic_string_p);
+  ecma_deref_ecma_string (magic_string_p);
+
+  if (ecma_is_value_true (multiline_prop->u.named_data_property.value))
+  {
+    ecma_string_t *m_flag_str_p = ecma_new_ecma_string ((ecma_char_t *) "m");
+    concat_p = ecma_concat_ecma_strings (output_str_p, m_flag_str_p);
+    ecma_deref_ecma_string (output_str_p);
+    ecma_deref_ecma_string (m_flag_str_p);
+    output_str_p = concat_p;
+  }
+
+  ret_value = ecma_make_normal_completion_value (ecma_make_string_value (output_str_p));
+
+  ECMA_FINALIZE (obj_this);
+
+  return ret_value;
+} /* ecma_builtin_regexp_prototype_to_string */
+
 /**
  * @}
  * @}

jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h

@@ -40,6 +40,8 @@ OBJECT_VALUE (ECMA_MAGIC_STRING_CONSTRUCTOR,
               ECMA_PROPERTY_CONFIGURABLE)
 
 ROUTINE (ECMA_MAGIC_STRING_EXEC, ecma_builtin_regexp_prototype_exec, 1, 1)
+ROUTINE (ECMA_MAGIC_STRING_TEST, ecma_builtin_regexp_prototype_test, 1, 1)
+ROUTINE (ECMA_MAGIC_STRING_TO_STRING_UL, ecma_builtin_regexp_prototype_to_string, 0, 0)
 
 #undef OBJECT_ID
 #undef SIMPLE_VALUE

tests/jerry/regexp_character_class.js

@@ -0,0 +1,33 @@
+// Copyright 2015 Samsung Electronics Co., Ltd.
+// Copyright 2015 University of Szeged.
+//
+// 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 r;
+
+r = new RegExp ("[abc]*").exec("aaabbcccabcacbacabacbacab");
+assert (r == "aaabbcccabcacbacabacbacab");
+
+r = new RegExp ("[abc]*").exec("aaabbcccabdcacb");
+assert (r == "aaabbcccab");
+
+r = new RegExp ("[abc]*").exec("defghjklmnopqrstuvwxyz");
+assert (r == "");
+
+r = new RegExp ("[a-z]*").exec("abcdefghjklmnopqrstuvwxyz");
+assert (r == "abcdefghjklmnopqrstuvwxyz");
+
+r = new RegExp ("[A-Z]*").exec("abcdefghjklmnopqrstuvwxyz");
+assert (r == "");
+
+// FIXME: Add more tescase when Unicode support is finished!

tests/jerry/regexp_construct.js

@@ -53,14 +53,14 @@ try {
 // assert (r2.ignoreCase == true);
 // assert (r2.multiline == true);
 
-// r = /a/gim;
-// assert (r.source == "a");
-// assert (r.global == false);
-// assert (r.ignoreCase == false);
-// assert (r.multiline == false);
+r = /a/;
+assert (r.source == "a");
+assert (r.global == false);
+assert (r.ignoreCase == false);
+assert (r.multiline == false);
 
-// r = /a/;
-// assert (r.source == "a");
-// assert (r.global == true);
-// assert (r.ignoreCase == true);
-// assert (r.multiline == true);
+r = /a/gim;
+assert (r.source == "a");
+assert (r.global == true);
+assert (r.ignoreCase == true);
+assert (r.multiline == true);

tests/jerry/regexp_routines.js

@@ -0,0 +1,26 @@
+// Copyright 2015 Samsung Electronics Co., Ltd.
+// Copyright 2015 University of Szeged.
+//
+// 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 r;
+
+r = new RegExp ("a");
+assert (r.exec ("a") == "a");
+assert (r.exec ("b") == undefined);
+
+assert (r.test ("a") == true);
+assert (r.test ("b") == false);
+
+r = new RegExp ("a", "mig");
+assert (r.toString () == "/a/gim");