Fix for Mantis bug 1951

ganelson · Apr 11, 2022 · f9f6811 · f9f6811
1 parent 420542d
commit f9f6811
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt
@@ -1,8 +1,8 @@
 100.0% in inform7 run
-     68.3% in compilation to Inter
-         47.9% in //Sequence::undertake_queued_tasks//
-          4.7% in //MajorNodes::pre_pass//
-          3.2% in //MajorNodes::pass_1//
+     68.2% in compilation to Inter
+         47.8% in //Sequence::undertake_queued_tasks//
+          4.5% in //MajorNodes::pre_pass//
+          3.1% in //MajorNodes::pass_1//
           2.3% in //RTPhrasebook::compile_entries//
           1.8% in //ImperativeDefinitions::assess_all//
           1.5% in //RTKindConstructors::compile//
@@ -18,20 +18,20 @@
           0.1% in //Task::make_built_in_kind_constructors//
           0.1% in //Understand::traverse//
           0.1% in //World::stages_II_and_III//
-          2.1% not specifically accounted for
-     28.9% in running Inter pipeline
-          9.9% in step 14/15: generate inform6 -> auto.inf
-          7.5% in step 5/15: load-binary-kits
-          6.8% in step 6/15: make-synoptic-module
-          1.5% in step 9/15: make-identifiers-unique
+          2.2% not specifically accounted for
+     29.0% in running Inter pipeline
+         10.1% in step 14/15: generate inform6 -> auto.inf
+          7.6% in step 5/15: load-binary-kits
+          6.7% in step 6/15: make-synoptic-module
+          1.6% in step 9/15: make-identifiers-unique
           0.4% in step 12/15: eliminate-redundant-operations
           0.4% in step 4/15: compile-splats
           0.4% in step 7/15: shorten-wiring
+          0.3% in step 11/15: eliminate-redundant-labels
           0.3% in step 8/15: detect-indirect-calls
-          0.2% in step 11/15: eliminate-redundant-labels
           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.2% in supervisor
-      0.5% not specifically accounted for
+          0.5% not specifically accounted for
+      2.3% 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
@@ -1324,10 +1324,15 @@ Print best possible error message.
 
     if (etype == STUCK_PE) {    PARSER_ERROR_INTERNAL_RM('A'); new_line; oops_from = 1; }
     if (etype == UPTO_PE) {
-    	if (inferred_go) PARSER_ERROR_INTERNAL_RM('C');
-    	else PARSER_ERROR_INTERNAL_RM('B');
         for (m=0 : m<32 : m++) pattern-->m = pattern2-->m;
-        pcount = pcount2; PrintCommand(0);
+        pcount = pcount2;
+    	if (inferred_go) {
+    		PARSER_ERROR_INTERNAL_RM('C');
+    		print (name) parser_results-->INP1_PRES;
+    	} else {
+    		PARSER_ERROR_INTERNAL_RM('B');
+        	PrintCommand(0);
+        }
         print ".^";
     }
     if (etype == NUMBER_PE) {   PARSER_ERROR_INTERNAL_RM('D'); new_line; }