diff --git a/inform7/Tests/Test Problems/_Results_Ideal/PM_DuplicateVerbs1.txt b/inform7/Tests/Test Problems/_Results_Ideal/PM_DuplicateVerbs1.txt index 1426ac77c..91a641530 100644 --- a/inform7/Tests/Test Problems/_Results_Ideal/PM_DuplicateVerbs1.txt +++ b/inform7/Tests/Test Problems/_Results_Ideal/PM_DuplicateVerbs1.txt @@ -1,7 +1,7 @@ -Inform 7.10.1 build 6N09 has started. +Inform 7.10.1 build 6Q15 has started. I've now read your source text, which is 82 words long. -I've also read Standard Rules by Graham Nelson, which is 43038 words long. -I've also read English Language by Graham Nelson, which is 2297 words long. +I've also read Standard Rules by Graham Nelson, which is 43240 words long. +I've also read English Language by Graham Nelson, which is 2328 words long. Problem__ PM_DuplicateVerbs1 >--> You wrote 'The verb to frob (he frobs, they frob, he frobbed, it is frobbed, he is frobbing) implies the mopping relation' (source text, line 13), @@ -12,6 +12,6 @@ Problem__ PM_DuplicateVerbs1 Problem__ PM_DuplicateVerbs1 >--> You wrote 'The verb to be means the enclosure relation' (source text, line 16), but in another sentence 'The verb to be means the equality relation' (the - Standard Rules, line 18): again, this gives us two definitions of what + Standard Rules, line 19): again, this gives us two definitions of what appears to be the same verb. -Inform 7 has finished: 32 centiseconds used. +Inform 7 has finished: 26 centiseconds used. diff --git a/inform7/Tests/Test Problems/_Results_Ideal/PM_KindUnalterable.txt b/inform7/Tests/Test Problems/_Results_Ideal/PM_KindUnalterable.txt index c758c9f32..4ebd08f77 100644 --- a/inform7/Tests/Test Problems/_Results_Ideal/PM_KindUnalterable.txt +++ b/inform7/Tests/Test Problems/_Results_Ideal/PM_KindUnalterable.txt @@ -1,10 +1,10 @@ -Inform 7.10.1 build 6P93 has started. +Inform 7.10.1 build 6Q15 has started. I've now read your source text, which is 11 words long. I've also read Standard Rules by Graham Nelson, which is 43240 words long. I've also read English Language by Graham Nelson, which is 2328 words long. Problem__ PM_KindUnalterable >--> You wrote 'A person is a kind of room' (source text, line 2), but that - seems to contradict 'A person is a kind of thing' (the Standard Rules, line 470), + seems to contradict 'A person is a kind of thing' (the Standard Rules, line 471), as a room and a thing are incompatible. (If a room were a kind of a thing or vice versa there'd be no problem, but they aren't.) -Inform 7 has finished: 43 centiseconds used. +Inform 7 has finished: 40 centiseconds used. diff --git a/inform7/Tests/Test Problems/_Results_Ideal/PM_KindsCircular.txt b/inform7/Tests/Test Problems/_Results_Ideal/PM_KindsCircular.txt index 8444437d1..80d6425ab 100644 --- a/inform7/Tests/Test Problems/_Results_Ideal/PM_KindsCircular.txt +++ b/inform7/Tests/Test Problems/_Results_Ideal/PM_KindsCircular.txt @@ -1,10 +1,10 @@ -Inform 7.10.1 build 6P93 has started. +Inform 7.10.1 build 6Q15 has started. I've now read your source text, which is 11 words long. I've also read Standard Rules by Graham Nelson, which is 43240 words long. I've also read English Language by Graham Nelson, which is 2328 words long. Problem__ PM_KindsCircular >--> You wrote 'A person is a kind of animal' (source text, line 3), but that - seems to contradict 'An animal is a kind of person' (the Standard Rules, line 719), + seems to contradict 'An animal is a kind of person' (the Standard Rules, line 720), as it would make a circularity with an animal and a thing each being kinds of the other. -Inform 7 has finished: 45 centiseconds used. +Inform 7 has finished: 40 centiseconds used. diff --git a/inform7/Tests/Test Problems/_Results_Ideal/PM_MasksRelation.txt b/inform7/Tests/Test Problems/_Results_Ideal/PM_MasksRelation.txt index e4782af50..05647d735 100644 --- a/inform7/Tests/Test Problems/_Results_Ideal/PM_MasksRelation.txt +++ b/inform7/Tests/Test Problems/_Results_Ideal/PM_MasksRelation.txt @@ -1,4 +1,4 @@ -Inform 7.10.1 build 6P93 has started. +Inform 7.10.1 build 6Q15 has started. I've now read your source text, which is 84 words long. I've also read Standard Rules by Graham Nelson, which is 43240 words long. I've also read English Language by Graham Nelson, which is 2328 words long. @@ -16,5 +16,5 @@ Problem__ PM_MasksRelation means for something to be 'less than' something else, so this phrase definition would look too much like testing whether 'X is less than Y'. ('The verb to be less than means the numerically-less-than relation' (the - Standard Rules, line 456).) -Inform 7 has finished: 53 centiseconds used. + Standard Rules, line 457).) +Inform 7 has finished: 49 centiseconds used. diff --git a/inform7/Tests/Test Problems/_Results_Ideal/PM_VarKOVClash.txt b/inform7/Tests/Test Problems/_Results_Ideal/PM_VarKOVClash.txt index 3027ec0cd..deaabf493 100644 --- a/inform7/Tests/Test Problems/_Results_Ideal/PM_VarKOVClash.txt +++ b/inform7/Tests/Test Problems/_Results_Ideal/PM_VarKOVClash.txt @@ -1,4 +1,4 @@ -Inform 7.10.1 build 6P93 has started. +Inform 7.10.1 build 6Q15 has started. I've now read your source text, which is 46 words long. I've also read Standard Rules by Graham Nelson, which is 43240 words long. I've also read English Language by Graham Nelson, which is 2328 words long. @@ -6,7 +6,7 @@ Problem__ PM_VarKOVClash In Part SR2 - Variables and Rulebooks, Section SR2/3 - Used when ruling on accessibility in the extension Standard Rules by Graham Nelson: >--> You wrote 'The container in question is an object that varies' (the - Standard Rules, line 848): but the name supplied for this new variable is a + Standard Rules, line 849): but the name supplied for this new variable is a piece of text which is not available because it has a rival meaning already, as a result of definitions made elsewhere. (Sometimes these are indirect: for instance, defining a column in a table called 'question' can @@ -17,7 +17,7 @@ In Part SR2 - Variables and Rulebooks, Section SR2/3 - Used when ruling on defined which might cause this clash. Problem__ PM_VarKOVClash >--> You wrote 'The supporter in question is an object that varies' (the - Standard Rules, line 849): again, the name supplied for this new variable + Standard Rules, line 850): again, the name supplied for this new variable is a piece of text which is not available because it has a rival meaning already. -Inform 7 has finished: 44 centiseconds used. +Inform 7 has finished: 41 centiseconds used. diff --git a/inform7/Tests/Test Problems/_Results_Ideal/PM_VariableContradiction.txt b/inform7/Tests/Test Problems/_Results_Ideal/PM_VariableContradiction.txt index 386207a3f..35b897b6f 100644 --- a/inform7/Tests/Test Problems/_Results_Ideal/PM_VariableContradiction.txt +++ b/inform7/Tests/Test Problems/_Results_Ideal/PM_VariableContradiction.txt @@ -1,11 +1,11 @@ -Inform 7.10.1 build 6P93 has started. +Inform 7.10.1 build 6Q15 has started. I've now read your source text, which is 15 words long. I've also read Standard Rules by Graham Nelson, which is 43240 words long. I've also read English Language by Graham Nelson, which is 2328 words long. Problem__ PM_VariableContradiction >--> You wrote 'The command prompt is "What do you want to do? >"' (source text, line 3), but in another sentence 'The command prompt is ">"' (the - Standard Rules, line 877): but this looks like a contradiction, because the + Standard Rules, line 878): but this looks like a contradiction, because the initial value of this variable seems to be being set in each of these sentences, but with a different outcome. -Inform 7 has finished: 47 centiseconds used. +Inform 7 has finished: 42 centiseconds used. diff --git a/inter/Tests/inter.intest b/inter/Tests/inter.intest index 09cff3662..0773095cb 100644 --- a/inter/Tests/inter.intest +++ b/inter/Tests/inter.intest @@ -13,6 +13,10 @@ set: $B = $PATH/_Binary/$CASE.interb set: $T = $PATH/_Console/$CASE.txt + mkdir: $PATH/_Textual + mkdir: $PATH/_Binary + mkdir: $PATH/_Console + step: inter/Tangled/inter $O -binary $B >$T 2>&1 or: 'produced errors in inter' $T @@ -32,6 +36,9 @@ set: $A = $PATH/_Results_Actual/$CASE.txt set: $I = $PATH/_Results_Ideal/$CASE.txt + mkdir: $PATH/_Results_Actual + mkdir: $PATH/_Results_Ideal + fail step: inter/Tangled/inter $O >$A 2>&1 or: 'failed to produce error message' $A show: $A @@ -49,6 +56,10 @@ set: $I = $PATH/_Results_Ideal/$CASE.txt set: $T = $PATH/_Console/$CASE.txt + mkdir: $PATH/_Results_Actual + mkdir: $PATH/_Results_Ideal + mkdir: $PATH/_Console + step: inter/Tangled/inter $O -inter 'parse-linked-matter, resolve-conditional-compilation, assimilate, generate-i6:$A' >$T 2>&1 or: 'failed to produce output' $T @@ -66,6 +77,10 @@ set: $I = $PATH/_Results_Ideal/$CASE.txt set: $T = $PATH/_Console/$CASE.txt + mkdir: $PATH/_Results_Actual + mkdir: $PATH/_Results_Ideal + mkdir: $PATH/_Console + step: inter/Tangled/inter $O -inter 'parse-linked-matter, resolve-conditional-compilation, generate-inter:$A' >$T 2>&1 or: 'failed to produce output' $T @@ -83,6 +98,10 @@ set: $I = $PATH/_Results_Ideal/$CASE.txt set: $T = $PATH/_Console/$CASE.txt + mkdir: $PATH/_Results_Actual + mkdir: $PATH/_Results_Ideal + mkdir: $PATH/_Console + step: inter/Tangled/inter $O -inter 'show-dependencies:$A' >$T 2>&1 or: 'failed to produce output' $T @@ -100,6 +119,10 @@ set: $I = $PATH/_Results_Ideal/$CASE.txt set: $T = $PATH/_Console/$CASE.txt + mkdir: $PATH/_Results_Actual + mkdir: $PATH/_Results_Ideal + mkdir: $PATH/_Console + step: inter/Tangled/inter $O -inter 'parse-linked-matter, generate-inter:$A' >$T 2>&1 or: 'failed to produce output' $T @@ -117,6 +140,10 @@ set: $I = $PATH/_Results_Ideal/$CASE.txt set: $T = $PATH/_Console/$CASE.txt + mkdir: $PATH/_Results_Actual + mkdir: $PATH/_Results_Ideal + mkdir: $PATH/_Console + step: inter/Tangled/inter $O -inter 'parse-linked-matter, assimilate, generate-inter:$A' >$T 2>&1 or: 'failed to produce output' $T