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

Merge branch 'ganelson:master' into master

Browse source
This commit is contained in:
David Kinder 2022-04-28 10:38:50 +01:00 committed by GitHub
parent c955ae1aea b8f4b2d9d9
commit 827b4b2099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -1,6 +1,6 @@
# Inform 7
v10.1.0-alpha.1+6U92 'Krypton' (27 April 2022)
v10.1.0-alpha.1+6U93 'Krypton' (28 April 2022)
## About Inform 7
@ -88,6 +88,10 @@ which runs nearly 2500 cases through the executables, but takes 10 minutes
on an 8-core desktop and half an hour on a 4-core laptop (which will sound
something like a helicopter taking off).
Current status: All tests should pass on Linux and MacOS, but there are currently
5 fails on Windows: Ballroom, Santa, Parts-C, SP, Chapter8. These are being
investigated already, so please do not report as a bug.
## Reporting Issues
The old Inform bug tracker, powered by Mantis, has now closed, and its issues

4
build.txt
View file

@ -1,3 +1,3 @@
Prerelease: alpha.1
Build Date: 27 April 2022
Build Number: 6U92
Build Date: 28 April 2022
Build Number: 6U93

26
inform7/Internal/HTML/xrefs.txt
View file

@ -264,16 +264,16 @@ release_solution _ doc411 "25.16" "25.16. Walkthrough solutions"
release_card release_source _ doc412 "25.17" "25.17. Releasing the source text"
PM_MapPlacementDirection PM_MapPlacement PM_MapDirectionClue PM_MapHintUnknown PM_MapSettingTypeFailed PM_MapSettingTooLong PM_MapSettingUnknown PM_MapSettingOfUnknown PM_MapBadRubric PM_MapUnknownOffsetBase PM_MapUnknownOffset PM_MapUnknownColour PM_MapNonLateral PM_MapToNonRoom PM_MapFromNonRoom MAPHINTS _ doc413 "25.18" "25.18. Improving the index map"
EPSMAP _ doc414 "25.19" "25.19. Producing an EPS format map"
EXTENSIONS _ doc430 "27.1" "27.1. The status of extensions"
SRULES _ doc431 "27.2" "27.2. The Standard Rules"
PM_ExtNoEndsHere PM_ExtNoBeginsHere PM_ExtMultipleEndsHere PM_ExtBeginsAfterEndsHere PM_ExtMultipleBeginsHere _ doc434 "27.5" "27.5. A simple example extension"
PM_ExtVersionTooLow phs_extcredits phs_compextcredits _ doc435 "27.6" "27.6. Version numbering"
PM_UnequalHeadingInPlaceOf PM_HeadingInPlaceOfUnknown PM_HeadingInPlaceOfUnincluded _ doc438 "27.9" "27.9. Extensions can interact with other extensions"
PM_ImplicationValueProperty PM_ImplicationCertain _ doc442 "27.13" "27.13. Implications"
PM_BadInlineTag PM_BadInlineExpansion PM_InlineRule PM_InlineTooLong PM_UnendingI6 _ doc444 "27.15" "27.15. Defining phrases in Inform 6"
PM_BadObjectTranslation _ doc450 "27.21" "27.21. Inform 6 objects and classes"
PM_QuantityTranslatedAlready PM_NonQuantityTranslated PM_NonPropertyTranslated PM_TranslatedToNonIdentifier PM_TranslatedUnknownCategory PM_TranslatedTwice PM_TranslatesActionAlready PM_TranslatesNonAction _ doc451 "27.22" "27.22. Inform 6 variables, properties, actions, and attributes"
PM_GrammarTranslatedAlready _ doc452 "27.23" "27.23. Inform 6 Understand tokens"
PM_UnicodeOutOfRange PM_UnicodeNonLiteral PM_UnicodeAlready _ doc454 "27.25" "27.25. Naming Unicode characters"
PM_IncludeInsteadOf PM_WhenDefiningUnknown PM_BeforeTheLibrary PM_BadI6Inclusion _ doc455 "27.26" "27.26. Overriding definitions in kits"
PM_LabelNamespaceTooLong _ doc458 "27.29" "27.29. Invocation labels, counters and storage"
EXTENSIONS _ doc428 "27.1" "27.1. The status of extensions"
SRULES _ doc429 "27.2" "27.2. The Standard Rules"
PM_ExtNoEndsHere PM_ExtNoBeginsHere PM_ExtMultipleEndsHere PM_ExtBeginsAfterEndsHere PM_ExtMultipleBeginsHere _ doc432 "27.5" "27.5. A simple example extension"
PM_ExtVersionTooLow phs_extcredits phs_compextcredits _ doc433 "27.6" "27.6. Version numbering"
PM_UnequalHeadingInPlaceOf PM_HeadingInPlaceOfUnknown PM_HeadingInPlaceOfUnincluded _ doc436 "27.9" "27.9. Extensions can interact with other extensions"
PM_ImplicationValueProperty PM_ImplicationCertain _ doc440 "27.13" "27.13. Implications"
PM_BadInlineTag PM_BadInlineExpansion PM_InlineRule PM_InlineTooLong PM_UnendingI6 _ doc442 "27.15" "27.15. Defining phrases in Inform 6"
PM_BadObjectTranslation _ doc448 "27.21" "27.21. Inform 6 objects and classes"
PM_QuantityTranslatedAlready PM_NonQuantityTranslated PM_NonPropertyTranslated PM_TranslatedToNonIdentifier PM_TranslatedUnknownCategory PM_TranslatedTwice PM_TranslatesActionAlready PM_TranslatesNonAction _ doc449 "27.22" "27.22. Inform 6 variables, properties, actions, and attributes"
PM_GrammarTranslatedAlready _ doc450 "27.23" "27.23. Inform 6 Understand tokens"
PM_UnicodeOutOfRange PM_UnicodeNonLiteral PM_UnicodeAlready _ doc452 "27.25" "27.25. Naming Unicode characters"
PM_IncludeInsteadOf PM_WhenDefiningUnknown PM_BeforeTheLibrary PM_BadI6Inclusion _ doc453 "27.26" "27.26. Overriding definitions in kits"
PM_LabelNamespaceTooLong _ doc456 "27.29" "27.29. Invocation labels, counters and storage"

15
inform7/if-module/Chapter 4/Action Name Lists.w
View file

@ -109,7 +109,20 @@ void ActionNameLists::remove_entries_marked_for_deletion(action_name_list *list)
if (list) {
int pos = -1;
for (anl_entry *entry = list->entries, *prev = NULL; entry; entry = entry->next_entry) {
if ((entry->marked_for_deletion) || (pos == entry->parsing_data.word_position)) {
if (Log::aspect_switched_on(ACTION_PATTERN_PARSING_DA)) {
ActionNameLists::log_entry(entry); LOG(" ");
}
int delete = FALSE;
if (entry->marked_for_deletion) {
delete = TRUE;
LOGIF(ACTION_PATTERN_PARSING, ": marked, so delete\n");
} else if (pos == entry->parsing_data.word_position) {
delete = TRUE;
LOGIF(ACTION_PATTERN_PARSING, ": fails to advance, so delete\n");
} else {
LOGIF(ACTION_PATTERN_PARSING, ": retain\n");
}
if (delete) {
if (prev == NULL) list->entries = entry->next_entry;
else prev->next_entry = entry->next_entry;
} else {

4
scripts/inform.rmscript
View file

@ -92,6 +92,10 @@ which runs nearly 2500 cases through the executables, but takes 10 minutes
on an 8-core desktop and half an hour on a 4-core laptop (which will sound
something like a helicopter taking off).
Current status: All tests should pass on Linux and MacOS, but there are currently
5 fails on Windows: Ballroom, Santa, Parts-C, SP, Chapter8. These are being
investigated already, so please do not report as a bug.
## Reporting Issues
The old Inform bug tracker, powered by Mantis, has now closed, and its issues