Fix compiler warning, and align Symbol and String apis a bit (use lon…

…g not size and add string_view constructor).
ruby-rice · Mar 5, 2024 · f7e4bc1 · f7e4bc1
1 parent 3530a28
commit f7e4bc1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/rice/cpp_api/Symbol.hpp b/rice/cpp_api/Symbol.hpp
@@ -33,6 +33,9 @@ namespace Rice
     //! Construct a Symbol from an std::string.
     Symbol(std::string const& s);
 
+    //! Construct a Symbol from an std::string_view.
+    Symbol(std::string_view const& s);
+
     //! Return a string representation of the Symbol.
     char const* c_str() const;
 

diff --git a/rice/cpp_api/Symbol.ipp b/rice/cpp_api/Symbol.ipp
@@ -16,7 +16,12 @@ namespace Rice
   }
 
   inline Symbol::Symbol(std::string const& s)
-    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern2, s.c_str(), s.size())))
+    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern2, s.c_str(), (long)s.length())))
+  {
+  }
+
+  inline Symbol::Symbol(std::string_view const& view)
+    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern2, view.data(), (long)view.length())))
   {
   }
 

diff --git a/test/test_Symbol.cpp b/test/test_Symbol.cpp
@@ -31,6 +31,13 @@ TESTCASE(construct_from_string)
   ASSERT_EQUAL(ID2SYM(rb_intern("Foo")), symbol.value());
 }
 
+TESTCASE(construct_from_string_view)
+{
+  std::string_view view("Foo");
+  Symbol symbol(view);
+  ASSERT_EQUAL(ID2SYM(rb_intern("Foo")), symbol.value());
+}
+
 TESTCASE(default_construct)
 {
   Symbol symbol;