diff --git a/README.md b/README.md index 9f28c78f1..96d463b09 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,8 @@ be accepted. (Note that these are not git submodules.) * inform6/Tests/Assistants/dumb-glulx/glulxe - A dumb-terminal Glulx interpreter. - __version 0.5.4__ - [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. - __version 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 + * inform7/Internal/Templates - Template websites for Inform 7's 'release as a website' feature * inform7/Internal/Templates/Parchment - Z-machine in Javascript - __version 'Parchment for Inform 7 (2015-09-25)'__ - from [https://github.com/curiousdannii/parchment], maintained by [Dannii Willis](https://github.com/curiousdannii) * inform7/Internal/Templates/Quixe - Glulx in Javascript - __version 'Quixe for Inform 7 (v. 2.1.2)'__ - from [https://github.com/erkyrath/quixe], maintained by [Andrew Plotkin](https://github.com/erkyrath) diff --git a/docs/inflections-test/1-pc.html b/docs/inflections-test/1-pc.html index 92f0d7add..113c7061e 100644 --- a/docs/inflections-test/1-pc.html +++ b/docs/inflections-test/1-pc.html @@ -58,7 +58,7 @@ switch (id) { case TEST_ADJECTIVES_CLSW: Main::load(I"Syntax.preform"); Unit::test_adjectives(arg); break; case TEST_ARTICLES_CLSW: Main::load(I"Syntax.preform"); Unit::test_articles(arg); break; - case TEST_DECLENSIONS_CLSW: Main::load(I"German.preform"); Unit::test_declensions(arg); break; + case TEST_DECLENSIONS_CLSW: Main::load_other(I"German.preform"); Unit::test_declensions(arg); break; case TEST_PARTICIPLES_CLSW: Main::load(I"Syntax.preform"); Unit::test_participles(arg); break; case TEST_PLURALS_CLSW: Main::load(I"Syntax.preform"); Unit::test_plurals(arg); break; case TEST_VERBS_CLSW: Main::load(I"Syntax.preform"); Unit::test_verbs(arg); break; @@ -74,6 +74,15 @@ Preform::parse_preform(W, FALSE); } + void Main::load_other(text_stream *leaf) { + pathname *P = Pathnames::from_text(I"inform7"); + P = Pathnames::subfolder(P, I"inflections-test"); + P = Pathnames::subfolder(P, I"Preform"); + filename *S = Filenames::in_folder(P, leaf); + wording W = Preform::load_from_file(S); + Preform::parse_preform(W, FALSE); + } + void Main::ignore(int id, text_stream *arg, void *state) { Errors::fatal("only switches may be used at the command line"); } @@ -87,6 +96,8 @@

The function Main::load appears nowhere else.

+

The function Main::load_other appears nowhere else.

+

The function Main::ignore appears nowhere else.

diff --git a/inblorb/.gitignore b/inblorb/.gitignore index 40d738970..f2af04c86 100644 --- a/inblorb/.gitignore +++ b/inblorb/.gitignore @@ -14,4 +14,6 @@ inblorb.mk Tests/Test Cases/_Console_Actual/ Tests/Test Cases/_Scan_Actual/ Tests/Test Cases/_Tree_Actual/ +Tests/Assistants/blorblib/blorbscan +Tests/Assistants/blorblib/*.o diff --git a/inblorb/Tests/Assistants/blorblib/blorb.h b/inblorb/Tests/Assistants/blorblib/blorb.h index 45ccc4ec5..c99596710 100644 --- a/inblorb/Tests/Assistants/blorblib/blorb.h +++ b/inblorb/Tests/Assistants/blorblib/blorb.h @@ -17,7 +17,7 @@ /* #define BLORB_BIG_ENDIAN */ #define BLORB_LITTLE_ENDIAN -typedef unsigned long uint32; +typedef unsigned int uint32; typedef unsigned short uint16; /* End of things you have to edit. */ diff --git a/inblorb/Tests/Assistants/blorblib/blorblib.o b/inblorb/Tests/Assistants/blorblib/blorblib.o deleted file mode 100644 index 92031bace..000000000 Binary files a/inblorb/Tests/Assistants/blorblib/blorblib.o and /dev/null differ diff --git a/inblorb/Tests/Assistants/blorblib/blorbscan b/inblorb/Tests/Assistants/blorblib/blorbscan deleted file mode 100755 index cb052c360..000000000 Binary files a/inblorb/Tests/Assistants/blorblib/blorbscan and /dev/null differ diff --git a/inblorb/Tests/Assistants/blorblib/blorbscan.o b/inblorb/Tests/Assistants/blorblib/blorbscan.o deleted file mode 100644 index a472ee009..000000000 Binary files a/inblorb/Tests/Assistants/blorblib/blorbscan.o and /dev/null differ diff --git a/inblorb/gitignorescript.txt b/inblorb/gitignorescript.txt index beba6c202..a92b21fa5 100644 --- a/inblorb/gitignorescript.txt +++ b/inblorb/gitignorescript.txt @@ -4,3 +4,5 @@ inblorb.mk Tests/Test Cases/_Console_Actual/ Tests/Test Cases/_Scan_Actual/ Tests/Test Cases/_Tree_Actual/ +Tests/Assistants/blorblib/blorbscan +Tests/Assistants/blorblib/*.o diff --git a/inblorb/makescript.txt b/inblorb/makescript.txt index 7e4b3b01b..a11f8db5d 100644 --- a/inblorb/makescript.txt +++ b/inblorb/makescript.txt @@ -8,7 +8,7 @@ BLORBLIB = $(ME)/Tests/Assistants/blorblib # Making the program: -$(ME)/Tangled/$(MYNAME): {dependent-files} +$(ME)/Tangled/$(MYNAME): $(BLORBLIB)/blorbscan {dependent-files} $(call make-me) .PHONY: force diff --git a/inform7/inflections-test/Chapter 1/Program Control.w b/inform7/inflections-test/Chapter 1/Program Control.w index 34f031ec6..a80b109b4 100644 --- a/inform7/inflections-test/Chapter 1/Program Control.w +++ b/inform7/inflections-test/Chapter 1/Program Control.w @@ -45,7 +45,7 @@ void Main::respond(int id, int val, text_stream *arg, void *state) { switch (id) { case TEST_ADJECTIVES_CLSW: Main::load(I"Syntax.preform"); Unit::test_adjectives(arg); break; case TEST_ARTICLES_CLSW: Main::load(I"Syntax.preform"); Unit::test_articles(arg); break; - case TEST_DECLENSIONS_CLSW: Main::load(I"German.preform"); Unit::test_declensions(arg); break; + case TEST_DECLENSIONS_CLSW: Main::load_other(I"German.preform"); Unit::test_declensions(arg); break; case TEST_PARTICIPLES_CLSW: Main::load(I"Syntax.preform"); Unit::test_participles(arg); break; case TEST_PLURALS_CLSW: Main::load(I"Syntax.preform"); Unit::test_plurals(arg); break; case TEST_VERBS_CLSW: Main::load(I"Syntax.preform"); Unit::test_verbs(arg); break; @@ -61,6 +61,15 @@ void Main::load(text_stream *leaf) { Preform::parse_preform(W, FALSE); } +void Main::load_other(text_stream *leaf) { + pathname *P = Pathnames::from_text(I"inform7"); + P = Pathnames::subfolder(P, I"inflections-test"); + P = Pathnames::subfolder(P, I"Preform"); + filename *S = Filenames::in_folder(P, leaf); + wording W = Preform::load_from_file(S); + Preform::parse_preform(W, FALSE); +} + void Main::ignore(int id, text_stream *arg, void *state) { Errors::fatal("only switches may be used at the command line"); } diff --git a/inform7/inflections-test/Tests/inflections-test.intest b/inform7/inflections-test/Tests/inflections-test.intest index af4b0f34b..d46b8588a 100644 --- a/inform7/inflections-test/Tests/inflections-test.intest +++ b/inform7/inflections-test/Tests/inflections-test.intest @@ -4,6 +4,7 @@ set: $A = $PATH/_Results_Actual/$CASE.txt set: $I = $PATH/_Results_Ideal/$CASE.txt + mkdir: $PATH/_Results_Actual step: inform7/inflections-test/Tangled/inflections-test -test-$CASE $PATH/$CASE.txt >$A 2>&1 or: 'produced errors in inflections-test' $A diff --git a/inform7/linguistics-test/Tests/linguistics-test.intest b/inform7/linguistics-test/Tests/linguistics-test.intest index e676e220f..53258d065 100644 --- a/inform7/linguistics-test/Tests/linguistics-test.intest +++ b/inform7/linguistics-test/Tests/linguistics-test.intest @@ -5,6 +5,7 @@ set: $A = $PATH/_Results_Actual/$CASE.txt set: $I = $PATH/_Results_Ideal/$CASE.txt + mkdir: $PATH/_Results_Actual step: inform7/linguistics-test/Tangled/linguistics-test -test-$CASE $PATH/$CASE.txt >$A 2>&1 or: 'produced errors in linguistics-test' $A diff --git a/inform7/problems-test/Tests/problems-test.intest b/inform7/problems-test/Tests/problems-test.intest index 8673c836c..4d9315163 100644 --- a/inform7/problems-test/Tests/problems-test.intest +++ b/inform7/problems-test/Tests/problems-test.intest @@ -4,6 +4,7 @@ set: $A = $PATH/_Results_Actual/$CASE.txt set: $I = $PATH/_Results_Ideal/$CASE.txt + mkdir: $PATH/_Results_Actual step: inform7/problems-test/Tangled/problems-test -test-$CASE $PATH/$CASE.txt >$A 2>&1 or: 'produced errors in problems-test' $A diff --git a/inform7/syntax-test/Tests/syntax-test.intest b/inform7/syntax-test/Tests/syntax-test.intest index 978a539c3..c942a3b40 100644 --- a/inform7/syntax-test/Tests/syntax-test.intest +++ b/inform7/syntax-test/Tests/syntax-test.intest @@ -4,6 +4,7 @@ set: $A = $PATH/_Results_Actual/$CASE.txt set: $I = $PATH/_Results_Ideal/$CASE.txt + mkdir: $PATH/_Results_Actual step: inform7/syntax-test/Tangled/syntax-test -test-$CASE $PATH/$CASE.txt >$A 2>&1 or: 'produced errors in syntax-test' $A diff --git a/inform7/words-test/Tests/words-test.intest b/inform7/words-test/Tests/words-test.intest index a7d9b0406..397cd99b7 100644 --- a/inform7/words-test/Tests/words-test.intest +++ b/inform7/words-test/Tests/words-test.intest @@ -4,6 +4,7 @@ set: $A = $PATH/_Results_Actual/$CASE.txt set: $I = $PATH/_Results_Ideal/$CASE.txt + mkdir: $PATH/_Results_Actual step: inform7/words-test/Tangled/words-test -test-$CASE $PATH/$CASE.txt >$A 2>&1 or: 'produced errors in words-test' $A diff --git a/scripts/READMEscript.txt b/scripts/READMEscript.txt index d432d7850..561d92fe1 100644 --- a/scripts/READMEscript.txt +++ b/scripts/READMEscript.txt @@ -177,6 +177,8 @@ be accepted. (Note that these are not git submodules.) * inform6/Tests/Assistants/dumb-glulx/glulxe - A dumb-terminal Glulx interpreter. - __@version(inform6/Tests/Assistants/dumb-glulx/glulxe)__ - [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. - __@version(inform6/Tests/Assistants/dumb-glulx/cheapglk)__ - [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 + @define template(program, for, maintainer, username, repository) * @program - @for - __@version(@program)__ - from [https://github.com/@username/@repository], maintained by [@maintainer](https://github.com/@username) @end