* Correct screw ups from the previous commits

This commit is contained in:
Matthew Honnibal 2015-11-07 06:51:41 +11:00
parent 5efad178b5
commit d24b8509e4
2 changed files with 5 additions and 4 deletions

View File

@ -269,7 +269,7 @@ cdef class Last:
@staticmethod @staticmethod
cdef int transition(StateClass st, int label) nogil: cdef int transition(StateClass st, int label) nogil:
st.close_ent() st.close_ent()
st.set_ent_tag(st.B(0), 2, label) st.set_ent_tag(st.B(0), 1, label)
st.push() st.push()
st.pop() st.pop()

View File

@ -46,7 +46,7 @@ cdef class StateClass:
cdef int E(self, int i) nogil: cdef int E(self, int i) nogil:
if self._e_i <= 0 or self._e_i >= self.length: if self._e_i <= 0 or self._e_i >= self.length:
return 0 return 0
if i < 0 or i > self._e_i: if i < 0 or i >= self._e_i:
return 0 return 0
self._ents[self._e_i - (i+1)].start self._ents[self._e_i - (i+1)].start
@ -174,8 +174,9 @@ cdef class StateClass:
self._e_i += 1 self._e_i += 1
cdef void close_ent(self) nogil: cdef void close_ent(self) nogil:
self._e_i -= 1 # Note that we don't decrement _e_i here! We want to maintain all
self._ents[self._e_i].end = self.B(0)+1 # entities, not over-write them...
self._ents[self._e_i-1].end = self.B(0)+1
self._sent[self.B(0)].ent_iob = 1 self._sent[self.B(0)].ent_iob = 1
cdef void set_ent_tag(self, int i, int ent_iob, int ent_type) nogil: cdef void set_ent_tag(self, int i, int ent_iob, int ent_type) nogil: