ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-06-26 04:00:43 +03:00
Code Issues Projects Releases Wiki Activity

Denumbered English Language

Browse source
This commit is contained in:
Graham Nelson 2024-05-19 12:04:48 +01:00
parent b37d193634
commit 65ec8c7437
9 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
inbuild/supervisor-module/Chapter 4/Extension Bundle Manager.w
View file

@ -90,13 +90,15 @@ inbuild_copy *ExtensionBundleManager::new_copy(text_stream *name, pathname *P,
Dictionaries::create(eb_copy_cache, key);
Dictionaries::write_value(eb_copy_cache, key, C);
if (VersionNumbers::is_null(apparent_V)) {
TEMPORARY_TEXT(error_text)
WRITE_TO(error_text,
"an extension in directory format must have a directory name ending "
"'-vN.i7xd', giving the version number: for example, "
"'Advanced Algebra-v2_3_6.i7xd'");
Copies::attach_error(C, CopyErrors::new_T(EXT_BAD_DIRNAME_CE, -1, error_text));
DISCARD_TEXT(error_text)
if (Nests::get_tag(N) != INTERNAL_NEST_TAG) {
TEMPORARY_TEXT(error_text)
WRITE_TO(error_text,
"an extension in directory format must have a directory name ending "
"'-vN.i7xd', giving the version number: for example, "
"'Advanced Algebra-v2_3_6.i7xd'");
Copies::attach_error(C, CopyErrors::new_T(EXT_BAD_DIRNAME_CE, -1, error_text));
DISCARD_TEXT(error_text)
}
} else if (VersionNumbers::ne(apparent_V, C->edition->version)) {
TEMPORARY_TEXT(error_text)
WRITE_TO(error_text,

0
inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/Documentation/Documentation.md → inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/Documentation/Documentation.md
View file

0
inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/Materials/Inter/EnglishLanguageKit/Contents.w → inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/Materials/Inter/EnglishLanguageKit/Contents.w
View file

0
inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/Materials/Inter/EnglishLanguageKit/Sections/Language.i6t → inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/Materials/Inter/EnglishLanguageKit/Sections/Language.i6t
View file

0
inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/Materials/Inter/EnglishLanguageKit/kit_metadata.json → inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/Materials/Inter/EnglishLanguageKit/kit_metadata.json
View file

0
inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/Source/English Language.i7x → inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/Source/English Language.i7x
View file

0
inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/extension_metadata.json → inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/extension_metadata.json
View file

6
inpolicy/Chapter 2/Extension Versioning.w
View file

@ -136,7 +136,9 @@ then encode the object out as a new version of the file:
STREAM_CLOSE(OUT);
V = set_to;
@
@ Note that the following currently does nothing, which is intentional. It's
more practical for the built-in extensions not to have version numbers in their
directory names, since that makes make-files more stable.
@<If necessary impose the new version in directory name@> =
TEMPORARY_TEXT(correct_name)
@ -147,7 +149,7 @@ then encode the object out as a new version of the file:
Str::put(pos, '_');
WRITE_TO(correct_name, "%S-v%S.i7xd", name, flattened);
DISCARD_TEXT(flattened)
if (Str::ne(Pathnames::directory_name(X), correct_name)) {
if ((FALSE) && (Str::ne(Pathnames::directory_name(X), correct_name))) {
pathname *XC = Pathnames::down(Pathnames::up(X), correct_name);
Pathnames::move_directory(X, XC);
X = XC;

2
scripts/inform.mkscript
View file

@ -152,7 +152,7 @@ INFORM6WEB = inform6
{component type: web symbol: ARCHITECTURE32KIT webname: Architecture32Kit path: inform7/Internal/Inter/Architecture32Kit set: kits}
{component type: web symbol: WORLDMODELKIT webname: WorldModelKit path: inform7/Internal/Inter/WorldModelKit set: kits}
{component type: web symbol: COMMANDPARSERKIT webname: CommandParserKit path: inform7/Internal/Inter/CommandParserKit set: kits}
{component type: web symbol: ENGLISHLANGUAGEKIT webname: EnglishLanguageKit path: inform7/Internal/Extensions/Graham Nelson/English Language-v10_2_0.i7xd/Materials/Inter/EnglishLanguageKit set: kits}
{component type: web symbol: ENGLISHLANGUAGEKIT webname: EnglishLanguageKit path: inform7/Internal/Extensions/Graham Nelson/English Language.i7xd/Materials/Inter/EnglishLanguageKit set: kits}
{component type: web symbol: DIALOGUEKIT webname: DialogueKit path: inform7/Internal/Inter/DialogueKit set: kits}
{component type: web symbol: STANDARDRULES webname: standard_rules path: inform7/extensions/standard_rules set: extensions}