diff --git a/docs/CommandParserKit/S-prs.html b/docs/CommandParserKit/S-prs.html index c53b86f917..a666e1a6c0 100644 --- a/docs/CommandParserKit/S-prs.html +++ b/docs/CommandParserKit/S-prs.html @@ -1359,6 +1359,10 @@

fake action ##NotUnderstood does not exist.

+

In order to assist people who do want to parse that type of mistyped command +in extensions, wn is left pointing at the first word not parsed as a command. +

+ 
   .GiveError;
 
@@ -1368,6 +1372,7 @@ 

             verb_wordnum = usual_grammar_after;
             jump AlmostReParse;
         }
+        m = wn; Save wn so extension authors can parse command errors if they want to
         wn = 1;
         while ((wn <= num_words) && (NextWord() ~= comma_word)) ;
         parser_results-->ACTION_PRES = ##Answer;
@@ -1376,6 +1381,7 @@ 

         parser_results-->INP2_PRES = 1; special_number1 = special_word;
         actor = player;
         consult_from = wn; consult_words = num_words-consult_from+1;
+        wn = m; Restore wn so extension authors can parse command errors if they want to
         rtrue;
     }
diff --git a/docs/WorldModelKit/S-act.html b/docs/WorldModelKit/S-act.html index cc81d16e06..b3f534303d 100644 --- a/docs/WorldModelKit/S-act.html +++ b/docs/WorldModelKit/S-act.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-act2.html b/docs/WorldModelKit/S-act2.html index 40e92164ed..71e3315c21 100644 --- a/docs/WorldModelKit/S-act2.html +++ b/docs/WorldModelKit/S-act2.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-chr.html b/docs/WorldModelKit/S-chr.html index cd9272c282..4e72933614 100644 --- a/docs/WorldModelKit/S-chr.html +++ b/docs/WorldModelKit/S-chr.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-fgr.html b/docs/WorldModelKit/S-fgr.html index 9dfb131f01..a09d06f22c 100644 --- a/docs/WorldModelKit/S-fgr.html +++ b/docs/WorldModelKit/S-fgr.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-gll.html b/docs/WorldModelKit/S-gll.html index 6d652206e5..c3726f8aea 100644 --- a/docs/WorldModelKit/S-gll.html +++ b/docs/WorldModelKit/S-gll.html @@ -40,8 +40,8 @@

Repository

Related Projects

@@ -133,8 +133,7 @@ 

 [ QUIT_THE_GAME_R;
     if (actor ~= player) rfalse;
-    if ((actor == player) && (untouchable_silence == false))
-        QUIT_THE_GAME_RM('A');
+    QUIT_THE_GAME_RM('A');
     if (YesOrNo()~=0) quit;
 ];
diff --git a/docs/WorldModelKit/S-lgh.html b/docs/WorldModelKit/S-lgh.html index 9ea3bb9d4f..598c53c1ab 100644 --- a/docs/WorldModelKit/S-lgh.html +++ b/docs/WorldModelKit/S-lgh.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-lst.html b/docs/WorldModelKit/S-lst.html index 93444695d4..cd5f6a16c1 100644 --- a/docs/WorldModelKit/S-lst.html +++ b/docs/WorldModelKit/S-lst.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-mpr.html b/docs/WorldModelKit/S-mpr.html index 32caad2b2c..61c902eca5 100644 --- a/docs/WorldModelKit/S-mpr.html +++ b/docs/WorldModelKit/S-mpr.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-msc.html b/docs/WorldModelKit/S-msc.html index b5ecbd20e7..9c01b8080d 100644 --- a/docs/WorldModelKit/S-msc.html +++ b/docs/WorldModelKit/S-msc.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-ord.html b/docs/WorldModelKit/S-ord.html index eb0e53d117..bafdd91bea 100644 --- a/docs/WorldModelKit/S-ord.html +++ b/docs/WorldModelKit/S-ord.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-otf.html b/docs/WorldModelKit/S-otf.html index 05d44f1080..d87377cc2f 100644 --- a/docs/WorldModelKit/S-otf.html +++ b/docs/WorldModelKit/S-otf.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-prn.html b/docs/WorldModelKit/S-prn.html index c147599c3c..416ee61e2a 100644 --- a/docs/WorldModelKit/S-prn.html +++ b/docs/WorldModelKit/S-prn.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-rtp.html b/docs/WorldModelKit/S-rtp.html index 0fb0909bdf..bed6d56c00 100644 --- a/docs/WorldModelKit/S-rtp.html +++ b/docs/WorldModelKit/S-rtp.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-str.html b/docs/WorldModelKit/S-str.html index f05a1b64ab..8f2f120e2b 100644 --- a/docs/WorldModelKit/S-str.html +++ b/docs/WorldModelKit/S-str.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-tm.html b/docs/WorldModelKit/S-tm.html index aedd6076b4..21baaaa77b 100644 --- a/docs/WorldModelKit/S-tm.html +++ b/docs/WorldModelKit/S-tm.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-tst.html b/docs/WorldModelKit/S-tst.html index 53ed793be0..4d077bd712 100644 --- a/docs/WorldModelKit/S-tst.html +++ b/docs/WorldModelKit/S-tst.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-wrl.html b/docs/WorldModelKit/S-wrl.html index 49af6d9370..6073d93eae 100644 --- a/docs/WorldModelKit/S-wrl.html +++ b/docs/WorldModelKit/S-wrl.html @@ -54,8 +54,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/S-zmc.html b/docs/WorldModelKit/S-zmc.html index b484f6cc61..ec3798f3a3 100644 --- a/docs/WorldModelKit/S-zmc.html +++ b/docs/WorldModelKit/S-zmc.html @@ -40,8 +40,8 @@

Repository

Related Projects

diff --git a/docs/WorldModelKit/index.html b/docs/WorldModelKit/index.html index d73ca2aa49..0030aca3da 100644 --- a/docs/WorldModelKit/index.html +++ b/docs/WorldModelKit/index.html @@ -38,8 +38,8 @@

Repository

Related Projects

diff --git a/docs/supervisor-module/3-bg.html b/docs/supervisor-module/3-bg.html index c267c4fbb2..108d02f15a 100644 --- a/docs/supervisor-module/3-bg.html +++ b/docs/supervisor-module/3-bg.html @@ -262,7 +262,6 @@

void Graphs::show_needs_r(OUTPUT_STREAM, build_vertex *V, int depth, int true_depth, int uses_only, int paths, int scan_count) { if (V->type == COPY_VERTEX) { - if (paths == FALSE) for (int i=0; i<depth; i++) WRITE(" "); inbuild_copy *C = V->as_copy; if (C->last_scanned != scan_count) { C->last_scanned = scan_count; @@ -272,6 +271,7 @@

else WRITE("?unlocated"); WRITE(" (%S)", C->edition->work->genre->genre_name); } else { + for (int i=0; i<depth; i++) WRITE(" "); WRITE("%S: ", C->edition->work->genre->genre_name); Copies::write_copy(OUT, C); } diff --git a/inbuild/supervisor-module/Chapter 3/Build Graphs.w b/inbuild/supervisor-module/Chapter 3/Build Graphs.w index b9097245fd..d4c0151199 100644 --- a/inbuild/supervisor-module/Chapter 3/Build Graphs.w +++ b/inbuild/supervisor-module/Chapter 3/Build Graphs.w @@ -197,7 +197,6 @@ void Graphs::show_needs(OUTPUT_STREAM, build_vertex *V, int uses_only, int paths void Graphs::show_needs_r(OUTPUT_STREAM, build_vertex *V, int depth, int true_depth, int uses_only, int paths, int scan_count) { if (V->type == COPY_VERTEX) { - if (paths == FALSE) for (int i=0; ias_copy; if (C->last_scanned != scan_count) { C->last_scanned = scan_count; @@ -207,6 +206,7 @@ void Graphs::show_needs_r(OUTPUT_STREAM, build_vertex *V, else WRITE("?unlocated"); WRITE(" (%S)", C->edition->work->genre->genre_name); } else { + for (int i=0; iedition->work->genre->genre_name); Copies::write_copy(OUT, C); } diff --git a/inform7/Figures/memory-diagnostics.txt b/inform7/Figures/memory-diagnostics.txt index 691ea0600b..653ea2ce03 100644 --- a/inform7/Figures/memory-diagnostics.txt +++ b/inform7/Figures/memory-diagnostics.txt @@ -1,6 +1,6 @@ -Total memory consumption was 129459K = 126 MB +Total memory consumption was 129458K = 126 MB - ---- was used for 2044965 objects, in 362888 frames in 0 x 800K = 0K = 0 MB: + ---- was used for 2044964 objects, in 362887 frames in 0 x 800K = 0K = 0 MB: 31.5% inter_tree_node_array 58 x 8192 = 475136 objects, 41813824 bytes 19.5% text_stream_array 4605 x 100 = 460500 objects, 25935360 bytes @@ -36,7 +36,7 @@ Total memory consumption was 129459K = 126 MB 0.3% local_variable_array 47 x 100 = 4700 objects, 452704 bytes 0.2% verb_usage 1128 objects, 388032 bytes 0.2% rule 470 objects, 368480 bytes - 0.2% dictionary 7521 objects, 361008 bytes + 0.2% dictionary 7520 objects, 360960 bytes 0.2% verb_form 386 objects, 348944 bytes 0.2% noun 2382 objects, 285840 bytes 0.2% compilation_subtask 3355 objects, 268400 bytes @@ -237,8 +237,8 @@ Total memory consumption was 129459K = 126 MB 100.0% was used for memory not allocated for objects: - 59.7% text stream storage 79164692 bytes in 478474 claims - 3.9% dictionary storage 5229056 bytes in 7521 claims + 59.7% text stream storage 79163588 bytes in 478472 claims + 3.9% dictionary storage 5228544 bytes in 7520 claims ---- sorting 1448 bytes in 149 claims 5.4% source text 7200000 bytes in 3 claims 8.1% source text details 10800000 bytes in 2 claims @@ -255,5 +255,5 @@ Total memory consumption was 129459K = 126 MB ---- code generation workspace for objects 1336 bytes in 4 claims 0.2% emitter array storage 280288 bytes in 1999 claims --139.-2% was overhead - -184656968 bytes = -180329K = -176 MB +-139.-2% was overhead - -184656920 bytes = -180329K = -176 MB diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index d9bf60c41e..907cb6690c 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,32 +1,33 @@ 100.0% in inform7 run - 71.7% in compilation to Inter - 50.6% in //Sequence::undertake_queued_tasks// - 4.7% in //MajorNodes::pre_pass// - 3.5% in //MajorNodes::pass_1// - 2.4% in //RTPhrasebook::compile_entries// - 1.8% in //ImperativeDefinitions::assess_all// - 1.4% in //RTKindConstructors::compile// - 1.0% in //Sequence::lint_inter// - 0.6% in //MajorNodes::pass_2// - 0.6% in //World::stage_V// - 0.4% in //ImperativeDefinitions::compile_first_block// - 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.2% in //Task::make_built_in_kind_constructors// + 70.6% in compilation to Inter + 48.7% in //Sequence::undertake_queued_tasks// + 5.0% in //MajorNodes::pre_pass// + 3.6% in //MajorNodes::pass_1// + 2.5% in //RTPhrasebook::compile_entries// + 1.9% in //ImperativeDefinitions::assess_all// + 1.5% in //RTKindConstructors::compile// + 0.9% in //Sequence::lint_inter// + 0.5% in //MajorNodes::pass_2// + 0.5% in //Sequence::undertake_queued_tasks// + 0.5% in //World::stage_V// + 0.3% in //ImperativeDefinitions::compile_first_block// + 0.3% in //Sequence::undertake_queued_tasks// + 0.1% in //CompletionModule::compile// + 0.1% in //InferenceSubjects::emit_all// + 0.1% in //RTKindConstructors::compile_permissions// + 0.1% in //Task::make_built_in_kind_constructors// + 0.1% in //World::stages_II_and_III// 2.7% not specifically accounted for - 25.5% in running Inter pipeline - 9.9% in step 14/15: generate inform6 -> auto.inf - 5.6% 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.4% in step 7/15: shorten-wiring - 0.2% in step 11/15: eliminate-redundant-labels - 0.2% in step 8/15: detect-indirect-calls - 1.5% not specifically accounted for - 2.2% in supervisor - 0.5% not specifically accounted for + 26.4% in running Inter pipeline + 10.2% 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.5% in step 9/15: make-identifiers-unique + 0.3% in step 12/15: eliminate-redundant-operations + 0.3% in step 4/15: compile-splats + 0.3% in step 7/15: shorten-wiring + 0.3% in step 8/15: detect-indirect-calls + 0.1% in step 11/15: eliminate-redundant-labels + 1.4% not specifically accounted for + 2.3% in supervisor + 0.6% not specifically accounted for