follow-up to 44b74b0 - add test, reformat code, update doc

d99kris · Jan 7, 2023 · 204a9db · 204a9db
1 parent 528ea88
commit 204a9db
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -157,6 +157,7 @@ Supported Methods / Attributes
 - dep_()
 - ent_iob_()
 - has_vector()
+- head()
 - i()
 - idx()
 - is_alpha()

diff --git a/src/spacy/python.h b/src/spacy/python.h
@@ -81,7 +81,7 @@ namespace Spacy
       PyObjectPtr attr(PyObject_GetAttrString(p_obj.get(), p_attr.c_str()));
       return get_vector<T>(attr);
     }
-    
+
     template <typename T, typename U>
     static std::vector<T> get_attr_vector_ctor_arg(PyObjectPtr p_obj, const std::string& p_attr, U p_arg)
     {

diff --git a/src/spacy/token.cpp b/src/spacy/token.cpp
@@ -57,6 +57,11 @@ namespace Spacy
     return Python::get_attr_value<bool>(m_token, "has_vector");
   }
 
+  Token Token::head() const
+  {
+    return Python::get_attr_obj<Token>(m_token, "head");
+  }
+
   long Token::i() const
   {
     return Python::get_attr_value<long>(m_token, "i");
@@ -268,13 +273,6 @@ namespace Spacy
     return Python::get_attr_value<std::string>(m_token, "whitespace_");
   }
 
-    Token Token::head() const
-  {
-    return Python::get_attr_obj<Token>(m_token, "head");
-  }
-
-
-
   Token::Token(PyObjectPtr p_token)
     : m_token(p_token)
   {

diff --git a/src/spacy/token.h b/src/spacy/token.h
@@ -36,6 +36,7 @@ namespace Spacy
     std::string dep_() const;
     std::string ent_iob_() const;
     bool has_vector() const;
+    Token head() const;
     long i() const;
     long idx() const;
     bool is_alpha() const;
@@ -78,7 +79,6 @@ namespace Spacy
     std::string text() const;
     std::string text_with_ws() const;
     std::string whitespace_() const;
-    Token head() const;
 
   private:
     explicit Token(PyObjectPtr p_token);

diff --git a/tests/test_token.cpp b/tests/test_token.cpp
@@ -81,6 +81,14 @@ int main()
       unittest::ExpectTrue(apples.has_vector());
     }
 
+    // Token::head
+    {
+      Spacy::Doc doc = nlp.parse("Give it back! He pleaded.");
+      std::vector<Spacy::Token> give_children = doc.tokens().at(0).children();
+      unittest::ExpectEqual(std::string, doc.tokens().at(0).text(),
+                            give_children.at(0).head().text());
+    }
+
     // Token::i
     {
       Spacy::Doc doc = nlp.parse("I like apples");