From 8ee7c541f1bbe9c04d92922c442a571958667355 Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal@gmail.com>
Date: Wed, 20 May 2015 16:03:26 +0200
Subject: [PATCH] * Update Constituent definition

---
 spacy/structs.pxd | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/spacy/structs.pxd b/spacy/structs.pxd
index 8b1a8d942..4f46ff1a2 100644
--- a/spacy/structs.pxd
+++ b/spacy/structs.pxd
@@ -49,16 +49,18 @@ cdef struct Entity:
 
 
 cdef struct Constituent:
-    int head
-    int start
-    int end
+    const TokenC* head
+    const Constituent* parent
+    const Constituent* first
+    const Constituent* last
     int label
-    bint on_stack
+    int length
 
 
 cdef struct TokenC:
     const LexemeC* lex
     Morphology morph
+    const Constituent* ctnt
     univ_pos_t pos
     int tag
     int idx
@@ -73,9 +75,6 @@ cdef struct TokenC:
     uint32_t l_edge
     uint32_t r_edge
 
-    int attach_order
-    int ctnt_label
-
     int ent_iob
     int ent_type