Fix for Jira bug I7-2100

docs/pipeline-module/2-pe.html

@@ -221,11 +221,10 @@ <h1><a href="../index.html">
 <span class="plain-syntax">    </span><span class="identifier-syntax">Problems::quote_stream</span><span class="plain-syntax">(1, </span><span class="identifier-syntax">M</span><span class="plain-syntax">);</span>
 <span class="plain-syntax">    </span><span class="identifier-syntax">StandardProblems::handmade_problem</span><span class="plain-syntax">(</span><span class="identifier-syntax">Task::syntax_tree</span><span class="plain-syntax">(), </span><span class="identifier-syntax">_p_</span><span class="plain-syntax">(...));</span>
 <span class="plain-syntax">    </span><span class="identifier-syntax">Problems::issue_problem_segment</span><span class="plain-syntax">(</span>
-<span class="plain-syntax">        </span><span class="string-syntax">"I ran into a mistake in the source code for a kit: %1. The Inform 6 "</span>
-<span class="plain-syntax">        </span><span class="string-syntax">"syntax source files for kits are a very low-level part of Inform, "</span>
-<span class="plain-syntax">        </span><span class="string-syntax">"and errors like this will only occur if the standard installation "</span>
-<span class="plain-syntax">        </span><span class="string-syntax">"has been amended or damaged, or if you are doing something quite "</span>
-<span class="plain-syntax">        </span><span class="string-syntax">"unusual."</span><span class="plain-syntax">);</span>
+<span class="plain-syntax">        </span><span class="string-syntax">"My low-level reader of source code reported a mistake - \"%1\"."</span>
+<span class="plain-syntax">        </span><span class="string-syntax">"%PLow-level material written in Inform 6 syntax occurs either in kits or "</span>
+<span class="plain-syntax">        </span><span class="string-syntax">"in matter written inside 'Include (- ... -)' in source text, either in "</span>
+<span class="plain-syntax">        </span><span class="string-syntax">"the main source or in an extension used by it."</span><span class="plain-syntax">);</span>
 <span class="plain-syntax">    </span><span class="identifier-syntax">Problems::issue_problem_end</span><span class="plain-syntax">();</span>
 <span class="plain-syntax">    </span><span class="identifier-syntax">DISCARD_TEXT</span><span class="plain-syntax">(</span><span class="identifier-syntax">M</span><span class="plain-syntax">)</span>
 <span class="plain-syntax">    #</span><span class="identifier-syntax">endif</span>

docs/pipeline-module/3-css.html

@@ -1601,7 +1601,7 @@ <h1><a href="../index.html">
 <span class="plain-syntax">        </span><span class="identifier-syntax">LOOP_OVER_LINKED_LIST</span><span class="plain-syntax">(</span><span class="identifier-syntax">err</span><span class="plain-syntax">, </span><span class="identifier-syntax">schema_parsing_error</span><span class="plain-syntax">, </span><span class="identifier-syntax">sch</span><span class="plain-syntax">-&gt;</span><span class="identifier-syntax">parsing_errors</span><span class="plain-syntax">) {</span>
 <span class="plain-syntax">            </span><span class="identifier-syntax">TEMPORARY_TEXT</span><span class="plain-syntax">(</span><span class="identifier-syntax">msg</span><span class="plain-syntax">)</span>
 <span class="plain-syntax">            </span><span class="identifier-syntax">WRITE_TO</span><span class="plain-syntax">(</span><span class="identifier-syntax">msg</span><span class="plain-syntax">, </span><span class="string-syntax">"in function '%S': %S"</span><span class="plain-syntax">, </span><span class="identifier-syntax">req</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">identifier</span><span class="plain-syntax">, </span><span class="identifier-syntax">err</span><span class="plain-syntax">-&gt;</span><span class="identifier-syntax">message</span><span class="plain-syntax">);</span>
-<span class="plain-syntax">            </span><a href="2-pe.html#SP3" class="function-link"><span class="function-syntax">PipelineErrors::kit_error</span></a><span class="plain-syntax">(</span><span class="string-syntax">"kit source error %S"</span><span class="plain-syntax">, </span><span class="identifier-syntax">msg</span><span class="plain-syntax">);</span>
+<span class="plain-syntax">            </span><a href="2-pe.html#SP3" class="function-link"><span class="function-syntax">PipelineErrors::kit_error</span></a><span class="plain-syntax">(</span><span class="string-syntax">"inform 6 syntax error %S"</span><span class="plain-syntax">, </span><span class="identifier-syntax">msg</span><span class="plain-syntax">);</span>
 <span class="plain-syntax">            </span><span class="identifier-syntax">DISCARD_TEXT</span><span class="plain-syntax">(</span><span class="identifier-syntax">msg</span><span class="plain-syntax">)</span>
 <span class="plain-syntax">        }</span>
 <span class="plain-syntax">    }</span>

inform7/Figures/timings-diagnostics.txt

@@ -1,6 +1,6 @@
 100.0% in inform7 run
-     71.0% in compilation to Inter
-         50.3% in //Sequence::undertake_queued_tasks//
+     70.5% in compilation to Inter
+         50.1% in //Sequence::undertake_queued_tasks//
           4.6% in //MajorNodes::pre_pass//
           3.4% in //MajorNodes::pass_1//
           1.8% in //ImperativeDefinitions::assess_all//
@@ -16,17 +16,18 @@
           0.2% in //InferenceSubjects::emit_all//
           0.2% in //RTKindConstructors::compile_permissions//
           0.2% in //Task::make_built_in_kind_constructors//
-          3.2% not specifically accounted for
-     26.3% in running Inter pipeline
-         10.0% in step 14/15: generate inform6 -> auto.inf
-          5.8% in step 5/15: load-binary-kits
-          5.6% in step 6/15: make-synoptic-module
-          1.6% in step 9/15: make-identifiers-unique
+          0.2% in //World::stages_II_and_III//
+          2.6% not specifically accounted for
+     26.7% in running Inter pipeline
+         10.5% in step 14/15: generate inform6 -> auto.inf
+          6.0% in step 6/15: make-synoptic-module
+          5.4% in step 5/15: load-binary-kits
+          1.4% 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.4% in step 8/15: detect-indirect-calls
           0.2% in step 11/15: eliminate-redundant-labels
-          1.4% not specifically accounted for
+          0.2% in step 8/15: detect-indirect-calls
+          1.6% not specifically accounted for
       2.2% in supervisor
       0.5% not specifically accounted for

inter/pipeline-module/Chapter 2/Pipeline Errors.w

@@ -146,11 +146,10 @@ void PipelineErrors::kit_error(char *message, text_stream *quote) {
 	Problems::quote_stream(1, M);
 	StandardProblems::handmade_problem(Task::syntax_tree(), _p_(...));
 	Problems::issue_problem_segment(
-		"I ran into a mistake in the source code for a kit: %1. The Inform 6 "
-		"syntax source files for kits are a very low-level part of Inform, "
-		"and errors like this will only occur if the standard installation "
-		"has been amended or damaged, or if you are doing something quite "
-		"unusual.");
+		"My low-level reader of source code reported a mistake - \"%1\"."
+		"%PLow-level material written in Inform 6 syntax occurs either in kits or "
+		"in matter written inside 'Include (- ... -)' in source text, either in "
+		"the main source or in an extension used by it.");
 	Problems::issue_problem_end();
 	DISCARD_TEXT(M)
 	#endif

inter/pipeline-module/Chapter 3/Compile Splats Stage.w

@@ -1256,7 +1256,7 @@ void CompileSplatsStage::report_kit_errors(inter_schema *sch, function_body_requ
 		LOOP_OVER_LINKED_LIST(err, schema_parsing_error, sch->parsing_errors) {
 			TEMPORARY_TEXT(msg)
 			WRITE_TO(msg, "in function '%S': %S", req->identifier, err->message);
-			PipelineErrors::kit_error("kit source error %S", msg);
+			PipelineErrors::kit_error("inform 6 syntax error %S", msg);
 			DISCARD_TEXT(msg)
 		}
 	}