      cdef Vocab vocab
      cdef Matcher matcher
      cdef PreshMap phrase_ids
      cdef int max_length
      cdef attr_t* _phrase_key
      cdef public object _callbacks
      cdef public object _patterns
  
      def __init__(self, Vocab vocab, max_length=10):
          self.mem = Pool()
 
</s> remove         self._phrase_key = <attr_t*>self.mem.alloc(max_length, sizeof(attr_t))
 </s> add  </s> remove     cdef void _parseC(self, StateC* state, 
 </s> add     cdef void _parseC(self, StateC** states, int nr_task,  </s> remove def merge_phrase(matcher, doc, i, matches):
    """Callback to merge a phrase on match."""
    ent_id, label, start, end = matches[i]
    span = doc[start:end]
    span.merge(ent_type=label, ent_id=ent_id)


def unpickle_matcher(vocab, patterns, callbacks):
    matcher = Matcher(vocab)
    for key, specs in patterns.items():
        callback = callbacks.get(key, None)
        matcher.add(key, callback, *specs)
    return matcher


 </s> add  </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):
      cdef Vocab vocab
      cdef Matcher matcher
      cdef PreshMap phrase_ids
      cdef int max_length

      cdef public object _callbacks
      cdef public object _patterns
  
      def __init__(self, Vocab vocab, max_length=10):
          self.mem = Pool()
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/matcher.pyx