Utilize string_view initialization of TfToken in path parsing

PixarAnimationStudios · May 31, 2024 · 9c0d0fb · 9c0d0fb
1 parent 92b130b
commit 9c0d0fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/pxr/usd/sdf/pathParser.cpp b/pxr/usd/sdf/pathParser.cpp
@@ -30,6 +30,11 @@ using namespace PXR_PEGTL_NAMESPACE;
 
 namespace Sdf_PathParser {
 
+template <class Input>
+TfToken GetToken(Input const &in) {
+    return TfToken{in.string_view()};
+}
+
 template <>
 struct Action<ReflexiveRelative> {
     template <class Input>

diff --git a/pxr/usd/sdf/pathParser.h b/pxr/usd/sdf/pathParser.h
@@ -216,25 +216,6 @@ struct PPContext {
     std::string varName;
 };
 
-template <class Input>
-TfToken GetToken(Input const &in) {
-    constexpr int BufSz = 32;
-    char buf[BufSz];
-    size_t strSize = std::distance(in.begin(), in.end());
-    TfToken tok;
-    if (strSize < BufSz) {
-        // copy & null-terminate.
-        std::copy(in.begin(), in.end(), buf);
-        buf[strSize] = '\0';
-        tok = TfToken(buf);
-    }
-    else {
-        // fall back to string path.
-        tok = TfToken(in.string());
-    }
-    return tok;
-}
-
 template <class Rule>
 struct Action : PEGTL_NS::nothing<Rule> {};