diff --git a/README.md b/README.md index 00bd09e16..7333de6a3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-alpha.1+6Q66 'Krypton' (4 July 2020) +v10.1.0-alpha.1+6Q67 'Krypton' (5 July 2020) ## About Inform 7 diff --git a/build.txt b/build.txt index 26ec4609c..37c73b743 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: alpha.1 -Build Date: 4 July 2020 -Build Number: 6Q66 +Build Date: 5 July 2020 +Build Number: 6Q67 diff --git a/docs/arch-test/1-pc.html b/docs/arch-test/1-pc.html index 5ce7ab2a9..487061ca8 100644 --- a/docs/arch-test/1-pc.html +++ b/docs/arch-test/1-pc.html @@ -53,6 +53,7 @@
int main(int argc, char **argv) { Foundation::start(); + CommandLine::set_locale(argc, argv); ArchModule::start(); CommandLine::declare_heading(L"inexample: a tool for testing foundation facilities\n"); diff --git a/docs/building-test/1-pc.html b/docs/building-test/1-pc.html index eb80936f9..1730e4625 100644 --- a/docs/building-test/1-pc.html +++ b/docs/building-test/1-pc.html @@ -62,6 +62,7 @@int main(int argc, char **argv) { Foundation::start(); + CommandLine::set_locale(argc, argv); WordsModule::start(); BuildingModule::start(); BytecodeModule::start(); diff --git a/docs/inblorb/1-mn.html b/docs/inblorb/1-mn.html index 7e9ecc362..e50848210 100644 --- a/docs/inblorb/1-mn.html +++ b/docs/inblorb/1-mn.html @@ -104,6 +104,7 @@ file, for instance. int main(int argc, char *argv[]) { Foundation::start(); + CommandLine::set_locale(argc, argv); Basics::register_mreasons(); blurb_filename = Filenames::in(NULL, I"Release.blurb"); blorb_filename = Filenames::in(NULL, I"story.zblorb"); diff --git a/docs/inbuild/1-mn.html b/docs/inbuild/1-mn.html index a93e323e3..344713d55 100644 --- a/docs/inbuild/1-mn.html +++ b/docs/inbuild/1-mn.html @@ -108,6 +108,7 @@ on; then to carry out that work, and then shut down again.Foundation::start(); must be started first + CommandLine::set_locale(argc, argv); WordsModule::start(); SyntaxModule::start(); HTMLModule::start(); diff --git a/docs/indoc/1-bsc.html b/docs/indoc/1-bsc.html index 5844e1425..f4d657895 100644 --- a/docs/indoc/1-bsc.html +++ b/docs/indoc/1-bsc.html @@ -57,8 +57,9 @@ definition we need to make is:define PROGRAM_NAME "indoc"-void Basics::start(void) { +void Basics::start(int argc, char **argv) { Foundation::start(); + CommandLine::set_locale(argc, argv); Declare the debugging log aspects1.2; } diff --git a/docs/indoc/1-mn.html b/docs/indoc/1-mn.html index c8655a60f..97ff1098b 100644 --- a/docs/indoc/1-mn.html +++ b/docs/indoc/1-mn.html @@ -55,7 +55,7 @@ chosen format, a process we'll call "rendering". We do this in two passes. int no_examples = 0; int main(int argc, char **argv) { - Basics::start(); + Basics::start(argc, argv); Start up indoc1.1; Make a first-pass scan of the rawtext1.2; Render the rawtext as documentation1.3; diff --git a/docs/inflections-test/1-pc.html b/docs/inflections-test/1-pc.html index f34593b0a..c3febedc1 100644 --- a/docs/inflections-test/1-pc.html +++ b/docs/inflections-test/1-pc.html @@ -58,6 +58,7 @@int main(int argc, char **argv) { Foundation::start(); + CommandLine::set_locale(argc, argv); WordsModule::start(); InflectionsModule::start(); diff --git a/docs/inform7/1-mn.html b/docs/inform7/1-mn.html index 277d7cc84..363707eaa 100644 --- a/docs/inform7/1-mn.html +++ b/docs/inform7/1-mn.html @@ -97,6 +97,7 @@ when they want I7 to run.Foundation::start(); must be started first + CommandLine::set_locale(argc, argv); WordsModule::start(); InflectionsModule::start(); SyntaxModule::start(); diff --git a/docs/inform7/M-pm.html b/docs/inform7/M-pm.html index 163c63d6b..f6fef5253 100644 --- a/docs/inform7/M-pm.html +++ b/docs/inform7/M-pm.html @@ -77,32 +77,31 @@ which take more than 1/1000th of the total running time.100.0% in inform7 run - 66.7% in compilation to Inter - 26.3% in Phrases::Manager::compile_first_block - 8.7% in Phrases::Manager::compile_as_needed + 67.4% in compilation to Inter + 27.5% in Phrases::Manager::compile_first_block + 8.5% in Phrases::Manager::compile_as_needed 6.8% in Strings::compile_responses - 6.1% in World::Compile::compile - 3.2% in Assertions::Traverse::traverse1 - 2.8% in Sentences::VPs::traverse - 2.0% in Phrases::Manager::RulePrintingRule_routine - 1.9% in Phrases::Manager::rulebooks_array - 1.1% in NewVerbs::ConjugateVerb + 5.7% in World::Compile::compile + 3.1% in Assertions::Traverse::traverse1 + 2.9% in Sentences::VPs::traverse + 2.2% in Phrases::Manager::RulePrintingRule_routine + 1.8% in Phrases::Manager::rulebooks_array + 1.1% in NewVerbs::ConjugateVerb + 0.7% in Phrases::Manager::parse_rule_parameters 0.7% in Phrases::Manager::traverse 0.3% in Phrases::Manager::compile_rulebooks - 0.3% in Phrases::Manager::parse_rule_parameters 0.3% in Phrases::Manager::traverse_for_names 0.3% in Relations::compile_defined_relations 0.1% in Assertions::Traverse::traverse2 - 0.1% in BinaryPredicates::make_built_in_further 0.1% in PL::Parsing::Verbs::compile_all 0.1% in Sentences::RuleSubtrees::register_recently_lexed_phrases 0.1% in Task::load_types 0.1% in World::complete - 4.0% not specifically accounted for - 30.9% in running Inter pipeline - 10.3% in step preparation - 9.9% in inter step 2/12: link - 7.2% in inter step 12/12: generate inform6 -> auto.inf + 3.9% not specifically accounted for + 30.1% in running Inter pipeline + 9.8% in step preparation + 9.6% in inter step 2/12: link + 7.0% in inter step 12/12: generate inform6 -> auto.inf 0.3% in inter step 9/12: make-identifiers-unique 0.1% in inter step 10/12: reconcile-verbs 0.1% in inter step 11/12: eliminate-redundant-labels @@ -110,9 +109,9 @@ which take more than 1/1000th of the total running time. 0.1% in inter step 6/12: assimilate 0.1% in inter step 7/12: resolve-external-symbols 0.1% in inter step 8/12: inspect-plugs - 1.9% not specifically accounted for + 2.1% not specifically accounted for 2.0% in supervisor - 0.2% not specifically accounted for + 0.4% not specifically accounted for§3. Memory consumption. The following gives some idea of which classes of object have the most instances, and also of how Inform's memory tends to be used in practice. @@ -121,89 +120,91 @@ represent less than 1/1000th of the total.
-Total memory consumption was 256347K = 250 MB +Total memory consumption was 256243K = 250 MB -62.4% was used for 1335177 objects, in 267912 frames in 200 x 800K = 160000K = 156 MB: +62.4% was used for 1347149 objects, in 270289 frames in 200 x 800K = 160000K = 156 MB: 9.8% inter_tree_node_array 36 x 8192 = 294912 objects, 25953408 bytes - 5.5% text_stream_array 2587 x 100 = 258700 objects, 14569984 bytes - 3.9% parse_node 130338 objects, 10427040 bytes + 5.5% text_stream_array 2569 x 100 = 256900 objects, 14468608 bytes + 3.9% parse_node 130221 objects, 10417680 bytes + 2.8% parse_node_annotation_array 470 x 500 = 235000 objects, 7535040 bytes 2.8% verb_conjugation 160 objects, 7425280 bytes - 2.7% parse_node_annotation_array 445 x 500 = 222500 objects, 7134240 bytes 2.4% inter_symbol_array 70 x 1024 = 71680 objects, 6310080 bytes - 1.9% linked_list 9033 objects, 5058480 bytes - 1.4% map_data 778 objects, 3690832 bytes - 1.3% pcalc_prop_array 24 x 1000 = 24000 objects, 3456768 bytes + 1.9% linked_list 8915 objects, 4992400 bytes + 1.3% pcalc_prop_array 24 x 1000 = 24000 objects, 3648768 bytes + 1.1% map_data 660 objects, 3131040 bytes 0.9% kind_array 65 x 1000 = 65000 objects, 2602080 bytes - 0.7% inter_schema_token 14554 objects, 2095776 bytes + 0.7% inter_schema_token 13492 objects, 1942848 bytes 0.6% vocabulary_entry_array 161 x 100 = 16100 objects, 1808352 bytes 0.5% match_trie_array 10 x 1000 = 10000 objects, 1360320 bytes 0.4% phrase 940 objects, 1233280 bytes 0.3% adjective_meaning 202 objects, 1001920 bytes - 0.3% excerpt_meaning 3161 objects, 986232 bytes + 0.3% excerpt_meaning 3102 objects, 967824 bytes 0.3% inter_name_array 20 x 1000 = 20000 objects, 960640 bytes 0.3% inter_package 13201 objects, 950472 bytes - 0.3% inter_schema_node 9518 objects, 913728 bytes - 0.3% production 3895 objects, 903640 bytes - 0.3% ptoken 8318 objects, 865072 bytes + 0.3% production 3921 objects, 909672 bytes + 0.3% ptoken 8339 objects, 867256 bytes + 0.3% individual_form 2564 objects, 861504 bytes 0.3% inter_symbols_table 13201 objects, 844864 bytes + 0.3% inter_schema_node 8692 objects, 834432 bytes 0.2% dictionary 16345 objects, 784560 bytes 0.2% dict_entry_array 236 x 100 = 23600 objects, 762752 bytes 0.2% package_request 7928 objects, 697664 bytes - 0.2% individual_name 2623 objects, 692472 bytes 0.2% inter_name_generator_array 16 x 1000 = 16000 objects, 640512 bytes - 0.2% verb_usage 1628 objects, 573056 bytes - 0.1% inference_subject 781 objects, 512336 bytes + 0.2% noun_usage 2405 objects, 577200 bytes + 0.2% verb_usage 1628 objects, 560032 bytes 0.1% local_variable_array 45 x 100 = 4500 objects, 505440 bytes + 0.1% inference_subject 663 objects, 434928 bytes 0.1% rule 469 objects, 363944 bytes - 0.1% i6_schema_array 6 x 100 = 600 objects, 360192 bytes - 0.1% verb_form 386 objects, 339680 bytes - 0.1% noun 2440 objects, 312320 bytes + 0.1% verb_form 386 objects, 342768 bytes + 0.1% i6_schema_array 5 x 100 = 500 objects, 300160 bytes 0.1% scan_directory 70 objects, 288960 bytes - 0.1% binary_predicate 439 objects, 270424 bytes + 0.1% noun 2381 objects, 285720 bytes ---- action_name_list_array 3 x 1000 = 3000 objects, 240096 bytes + ---- binary_predicate 321 objects, 197736 bytes ---- inter_annotation_array 1 x 8192 objects, 196640 bytes ---- inference 1703 objects, 177112 bytes - ---- linked_list_item_array 11 x 1000 = 11000 objects, 176352 bytes + ---- linked_list_item_array 10 x 1000 = 10000 objects, 160320 bytes + ---- linguistic_stock_item 3312 objects, 158976 bytes ---- stacked_variable_owner_list_array 38 x 100 = 3800 objects, 153216 bytes ---- action_pattern_array 6 x 100 = 600 objects, 144192 bytes - ---- lexicon_entry 395 objects, 142200 bytes - ---- nonterminal 743 objects, 136712 bytes - ---- adjective_usage_array 8 x 1000 = 8000 objects, 128256 bytes + ---- index_lexicon_entry 395 objects, 142200 bytes + ---- nonterminal 752 objects, 138368 bytes ---- documentation_ref 1275 objects, 112200 bytes ---- hierarchy_location 731 objects, 105264 bytes - ---- preposition_identity 273 objects, 82992 bytes - ---- name_cluster 2577 objects, 82464 bytes + ---- preposition 273 objects, 87360 bytes + ---- lexical_cluster 2518 objects, 80576 bytes ---- pcalc_term_array 2 x 1000 = 2000 objects, 80064 bytes ---- kind_variable_declaration 1652 objects, 79296 bytes ---- inter_tree 6 objects, 78672 bytes - ---- inter_schema 1627 objects, 78096 bytes - ---- spatial_data 782 objects, 75072 bytes + ---- inter_schema 1509 objects, 72432 bytes ---- rulebook 407 objects, 71632 bytes ---- kind_macro_definition 10 objects, 64400 bytes + ---- spatial_data 664 objects, 63744 bytes ---- booking 860 objects, 61920 bytes ---- grammar_verb 130 objects, 57200 bytes ---- property_permission 96 objects, 56832 bytes ---- pcalc_func_array 1 x 1000 objects, 56032 bytes ---- ph_stack_frame_box 577 objects, 55392 bytes - ---- kind_constructor 75 objects, 54600 bytes + ---- kind_constructor 75 objects, 55200 bytes ---- text_substitution 436 objects, 48832 bytes ---- grammar_line 230 objects, 46000 bytes ---- table 7 objects, 45528 bytes ---- inter_node_list 750 objects, 42000 bytes ---- activity_list_array 1 x 1000 objects, 40032 bytes - ---- regions_data 778 objects, 37344 bytes ---- response_message 407 objects, 35816 bytes - ---- production_list 618 objects, 34608 bytes + ---- production_list 627 objects, 35112 bytes + ---- unary_predicate_array 8 x 1000 = 8000 objects, 32192 bytes ---- HTML_tag_array 1 x 1000 objects, 32032 bytes + ---- regions_data 660 objects, 31680 bytes ---- property 146 objects, 31536 bytes - ---- counting_data 782 objects, 31280 bytes ---- verb_sense 403 objects, 29016 bytes ---- stacked_variable_owner_array 6 x 100 = 600 objects, 28992 bytes ---- heading 198 objects, 28512 bytes - ---- parsing_data 782 objects, 25024 bytes + ---- counting_data 664 objects, 26560 bytes ---- instance 167 objects, 22712 bytes ---- ap_optional_clause_array 1 x 400 objects, 22432 bytes + ---- parsing_data 664 objects, 21248 bytes ---- pcalc_prop_deferral 90 objects, 19440 bytes ---- nonlocal_variable 93 objects, 19344 bytes ---- action_name 90 objects, 18720 bytes @@ -216,17 +217,16 @@ represent less than 1/1000th of the total. ---- stopwatch_timer 156 objects, 12480 bytes ---- understanding_reference_array 2 x 100 = 200 objects, 11264 bytes ---- pathname 265 objects, 10600 bytes + ---- adjective 137 objects, 9864 bytes + ---- method 177 objects, 8496 bytes ---- filename 206 objects, 8240 bytes - ---- method 169 objects, 8112 bytes - ---- adjectival_phrase 137 objects, 7672 bytes ---- equation_node 68 objects, 7616 bytes ---- understanding_item_array 3 x 100 = 300 objects, 7296 bytes - ---- determiner 22 objects, 7040 bytes + ---- determiner 22 objects, 7216 bytes ---- stacked_variable_array 1 x 100 objects, 6432 bytes ---- uniqueness_count 260 objects, 6240 bytes + ---- verb 108 objects, 6048 bytes ---- text_literal_holder 145 objects, 5800 bytes - ---- adjective_meaning_block 137 objects, 5480 bytes - ---- verb_identity 108 objects, 5184 bytes ---- inbuild_work 78 objects, 4992 bytes ---- kind_constructor_instance_array 2 x 100 = 200 objects, 4864 bytes ---- heading_tree 20 objects, 4640 bytes @@ -238,9 +238,9 @@ represent less than 1/1000th of the total. ---- activity 35 objects, 3920 bytes ---- inbuild_edition 54 objects, 3888 bytes ---- inbuild_copy 35 objects, 3640 bytes - ---- command_line_switch 41 objects, 3280 bytes - ---- kind_constructor_comparison_schema_array 1 x 100 objects, 3232 bytes + ---- command_line_switch 42 objects, 3360 bytes ---- instance_usage_array 1 x 200 objects, 3232 bytes + ---- kind_constructor_comparison_schema_array 1 x 100 objects, 3232 bytes ---- definition 44 objects, 3168 bytes ---- compatibility_specification 66 objects, 3168 bytes ---- inform_extension 19 objects, 3040 bytes @@ -250,22 +250,22 @@ represent less than 1/1000th of the total. ---- kind_constructor_casting_rule_array 1 x 100 objects, 2432 bytes ---- equation_symbol 30 objects, 2400 bytes ---- semver_range 22 objects, 2288 bytes - ---- table_contribution_array 1 x 100 objects, 1632 bytes + ---- method_set 56 objects, 1792 bytes ---- plugin_call_array 1 x 100 objects, 1632 bytes ---- activity_crossref_array 1 x 100 objects, 1632 bytes + ---- table_contribution_array 1 x 100 objects, 1632 bytes ---- use_option 29 objects, 1624 bytes ---- kind_interaction 39 objects, 1560 bytes - ---- method_set 48 objects, 1536 bytes ---- inter_annotation_form 37 objects, 1480 bytes ---- pipeline_step 12 objects, 1440 bytes ---- noun_filter_token 22 objects, 1408 bytes ---- scene 1 object, 1344 bytes ---- special_meaning_holder 33 objects, 1320 bytes - ---- build_script 40 objects, 1280 bytes ---- constant_phrase 20 objects, 1280 bytes + ---- build_script 40 objects, 1280 bytes ---- invocation_options_array 1 x 100 objects, 1224 bytes ---- hierarchy_metadatum 15 objects, 1200 bytes - ---- quantifier 16 objects, 1152 bytes + ---- quantifier 16 objects, 1024 bytes ---- table_column 16 objects, 896 bytes ---- inbuild_requirement 22 objects, 880 bytes ---- code_generation 1 object, 864 bytes @@ -285,53 +285,57 @@ represent less than 1/1000th of the total. ---- I6T_intervention 8 objects, 640 bytes ---- relation_guard 5 objects, 640 bytes ---- nascent_array 7 objects, 616 bytes - ---- inbuild_search_result 15 objects, 600 bytes ---- named_rulebook_outcome 15 objects, 600 bytes + ---- inbuild_search_result 15 objects, 600 bytes ---- label_namespace 10 objects, 560 bytes ---- inform_kit 5 objects, 520 bytes ---- equation 4 objects, 416 bytes ---- i6_memory_setting 13 objects, 416 bytes - ---- module_package 10 objects, 400 bytes ---- dval_written 10 objects, 400 bytes + ---- module_package 10 objects, 400 bytes ---- source_file 5 objects, 360 bytes ---- inbuild_genre 7 objects, 336 bytes ---- door_dir_notice 5 objects, 320 bytes + ---- grammatical_category 8 objects, 320 bytes ---- build_step 4 objects, 288 bytes ---- door_to_notice 5 objects, 280 bytes ---- inform_pipeline 4 objects, 256 bytes ---- verb_usage_tier 5 objects, 240 bytes ---- test_scenario 1 object, 208 bytes - ---- build_skill 5 objects, 200 bytes ---- compilation_module 5 objects, 200 bytes - ---- kit_dependency 4 objects, 192 bytes + ---- build_skill 5 objects, 200 bytes ---- plural_dictionary_entry 4 objects, 192 bytes + ---- kit_dependency 4 objects, 192 bytes ---- inform_project 1 object, 176 bytes - ---- kind_template_obligation 4 objects, 160 bytes - ---- link_instruction 4 objects, 160 bytes - ---- inter_architecture 4 objects, 160 bytes ---- pointer_allocation 2 objects, 160 bytes ---- code_generation_target 4 objects, 160 bytes - ---- codegen_pipeline 1 object, 128 bytes + ---- inter_architecture 4 objects, 160 bytes + ---- kind_template_obligation 4 objects, 160 bytes + ---- link_instruction 4 objects, 160 bytes ---- element_activation 4 objects, 128 bytes + ---- codegen_pipeline 1 object, 128 bytes ---- inbuild_nest 3 objects, 120 bytes + ---- pronoun 3 objects, 120 bytes ---- inform_kit_ittt 2 objects, 96 bytes - ---- compile_task_data 1 object, 80 bytes ---- list_together_routine 2 objects, 80 bytes + ---- article 2 objects, 80 bytes + ---- compile_task_data 1 object, 80 bytes ---- inter_warehouse 1 object, 56 bytes ---- build_methodology 1 object, 56 bytes - ---- HTML_file_state 1 object, 48 bytes ---- blorb_figure 1 object, 48 bytes - ---- loop_over_scope 1 object, 40 bytes + ---- HTML_file_state 1 object, 48 bytes ---- kind_template_definition 1 object, 40 bytes ---- parse_name_notice 1 object, 40 bytes + ---- loop_over_scope 1 object, 40 bytes 37.5% was used for memory not allocated for objects: - 16.0% text stream storage 42037484 bytes in 265078 claims + 15.9% text stream storage 41849780 bytes in 263291 claims 3.5% dictionary storage 9265152 bytes in 16345 claims ---- sorting 1112 bytes in 3 claims 2.7% source text 7200000 bytes in 3 claims 4.1% source text details 10800000 bytes in 2 claims + ---- linguistic stock array 81920 bytes in 2 claims 0.8% inter symbols storage 2276992 bytes in 13911 claims 6.4% inter bytecode storage 16802820 bytes in 14 claims 3.3% inter links storage 8750208 bytes in 246 claims @@ -342,7 +346,7 @@ represent less than 1/1000th of the total. ---- emitter array storage 14368 bytes in 8 claims ---- code generation workspace for objects 9200 bytes in 9 claims -19.9% was overhead - 52468856 bytes = 51239K = 50 MB +19.9% was overhead - 52335680 bytes = 51109K = 49 MB§4. Preform grammar. The full annotated description of the Preform grammar (see About Preform (in words)), with optimisation details and hit/miss statistics added, is also long: it's @@ -351,14 +355,14 @@ sample, showing the nonterminal used to parse literals in Inform 7 source text:
-<s-literal> hits 2097/23834 nti 23 constraint (none) extremes [1, infinity) +<s-literal> hits 2097/23834 nti 27 constraint (none) extremes [1, infinity) English: (@1)<cardinal-number>=1 (hits 171/171) (matched: '100') constraint CS = {r0} extremes [1, 1] (@1)minus (@2)<cardinal-number>=1 - (hits 0/1481) constraint DS = {23} extremes [2, 2] + (hits 0/1395) constraint DS = {27} extremes [2, 2] (@1)<quoted-text>=1 (@2)( (@3)<response-letter>=2 (@4)) - (hits 273/728) (matched: '"[current item from the multiple object list]: [run paragraph on]" ( a )') constraint DS = {23} extremes [4, 4] + (hits 273/802) (matched: '"[current item from the multiple object list]: [run paragraph on]" ( a )') constraint DS = {27} extremes [4, 4] (@1)<quoted-text>=1 (hits 1564/5548) (matched: 'Represents geographical locations, both indoor and outdoor, which are not necessarily areas in a building. A player in one @@ -367,13 +371,13 @@ sample, showing the nonterminal used to parse literals in Inform 7 source text: <s-literal-real-number>=1 (hits 11/9909) (matched: 'plus infinity') constraint (none) extremes [1, infinity) (@1)<s-literal-truth-state>=1 - (hits 78/231) (matched: 'false') constraint CS = {17} extremes [1, 1] + (hits 78/228) (matched: 'false') constraint CS = {21} extremes [1, 1] <s-literal-list>=1 - (hits 0/3241) constraint DS = {19} extremes [2, infinity) + (hits 0/3681) constraint DS = {23} extremes [2, infinity) (@1)unicode <s-unicode-character>=1 - (hits 0/3299) constraint DS = {23} extremes [2, infinity) + (hits 0/3352) constraint DS = {27} extremes [2, infinity) <s-literal-time>=1 - (hits 0/3457) constraint DW = {20, 21, 22} extremes [2, 5] + (hits 0/3474) constraint DW = {24, 25, 26} extremes [2, 5] <s-literal-unit-notation>=1 (hits 0/9820) constraint (none) extremes [1, infinity)@@ -385,7 +389,7 @@ sample, showing the nonterminal used to parse literals in Inform 7 source text: diff --git a/docs/inform7/preform-diagnostics.txt b/docs/inform7/preform-diagnostics.txt index 6d5aed030..39d22db57 100644 --- a/docs/inform7/preform-diagnostics.txt +++ b/docs/inform7/preform-diagnostics.txt @@ -1,10 +1,10 @@ -internal nti 15 constraint (none) extremes [1, 1] + internal nti 19 constraint (none) extremes [1, 1] - internal hits 1205/7256 nti 16 constraint (none) extremes [0, 0] + internal hits 1185/6478 nti 20 constraint (none) extremes [0, 0] - internal hits 3083/6246 nti 17 constraint (none) extremes [0, 0] + internal hits 3083/6246 nti 21 constraint (none) extremes [0, 0] - hits 1504/3008 nti 18 constraint (none) extremes [1, infinity) + hits 1504/3008 nti 22 constraint (none) extremes [1, infinity) English: {......} (hits 1504/1504) (matched long text) constraint (none) extremes [1, infinity) @@ -12,19 +12,19 @@ hits 6/28 nti 15 constraint DS = {15} extremes [3, infinity) English: {......} , {......} - (hits 6/13) (matched long text) constraint DS = {15} extremes [3, infinity) + (hits 6/6) (matched long text) constraint DS = {15} extremes [3, infinity) - internal nti 19 constraint (none) extremes [1, 1] + internal nti 23 constraint (none) extremes [1, 1] - internal hits 2894/23406 nti 20 constraint (none) extremes [1, 1] + internal hits 2894/23406 nti 24 constraint (none) extremes [1, 1] - internal nti 21 constraint (none) extremes [1, 1] + internal nti 25 constraint (none) extremes [1, 1] - internal hits 25/50 nti 22 constraint (none) extremes [1, 1] + internal hits 25/50 nti 26 constraint (none) extremes [1, 1] - internal nti 23 constraint (none) extremes [1, 1] + internal nti 27 constraint (none) extremes [1, 1] - internal hits 2/12950 nti 24 constraint (none) extremes [0, 0] + internal hits 2/12950 nti 28 constraint (none) extremes [0, 0] hits 0/18 nti 16 constraint DS = {16} extremes [3, infinity) English: @@ -73,11 +73,11 @@ {...} than constraint DS = {22} extremes [2, infinity) - internal nti 25 constraint (none) extremes [1, infinity) + internal nti 29 constraint (none) extremes [1, infinity) - internal nti 26 constraint (none) extremes [1, infinity) + internal nti 30 constraint (none) extremes [1, infinity) - nti 27 constraint CW = {23, 24, 25} extremes [2, 2] + nti 31 constraint CW = {23, 24, 25} extremes [2, 2] English: constraint CS = {23} extremes [2, 2] @@ -339,7 +339,7 @@ yw* an constraint CS = {25} extremes [2, 2] - nti 28 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [3, infinity) + nti 6 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [3, infinity) English: {...} constraint DS = {26} extremes [3, infinity) @@ -1499,7 +1499,7 @@ shouldn't shouldn't constraint CS = {25} extremes [2, 2] - nti 29 constraint DW = {12, 13, 14, 15, 16} extremes [3, infinity) + nti 7 constraint DW = {12, 13, 14, 15, 16} extremes [3, infinity) English: {...} constraint DS = {12} extremes [3, infinity) @@ -2025,7 +2025,7 @@ * 0ing constraint CS = {16} extremes [2, 2] - nti 30 constraint DW = {17, 18, 19, 20, 21, 22} extremes [2, infinity) + nti 8 constraint DW = {17, 18, 19, 20, 21, 22} extremes [2, infinity) English: constraint CS = {17} extremes [2, 2] @@ -2337,7 +2337,7 @@ write written constraint CS = {17} extremes [2, 2] - nti 31 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [2, infinity) + nti 9 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [2, infinity) English: constraint CS = {30} extremes [2, 2] @@ -2353,7 +2353,7 @@ do does constraint CS = {30} extremes [2, 2] - nti 6 constraint DW = {18, 19, 20, 21, 22} extremes [3, infinity) + nti 10 constraint DW = {18, 19, 20, 21, 22} extremes [3, infinity) English: {...} constraint DS = {18} extremes [3, infinity) @@ -3595,7 +3595,7 @@ * 0ed constraint CS = {22} extremes [2, 2] - nti 7 constraint DW = {9, 10, 11} extremes [2, infinity) + nti 11 constraint DW = {9, 10, 11} extremes [2, infinity) English: constraint CS = {9} extremes [2, 2] @@ -4642,7 +4642,7 @@ * 1 constraint CS = {21} extremes [2, 2] - nti 8 constraint CS = {22} extremes [1, 1] + nti 12 constraint CS = {22} extremes [1, 1] English: constraint CS = {22} extremes [1, 1] @@ -4670,47 +4670,71 @@ the the the the the constraint CS = {24} extremes [5, 5] - hits 88/492 nti 9 constraint CW = {26, 27} extremes [1, 1] + nti 26 constraint CS = {26} extremes [1, 1] English: - - (hits 88/108) (matched: 'it') constraint CS = {26} extremes [1, 1] - + zero + constraint CS = {26} extremes [1, 1] + one + constraint CS = {26} extremes [1, 1] + two + constraint CS = {26} extremes [1, 1] + three + constraint CS = {26} extremes [1, 1] + four + constraint CS = {26} extremes [1, 1] + five + constraint CS = {26} extremes [1, 1] + six + constraint CS = {26} extremes [1, 1] + seven + constraint CS = {26} extremes [1, 1] + eight + constraint CS = {26} extremes [1, 1] + nine + constraint CS = {26} extremes [1, 1] + ten + constraint CS = {26} extremes [1, 1] + eleven + constraint CS = {26} extremes [1, 1] + twelve + constraint CS = {26} extremes [1, 1] + + nti 27 constraint CS = {27} extremes [1, 1] + English: + zeroth + constraint CS = {27} extremes [1, 1] + first + constraint CS = {27} extremes [1, 1] + second + constraint CS = {27} extremes [1, 1] + third + constraint CS = {27} extremes [1, 1] + fourth + constraint CS = {27} extremes [1, 1] + fifth + constraint CS = {27} extremes [1, 1] + sixth + constraint CS = {27} extremes [1, 1] + seventh + constraint CS = {27} extremes [1, 1] + eighth + constraint CS = {27} extremes [1, 1] + ninth + constraint CS = {27} extremes [1, 1] + tenth + constraint CS = {27} extremes [1, 1] + eleventh + constraint CS = {27} extremes [1, 1] + twelfth constraint CS = {27} extremes [1, 1] - hits 103/300 nti 26 constraint CS = {26} extremes [1, 1] - English: - it/he/she - (hits 102/129) (matched: 'he') constraint CS = {26} extremes [1, 1] - they - (hits 1/27) (matched: 'they') constraint CS = {26} extremes [1, 1] + internal hits 200/24210 nti r0 constraint CS = {r0} extremes [1, 1] - hits 490/1114 nti 27 constraint CS = {27} extremes [1, 1] - English: - it/him/her - (hits 490/557) (matched: 'it') constraint CS = {27} extremes [1, 1] - them - (hits 0/67) constraint CS = {27} extremes [1, 1] + internal nti r1 constraint CS = {r1} extremes [1, 1] - nti 28 constraint CS = {28} extremes [1, 1] - English: - my - constraint CS = {28} extremes [1, 1] - our - constraint CS = {28} extremes [1, 1] + internal hits 36/72 nti 13 constraint (none) extremes [1, 1] - hits 0/444 nti 29 constraint CS = {29} extremes [1, 1] - English: - your - (hits 0/10) constraint CS = {29} extremes [1, 1] - your - (hits 0/10) constraint CS = {29} extremes [1, 1] - - hits 0/172 nti 30 constraint CS = {30} extremes [1, 1] - English: - its/his/her - constraint CS = {30} extremes [1, 1] - their - constraint CS = {30} extremes [1, 1] + internal hits 0/258 nti 18 constraint (none) extremes [1, infinity) hits 16202/50122 nti r2 constraint CS = {r2} extremes [1, 1] English: @@ -4719,179 +4743,225 @@ (hits 11912/11912) (matched: 'the') constraint CS = {r2} extremes [1, 1] - hits 33480/195066 nti r2 constraint CS = {r2} extremes [1, 1] + hits 33480/195068 nti r2 constraint CS = {r2} extremes [1, 1] + English: + + (hits 33480/39948) (matched: 'the') constraint CS = {r2} extremes [1, 1] + + hits 6533/55544 nti r2 constraint CS = {r2} extremes [1, 1] + English: + + (hits 6533/24703) (matched: 'a') constraint CS = {r2} extremes [1, 1] + + hits 33480/79896 nti r2 constraint CS = {r2} extremes [1, 1] English: the - (hits 33480/39947) (matched: 'the') constraint CS = {r2} extremes [1, 1] + (hits 33480/39948) (matched: 'the') constraint CS = {r2} extremes [1, 1] - hits 6649/55762 nti r2 constraint CS = {r2} extremes [1, 1] + hits 6533/49406 nti r2 constraint CS = {r2} extremes [1, 1] English: a/an - (hits 6645/24819) (matched: 'a') constraint CS = {r2} extremes [1, 1] + (hits 6531/24703) (matched: 'a') constraint CS = {r2} extremes [1, 1] some - (hits 4/18174) (matched: 'some') constraint CS = {r2} extremes [1, 1] + (hits 2/18172) (matched: 'some') constraint CS = {r2} extremes [1, 1] - hits 36057/72114 nti 10 constraint (none) extremes [1, infinity) + hits 36057/72114 nti 14 constraint (none) extremes [1, infinity) English: {...} (hits 7694/17674) (matched long text) constraint DS = {r2} extremes [2, infinity) {...} (hits 28363/28363) (matched long text) constraint (none) extremes [1, infinity) - hits 81532/163064 nti 11 constraint (none) extremes [1, infinity) + nti 15 constraint (none) extremes [1, infinity) + English: + {...} + constraint DS = {r2} extremes [2, infinity) + {...} + constraint (none) extremes [1, infinity) + + hits 81532/163064 nti 16 constraint (none) extremes [1, infinity) English: {...} (hits 15779/24422) (matched long text) constraint DS = {r2} extremes [2, infinity) {...} (hits 65753/65753) (matched long text) constraint (none) extremes [1, infinity) - nti 12 constraint DS = {r2} extremes [2, infinity) + nti 17 constraint DS = {r2} extremes [2, infinity) English: {...} constraint DS = {r2} extremes [2, infinity) - hits 61/898 nti 31 constraint CS = {31} extremes [1, 1] - English: - thing/something - (hits 61/63) (matched: 'thing') constraint CS = {31} extremes [1, 1] - - internal hits 388/16728 nti 13 constraint (none) extremes [1, 1] - - hits 16/21706 nti 6 constraint DS = {6} extremes [2, infinity) - English: - not {...} - (hits 16/6363) (matched long text) constraint DS = {6} extremes [2, infinity) - - nti 7 constraint CS = {7} extremes [1, 1] - English: - zero - constraint CS = {7} extremes [1, 1] - one - constraint CS = {7} extremes [1, 1] - two - constraint CS = {7} extremes [1, 1] - three - constraint CS = {7} extremes [1, 1] - four - constraint CS = {7} extremes [1, 1] - five - constraint CS = {7} extremes [1, 1] - six - constraint CS = {7} extremes [1, 1] - seven - constraint CS = {7} extremes [1, 1] - eight - constraint CS = {7} extremes [1, 1] - nine - constraint CS = {7} extremes [1, 1] - ten - constraint CS = {7} extremes [1, 1] - eleven - constraint CS = {7} extremes [1, 1] - twelve - constraint CS = {7} extremes [1, 1] - - nti 8 constraint CS = {8} extremes [1, 1] - English: - zeroth - constraint CS = {8} extremes [1, 1] - first - constraint CS = {8} extremes [1, 1] - second - constraint CS = {8} extremes [1, 1] - third - constraint CS = {8} extremes [1, 1] - fourth - constraint CS = {8} extremes [1, 1] - fifth - constraint CS = {8} extremes [1, 1] - sixth - constraint CS = {8} extremes [1, 1] - seventh - constraint CS = {8} extremes [1, 1] - eighth - constraint CS = {8} extremes [1, 1] - ninth - constraint CS = {8} extremes [1, 1] - tenth - constraint CS = {8} extremes [1, 1] - eleventh - constraint CS = {8} extremes [1, 1] - twelfth - constraint CS = {8} extremes [1, 1] - - internal hits 200/23948 nti r0 constraint CS = {r0} extremes [1, 1] - - internal nti r1 constraint CS = {r1} extremes [1, 1] - - internal hits 36/72 nti 14 constraint (none) extremes [1, 1] - - nti 9 constraint CS = {9} extremes [1, 2] + nti 28 constraint CS = {28} extremes [1, 2] English: all - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] each - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] every - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] no - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] none - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] some - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] any - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] all but - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] all except - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] almost all - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] almost no - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] most - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] under half - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] at least - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] at most - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] exactly - constraint CS = {9} extremes [1, 1] + constraint CS = {28} extremes [1, 1] fewer than - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] less than - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] more than - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] greater than - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] other than - constraint CS = {9} extremes [2, 2] + constraint CS = {28} extremes [2, 2] - hits 79/158 nti 10 constraint (none) extremes [1, infinity) + hits 16/21706 nti 29 constraint DS = {29} extremes [2, infinity) + English: + not {...} + (hits 16/5604) (matched long text) constraint DS = {29} extremes [2, infinity) + + hits 79/158 nti 30 constraint (none) extremes [1, infinity) English: of the {...} - (hits 0/16) constraint DS = {10} extremes [3, infinity) + (hits 0/8) constraint DS = {30} extremes [3, infinity) of {...} - (hits 0/28) constraint DS = {10} extremes [2, infinity) + (hits 0/8) constraint DS = {30} extremes [2, infinity) {...} (hits 79/79) (matched: 'dvd carried by the person asked') constraint (none) extremes [1, infinity) - hits 0/21422 nti 11 constraint DS = {11} extremes [2, infinity) + hits 0/21422 nti 31 constraint DS = {31} extremes [2, infinity) English: no one {***} - (hits 0/6519) constraint DS = {11} extremes [2, infinity) + (hits 0/2558) constraint DS = {31} extremes [2, infinity) - internal hits 0/258 nti 14 constraint (none) extremes [1, infinity) + hits 11/98 nti 18 constraint CW = {6, 7, 8} extremes [1, 1] + English: + + (hits 0/13) constraint CS = {6} extremes [1, 1] + + (hits 0/9) constraint CS = {7} extremes [1, 1] + + (hits 11/20) (matched: 'he') constraint CS = {8} extremes [1, 1] - internal hits 4128/9256 nti 6 constraint FS = {6} extremes [1, infinity) + hits 0/26 nti 6 constraint CS = {6} extremes [1, 1] + English: + i + (hits 0/13) constraint CS = {6} extremes [1, 1] + we + (hits 0/13) constraint CS = {6} extremes [1, 1] + + hits 0/18 nti 7 constraint CS = {7} extremes [1, 1] + English: + you + (hits 0/9) constraint CS = {7} extremes [1, 1] + you + (hits 0/9) constraint CS = {7} extremes [1, 1] + + hits 11/356 nti 8 constraint CS = {8} extremes [1, 1] + English: + it + (hits 7/30) (matched: 'it') constraint CS = {8} extremes [1, 1] + he + (hits 3/23) (matched: 'he') constraint CS = {8} extremes [1, 1] + she + (hits 0/20) constraint CS = {8} extremes [1, 1] + they + (hits 1/20) (matched: 'they') constraint CS = {8} extremes [1, 1] + + hits 490/7198 nti 19 constraint CW = {9, 10, 11} extremes [1, 1] + English: + + (hits 0/2837) constraint CS = {9} extremes [1, 1] + + (hits 0/265) constraint CS = {10} extremes [1, 1] + + (hits 490/617) (matched: 'it') constraint CS = {11} extremes [1, 1] + + hits 0/5674 nti 9 constraint CS = {9} extremes [1, 1] + English: + me + (hits 0/2837) constraint CS = {9} extremes [1, 1] + us + (hits 0/2837) constraint CS = {9} extremes [1, 1] + + hits 0/530 nti 10 constraint CS = {10} extremes [1, 1] + English: + you + (hits 0/265) constraint CS = {10} extremes [1, 1] + you + (hits 0/265) constraint CS = {10} extremes [1, 1] + + hits 578/1726 nti 11 constraint CS = {11} extremes [1, 1] + English: + it + (hits 578/717) (matched: 'it') constraint CS = {11} extremes [1, 1] + him + (hits 0/139) constraint CS = {11} extremes [1, 1] + her + (hits 0/139) constraint CS = {11} extremes [1, 1] + them + (hits 0/139) constraint CS = {11} extremes [1, 1] + + nti 20 constraint CW = {12, 13, 14} extremes [1, 1] + English: + + constraint CS = {12} extremes [1, 1] + + constraint CS = {13} extremes [1, 1] + + constraint CS = {14} extremes [1, 1] + + nti 12 constraint CS = {12} extremes [1, 1] + English: + my + constraint CS = {12} extremes [1, 1] + our + constraint CS = {12} extremes [1, 1] + + hits 0/444 nti 13 constraint CS = {13} extremes [1, 1] + English: + your + (hits 0/21) constraint CS = {13} extremes [1, 1] + your + (hits 0/21) constraint CS = {13} extremes [1, 1] + + hits 0/172 nti 14 constraint CS = {14} extremes [1, 1] + English: + its + (hits 0/21) constraint CS = {14} extremes [1, 1] + his + (hits 0/21) constraint CS = {14} extremes [1, 1] + her + (hits 0/21) constraint CS = {14} extremes [1, 1] + their + (hits 0/21) constraint CS = {14} extremes [1, 1] + + internal hits 3786/9014 nti 6 constraint FS = {6} extremes [1, infinity) internal hits 16/128 nti 7 constraint FS = {7} extremes [1, infinity) - internal hits 1/8990 nti 8 constraint FS = {8} extremes [1, infinity) + internal hits 1/7074 nti 8 constraint FS = {8} extremes [1, infinity) internal hits 0/1832 nti 9 constraint FS = {9} extremes [1, infinity) @@ -4899,94 +4969,94 @@ internal nti 11 constraint FS = {11} extremes [1, infinity) - internal hits 210/5162 nti 15 constraint (none) extremes [1, infinity) + internal hits 210/5162 nti 21 constraint (none) extremes [1, infinity) - internal hits 59/4030 nti 16 constraint (none) extremes [1, infinity) + internal hits 59/4030 nti 22 constraint (none) extremes [1, infinity) - internal hits 1/2 nti 17 constraint (none) extremes [1, infinity) + internal hits 1/2 nti 23 constraint (none) extremes [1, infinity) - internal nti 18 constraint (none) extremes [1, infinity) + internal nti 24 constraint (none) extremes [1, infinity) - internal hits 58/118 nti 19 constraint (none) extremes [1, infinity) + internal hits 58/118 nti 25 constraint (none) extremes [1, infinity) internal nti 12 constraint DS = {12} extremes [1, infinity) - internal hits 635/19306 nti 13 constraint DS = {13} extremes [1, infinity) + internal hits 635/18300 nti 13 constraint DS = {13} extremes [1, infinity) - internal hits 255/10468 nti 14 constraint DS = {14} extremes [1, infinity) + internal hits 255/9840 nti 14 constraint DS = {14} extremes [1, infinity) - hits 67/3528 nti 12 constraint CS = {12} extremes [1, 1] + hits 67/2988 nti 15 constraint CS = {15} extremes [1, 1] English: always/certainly - (hits 10/775) (matched: 'always') constraint CS = {12} extremes [1, 1] + (hits 10/280) (matched: 'always') constraint CS = {15} extremes [1, 1] usually/normally - (hits 53/765) (matched: 'usually') constraint CS = {12} extremes [1, 1] + (hits 53/270) (matched: 'usually') constraint CS = {15} extremes [1, 1] rarely/seldom - (hits 0/712) constraint CS = {12} extremes [1, 1] + (hits 0/217) constraint CS = {15} extremes [1, 1] never - (hits 4/712) (matched: 'never') constraint CS = {12} extremes [1, 1] + (hits 4/217) (matched: 'never') constraint CS = {15} extremes [1, 1] initially - (hits 0/708) constraint CS = {12} extremes [1, 1] + (hits 0/213) constraint CS = {15} extremes [1, 1] - hits 0/4304 nti 13 constraint DS = {13} extremes [1, infinity) + hits 0/4304 nti 16 constraint DS = {16} extremes [1, infinity) English: {***} once/twice/thrice/turn/turns/time/times - (hits 0/1783) constraint DS = {13} extremes [1, infinity) + (hits 0/1248) constraint DS = {16} extremes [1, infinity) - nti 17 constraint DW = {14, 15, 16, 17} extremes [1, 9] + nti 20 constraint DW = {17, 18, 19, 20} extremes [1, 9] English: for - constraint DS = {17} extremes [2, 9] + constraint DS = {20} extremes [2, 9] - constraint DW = {14, 15, 16} extremes [1, 8] + constraint DW = {17, 18, 19} extremes [1, 8] - nti 16 constraint DW = {14, 15, 16} extremes [1, 8] + nti 19 constraint DW = {17, 18, 19} extremes [1, 8] English: only/exactly - constraint DS = {16} extremes [2, 7] + constraint DS = {19} extremes [2, 7] at most - constraint DS = {16} extremes [3, 8] + constraint DS = {19} extremes [3, 8] less/fewer than - constraint DS = {16} extremes [3, 8] + constraint DS = {19} extremes [3, 8] at least - constraint DS = {16} extremes [3, 8] + constraint DS = {19} extremes [3, 8] more than - constraint DS = {16} extremes [3, 8] + constraint DS = {19} extremes [3, 8] under - constraint DS = {16} extremes [2, 7] + constraint DS = {19} extremes [2, 7] over - constraint DS = {16} extremes [2, 7] + constraint DS = {19} extremes [2, 7] - constraint DW = {14, 15} extremes [1, 6] + constraint DW = {17, 18} extremes [1, 6] - nti 20 constraint DW = {14, 15} extremes [1, 6] + nti 26 constraint DW = {17, 18} extremes [1, 6] English: - constraint DS = {14} extremes [1, 6] + constraint DS = {17} extremes [1, 6] - constraint DS = {15} extremes [2, 6] + constraint DS = {18} extremes [2, 6] - nti 14 constraint DS = {14} extremes [1, 6] + nti 17 constraint DS = {17} extremes [1, 6] English: once - constraint CS = {14} extremes [1, 1] + constraint CS = {17} extremes [1, 1] twice - constraint CS = {14} extremes [1, 1] + constraint CS = {17} extremes [1, 1] thrice - constraint CS = {14} extremes [1, 1] + constraint CS = {17} extremes [1, 1] to time/times - constraint DS = {14} extremes [4, 6] + constraint DS = {17} extremes [4, 6] time/times - constraint DS = {14} extremes [2, 3] + constraint DS = {17} extremes [2, 3] - nti 15 constraint DS = {15} extremes [2, 6] + nti 18 constraint DS = {18} extremes [2, 6] English: to turn/turns - constraint DS = {15} extremes [4, 6] + constraint DS = {18} extremes [4, 6] turn/turns - constraint DS = {15} extremes [2, 3] + constraint DS = {18} extremes [2, 3] - nti 21 constraint (none) extremes [1, 2] + nti 27 constraint (none) extremes [1, 2] English: constraint DS = {r2} extremes [2, 2] @@ -4995,19 +5065,19 @@ constraint CS = {r0} extremes [1, 1] - hits 3218/6436 nti 22 constraint (none) extremes [1, infinity) + hits 3218/6436 nti 28 constraint (none) extremes [1, infinity) English: {...} (hits 3218/3218) (matched long text) constraint (none) extremes [1, infinity) - hits 220/440 nti 23 constraint (none) extremes [1, infinity) + hits 220/440 nti 29 constraint (none) extremes [1, infinity) English: (hits 220/220) (matched long text) constraint DS = {r2} extremes [2, infinity) constraint (none) extremes [1, infinity) - hits 1931/3862 nti 24 constraint (none) extremes [1, infinity) + hits 1931/3862 nti 30 constraint (none) extremes [1, infinity) English: {...} (hits 99/1931) (matched: '"(considering the first sixteen objects only)[command clarification break]" ( a )') constraint (none) extremes [1, infinity) @@ -5018,60 +5088,60 @@ (hits 1058/1058) (matched long text) constraint (none) extremes [1, infinity) - hits 60/120 nti 25 constraint (none) extremes [0, infinity) + hits 60/120 nti 31 constraint (none) extremes [0, infinity) English: ^ (hits 0/60) constraint (none) extremes [0, infinity) (hits 60/60) (matched: 'fixed in place') constraint (none) extremes [1, infinity) - hits 1444/2890 nti 26 constraint (none) extremes [0, infinity) + hits 1444/2890 nti 6 constraint (none) extremes [0, infinity) English: ^ (hits 0/1445) constraint (none) extremes [0, infinity) (hits 1444/1444) (matched long text) constraint (none) extremes [1, infinity) - hits 279/558 nti 27 constraint (none) extremes [1, infinity) + hits 279/558 nti 7 constraint (none) extremes [1, infinity) English: {...} (hits 99/279) (matched long text) constraint (none) extremes [1, infinity) - (hits 99/143) (matched long text) constraint DS = {18} extremes [2, infinity) + (hits 99/154) (matched long text) constraint DS = {21} extremes [2, infinity) (hits 81/81) (matched long text) constraint (none) extremes [1, infinity) - hits 198/1240 nti 18 constraint DS = {18} extremes [2, infinity) + hits 198/1298 nti 21 constraint DS = {21} extremes [2, infinity) English: , _{and} - (hits 0/532) constraint DS = {18} extremes [3, infinity) + (hits 0/540) constraint DS = {21} extremes [3, infinity) _{,/and} - (hits 198/571) (matched long text) constraint DS = {18} extremes [2, infinity) + (hits 198/591) (matched long text) constraint DS = {21} extremes [2, infinity) - hits 103/206 nti 28 constraint (none) extremes [1, infinity) + hits 103/206 nti 8 constraint (none) extremes [1, infinity) English: {...} (hits 30/103) (matched: 'unmarked for listing') constraint (none) extremes [1, infinity) - (hits 30/32) (matched: 'marked for listing or unmarked for listing') constraint DS = {19} extremes [2, infinity) + (hits 30/32) (matched: 'marked for listing or unmarked for listing') constraint DS = {22} extremes [2, infinity) (hits 43/43) (matched: 'pushable between rooms') constraint (none) extremes [1, infinity) - hits 60/142 nti 19 constraint DS = {19} extremes [2, infinity) + hits 60/142 nti 22 constraint DS = {22} extremes [2, infinity) English: , _{or} - (hits 0/13) constraint DS = {19} extremes [3, infinity) + (hits 0/13) constraint DS = {22} extremes [3, infinity) _{,/or} - (hits 60/69) (matched: 'or unmarked for listing') constraint DS = {19} extremes [2, infinity) + (hits 60/69) (matched: 'or unmarked for listing') constraint DS = {22} extremes [2, infinity) - hits 587/1174 nti 29 constraint (none) extremes [0, infinity) + hits 587/1174 nti 9 constraint (none) extremes [0, infinity) English: (hits 587/587) (matched long text) constraint (none) extremes [0, infinity) constraint (none) extremes [1, infinity) - hits 471/942 nti 30 constraint (none) extremes [0, infinity) + hits 471/942 nti 10 constraint (none) extremes [0, infinity) English: (hits 0/471) constraint (none) extremes [1, infinity) @@ -5080,174 +5150,183 @@ constraint (none) extremes [1, infinity) - hits 1226/2452 nti 31 constraint (none) extremes [0, infinity) + hits 1226/2452 nti 11 constraint (none) extremes [0, infinity) English: (hits 0/1226) constraint (none) extremes [1, infinity) (hits 1226/1226) (matched long text) constraint (none) extremes [0, infinity) - hits 0/942 nti 6 constraint (none) extremes [1, infinity) + hits 0/942 nti 12 constraint (none) extremes [1, infinity) English: - (hits 0/2) constraint CS = {20} extremes [1, 2] + (hits 0/2) constraint CS = {23} extremes [1, 2] {***} (hits 0/464) constraint (none) extremes [1, infinity) - (hits 0/392) constraint DS = {14} extremes [1, infinity) + (hits 0/389) constraint DS = {14} extremes [1, infinity) - hits 0/2384 nti 7 constraint (none) extremes [1, infinity) + hits 0/2384 nti 13 constraint (none) extremes [1, infinity) English: - (hits 0/4) constraint CS = {20} extremes [1, 2] + constraint CS = {23} extremes [1, 2] - (hits 0/725) constraint DS = {14} extremes [1, infinity) + (hits 0/756) constraint DS = {14} extremes [1, infinity) - hits 0/2234 nti 26 constraint DS = {14} extremes [1, infinity) + hits 61/898 nti 30 constraint CS = {30} extremes [1, 1] + English: + thing/something + (hits 61/61) (matched: 'thing') constraint CS = {30} extremes [1, 1] + + internal hits 388/16728 nti 14 constraint (none) extremes [1, 1] + + hits 0/2290 nti 29 constraint DS = {14} extremes [1, infinity) English: _,/and {...} - (hits 0/688) constraint DS = {14, 26} extremes [3, infinity) + (hits 0/759) constraint DS = {14, 29} extremes [3, infinity) _,/and - (hits 0/738) constraint DS = {14, 26} extremes [2, infinity) + (hits 0/832) constraint DS = {14, 29} extremes [2, infinity) - (hits 0/1117) constraint DS = {14} extremes [1, infinity) + (hits 0/1145) constraint DS = {14} extremes [1, infinity) - hits 1697/3396 nti 25 constraint (none) extremes [0, infinity) +