From 6b30d1cf7b5b9cc96a829f7f86c35ea9b023b989 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Sat, 10 Oct 2015 22:11:38 +1100 Subject: [PATCH] * Remove qualified naming in symbols --- spacy/symbols.pxd | 202 ++++++++++++++++++++++----------------------- spacy/symbols.pyx | 205 +++++++++++++++++++++++----------------------- 2 files changed, 204 insertions(+), 203 deletions(-) diff --git a/spacy/symbols.pxd b/spacy/symbols.pxd index e8ddeaa8f..590a2d41d 100644 --- a/spacy/symbols.pxd +++ b/spacy/symbols.pxd @@ -1,109 +1,109 @@ cpdef enum symbol_t: - EMPTY_VALUE - Attr_is_alpha - Attr_is_ascii - Attr_is_digit - Attr_is_lower - Attr_is_punct - Attr_is_space - Attr_is_title - Attr_is_upper - Attr_like_url - Attr_like_num - Attr_like_email - Attr_is_stop - Attr_is_oov + NIL + IS_ALPHA + IS_ASCII + IS_DIGIT + IS_LOWER + IS_PUNCT + IS_SPACE + IS_TITLE + IS_UPPER + LIKE_URL + LIKE_NUM + LIKE_EMAIL + IS_STOP + IS_OOV - Attr_flag14 - Attr_flag15 - Attr_flag16 - Attr_flag17 - Attr_flag18 - Attr_flag19 - Attr_flag20 - Attr_flag21 - Attr_flag22 - Attr_flag23 - Attr_flag24 - Attr_flag25 - Attr_flag26 - Attr_flag27 - Attr_flag28 - Attr_flag29 - Attr_flag30 - Attr_flag31 - Attr_flag32 - Attr_flag33 - Attr_flag34 - Attr_flag35 - Attr_flag36 - Attr_flag37 - Attr_flag38 - Attr_flag39 - Attr_flag40 - Attr_flag41 - Attr_flag42 - Attr_flag43 - Attr_flag44 - Attr_flag45 - Attr_flag46 - Attr_flag47 - Attr_flag48 - Attr_flag49 - Attr_flag50 - Attr_flag51 - Attr_flag52 - Attr_flag53 - Attr_flag54 - Attr_flag55 - Attr_flag56 - Attr_flag57 - Attr_flag58 - Attr_flag59 - Attr_flag60 - Attr_flag61 - Attr_flag62 - Attr_flag63 + FLAG14 + FLAG15 + FLAG16 + FLAG17 + FLAG18 + FLAG19 + FLAG20 + FLAG21 + FLAG22 + FLAG23 + FLAG24 + FLAG25 + FLAG26 + FLAG27 + FLAG28 + FLAG29 + FLAG30 + FLAG31 + FLAG32 + FLAG33 + FLAG34 + FLAG35 + FLAG36 + FLAG37 + FLAG38 + FLAG39 + FLAG40 + FLAG41 + FLAG42 + FLAG43 + FLAG44 + FLAG45 + FLAG46 + FLAG47 + FLAG48 + FLAG49 + FLAG50 + FLAG51 + FLAG52 + FLAG53 + FLAG54 + FLAG55 + FLAG56 + FLAG57 + FLAG58 + FLAG59 + FLAG60 + FLAG61 + FLAG62 + FLAG63 - Attr_id - Attr_orth - Attr_lower - Attr_norm - Attr_shape - Attr_prefix - Attr_suffix + ID + ORTH + LOWER + NORM + SHAPE + PREFIX + SUFFIX - Attr_length - Attr_cluster - Attr_lemma - Attr_pos - Attr_tag - Attr_dep - Attr_ent_iob - Attr_ent_type - Attr_head - Attr_spacy - Attr_prob + LENGTH + CLUSTER + LEMMA + POS + TAG + DEP + ENT_IOB + ENT_TYPE + HEAD + SPACY + PROB - POS_adj - POS_adp - POS_adv - POS_aux - POS_conj - POS_det - POS_intj - POS_noun - POS_num - POS_part - POS_pron - POS_propn - POS_punct - POS_sconj - POS_sym - POS_verb - POS_x - POS_eol - POS_space + ADJ + ADP + ADV + AUX + CONJ + DET + INTJ + NOUN + NUM + PART + PRON + PROPN + PUNCT + SCONJ + SYM + VERB + X + EOL + SPACE Animacy_anim Animacy_inam diff --git a/spacy/symbols.pyx b/spacy/symbols.pyx index a0a39f2ff..9a3d219d5 100644 --- a/spacy/symbols.pyx +++ b/spacy/symbols.pyx @@ -1,108 +1,109 @@ -SYMBOL_IDS = { - "Attr_is_alpha": Attr_is_alpha, - "Attr_is_ascii": Attr_is_ascii, - "Attr_is_digit": Attr_is_digit, - "Attr_is_lower": Attr_is_lower, - "Attr_is_punct": Attr_is_punct, - "Attr_is_space": Attr_is_space, - "Attr_is_title": Attr_is_title, - "Attr_is_upper": Attr_is_upper, - "Attr_like_url": Attr_like_url, - "Attr_like_num": Attr_like_num, - "Attr_like_email": Attr_like_email, - "Attr_is_stop": Attr_is_stop, - "Attr_is_oov": Attr_is_oov, +IDS = { + "": NIL, + "IS_ALPHA": IS_ALPHA, + "IS_ASCII": IS_ASCII, + "IS_DIGIT": IS_DIGIT, + "IS_LOWER": IS_LOWER, + "IS_PUNCT": IS_PUNCT, + "IS_SPACE": IS_SPACE, + "IS_TITLE": IS_TITLE, + "IS_UPPER": IS_UPPER, + "LIKE_URL": LIKE_URL, + "LIKE_NUM": LIKE_NUM, + "LIKE_EMAIL": LIKE_EMAIL, + "IS_STOP": IS_STOP, + "IS_OOV": IS_OOV, - "Attr_flag14": Attr_flag14, - "Attr_flag15": Attr_flag15, - "Attr_flag16": Attr_flag16, - "Attr_flag17": Attr_flag17, - "Attr_flag18": Attr_flag18, - "Attr_flag19": Attr_flag19, - "Attr_flag20": Attr_flag20, - "Attr_flag21": Attr_flag21, - "Attr_flag22": Attr_flag22, - "Attr_flag23": Attr_flag23, - "Attr_flag24": Attr_flag24, - "Attr_flag25": Attr_flag25, - "Attr_flag26": Attr_flag26, - "Attr_flag27": Attr_flag27, - "Attr_flag28": Attr_flag28, - "Attr_flag29": Attr_flag29, - "Attr_flag30": Attr_flag30, - "Attr_flag31": Attr_flag31, - "Attr_flag32": Attr_flag32, - "Attr_flag33": Attr_flag33, - "Attr_flag34": Attr_flag34, - "Attr_flag35": Attr_flag35, - "Attr_flag36": Attr_flag36, - "Attr_flag37": Attr_flag37, - "Attr_flag38": Attr_flag38, - "Attr_flag39": Attr_flag39, - "Attr_flag40": Attr_flag40, - "Attr_flag41": Attr_flag41, - "Attr_flag42": Attr_flag42, - "Attr_flag43": Attr_flag43, - "Attr_flag44": Attr_flag44, - "Attr_flag45": Attr_flag45, - "Attr_flag46": Attr_flag46, - "Attr_flag47": Attr_flag47, - "Attr_flag48": Attr_flag48, - "Attr_flag49": Attr_flag49, - "Attr_flag50": Attr_flag50, - "Attr_flag51": Attr_flag51, - "Attr_flag52": Attr_flag52, - "Attr_flag53": Attr_flag53, - "Attr_flag54": Attr_flag54, - "Attr_flag55": Attr_flag55, - "Attr_flag56": Attr_flag56, - "Attr_flag57": Attr_flag57, - "Attr_flag58": Attr_flag58, - "Attr_flag59": Attr_flag59, - "Attr_flag60": Attr_flag60, - "Attr_flag61": Attr_flag61, - "Attr_flag62": Attr_flag62, - "Attr_flag63": Attr_flag63, + "FLAG14": FLAG14, + "FLAG15": FLAG15, + "FLAG16": FLAG16, + "FLAG17": FLAG17, + "FLAG18": FLAG18, + "FLAG19": FLAG19, + "FLAG20": FLAG20, + "FLAG21": FLAG21, + "FLAG22": FLAG22, + "FLAG23": FLAG23, + "FLAG24": FLAG24, + "FLAG25": FLAG25, + "FLAG26": FLAG26, + "FLAG27": FLAG27, + "FLAG28": FLAG28, + "FLAG29": FLAG29, + "FLAG30": FLAG30, + "FLAG31": FLAG31, + "FLAG32": FLAG32, + "FLAG33": FLAG33, + "FLAG34": FLAG34, + "FLAG35": FLAG35, + "FLAG36": FLAG36, + "FLAG37": FLAG37, + "FLAG38": FLAG38, + "FLAG39": FLAG39, + "FLAG40": FLAG40, + "FLAG41": FLAG41, + "FLAG42": FLAG42, + "FLAG43": FLAG43, + "FLAG44": FLAG44, + "FLAG45": FLAG45, + "FLAG46": FLAG46, + "FLAG47": FLAG47, + "FLAG48": FLAG48, + "FLAG49": FLAG49, + "FLAG50": FLAG50, + "FLAG51": FLAG51, + "FLAG52": FLAG52, + "FLAG53": FLAG53, + "FLAG54": FLAG54, + "FLAG55": FLAG55, + "FLAG56": FLAG56, + "FLAG57": FLAG57, + "FLAG58": FLAG58, + "FLAG59": FLAG59, + "FLAG60": FLAG60, + "FLAG61": FLAG61, + "FLAG62": FLAG62, + "FLAG63": FLAG63, - "Attr_id": Attr_id, - "Attr_orth": Attr_orth, - "Attr_lower": Attr_lower, - "Attr_norm": Attr_norm, - "Attr_shape": Attr_shape, - "Attr_prefix": Attr_prefix, - "Attr_suffix": Attr_suffix, + "ID": ID, + "ORTH": ORTH, + "LOWER": LOWER, + "NORM": NORM, + "SHAPE": SHAPE, + "PREFIX": PREFIX, + "SUFFIX": SUFFIX, - "Attr_length": Attr_length, - "Attr_cluster": Attr_cluster, - "Attr_lemma": Attr_lemma, - "Attr_pos": Attr_pos, - "Attr_tag": Attr_tag, - "Attr_dep": Attr_dep, - "Attr_ent_iob": Attr_ent_iob, - "Attr_ent_type": Attr_ent_type, - "Attr_head": Attr_head, - "Attr_spacy": Attr_spacy, - "Attr_prob": Attr_prob, + "LENGTH": LENGTH, + "CLUSTER": CLUSTER, + "LEMMA": LEMMA, + "POS": POS, + "TAG": TAG, + "DEP": DEP, + "ENT_IOB": ENT_IOB, + "ENT_TYPE": ENT_TYPE, + "HEAD": HEAD, + "SPACY": SPACY, + "PROB": PROB, - "POS_adj": POS_adj, - "POS_adp": POS_adp, - "POS_adv": POS_adv, - "POS_aux": POS_aux, - "POS_conj": POS_conj, - "POS_det": POS_det, - "POS_intj": POS_intj, - "POS_noun": POS_noun, - "POS_num": POS_num, - "POS_part": POS_part, - "POS_pron": POS_pron, - "POS_propn": POS_propn, - "POS_punct": POS_punct, - "POS_sconj": POS_sconj, - "POS_sym": POS_sym, - "POS_verb": POS_verb, - "POS_x": POS_x, - "POS_eol": POS_eol, - "POS_space": POS_space, + "ADJ": ADJ, + "ADP": ADP, + "ADV": ADV, + "AUX": AUX, + "CONJ": CONJ, + "DET": DET, + "INTJ": INTJ, + "NOUN": NOUN, + "NUM": NUM, + "PART": PART, + "PRON": PRON, + "PROPN": PROPN, + "PUNCT": PUNCT, + "SCONJ": SCONJ, + "SYM": SYM, + "VERB": VERB, + "X": X, + "EOL": EOL, + "SPACE": SPACE, "Animacy_anim": Animacy_anim, "Animacy_inam": Animacy_inam, @@ -420,4 +421,4 @@ SYMBOL_IDS = { "Dep_xcomp": Dep_xcomp } -SYMBOL_NAMES = [it[0] for it in sorted(SYMBOL_IDS.items(), key=lambda it: it[1])] +NAMES = [it[0] for it in sorted(IDS.items(), key=lambda it: it[1])]