Merge pull request #205 from froydnj/froydnj-string-identifiers

better constructors from `string` for `Identifier` and `Symbol`
ruby-rice · Feb 27, 2024 · 27993c2 · 27993c2
2 parents cb19602 + 41e707f
commit 27993c2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/include/rice/rice.hpp b/include/rice/rice.hpp
@@ -3695,7 +3695,7 @@ namespace Rice
     Identifier(char const* s);
 
     //! Construct a new Identifier from a string.
-    Identifier(std::string const string);
+    Identifier(std::string const& string);
 
     //! Return a string representation of the Identifier.
     char const* c_str() const;
@@ -3729,7 +3729,7 @@ namespace Rice
   {
   }
 
-  inline Identifier::Identifier(std::string const s) : id_(rb_intern(s.c_str()))
+  inline Identifier::Identifier(std::string const& s) : id_(rb_intern2(s.c_str(), s.size()))
   {
   }
 
@@ -6273,7 +6273,7 @@ namespace Rice
   }
 
   inline Symbol::Symbol(std::string const& s)
-    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern, s.c_str())))
+    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern2, s.c_str(), s.size())))
   {
   }
 

diff --git a/rice/Identifier.hpp b/rice/Identifier.hpp
@@ -23,7 +23,7 @@ namespace Rice
     Identifier(char const* s);
 
     //! Construct a new Identifier from a string.
-    Identifier(std::string const string);
+    Identifier(std::string const& string);
 
     //! Return a string representation of the Identifier.
     char const* c_str() const;

diff --git a/rice/Identifier.ipp b/rice/Identifier.ipp
@@ -8,7 +8,7 @@ namespace Rice
   {
   }
 
-  inline Identifier::Identifier(std::string const s) : id_(rb_intern(s.c_str()))
+  inline Identifier::Identifier(std::string const& s) : id_(rb_intern2(s.c_str(), s.size()))
   {
   }
 

diff --git a/rice/cpp_api/Symbol.ipp b/rice/cpp_api/Symbol.ipp
@@ -16,7 +16,7 @@ namespace Rice
   }
 
   inline Symbol::Symbol(std::string const& s)
-    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern, s.c_str())))
+    : Object(detail::protect(rb_id2sym, detail::protect(rb_intern2, s.c_str(), s.size())))
   {
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ namespace Rice @@
       {
       }
-      inline Identifier::Identifier(std::string const s) : id_(rb_intern(s.c_str()))
+      inline Identifier::Identifier(std::string const& s) : id_(rb_intern2(s.c_str(), s.size()))
       {
       }
@@ Expand Down @@