Issue 6378 - [emscripten] Make DependentString constexpr

test/compiled/String.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <string>
 #include <gtest/gtest.h>
 #include "compiled/String.h"
 
 ABP_NS_USING
 
-void checkConstexprTemplateCtor()
-{
-  static constexpr DependentString s(u"Test string");
-}
-
-void checkConstexprInvalidCtor()
-{
-  static constexpr DependentString s;

[sergei, 2018/03/16 13:43:27]

What is the reason to have `static` variables?

[René Jeschke, 2018/03/16 17:00:47]

It's an old habit. As I am using 'const' a lot, I want to make a difference
between 'is-not-gonna-change' and 'does-never-ever-change'. E.g. 'const len =
strlen(chars);' and 'static const len = 10;'.

I can remove the static modifier it it bothers someone.

[hub, 2018/03/16 17:11:32]

Yes, please.

+constexpr void checkConstexprTemplateCtor()
+{
+  constexpr DependentString s(u"Test string");
+}
+
+constexpr void checkConstexprInvalidCtor()
+{
+  constexpr DependentString s;
   static_assert(s.is_invalid(), "String should be invalid");
 }
 
-void checkConstexprCtor()
-{
-  static const String::value_type chars[] = u"Test string";
-  static const String::size_type length = sizeof(chars) / sizeof(chars[0]) - 1;
-  static constexpr DependentString s(chars, length);
-}
-
-void checkConstexprFuncsAndOps()
-{
-  static constexpr DependentString s = u"Test string"_str;
-  static constexpr DependentString s2 = u"Test string"_str;
+constexpr void checkConstexprCtor()
+{
+  constexpr DependentString s(u"Test string", 11);
+}
+
+constexpr void checkConstexprFuncsAndOps()
+{
+  constexpr DependentString s = u"Test string"_str;
+  constexpr DependentString s2 = u"Test string"_str;
+  constexpr DependentString s3 = u"Another test string"_str;
 
   static_assert(s.length() == s2.length(), "Length should be equal");
   static_assert(s.equals(s2), "Strings should be equal");
   static_assert(s == s2, "Strings should be equal");
+  static_assert(s != s3, "Strings should not be equal");
 
   static_assert(!s.empty(), "String should not be empty");
   static_assert(!s.is_writable(), "String should not be writable");
   static_assert(!s.is_deleted(), "String should not be deleted");
 
   static_assert(s.data()[0] == 'T', "First character should be 'T'");
   static_assert(s[1] == 'e', "Second character should be 'e'");
+
+  static_assert(s.find(u'e') == 1, "'e' should be at pos 1");
+  static_assert(s.find(s2) == 0, "String should be found at pos 0");
+  static_assert(s.rfind(u'e') == 1, "'e' should be at pos 1");
 }
 
 TEST(TestString, constructInvalidDependentString)
 {
   DependentString s;
   EXPECT_TRUE(s.is_invalid());
 
   DependentString s2(s);
   EXPECT_TRUE(s2.is_invalid());
 }
@@ skipping 136 matching lines @@
   EXPECT_FALSE(lexical_cast<bool>(ABP_TEXT("some-string"_str)));
   EXPECT_FALSE(lexical_cast<bool>(ABP_TEXT(""_str)));
   EXPECT_FALSE(lexical_cast<bool>(DependentString()));
 }
 
 TEST(TestStringLexicalCast, toOwnedString)
 {
   EXPECT_EQ(ABP_TEXT("some-string"_str), lexical_cast<OwnedString>(ABP_TEXT("some-string"_str)));
   EXPECT_EQ(ABP_TEXT(""_str), lexical_cast<OwnedString>(ABP_TEXT(""_str)));
 }