ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-06-26 04:00:43 +03:00
Code Issues Projects Releases Wiki Activity

Fix kit enumerated kinds to allow for consecutive values

Browse source
This commit is contained in:
Dannii Willis 2023-07-05 13:00:04 +10:00
parent 000c4f928d
commit 8dbf385d21
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -9,7 +9,7 @@ charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
[*.{i6t,w}]
[*.{i6t,neptune,w}]
indent_style = tab
[*.json]

1
inform7/Tests/Extensions/Araminta Intest/Directorial Testing-v2_7.i7xd/Materials/Inter/TestKit/kinds/Testy.neptune
View file

@ -4,6 +4,7 @@ new base COLOUR_TY {
plural: colours
instance: red = RED_COL = 7
instance: pink = PINK_COL = 8
instance: purple = PURPLE_COL = $1f
instance: chartreusey lavender = MAUVE_COL = $$1100101
}

23
inform7/Tests/Test Cases/_Results_Ideal/KitEnumerations.txt
View file

@ -4,29 +4,36 @@
This is an uninitialised colour variable - "C" = colour: red
Iterating...
"D" = colour: red
"colour after D" = colour: purple
"colour after D" = colour: pink
"colour before D" = colour: chartreusey lavender
"sequence number of D" = number: 1
"numerical value of D" = number: 7
"whether or not D is valid" = truth state: true
"D" = colour: purple
"colour after D" = colour: chartreusey lavender
"D" = colour: pink
"colour after D" = colour: purple
"colour before D" = colour: red
"sequence number of D" = number: 2
"numerical value of D" = number: 8
"whether or not D is valid" = truth state: true
"D" = colour: purple
"colour after D" = colour: chartreusey lavender
"colour before D" = colour: pink
"sequence number of D" = number: 3
"numerical value of D" = number: 31
"whether or not D is valid" = truth state: true
"D" = colour: chartreusey lavender
"colour after D" = colour: red
"colour before D" = colour: purple
"sequence number of D" = number: 3
"sequence number of D" = number: 4
"numerical value of D" = number: 101
"whether or not D is valid" = truth state: true
Done.
Now for a limited-span repeat...
"D" = colour: red
"D" = colour: pink
"D" = colour: purple
Done.
"list of colours" = list of colours: {red, purple, chartreusey lavender}
"list of colours" = list of colours: {red, pink, purple, chartreusey lavender}
"first value of colour" = colour: red
"last value of colour" = colour: chartreusey lavender
"colour scheme of the Laboratory" = colour: red
@ -35,9 +42,9 @@
The mauve is 101
101 = 101
Now for some random values...
purple; purple; chartreusey lavender; purple; red; red; chartreusey lavender; purple; chartreusey lavender; red; purple; chartreusey lavender; chartreusey lavender; purple; chartreusey lavender; red; purple; purple; red; purple; red; chartreusey lavender; purple; chartreusey lavender; chartreusey lavender; chartreusey lavender; purple; red; red; red; purple; purple; purple; red; purple; chartreusey lavender; red; purple; purple; purple; chartreusey lavender; purple; chartreusey lavender; chartreusey lavender; red; purple; red; red; red; red; chartreusey lavender; purple; purple; chartreusey lavender; purple; purple; chartreusey lavender; red; red; purple; purple; chartreusey lavender; chartreusey lavender; red; red; red; red; red; red; purple; red; chartreusey lavender; purple; red; purple; red; chartreusey lavender; purple; purple; chartreusey lavender; red; red; chartreusey lavender; chartreusey lavender; chartreusey lavender; chartreusey lavender; purple; purple; purple; purple;
chartreusey lavender; chartreusey lavender; purple; red; red; red; purple; chartreusey lavender; red; red; ... enough!
red; purple; red; purple; red; red; purple; red; purple; purple; red; red; purple; red; purple; purple; red; purple; red; red; purple; red; red; purple; purple; purple; purple; red; red; purple; red; purple; red; red; red; red; purple; purple; red; red; purple; purple; red; purple; purple; purple; purple; red; purple; purple; purple; red; red; red; purple; red; red; purple; purple; purple; purple; purple; red; red; purple; red; red; purple; purple; red; red; purple; red; red; purple; red; purple; purple; red; red; purple; red; red; red; purple; red; purple; red; purple; red; red; purple; red; purple; purple; purple; red; purple; purple; purple; ... enough!
pink; chartreusey lavender; purple; purple; chartreusey lavender; purple; purple; red; purple; red; purple; purple; red; chartreusey lavender; chartreusey lavender; pink; red; chartreusey lavender; purple; red; pink; chartreusey lavender; red; pink; chartreusey lavender; pink; chartreusey lavender; red; chartreusey lavender; red; purple; red; purple; chartreusey lavender; red; chartreusey lavender; pink; pink; red; chartreusey lavender; chartreusey lavender; red; red; purple; chartreusey lavender; pink; pink; pink; chartreusey lavender; chartreusey lavender; chartreusey lavender; red; pink; purple; pink; pink; pink; chartreusey lavender; chartreusey lavender; chartreusey lavender; chartreusey lavender; chartreusey lavender; pink; red; purple; pink; purple; pink; pink; chartreusey lavender; purple; pink; red; purple; pink; pink; purple; pink; pink; chartreusey lavender; pink; red; pink; purple; chartreusey lavender; purple; purple; red; red; red; pink; red; chartreusey lavender;
chartreusey lavender; chartreusey lavender; pink; pink; chartreusey lavender; pink; red; ... enough!
red; pink; red; purple; pink; pink; red; pink; purple; red; purple; pink; purple; pink; red; purple; pink; purple; purple; red; purple; red; red; red; pink; pink; red; purple; pink; pink; purple; red; purple; red; red; purple; red; pink; pink; purple; red; pink; red; red; pink; red; pink; pink; pink; red; pink; red; pink; purple; pink; purple; red; pink; pink; pink; pink; purple; purple; red; pink; purple; purple; red; red; pink; pink; red; purple; red; purple; purple; red; purple; red; pink; pink; purple; pink; purple; red; purple; pink; purple; pink; red; red; red; purple; pink; red; purple; pink; purple; pink; purple; ... enough!
Welcome
An Interactive Fiction

6
inform7/knowledge-module/Chapter 2/Instances.w
View file

@ -350,7 +350,7 @@ void Instances::make_instances_from_Neptune(void) {
LOOP_OVER(kc, kind_constructor) {
linked_list *L = KindConstructors::instances(kc);
kind_constructor_instance *kci;
inter_ti current_val = 1;
inter_ti current_val = 0;
int first_val = TRUE;
LOOP_OVER_LINKED_LIST(kci, kind_constructor_instance, L) {
wording W = Feeds::feed_text(kci->natural_language_name);
@ -372,10 +372,12 @@ void Instances::make_instances_from_Neptune(void) {
}
current_val = (inter_ti) kci->value;
}
else {
current_val++;
}
RTKindConstructors::set_explicit_runtime_instance_value(K, I, current_val);
RTInstances::set_translation(I, kci->identifier);
// LOG("From kit: %W = %S = %d -> $O\n", W, kci->identifier, current_val, I);
current_val++;
first_val = FALSE;
}
}