mirror of
https://github.com/ganelson/inform.git
synced 2024-07-01 06:24:58 +03:00
Fixed some build omissions, notably around blorblib
This commit is contained in:
Graham Nelson
parent
21d60fc2eb
commit
203b98dcb1
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
<span class="reserved">switch</span><span class="plain"> (</span><span class="identifier">id</span><span class="plain">) {</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_ADJECTIVES_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"Syntax.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_adjectives</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_ARTICLES_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"Syntax.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_articles</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_DECLENSIONS_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"German.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_declensions</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_DECLENSIONS_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load_other</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"German.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_declensions</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_PARTICIPLES_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"Syntax.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_participles</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_PLURALS_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"Syntax.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_plurals</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
<span class="reserved">case</span><span class="plain"> </span><span class="constant">TEST_VERBS_CLSW</span><span class="plain">: </span><span class="functiontext">Main::load</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"Syntax.preform"</span><span class="plain">); </span><span class="functiontext">Unit::test_verbs</span><span class="plain">(</span><span class="identifier">arg</span><span class="plain">); </span><span class="reserved">break</span><span class="plain">;</span>
|
||||
|
|
@ -74,6 +74,15 @@
|
|||
<span class="functiontext">Preform::parse_preform</span><span class="plain">(</span><span class="identifier">W</span><span class="plain">, </span><span class="constant">FALSE</span><span class="plain">);</span>
|
||||
<span class="plain">}</span>
|
||||
|
||||
<span class="reserved">void</span><span class="plain"> </span><span class="functiontext">Main::load_other</span><span class="plain">(</span><span class="reserved">text_stream</span><span class="plain"> *</span><span class="identifier">leaf</span><span class="plain">) {</span>
|
||||
<span class="reserved">pathname</span><span class="plain"> *</span><span class="identifier">P</span><span class="plain"> = </span><span class="functiontext">Pathnames::from_text</span><span class="plain">(</span><span class="identifier">I</span><span class="string">"inform7"</span><span class="plain">);</span>
|
||||
<span class="identifier">P</span><span class="plain"> = </span><span class="functiontext">Pathnames::subfolder</span><span class="plain">(</span><span class="identifier">P</span><span class="plain">, </span><span class="identifier">I</span><span class="string">"inflections-test"</span><span class="plain">);</span>
|
||||
<span class="identifier">P</span><span class="plain"> = </span><span class="functiontext">Pathnames::subfolder</span><span class="plain">(</span><span class="identifier">P</span><span class="plain">, </span><span class="identifier">I</span><span class="string">"Preform"</span><span class="plain">);</span>
|
||||
<span class="reserved">filename</span><span class="plain"> *</span><span class="identifier">S</span><span class="plain"> = </span><span class="functiontext">Filenames::in_folder</span><span class="plain">(</span><span class="identifier">P</span><span class="plain">, </span><span class="identifier">leaf</span><span class="plain">);</span>
|
||||
<span class="reserved">wording</span><span class="plain"> </span><span class="identifier">W</span><span class="plain"> = </span><span class="functiontext">Preform::load_from_file</span><span class="plain">(</span><span class="identifier">S</span><span class="plain">);</span>
|
||||
<span class="functiontext">Preform::parse_preform</span><span class="plain">(</span><span class="identifier">W</span><span class="plain">, </span><span class="constant">FALSE</span><span class="plain">);</span>
|
||||
<span class="plain">}</span>
|
||||
|
||||
<span class="reserved">void</span><span class="plain"> </span><span class="functiontext">Main::ignore</span><span class="plain">(</span><span class="reserved">int</span><span class="plain"> </span><span class="identifier">id</span><span class="plain">, </span><span class="reserved">text_stream</span><span class="plain"> *</span><span class="identifier">arg</span><span class="plain">, </span><span class="reserved">void</span><span class="plain"> *</span><span class="identifier">state</span><span class="plain">) {</span>
|
||||
<span class="functiontext">Errors::fatal</span><span class="plain">(</span><span class="string">"only switches may be used at the command line"</span><span class="plain">);</span>
|
||||
<span class="plain">}</span>
|
||||
|
|
@ -87,6 +96,8 @@
|
|||
|
||||
<p class="endnote">The function Main::load appears nowhere else.</p>
|
||||
|
||||
<p class="endnote">The function Main::load_other appears nowhere else.</p>
|
||||
|
||||
<p class="endnote">The function Main::ignore appears nowhere else.</p>
|
||||
|
||||
<hr class="tocbar">
|
||||
|
|
|
|||
2
inblorb/.gitignore
vendored
2
inblorb/.gitignore
vendored
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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. */
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue