Revert "Space out symbols enum, to make maintaining easier"

This reverts commit be5235369c.
This commit is contained in:
Matthew Honnibal 2019-03-07 12:52:30 +01:00
parent c773b5011c
commit 74db1d9602
2 changed files with 16 additions and 16 deletions

View File

@ -1,9 +1,7 @@
from . cimport symbols
# Reserve 64 values for flag features # Reserve 64 values for flag features
cdef enum attr_id_t: cdef enum attr_id_t:
NULL_ATTR = 0 NULL_ATTR
IS_ALPHA = symbols.IS_ALPHA IS_ALPHA
IS_ASCII IS_ASCII
IS_DIGIT IS_DIGIT
IS_LOWER IS_LOWER
@ -22,7 +20,7 @@ cdef enum attr_id_t:
IS_RIGHT_PUNCT IS_RIGHT_PUNCT
IS_CURRENCY IS_CURRENCY
FLAG19 = symbols.FLAG19 FLAG19 = 19
FLAG20 FLAG20
FLAG21 FLAG21
FLAG22 FLAG22
@ -68,7 +66,7 @@ cdef enum attr_id_t:
FLAG62 FLAG62
FLAG63 FLAG63
ID = symbols.ID ID
ORTH ORTH
LOWER LOWER
NORM NORM
@ -76,7 +74,7 @@ cdef enum attr_id_t:
PREFIX PREFIX
SUFFIX SUFFIX
LENGTH = symbols.LENGTH LENGTH
CLUSTER CLUSTER
LEMMA LEMMA
POS POS
@ -88,4 +86,5 @@ cdef enum attr_id_t:
SENT_START SENT_START
SPACY SPACY
PROB PROB
LANG LANG

View File

@ -19,7 +19,7 @@ cdef enum symbol_t:
IS_RIGHT_PUNCT IS_RIGHT_PUNCT
IS_CURRENCY IS_CURRENCY
FLAG19 = 1000 FLAG19 = 19
FLAG20 FLAG20
FLAG21 FLAG21
FLAG22 FLAG22
@ -65,7 +65,7 @@ cdef enum symbol_t:
FLAG62 FLAG62
FLAG63 FLAG63
ID = 2000 ID
ORTH ORTH
LOWER LOWER
NORM NORM
@ -73,7 +73,7 @@ cdef enum symbol_t:
PREFIX PREFIX
SUFFIX SUFFIX
LENGTH = 3000 LENGTH
CLUSTER CLUSTER
LEMMA LEMMA
POS POS
@ -87,7 +87,7 @@ cdef enum symbol_t:
PROB PROB
LANG LANG
ADJ = 4000 ADJ
ADP ADP
ADV ADV
AUX AUX
@ -108,7 +108,7 @@ cdef enum symbol_t:
EOL EOL
SPACE SPACE
Animacy_anim = 5000 Animacy_anim
Animacy_inan Animacy_inan
Animacy_hum # U20 Animacy_hum # U20
Animacy_nhum Animacy_nhum
@ -385,7 +385,7 @@ cdef enum symbol_t:
VerbType_mod # U VerbType_mod # U
VerbType_light # U VerbType_light # U
PERSON = 6000 PERSON
NORP NORP
FACILITY FACILITY
ORG ORG
@ -397,7 +397,7 @@ cdef enum symbol_t:
LANGUAGE LANGUAGE
LAW LAW
DATE = 7000 DATE
TIME TIME
PERCENT PERCENT
MONEY MONEY
@ -405,7 +405,6 @@ cdef enum symbol_t:
ORDINAL ORDINAL
CARDINAL CARDINAL
acl = 8000
acomp acomp
advcl advcl
advmod advmod
@ -459,3 +458,5 @@ cdef enum symbol_t:
rcmod rcmod
root root
xcomp xcomp
acl