diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index e0feebeec9..ebc7c7b51a 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,6 +1,6 @@ 100.0% in inform7 run - 68.3% in compilation to Inter - 47.8% in //Sequence::undertake_queued_tasks// + 68.4% in compilation to Inter + 47.9% in //Sequence::undertake_queued_tasks// 4.6% in //MajorNodes::pre_pass// 3.3% in //MajorNodes::pass_1// 2.4% in //RTPhrasebook::compile_entries// @@ -21,7 +21,7 @@ 2.0% not specifically accounted for 28.9% in running Inter pipeline 10.1% in step 14/15: generate inform6 -> auto.inf - 7.4% in step 5/15: load-binary-kits + 7.5% in step 5/15: load-binary-kits 6.7% in step 6/15: make-synoptic-module 1.5% in step 9/15: make-identifiers-unique 0.4% in step 12/15: eliminate-redundant-operations @@ -32,6 +32,6 @@ 0.1% in step 10/15: reconcile-verbs 0.1% in step 2/15: parse-insertions 0.1% in step 3/15: resolve-conditional-compilation - 0.7% not specifically accounted for - 2.3% in supervisor + 0.6% not specifically accounted for + 2.2% in supervisor 0.4% not specifically accounted for diff --git a/inform7/Internal/Inter/CommandParserKit/Sections/Parser.i6t b/inform7/Internal/Inter/CommandParserKit/Sections/Parser.i6t index 88e5f079ba..ccae191360 100644 --- a/inform7/Internal/Inter/CommandParserKit/Sections/Parser.i6t +++ b/inform7/Internal/Inter/CommandParserKit/Sections/Parser.i6t @@ -1290,18 +1290,14 @@ fake action |##NotUnderstood| does not exist. verb_wordnum = usual_grammar_after; jump AlmostReParse; } - wn = verb_wordnum; - special_word = NextWord(); - if (special_word == comma_word) { - special_word = NextWord(); - verb_wordnum++; - } + wn = 1; + while ((wn <= num_words) && (NextWord() ~= comma_word)) ; parser_results-->ACTION_PRES = ##Answer; parser_results-->NO_INPS_PRES = 2; parser_results-->INP1_PRES = actor; parser_results-->INP2_PRES = 1; special_number1 = special_word; actor = player; - consult_from = verb_wordnum; consult_words = num_words-consult_from+1; + consult_from = wn; consult_words = num_words-consult_from+1; rtrue; } diff --git a/inform7/Tests/Test Makes/Eg4-C/textual.txt b/inform7/Tests/Test Makes/Eg4-C/textual.txt index b8473bc74f..e30f15dbba 100644 --- a/inform7/Tests/Test Makes/Eg4-C/textual.txt +++ b/inform7/Tests/Test Makes/Eg4-C/textual.txt @@ -27774,7 +27774,7 @@ package main _plain constant (int32) KIT_CONFIGURATION_BITMAP = 0 constant (int32) KIT_CONFIGURATION_LOOKMODE = 2 constant (text) I7_VERSION_NUMBER = "10.1.0" - constant (text) I7_FULL_VERSION_NUMBER = "10.1.0-alpha.1+6U82" + constant (text) I7_FULL_VERSION_NUMBER = "10.1.0-alpha.1+6U83" constant (text) ^virtual_machine = "C/32d/v1/no-main" constant (text) ^virtual_machine_icon = "vm_glulx.png" constant (text) ^language_elements_used = "core, naming, instance counting, glulx external files"