From 7c2a7170c42ce7215d338a020a8a5d5838618a84 Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Mon, 6 Jul 2020 23:00:03 +0100 Subject: [PATCH] New file-system separator character convention --- README.md | 2 +- build.txt | 4 +-- docs/html-module/2-sl.html | 2 +- docs/inblorb/3-laaf.html | 6 ++-- docs/inbuild/1-mn.html | 4 +-- docs/indoc/1-ins.html | 8 ++--- docs/indoc/2-exm.html | 2 +- docs/supervisor-module/4-em.html | 2 +- docs/supervisor-module/4-km.html | 2 +- docs/supervisor-module/4-lm.html | 4 +-- docs/supervisor-module/4-pm.html | 2 +- docs/supervisor-module/4-tm.html | 2 +- inblorb/Chapter 3/Links and Auxiliary Files.w | 6 ++-- inbuild/Chapter 1/Main.w | 4 +-- .../Chapter 4/Extension Manager.w | 2 +- .../supervisor-module/Chapter 4/Kit Manager.w | 2 +- .../Chapter 4/Language Manager.w | 4 +-- .../Chapter 4/Pipeline Manager.w | 2 +- .../Chapter 4/Template Manager.w | 2 +- indoc/Chapter 1/Instructions.w | 8 ++--- indoc/Chapter 2/Examples.w | 2 +- inform7/Figures/timings-diagnostics.txt | 33 +++++++++---------- services/html-module/Chapter 2/Source Links.w | 2 +- 23 files changed, 53 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 7333de6a3..85a081215 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-alpha.1+6Q67 'Krypton' (5 July 2020) +v10.1.0-alpha.1+6Q68 'Krypton' (6 July 2020) ## About Inform 7 diff --git a/build.txt b/build.txt index 37c73b743..9c40d42f7 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: alpha.1 -Build Date: 5 July 2020 -Build Number: 6Q67 +Build Date: 6 July 2020 +Build Number: 6Q68 diff --git a/docs/html-module/2-sl.html b/docs/html-module/2-sl.html index 244d0e039..ecd9cc220 100644 --- a/docs/html-module/2-sl.html +++ b/docs/html-module/2-sl.html @@ -145,7 +145,7 @@ is the only place in Inform where if ((Str::begins_with_wide_string(fn, L"Source")) && - (Str::get_at(fn, 6) == FOLDER_SEPARATOR)) + (Platform::is_folder_separator(Str::get_at(fn, 6)))) Str::delete_n_characters(fn, 7);
  • This code is used in §2.
diff --git a/docs/inblorb/3-laaf.html b/docs/inblorb/3-laaf.html index 56d153cda..5f6f0812e 100644 --- a/docs/inblorb/3-laaf.html +++ b/docs/inblorb/3-laaf.html @@ -104,8 +104,8 @@ in the subfolder. void Links::get_extension_from_textual_filename(OUTPUT_STREAM, text_stream *filename) { int i = Str::len(filename) - 1; while ((i>=0) && ((Str::get_at(filename, i) == '.') || (Str::get_at(filename, i) == ' '))) i--; - while ((i>=0) && (Str::get_at(filename, i) != '.') && (Str::get_at(filename, i) != FOLDER_SEPARATOR)) i--; - if ((i<0) || (Str::get_at(filename, i) == FOLDER_SEPARATOR)) return; + while ((i>=0) && (Str::get_at(filename, i) != '.') && (Platform::is_folder_separator(Str::get_at(filename, i)) == FALSE)) i--; + if ((i<0) || (Platform::is_folder_separator(Str::get_at(filename, i)))) return; Str::copy_tail(OUT, filename, i); } @@ -114,7 +114,7 @@ in the subfolder. 
 void Links::get_leafname_from_textual_filename(OUTPUT_STREAM, text_stream *filename) {
     int i = Str::len(filename) - 1;
-    while ((i>=0) && (Str::get_at(filename, i) != FOLDER_SEPARATOR)) i--;
+    while ((i>=0) && (Platform::is_folder_separator(Str::get_at(filename, i)) == FALSE)) i--;
     Str::copy_tail(OUT, filename, i+1);
 }
diff --git a/docs/inbuild/1-mn.html b/docs/inbuild/1-mn.html index 7b380fecb..83bf610a6 100644 --- a/docs/inbuild/1-mn.html +++ b/docs/inbuild/1-mn.html @@ -320,14 +320,14 @@ Inbuild this number is never likely to be more than about 100 at a time. int pos = Str::len(arg) - 1, dotpos = -1; while (pos >= 0) { wchar_t c = Str::get_at(arg, pos); - if (c == FOLDER_SEPARATOR) break; + if (Platform::is_folder_separator(c)) break; if (c == '.') dotpos = pos; pos--; } if (dotpos >= 0) Str::substr(ext, Str::at(arg, dotpos+1), Str::end(arg)); int directory_status = NOT_APPLICABLE; - if (Str::get_last_char(arg) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(arg))) { Str::delete_last_character(arg); directory_status = TRUE; } diff --git a/docs/indoc/1-ins.html b/docs/indoc/1-ins.html index 022efb00f..3b71ed2fc 100644 --- a/docs/indoc/1-ins.html +++ b/docs/indoc/1-ins.html @@ -623,7 +623,7 @@ home folder, ~~ pathname *Instructions::set_path(text_stream *val, settings_block *settings) { if (Str::get_at(val, 0) == '~') { if (Str::get_at(val, 1) == '~') { - if ((Str::get_at(val, 2) == '/') || (Str::get_at(val, 2) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 2) == '/') || (Platform::is_folder_separator(Str::get_at(val, 2)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 3); pathname *P = Pathnames::from_text_relative(settings->book_folder, t); @@ -631,7 +631,7 @@ home folder, ~~ return P; } else if (Str::get_at(val, 2) == 0) return settings->book_folder; } - if ((Str::get_at(val, 1) == '/') || (Str::get_at(val, 1) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 1) == '/') || (Platform::is_folder_separator(Str::get_at(val, 1)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 2); pathname *P = Pathnames::from_text_relative(home_path, t); @@ -648,7 +648,7 @@ home folder, ~~ filename *Instructions::set_file(text_stream *val, settings_block *settings) { if (Str::get_at(val, 0) == '~') { if (Str::get_at(val, 1) == '~') { - if ((Str::get_at(val, 2) == '/') || (Str::get_at(val, 2) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 2) == '/') || (Platform::is_folder_separator(Str::get_at(val, 2)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 3); filename *F = Filenames::from_text_relative(settings->book_folder, t); @@ -656,7 +656,7 @@ home folder, ~~ return F; } } - if ((Str::get_at(val, 1) == '/') || (Str::get_at(val, 1) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 1) == '/') || (Platform::is_folder_separator(Str::get_at(val, 1)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 2); filename *F = Filenames::from_text_relative(home_path, t); diff --git a/docs/indoc/2-exm.html b/docs/indoc/2-exm.html index 6358578b8..29988a51c 100644 --- a/docs/indoc/2-exm.html +++ b/docs/indoc/2-exm.html @@ -127,7 +127,7 @@ Inform documentation. TEMPORARY_TEXT(leafname) while (Directories::next(dir, leafname)) { - if (Str::get_last_char(leafname) == FOLDER_SEPARATOR) continue; + if (Platform::is_folder_separator(Str::get_last_char(leafname))) continue; filename *exloc = Filenames::in(indoc_settings->examples_directory, leafname); if (Regexp::match(NULL, leafname, L"%(Recipes%)%c*")) Scan the Recipe Book catalogue5.2 else Scan a regular example5.1; diff --git a/docs/supervisor-module/4-em.html b/docs/supervisor-module/4-em.html index 779261d96..f87c374f7 100644 --- a/docs/supervisor-module/4-em.html +++ b/docs/supervisor-module/4-em.html @@ -202,7 +202,7 @@ so we'll quietly allow for it. if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); if (Str::ne(LEAFNAME, I"Reserved")) { pathname *Q = Pathnames::down(P, LEAFNAME); diff --git a/docs/supervisor-module/4-km.html b/docs/supervisor-module/4-km.html index 941bdab3e..27ccd81e7 100644 --- a/docs/supervisor-module/4-km.html +++ b/docs/supervisor-module/4-km.html @@ -178,7 +178,7 @@ requirements. if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); pathname *Q = Pathnames::down(P, LEAFNAME); inbuild_copy *C = KitManager::claim_folder_as_copy(Q); diff --git a/docs/supervisor-module/4-lm.html b/docs/supervisor-module/4-lm.html index e0db9d1d0..3b7c377ac 100644 --- a/docs/supervisor-module/4-lm.html +++ b/docs/supervisor-module/4-lm.html @@ -150,7 +150,7 @@ a valid metadata file. The name should be in English text, without accents. LOOP_THROUGH_TEXT(pos, name) { int c = Str::get(pos); if ((c < 32) || (c > 126)) acceptable = FALSE; contains non-ASCII - if (c == FOLDER_SEPARATOR) { Str::put(pos, 0); break; } + if (Platform::is_folder_separator(c)) { Str::put(pos, 0); break; } } if (Str::len(name) == 0) acceptable = FALSE; i.e., an empty text if (acceptable) { @@ -177,7 +177,7 @@ requirements. if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); pathname *Q = Pathnames::down(P, LEAFNAME); inbuild_copy *C = LanguageManager::claim_folder_as_copy(Q); diff --git a/docs/supervisor-module/4-pm.html b/docs/supervisor-module/4-pm.html index 2f9efd656..73e18e15b 100644 --- a/docs/supervisor-module/4-pm.html +++ b/docs/supervisor-module/4-pm.html @@ -158,7 +158,7 @@ requirements. if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) != FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME)) == FALSE) { filename *F = Filenames::in(P, LEAFNAME); inbuild_copy *C = PipelineManager::claim_file_as_copy(F, NULL); if ((C) && (Requirements::meets(C->edition, req))) { diff --git a/docs/supervisor-module/4-tm.html b/docs/supervisor-module/4-tm.html index b20a50ec8..8a532b767 100644 --- a/docs/supervisor-module/4-tm.html +++ b/docs/supervisor-module/4-tm.html @@ -157,7 +157,7 @@ requirements. if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); pathname *Q = Pathnames::down(P, LEAFNAME); inbuild_copy *C = TemplateManager::claim_folder_as_copy(Q); diff --git a/inblorb/Chapter 3/Links and Auxiliary Files.w b/inblorb/Chapter 3/Links and Auxiliary Files.w index c653f28c5..009642890 100755 --- a/inblorb/Chapter 3/Links and Auxiliary Files.w +++ b/inblorb/Chapter 3/Links and Auxiliary Files.w @@ -54,15 +54,15 @@ void Links::create_auxiliary_file(text_stream *fn, text_stream *description, tex void Links::get_extension_from_textual_filename(OUTPUT_STREAM, text_stream *filename) { int i = Str::len(filename) - 1; while ((i>=0) && ((Str::get_at(filename, i) == '.') || (Str::get_at(filename, i) == ' '))) i--; - while ((i>=0) && (Str::get_at(filename, i) != '.') && (Str::get_at(filename, i) != FOLDER_SEPARATOR)) i--; - if ((i<0) || (Str::get_at(filename, i) == FOLDER_SEPARATOR)) return; + while ((i>=0) && (Str::get_at(filename, i) != '.') && (Platform::is_folder_separator(Str::get_at(filename, i)) == FALSE)) i--; + if ((i<0) || (Platform::is_folder_separator(Str::get_at(filename, i)))) return; Str::copy_tail(OUT, filename, i); } @ = void Links::get_leafname_from_textual_filename(OUTPUT_STREAM, text_stream *filename) { int i = Str::len(filename) - 1; - while ((i>=0) && (Str::get_at(filename, i) != FOLDER_SEPARATOR)) i--; + while ((i>=0) && (Platform::is_folder_separator(Str::get_at(filename, i)) == FALSE)) i--; Str::copy_tail(OUT, filename, i+1); } diff --git a/inbuild/Chapter 1/Main.w b/inbuild/Chapter 1/Main.w index 4569795fb..894d8bc33 100644 --- a/inbuild/Chapter 1/Main.w +++ b/inbuild/Chapter 1/Main.w @@ -229,14 +229,14 @@ void Main::add_file_or_path_as_target(text_stream *arg, int throwing_error) { int pos = Str::len(arg) - 1, dotpos = -1; while (pos >= 0) { wchar_t c = Str::get_at(arg, pos); - if (c == FOLDER_SEPARATOR) break; + if (Platform::is_folder_separator(c)) break; if (c == '.') dotpos = pos; pos--; } if (dotpos >= 0) Str::substr(ext, Str::at(arg, dotpos+1), Str::end(arg)); int directory_status = NOT_APPLICABLE; - if (Str::get_last_char(arg) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(arg))) { Str::delete_last_character(arg); directory_status = TRUE; } diff --git a/inbuild/supervisor-module/Chapter 4/Extension Manager.w b/inbuild/supervisor-module/Chapter 4/Extension Manager.w index 7806ec1f0..3240f3e60 100644 --- a/inbuild/supervisor-module/Chapter 4/Extension Manager.w +++ b/inbuild/supervisor-module/Chapter 4/Extension Manager.w @@ -129,7 +129,7 @@ void ExtensionManager::search_nest_for_r(pathname *P, inbuild_nest *N, if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); if (Str::ne(LEAFNAME, I"Reserved")) { pathname *Q = Pathnames::down(P, LEAFNAME); diff --git a/inbuild/supervisor-module/Chapter 4/Kit Manager.w b/inbuild/supervisor-module/Chapter 4/Kit Manager.w index dc3f1823b..1ab9a0026 100644 --- a/inbuild/supervisor-module/Chapter 4/Kit Manager.w +++ b/inbuild/supervisor-module/Chapter 4/Kit Manager.w @@ -110,7 +110,7 @@ void KitManager::search_nest_for(inbuild_genre *gen, inbuild_nest *N, if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); pathname *Q = Pathnames::down(P, LEAFNAME); inbuild_copy *C = KitManager::claim_folder_as_copy(Q); diff --git a/inbuild/supervisor-module/Chapter 4/Language Manager.w b/inbuild/supervisor-module/Chapter 4/Language Manager.w index 894cae350..51231fb29 100644 --- a/inbuild/supervisor-module/Chapter 4/Language Manager.w +++ b/inbuild/supervisor-module/Chapter 4/Language Manager.w @@ -82,7 +82,7 @@ void LanguageManager::claim_as_copy(inbuild_genre *gen, inbuild_copy **C, LOOP_THROUGH_TEXT(pos, name) { int c = Str::get(pos); if ((c < 32) || (c > 126)) acceptable = FALSE; /* contains non-ASCII */ - if (c == FOLDER_SEPARATOR) { Str::put(pos, 0); break; } + if (Platform::is_folder_separator(c)) { Str::put(pos, 0); break; } } if (Str::len(name) == 0) acceptable = FALSE; /* i.e., an empty text */ if (acceptable) { @@ -109,7 +109,7 @@ void LanguageManager::search_nest_for(inbuild_genre *gen, inbuild_nest *N, if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); pathname *Q = Pathnames::down(P, LEAFNAME); inbuild_copy *C = LanguageManager::claim_folder_as_copy(Q); diff --git a/inbuild/supervisor-module/Chapter 4/Pipeline Manager.w b/inbuild/supervisor-module/Chapter 4/Pipeline Manager.w index cb36686eb..63b21a2aa 100644 --- a/inbuild/supervisor-module/Chapter 4/Pipeline Manager.w +++ b/inbuild/supervisor-module/Chapter 4/Pipeline Manager.w @@ -90,7 +90,7 @@ void PipelineManager::search_nest_for(inbuild_genre *gen, inbuild_nest *N, if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) != FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME)) == FALSE) { filename *F = Filenames::in(P, LEAFNAME); inbuild_copy *C = PipelineManager::claim_file_as_copy(F, NULL); if ((C) && (Requirements::meets(C->edition, req))) { diff --git a/inbuild/supervisor-module/Chapter 4/Template Manager.w b/inbuild/supervisor-module/Chapter 4/Template Manager.w index ea92314c4..97e1803f9 100644 --- a/inbuild/supervisor-module/Chapter 4/Template Manager.w +++ b/inbuild/supervisor-module/Chapter 4/Template Manager.w @@ -89,7 +89,7 @@ void TemplateManager::search_nest_for(inbuild_genre *gen, inbuild_nest *N, if (D) { TEMPORARY_TEXT(LEAFNAME) while (Directories::next(D, LEAFNAME)) { - if (Str::get_last_char(LEAFNAME) == FOLDER_SEPARATOR) { + if (Platform::is_folder_separator(Str::get_last_char(LEAFNAME))) { Str::delete_last_character(LEAFNAME); pathname *Q = Pathnames::down(P, LEAFNAME); inbuild_copy *C = TemplateManager::claim_folder_as_copy(Q); diff --git a/indoc/Chapter 1/Instructions.w b/indoc/Chapter 1/Instructions.w index a84c66f9d..5b47db340 100644 --- a/indoc/Chapter 1/Instructions.w +++ b/indoc/Chapter 1/Instructions.w @@ -529,7 +529,7 @@ home folder, |~~| means the book folder. pathname *Instructions::set_path(text_stream *val, settings_block *settings) { if (Str::get_at(val, 0) == '~') { if (Str::get_at(val, 1) == '~') { - if ((Str::get_at(val, 2) == '/') || (Str::get_at(val, 2) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 2) == '/') || (Platform::is_folder_separator(Str::get_at(val, 2)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 3); pathname *P = Pathnames::from_text_relative(settings->book_folder, t); @@ -537,7 +537,7 @@ pathname *Instructions::set_path(text_stream *val, settings_block *settings) { return P; } else if (Str::get_at(val, 2) == 0) return settings->book_folder; } - if ((Str::get_at(val, 1) == '/') || (Str::get_at(val, 1) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 1) == '/') || (Platform::is_folder_separator(Str::get_at(val, 1)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 2); pathname *P = Pathnames::from_text_relative(home_path, t); @@ -552,7 +552,7 @@ pathname *Instructions::set_path(text_stream *val, settings_block *settings) { filename *Instructions::set_file(text_stream *val, settings_block *settings) { if (Str::get_at(val, 0) == '~') { if (Str::get_at(val, 1) == '~') { - if ((Str::get_at(val, 2) == '/') || (Str::get_at(val, 2) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 2) == '/') || (Platform::is_folder_separator(Str::get_at(val, 2)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 3); filename *F = Filenames::from_text_relative(settings->book_folder, t); @@ -560,7 +560,7 @@ filename *Instructions::set_file(text_stream *val, settings_block *settings) { return F; } } - if ((Str::get_at(val, 1) == '/') || (Str::get_at(val, 1) == FOLDER_SEPARATOR)) { + if ((Str::get_at(val, 1) == '/') || (Platform::is_folder_separator(Str::get_at(val, 1)))) { TEMPORARY_TEXT(t) Str::copy_tail(t, val, 2); filename *F = Filenames::from_text_relative(home_path, t); diff --git a/indoc/Chapter 2/Examples.w b/indoc/Chapter 2/Examples.w index 3cdb4a31b..765b9b5dd 100644 --- a/indoc/Chapter 2/Examples.w +++ b/indoc/Chapter 2/Examples.w @@ -71,7 +71,7 @@ void Examples::scan_examples(void) { TEMPORARY_TEXT(leafname) while (Directories::next(dir, leafname)) { - if (Str::get_last_char(leafname) == FOLDER_SEPARATOR) continue; + if (Platform::is_folder_separator(Str::get_last_char(leafname))) continue; filename *exloc = Filenames::in(indoc_settings->examples_directory, leafname); if (Regexp::match(NULL, leafname, L"%(Recipes%)%c*")) @ else @; diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index 38933da30..bb95d3bd2 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,13 +1,13 @@ 100.0% in inform7 run - 66.9% in compilation to Inter - 27.6% in //Phrases::Manager::compile_first_block// - 8.2% in //Phrases::Manager::compile_as_needed// - 6.6% in //Strings::compile_responses// - 5.9% in //World::Compile::compile// - 3.4% in //Assertions::Traverse::traverse1// - 3.0% in //Sentences::VPs::traverse// - 1.9% in //Phrases::Manager::RulePrintingRule_routine// - 1.7% in //Phrases::Manager::rulebooks_array// + 67.5% in compilation to Inter + 27.9% in //Phrases::Manager::compile_first_block// + 8.3% in //Phrases::Manager::compile_as_needed// + 6.7% in //Strings::compile_responses// + 5.8% in //World::Compile::compile// + 3.2% in //Assertions::Traverse::traverse1// + 3.1% in //Sentences::VPs::traverse// + 2.0% in //Phrases::Manager::RulePrintingRule_routine// + 1.8% in //Phrases::Manager::rulebooks_array// 1.0% in //NewVerbs::ConjugateVerb// 0.7% in //Phrases::Manager::parse_rule_parameters// 0.7% in //Phrases::Manager::traverse// @@ -19,19 +19,18 @@ 0.1% in //Sentences::RuleSubtrees::register_recently_lexed_phrases// 0.1% in //Task::load_types// 0.1% in //World::complete// - 3.8% not specifically accounted for - 30.7% in running Inter pipeline - 10.0% in step preparation - 9.5% in inter step 2/12: link - 7.5% in inter step 12/12: generate inform6 -> auto.inf + 3.9% not specifically accounted for + 30.2% in running Inter pipeline + 9.8% in inter step 2/12: link + 9.8% in step preparation + 7.1% in inter step 12/12: generate inform6 -> auto.inf 0.3% in inter step 9/12: make-identifiers-unique 0.1% in inter step 10/12: reconcile-verbs 0.1% in inter step 11/12: eliminate-redundant-labels - 0.1% in inter step 4/12: parse-linked-matter 0.1% in inter step 5/12: resolve-conditional-compilation 0.1% in inter step 6/12: assimilate 0.1% in inter step 7/12: resolve-external-symbols 0.1% in inter step 8/12: inspect-plugs 2.0% not specifically accounted for - 1.9% in supervisor - 0.4% not specifically accounted for + 2.0% in supervisor + 0.2% not specifically accounted for diff --git a/services/html-module/Chapter 2/Source Links.w b/services/html-module/Chapter 2/Source Links.w index fcc893178..fed247b14 100644 --- a/services/html-module/Chapter 2/Source Links.w +++ b/services/html-module/Chapter 2/Source Links.w @@ -73,5 +73,5 @@ void SourceLinks::link(OUTPUT_STREAM, source_location sl, int nonbreaking_space) @ = if ((Str::begins_with_wide_string(fn, L"Source")) && - (Str::get_at(fn, 6) == FOLDER_SEPARATOR)) + (Platform::is_folder_separator(Str::get_at(fn, 6)))) Str::delete_n_characters(fn, 7);