  
  cdef enum univ_morph_t:
      NIL = 0
      Animacy_anim = symbols.Animacy_anim
      Animacy_inam
      Aspect_freq
      Aspect_imp
      Aspect_mod
      Aspect_none
      Aspect_perf
 
</s> remove cpdef enum quantifier_t:
    _META
    ONE
 </s> add cdef enum action_t:
    REJECT = 0000
    MATCH = 1000
    ADVANCE = 0100
    RETRY = 0010
    RETRY_EXTEND = 0011
    MATCH_EXTEND = 1001
    MATCH_REJECT = 2000


cdef enum quantifier_t: </s> remove             docs, cuda_stream, 0.0)
 </s> add             docs, cuda_stream, drop) </s> remove             self._phrase_key[i] = doc.c[j].lex.orth
        cdef hash_t key = hash64(self._phrase_key,
                                 self.max_length * sizeof(attr_t), 0)
 </s> add             phrase_key[i] = doc.c[j].lex.orth
        cdef hash_t key = hash64(phrase_key,
                                 (end-start) * sizeof(attr_t), 0) </s> remove     def __init__(self, StringStore string_table, labels_by_action):
 </s> add     def __init__(self, StringStore string_table, labels_by_action=None, min_freq=None): </s> remove         for i in range(self.max_length):
            self._phrase_key[i] = 0
 </s> add         cdef Pool mem = Pool()
        phrase_key = <attr_t*>mem.alloc(end-start, sizeof(attr_t))
    Animacy_inan
    Animacy_hum
    Animacy_nhum
  
  cdef enum univ_morph_t:
      NIL = 0
      Animacy_anim = symbols.Animacy_anim
    Animacy_inan
    Animacy_hum
    Animacy_nhum
      Aspect_freq
      Aspect_imp
      Aspect_mod
      Aspect_none
      Aspect_perf
keep keep keep keep replace keep keep keep keep keep
 Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop"

This reverts commit c9ba3d3c2dc7067cf8bd55f878cec45a8c6d73d4, reversing
changes made to 92c26a35d425d4e8ca1b805ea776ea10f5ded3df. 
spacy/morphology.pxd