mirror of
https://github.com/ganelson/inform.git
synced 2024-06-30 22:14:58 +03:00
Fix for Mantis bug 2086
This commit is contained in:
Graham Nelson
parent
5a8ad1d7aa
commit
c143db1985
|
|
@ -33,7 +33,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,9 @@ function togglePopup(material_id) {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,9 @@ function togglePopup(material_id) {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,9 @@ function togglePopup(material_id) {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -55,7 +55,9 @@ MathJax = {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -55,7 +55,9 @@ MathJax = {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,9 @@ function togglePopup(material_id) {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,9 @@ function togglePopup(material_id) {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,9 @@ function togglePopup(material_id) {
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
@ -367,12 +369,14 @@ from archaisms.
|
|||
<ul class="endnotetexts"><li>This is <a href="../words-module/4-ap.html" class="internal">Preform grammar</a>, not regular C code.</li></ul>
|
||||
<p class="commentary firstcommentary"><a id="SP9" class="paragraph-anchor"></a><b>§9. </b>Step 5. Now we reach a batch of irregular but fairly general inflected
|
||||
endings; for example, protozoon to protozoa, or metamorphosis to metamorphoses.
|
||||
Note that we differ from Conway in pluralizing blouse as blouses, not blice.
|
||||
Note that we differ from Conway in pluralizing blouse as blouses, not blice,
|
||||
and human as humans, not humen.
|
||||
</p>
|
||||
|
||||
<pre class="Preform-displayed-code all-displayed-code code-font">
|
||||
<span class="Preform-function-syntax"><en-trie-plural-irregular-inflections></span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">::=</span>
|
||||
<span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">*man</span><span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">3men</span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">|</span><span class="Preform-plain-syntax"> </span><span class="Preform-comment-syntax"> Step 5 begins here</span>
|
||||
<span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">*human</span><span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">humans</span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">|</span><span class="Preform-plain-syntax"> </span><span class="Preform-comment-syntax"> Step 5 begins here</span>
|
||||
<span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">*man</span><span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">3men</span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">|</span>
|
||||
<span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">*blouse</span><span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">2ses</span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">|</span>
|
||||
<span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">*louse</span><span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">5lice</span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">|</span>
|
||||
<span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">*mouse</span><span class="Preform-plain-syntax"> </span><span class="Preform-constant-syntax">5mice</span><span class="Preform-plain-syntax"> </span><span class="Preform-reserved-syntax">|</span>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,9 @@
|
|||
<li><a href="../inform6.html">inform6</a></li>
|
||||
<li><a href="../inpolicyn.html">inpolicy</a></li>
|
||||
<li><a href="../inrtpsn.html">inrtps</a></li>
|
||||
<li><a href="../extensions.html">extensions and kits</a></li>
|
||||
</ul><h2>Resources</h2><ul>
|
||||
<li><a href="../extensions.html">extensions</a></li>
|
||||
<li><a href="../kits.html">kits</a></li>
|
||||
</ul><h2>Repository</h2><ul>
|
||||
<li><a href="https://github.com/ganelson/inform"><img src="../docs-assets/github.png" height=18> github</a></li>
|
||||
</ul><h2>Related Projects</h2><ul>
|
||||
|
|
|
|||
|
|
@ -551,6 +551,8 @@
|
|||
|
||||
<en-trie-plural-irregular-inflections> nti 31 constraint CS = {31} extremes [2, 2]
|
||||
English:
|
||||
*human humans
|
||||
constraint CS = {31} extremes [2, 2]
|
||||
*man 3men
|
||||
constraint CS = {31} extremes [2, 2]
|
||||
*blouse 2ses
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Total memory consumption was 126309K = 123 MB
|
||||
|
||||
---- was used for 2008043 objects, in 360818 frames in 0 x 800K = 0K = 0 MB:
|
||||
---- was used for 2008046 objects, in 360821 frames in 0 x 800K = 0K = 0 MB:
|
||||
|
||||
32.3% inter_tree_node_array 58 x 8192 = 475136 objects, 41813824 bytes
|
||||
18.9% text_stream_array 4342 x 100 = 434200 objects, 24454144 bytes
|
||||
|
|
@ -26,8 +26,8 @@ Total memory consumption was 126309K = 123 MB
|
|||
0.8% id_body 941 objects, 1076504 bytes
|
||||
0.7% adjective_meaning 202 objects, 1000304 bytes
|
||||
0.7% excerpt_meaning 3100 objects, 967200 bytes
|
||||
0.6% production 3872 objects, 898304 bytes
|
||||
0.6% ptoken 8382 objects, 871728 bytes
|
||||
0.6% production 3873 objects, 898536 bytes
|
||||
0.6% ptoken 8384 objects, 871936 bytes
|
||||
0.6% grammatical_usage 3611 objects, 866640 bytes
|
||||
0.6% individual_form 2561 objects, 860496 bytes
|
||||
0.6% inter_schema_node 8891 objects, 853536 bytes
|
||||
|
|
@ -255,5 +255,5 @@ Total memory consumption was 126309K = 123 MB
|
|||
---- code generation workspace for objects 1336 bytes in 4 claims
|
||||
0.2% emitter array storage 279776 bytes in 1995 claims
|
||||
|
||||
-140.-6% was overhead - -181856192 bytes = -177593K = -173 MB
|
||||
-140.-6% was overhead - -181856632 bytes = -177594K = -173 MB
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
68.6% in compilation to Inter
|
||||
47.6% in //Sequence::undertake_queued_tasks//
|
||||
4.6% in //MajorNodes::pre_pass//
|
||||
3.5% in //MajorNodes::pass_1//
|
||||
3.3% in //MajorNodes::pass_1//
|
||||
2.4% in //RTPhrasebook::compile_entries//
|
||||
1.8% in //ImperativeDefinitions::assess_all//
|
||||
1.5% in //RTKindConstructors::compile//
|
||||
|
|
@ -17,17 +17,17 @@
|
|||
0.1% in //RTKindConstructors::compile_permissions//
|
||||
0.1% in //Task::make_built_in_kind_constructors//
|
||||
0.1% in //World::stages_II_and_III//
|
||||
2.2% not specifically accounted for
|
||||
28.7% in running Inter pipeline
|
||||
10.3% in step 14/14: generate inform6 -> auto.inf
|
||||
2.4% not specifically accounted for
|
||||
28.5% in running Inter pipeline
|
||||
10.1% in step 14/14: generate inform6 -> auto.inf
|
||||
7.6% in step 5/14: load-binary-kits
|
||||
6.1% in step 6/14: make-synoptic-module
|
||||
6.3% in step 6/14: make-synoptic-module
|
||||
1.5% in step 9/14: make-identifiers-unique
|
||||
0.3% in step 12/14: eliminate-redundant-operations
|
||||
0.3% in step 4/14: compile-splats
|
||||
0.3% in step 7/14: shorten-wiring
|
||||
0.3% in step 8/14: detect-indirect-calls
|
||||
0.1% in step 11/14: eliminate-redundant-labels
|
||||
1.4% not specifically accounted for
|
||||
1.2% not specifically accounted for
|
||||
2.2% in supervisor
|
||||
0.4% not specifically accounted for
|
||||
0.6% not specifically accounted for
|
||||
|
|
|
|||
|
|
@ -300,11 +300,13 @@ from archaisms.
|
|||
|
||||
@ Step 5. Now we reach a batch of irregular but fairly general inflected
|
||||
endings; for example, protozoon to protozoa, or metamorphosis to metamorphoses.
|
||||
Note that we differ from Conway in pluralizing blouse as blouses, not blice.
|
||||
Note that we differ from Conway in pluralizing blouse as blouses, not blice,
|
||||
and human as humans, not humen.
|
||||
|
||||
=
|
||||
<en-trie-plural-irregular-inflections> ::=
|
||||
*man 3men | /* Step 5 begins here */
|
||||
*human humans | /* Step 5 begins here */
|
||||
*man 3men |
|
||||
*blouse 2ses |
|
||||
*louse 5lice |
|
||||
*mouse 5mice |
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Size of lexicon: 3100 excerpt meanings
|
||||
Stored among 839 words out of total vocabulary of 10562
|
||||
Stored among 839 words out of total vocabulary of 10564
|
||||
709 words have a start list: longest belongs to report (with 293 meanings)
|
||||
15 words have an end list: longest belongs to case (with 6 meanings)
|
||||
29 words have a middle list: longest belongs to to (with 4 meanings)
|
||||
|
|
|
|||
Loading…
Reference in a new issue