1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-06-17 07:40:47 +03:00

Fixed bug where extensions not recognised if their titling lines have trailing spaces

This commit is contained in:
Graham Nelson 2022-05-10 23:39:10 +01:00
parent dd47a1fa79
commit 7f7deec532
3 changed files with 20 additions and 23 deletions

View file

@ -194,6 +194,7 @@ by the local <span class="extract"><span class="extract-syntax">\n</span></span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">c</span><span class="plain-syntax"> == </span><span class="character-syntax">'\x0a'</span><span class="plain-syntax">) || (</span><span class="identifier-syntax">c</span><span class="plain-syntax"> == </span><span class="character-syntax">'\x0d'</span><span class="plain-syntax">) || (</span><span class="identifier-syntax">c</span><span class="plain-syntax"> == </span><span class="character-syntax">'\n'</span><span class="plain-syntax">)) </span><span class="reserved-syntax">break</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">PUT_TO</span><span class="plain-syntax">(</span><span class="identifier-syntax">titling_line</span><span class="plain-syntax">, </span><span class="identifier-syntax">c</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> }</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">Str::trim_white_space</span><span class="plain-syntax">(</span><span class="identifier-syntax">titling_line</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> </span><a href="2-wrk.html#SP5" class="function-link"><span class="function-syntax">Works::normalise_casing_mixed</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">titling_line</span><span class="plain-syntax">);</span>
</pre>
<ul class="endnotetexts"><li>This code is used in <a href="5-es.html#SP2_2">&#167;2.2</a>.</li></ul>

View file

@ -120,6 +120,7 @@ by the local |\n| for good measure.
if ((c == '\x0a') || (c == '\x0d') || (c == '\n')) break;
PUT_TO(titling_line, c);
}
Str::trim_white_space(titling_line);
Works::normalise_casing_mixed(titling_line);
@ In the following, all possible newlines are converted to white space, and

View file

@ -1,11 +1,11 @@
100.0% in inform7 run
70.9% in compilation to Inter
50.8% in //Sequence::undertake_queued_tasks//
4.6% in //MajorNodes::pre_pass//
3.2% in //MajorNodes::pass_1//
1.9% in //ImperativeDefinitions::assess_all//
70.8% in compilation to Inter
50.1% in //Sequence::undertake_queued_tasks//
4.7% in //MajorNodes::pre_pass//
3.5% in //MajorNodes::pass_1//
1.8% in //ImperativeDefinitions::assess_all//
1.8% in //RTPhrasebook::compile_entries//
1.5% in //RTKindConstructors::compile//
1.4% in //RTKindConstructors::compile//
1.0% in //Sequence::lint_inter//
0.6% in //MajorNodes::pass_2//
0.6% in //World::stage_V//
@ -13,25 +13,20 @@
0.4% in //Sequence::undertake_queued_tasks//
0.4% in //Sequence::undertake_queued_tasks//
0.2% in //CompletionModule::compile//
0.2% in //InferenceSubjects::emit_all//
0.2% in //RTKindConstructors::compile_permissions//
0.1% in //InferenceSubjects::emit_all//
0.1% in //Task::make_built_in_kind_constructors//
0.1% in //Understand::traverse//
0.1% in //World::stages_II_and_III//
2.2% not specifically accounted for
26.3% in running Inter pipeline
10.2% in step 14/15: generate inform6 -> auto.inf
5.8% in step 6/15: make-synoptic-module
5.6% in step 5/15: load-binary-kits
1.5% in step 9/15: make-identifiers-unique
0.2% in //Task::make_built_in_kind_constructors//
2.9% not specifically accounted for
26.2% in running Inter pipeline
10.5% in step 14/15: generate inform6 -> auto.inf
5.7% in step 5/15: load-binary-kits
5.3% in step 6/15: make-synoptic-module
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.3% in step 7/15: shorten-wiring
0.3% in step 8/15: detect-indirect-calls
0.4% in step 7/15: shorten-wiring
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
0.2% in step 8/15: detect-indirect-calls
1.4% not specifically accounted for
2.2% in supervisor
0.5% not specifically accounted for
0.7% not specifically accounted for