From 78c9d2425eaa0f7a96a964a168ba58f035b0a33f Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Sun, 24 Jul 2022 11:48:23 +0100 Subject: [PATCH] Enabled $STRIP_UNREACHABLE_LABELS in code generated to inform6 --- README.md | 6 +++--- build.txt | 4 ++-- inter/Tests/General/_Results_Ideal/Cons.txt | 1 - inter/Tests/General/_Results_Ideal/ObjKind.txt | 1 - inter/Tests/General/_Results_Ideal/Predeclared.txt | 1 - inter/Tests/General/_Results_Ideal/Primitives.txt | 1 - inter/Tests/General/_Results_Ideal/SimpleKind.txt | 1 - inter/Tests/General/_Results_Ideal/SimpleRoutines.txt | 1 - inter/final-module/Chapter 4/Final Inform 6.w | 1 - 9 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 23326488b..73d993914 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-beta+6V33 'Krypton' (2 July 2022) +v10.1.0-beta+6V34 'Krypton' (24 July 2022) ## About Inform 7 @@ -226,9 +226,9 @@ Stable versions of the following are periodically copied into this repository, but this is not where development on them is done, and no pull requests will be accepted. (Note that these are not git submodules.) -* inform6 - The Inform 6 compiler (used by I7 as a code generator). - __1636__ - from [https://github.com/DavidKinder/Inform6], maintained by [David Kinder](https://github.com/DavidKinder) +* inform6 - The Inform 6 compiler (used by I7 as a code generator). - __1641__ - from [https://github.com/DavidKinder/Inform6], maintained by [David Kinder](https://github.com/DavidKinder) * inform6/Tests/Assistants/dumb-frotz - A dumb-terminal Z-machine interpreter. - unversioned: modified from [Alembic Petrofsky's 1998 Teletype port of Frotz](https://github.com/sussman/ircbot-collection/tree/master/dumb-frotz) - * inform6/Tests/Assistants/dumb-glulx/glulxe - A dumb-terminal Glulx interpreter. - __0.5.4__ - [erkyrath/glulxe](https://github.com/erkyrath/glulxe), maintained by [Andrew Plotkin](https://github.com/erkyrath) + * inform6/Tests/Assistants/dumb-glulx/glulxe - A dumb-terminal Glulx interpreter. - __0.6.0__ - [erkyrath/glulxe](https://github.com/erkyrath/glulxe), maintained by [Andrew Plotkin](https://github.com/erkyrath) * inform6/Tests/Assistants/dumb-glulx/cheapglk - A basic Glk implementation to support dumb-glulxe. - __1.0.6.__ - [erkyrath/cheapglk](https://github.com/erkyrath/cheapglk), maintained by [Andrew Plotkin](https://github.com/erkyrath) * inblorb/Tests/Assistants/blorblib - Code for examining blorb files, including blorbscan, used here for validating inblorb's output in tests. - version 1.0.2 - by [Andrew Plotkin](https://github.com/erkyrath), but not currently elsewhere on Github diff --git a/build.txt b/build.txt index 312000258..b9ee9b661 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 2 July 2022 -Build Number: 6V33 +Build Date: 24 July 2022 +Build Number: 6V34 diff --git a/inter/Tests/General/_Results_Ideal/Cons.txt b/inter/Tests/General/_Results_Ideal/Cons.txt index a12e9c4f8..c5f10ba51 100644 --- a/inter/Tests/General/_Results_Ideal/Cons.txt +++ b/inter/Tests/General/_Results_Ideal/Cons.txt @@ -1,4 +1,3 @@ -!% $STRIP_UNREACHABLE_LABELS=0; !% $ZCODE_LESS_DICT_DATA=1; Constant Grammar__Version 2; Global debug_flag; diff --git a/inter/Tests/General/_Results_Ideal/ObjKind.txt b/inter/Tests/General/_Results_Ideal/ObjKind.txt index a26b076e4..88ac1500c 100644 --- a/inter/Tests/General/_Results_Ideal/ObjKind.txt +++ b/inter/Tests/General/_Results_Ideal/ObjKind.txt @@ -1,4 +1,3 @@ -!% $STRIP_UNREACHABLE_LABELS=0; !% $ZCODE_LESS_DICT_DATA=1; Constant Grammar__Version 2; Global debug_flag; diff --git a/inter/Tests/General/_Results_Ideal/Predeclared.txt b/inter/Tests/General/_Results_Ideal/Predeclared.txt index dc0a94055..14618792f 100644 --- a/inter/Tests/General/_Results_Ideal/Predeclared.txt +++ b/inter/Tests/General/_Results_Ideal/Predeclared.txt @@ -1,4 +1,3 @@ -!% $STRIP_UNREACHABLE_LABELS=0; !% $ZCODE_LESS_DICT_DATA=1; Constant Grammar__Version 2; Global debug_flag; diff --git a/inter/Tests/General/_Results_Ideal/Primitives.txt b/inter/Tests/General/_Results_Ideal/Primitives.txt index 814bce5ef..aca25ffb2 100644 --- a/inter/Tests/General/_Results_Ideal/Primitives.txt +++ b/inter/Tests/General/_Results_Ideal/Primitives.txt @@ -1,4 +1,3 @@ -!% $STRIP_UNREACHABLE_LABELS=0; !% $ZCODE_LESS_DICT_DATA=1; Constant Grammar__Version 2; Global debug_flag; diff --git a/inter/Tests/General/_Results_Ideal/SimpleKind.txt b/inter/Tests/General/_Results_Ideal/SimpleKind.txt index ca378833d..8075d44d1 100644 --- a/inter/Tests/General/_Results_Ideal/SimpleKind.txt +++ b/inter/Tests/General/_Results_Ideal/SimpleKind.txt @@ -1,4 +1,3 @@ -!% $STRIP_UNREACHABLE_LABELS=0; !% $ZCODE_LESS_DICT_DATA=1; Constant Grammar__Version 2; Global debug_flag; diff --git a/inter/Tests/General/_Results_Ideal/SimpleRoutines.txt b/inter/Tests/General/_Results_Ideal/SimpleRoutines.txt index 6c09a64c4..2d035e348 100644 --- a/inter/Tests/General/_Results_Ideal/SimpleRoutines.txt +++ b/inter/Tests/General/_Results_Ideal/SimpleRoutines.txt @@ -1,4 +1,3 @@ -!% $STRIP_UNREACHABLE_LABELS=0; !% $ZCODE_LESS_DICT_DATA=1; Constant Grammar__Version 2; Global debug_flag; diff --git a/inter/final-module/Chapter 4/Final Inform 6.w b/inter/final-module/Chapter 4/Final Inform 6.w index abe17a461..c43b7fb91 100644 --- a/inter/final-module/Chapter 4/Final Inform 6.w +++ b/inter/final-module/Chapter 4/Final Inform 6.w @@ -113,7 +113,6 @@ See the Inform 6 Technical Manual for more on these oddities. CodeGen::deselect(gen, saved); saved = CodeGen::select(gen, ICL_directives_I7CGS); OUT = CodeGen::current(gen); - WRITE("!%% $STRIP_UNREACHABLE_LABELS=0;\n"); WRITE("!%% $ZCODE_LESS_DICT_DATA=1;\n"); CodeGen::deselect(gen, saved);