typo in python; --dep-delimit for conv

Author: mr-martian

python/cg3.py

@@ -16,7 +16,7 @@ class Cohort:
 	static: Reading = field(default_factory=Reading)
 	readings: List[Reading] = field(default_factory=list)
 	dep_self: int = 0
-	dep_head: Optional[int] = None
+	dep_parent: Optional[int] = None
 	relations: DefaultDict[str, List[int]] = field(
 		default_factory=lambda: defaultdict(list))
 	text: str = ''

src/GrammarApplicator.cpp

@@ -1009,6 +1009,9 @@ void GrammarApplicator::setOptions(UConverter* conv) {
 	if (options[PRINT_IDS].doesOccur) {
 		print_ids = true;
 	}
+	if (options[PRINT_DEP].doesOccur) {
+		has_dep = true;
+	}
 	if (options[NUM_WINDOWS].doesOccur) {
 		num_windows = std::stoul(options[NUM_WINDOWS].value);
 	}

src/cg-conv.cpp

@@ -232,6 +232,15 @@ int main(int argc, char* argv[]) {
 		applicator.parse_dep = true;
 		applicator.has_dep = true;
 	}
+	if (options_conv[DEP_DELIMIT].doesOccur) {
+		if (!options_conv[DEP_DELIMIT].value.empty()) {
+			applicator.dep_delimit = std::stoul(options_conv[DEP_DELIMIT].value);
+		}
+		else {
+			applicator.dep_delimit = 10;
+		}
+		applicator.parse_dep = true;
+	}
 	applicator.is_conv = true;
 	applicator.trace = true;
 	applicator.verbosity_level = 0;

src/options.cpp

@@ -73,6 +73,7 @@ options_t options{
 	UOption{"unicode-tags",          0, UOPT_NO_ARG,       "outputs Unicode code points for things like ->"},
 	UOption{"unique-tags",           0, UOPT_NO_ARG,       "outputs unique tags only once per reading"},
 	UOption{"print-ids",             0, UOPT_NO_ARG,       "always output IDs"},
+	UOption{"print-dep",             0, UOPT_NO_ARG,       "always output dependencies"},
 
 	UOption{"num-windows",           0, UOPT_REQUIRES_ARG, "number of windows to keep in before/ahead buffers; defaults to 2"},
 	UOption{"always-span",           0, UOPT_NO_ARG,       "forces scanning tests to always span across window boundaries"},

src/options.hpp

@@ -71,6 +71,7 @@ enum OPTIONS {
 	UNICODE_TAGS,
 	UNIQUE_TAGS,
 	PRINT_IDS,
+	PRINT_DEP,
 	NUM_WINDOWS,
 	ALWAYS_SPAN,
 	SOFT_LIMIT,

src/options_conv.hpp

@@ -27,6 +27,7 @@ namespace OptionsConv {
 
 using ::Options::UOption;
 using ::Options::UOPT_NO_ARG;
+using ::Options::UOPT_OPTIONAL_ARG;
 using ::Options::UOPT_REQUIRES_ARG;
 
 enum OPTIONS {
@@ -59,6 +60,7 @@ enum OPTIONS {
 	SUB_LTR,
 	ORDERED,
 	PARSE_DEP,
+	DEP_DELIMIT,
 	UNICODE_TAGS,
 	PIPE_DELETED,
 	NO_BREAK,
@@ -95,6 +97,7 @@ std::array<UOption, NUM_OPTIONS_CONV> options_conv{
 	UOption{"ltr",          'l', UOPT_NO_ARG,       "sets sub-reading direction to LTR"},
 	UOption{"ordered",      'o', UOPT_NO_ARG,       "tag order matters mode"},
 	UOption{"parse-dep",    'D', UOPT_NO_ARG,       "parse dependency (defaults to treating as normal tags)"},
+	UOption{"dep-delimit",    0, UOPT_OPTIONAL_ARG, "delimit windows based on dependency; defaults to 10"},
 	UOption{"unicode-tags",   0, UOPT_NO_ARG,       "outputs Unicode code points for things like ->"},
 	UOption{"deleted",        0, UOPT_NO_ARG,       "read deleted readings as such, instead of as text"},
 	UOption{"no-break",     'B', UOPT_NO_ARG,       "inhibits any extra whitespace in output"},