mirror of
https://github.com/ganelson/inform.git
synced 2024-07-05 00:24:22 +03:00
updating no automatic plural synonyms for new use option scheme
This commit is contained in:
parent
9608d429a5
commit
2b92e635ab
|
@ -32,7 +32,7 @@
|
||||||
"defines-Main": false,
|
"defines-Main": false,
|
||||||
"provides-kinds": [ "Macros.neptune", "Protocols.neptune", "Core.neptune", "Punctuation.neptune", "Files.neptune" ],
|
"provides-kinds": [ "Macros.neptune", "Protocols.neptune", "Core.neptune", "Punctuation.neptune", "Files.neptune" ],
|
||||||
"indexes-with-structure": "Basic.indext",
|
"indexes-with-structure": "Basic.indext",
|
||||||
"configuration-flags": [ "AMERICAN_DIALECT", "AUTHORIAL_MODESTY", "ECHO_COMMANDS", "FIX_RNG", "MEMORY_ECONOMY", "NO_DEPRECATED", "NUMBERED_RULES", "PRINT_ENGINEER_EXPS", "SERIAL_COMMA" ],
|
"configuration-flags": [ "AMERICAN_DIALECT", "AUTHORIAL_MODESTY", "ECHO_COMMANDS", "FIX_RNG", "MEMORY_ECONOMY", "NO_DEPRECATED", "NUMBERED_RULES", "PRINT_ENGINEER_EXPS", "SERIAL_COMMA", "NO_AUTO_PLURAL_NAMES" ],
|
||||||
"configuration-values": [ "STACK_FRAME_CAPACITY", "TEXT_BUFFER_SIZE", "DICT_RESOLUTION" ]
|
"configuration-values": [ "STACK_FRAME_CAPACITY", "TEXT_BUFFER_SIZE", "DICT_RESOLUTION" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -26,7 +26,7 @@ meaningful only for works of IF and are inert for Basic Inform projects.
|
||||||
@e FAST_ROUTE_FINDING_UO
|
@e FAST_ROUTE_FINDING_UO
|
||||||
@e SLOW_ROUTE_FINDING_UO
|
@e SLOW_ROUTE_FINDING_UO
|
||||||
@e DICTIONARY_RESOLUTION_UO
|
@e DICTIONARY_RESOLUTION_UO
|
||||||
@e NO_AUTOMATIC_PLURAL_SYNONYMS_UO
|
@e NO_AUTO_PLURAL_NAMES_UO
|
||||||
|
|
||||||
@ Note that Inform recognises these by their English names, so there would be no
|
@ Note that Inform recognises these by their English names, so there would be no
|
||||||
need to translate this to other languages.
|
need to translate this to other languages.
|
||||||
|
@ -43,7 +43,7 @@ need to translate this to other languages.
|
||||||
no scoring | ==> { NO_SCORING_UO, - }
|
no scoring | ==> { NO_SCORING_UO, - }
|
||||||
engineering notation | ==> { ENGINEERING_NOTATION_UO, - }
|
engineering notation | ==> { ENGINEERING_NOTATION_UO, - }
|
||||||
unabbreviated object names | ==> { UNABBREVIATED_OBJECT_NAMES_UO, - }
|
unabbreviated object names | ==> { UNABBREVIATED_OBJECT_NAMES_UO, - }
|
||||||
no automatic plural synonyms | ==> { NO_AUTOMATIC_PLURAL_SYNONYMS_UO, - }
|
no automatic plural synonyms | ==> { NO_AUTO_PLURAL_NAMES_UO, - }
|
||||||
index figure thumbnails | ==> { INDEX_FIGURE_THUMBNAILS_UO, - }
|
index figure thumbnails | ==> { INDEX_FIGURE_THUMBNAILS_UO, - }
|
||||||
fast route-finding | ==> { FAST_ROUTE_FINDING_UO, - }
|
fast route-finding | ==> { FAST_ROUTE_FINDING_UO, - }
|
||||||
slow route-finding | ==> { SLOW_ROUTE_FINDING_UO, - }
|
slow route-finding | ==> { SLOW_ROUTE_FINDING_UO, - }
|
||||||
|
@ -63,7 +63,7 @@ typedef struct compilation_settings {
|
||||||
int ranking_table_given;
|
int ranking_table_given;
|
||||||
int scoring_option_set;
|
int scoring_option_set;
|
||||||
int use_exact_parsing_option;
|
int use_exact_parsing_option;
|
||||||
int no_automatic_plural_synonyms;
|
int no_auto_plural_names;
|
||||||
int dictionary_resolution;
|
int dictionary_resolution;
|
||||||
int fast_route_finding;
|
int fast_route_finding;
|
||||||
int slow_route_finding;
|
int slow_route_finding;
|
||||||
|
@ -85,7 +85,7 @@ void CompilationSettings::initialise_gcs(void) {
|
||||||
global_compilation_settings.ranking_table_given = FALSE;
|
global_compilation_settings.ranking_table_given = FALSE;
|
||||||
global_compilation_settings.scoring_option_set = NOT_APPLICABLE;
|
global_compilation_settings.scoring_option_set = NOT_APPLICABLE;
|
||||||
global_compilation_settings.use_exact_parsing_option = FALSE;
|
global_compilation_settings.use_exact_parsing_option = FALSE;
|
||||||
global_compilation_settings.no_automatic_plural_synonyms = FALSE;
|
global_compilation_settings.no_auto_plural_names = FALSE;
|
||||||
int N = 9;
|
int N = 9;
|
||||||
if (TargetVMs::is_16_bit(Task::vm())) N = 6;
|
if (TargetVMs::is_16_bit(Task::vm())) N = 6;
|
||||||
global_compilation_settings.dictionary_resolution = N;
|
global_compilation_settings.dictionary_resolution = N;
|
||||||
|
@ -115,7 +115,7 @@ void CompilationSettings::set(int U, int N, source_file *from) {
|
||||||
case SCORING_UO: g->scoring_option_set = TRUE; break;
|
case SCORING_UO: g->scoring_option_set = TRUE; break;
|
||||||
case TELEMETRY_RECORDING_UO: ProblemBuffer::set_telemetry(); break;
|
case TELEMETRY_RECORDING_UO: ProblemBuffer::set_telemetry(); break;
|
||||||
case UNABBREVIATED_OBJECT_NAMES_UO: g->use_exact_parsing_option = TRUE; break;
|
case UNABBREVIATED_OBJECT_NAMES_UO: g->use_exact_parsing_option = TRUE; break;
|
||||||
case NO_AUTOMATIC_PLURAL_SYNONYMS_UO: g->no_automatic_plural_synonyms = TRUE; break;
|
case NO_AUTO_PLURAL_NAMES_UO: g->no_auto_plural_names = TRUE; break;
|
||||||
case FAST_ROUTE_FINDING_UO: g->fast_route_finding = TRUE; break;
|
case FAST_ROUTE_FINDING_UO: g->fast_route_finding = TRUE; break;
|
||||||
case SLOW_ROUTE_FINDING_UO: g->slow_route_finding = TRUE; break;
|
case SLOW_ROUTE_FINDING_UO: g->slow_route_finding = TRUE; break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,7 +141,7 @@ Use command line echoing translates as the configuration flag ECHO_COMMANDS
|
||||||
Use dictionary resolution of at least 6 translates as the configuration value
|
Use dictionary resolution of at least 6 translates as the configuration value
|
||||||
DICT_RESOLUTION in BasicInformKit.
|
DICT_RESOLUTION in BasicInformKit.
|
||||||
Use no automatic plural synonyms translates as the configuration flag
|
Use no automatic plural synonyms translates as the configuration flag
|
||||||
NO_AUTOMATIC_PLURAL_SYNONYMS in BasicInformKit.
|
NO_AUTO_PLURAL_NAMES in BasicInformKit.
|
||||||
|
|
||||||
@ These, on the other hand, are settings used by the dynamic memory management
|
@ These, on the other hand, are settings used by the dynamic memory management
|
||||||
code, which runs in I6 as part of the template layer. Each setting translates
|
code, which runs in I6 as part of the template layer. Each setting translates
|
||||||
|
|
|
@ -82,7 +82,7 @@ parse_node *Name::name_property_array(instance *I, wording W, wording PW,
|
||||||
EmitArrays::dword_entry(content); entry_count++;
|
EmitArrays::dword_entry(content); entry_count++;
|
||||||
DISCARD_TEXT(content)
|
DISCARD_TEXT(content)
|
||||||
}
|
}
|
||||||
if (from_kind && !global_compilation_settings.no_automatic_plural_synonyms)
|
if (from_kind && !global_compilation_settings.no_auto_plural_names)
|
||||||
LOOP_THROUGH_WORDING(j, PW) {
|
LOOP_THROUGH_WORDING(j, PW) {
|
||||||
int additional = TRUE;
|
int additional = TRUE;
|
||||||
LOOP_THROUGH_WORDING(k, W)
|
LOOP_THROUGH_WORDING(k, W)
|
||||||
|
|
Loading…
Reference in a new issue