-Constant RS_NEITHER = 0;
-Constant RS_SUCCEEDS = 1;
-Constant RS_FAILS = 2;
+Constant RS_NEITHER = 0;
+Constant RS_SUCCEEDS = 1;
+Constant RS_FAILS = 2;
Array latest_rule_result --> 3;
diff --git a/docs/BasicInformKit/S-rlt.html b/docs/BasicInformKit/S-rlt.html
index 01a6ab169..4cde9abcd 100644
--- a/docs/BasicInformKit/S-rlt.html
+++ b/docs/BasicInformKit/S-rlt.html
@@ -74,15 +74,15 @@ to allow for the five-word block header.)
-Constant RRV_NAME RR_NAME-5;
-Constant RRV_PERMISSIONS RR_PERMISSIONS-5;
-Constant RRV_STORAGE RR_STORAGE-5;
-Constant RRV_KIND RR_KIND-5;
-Constant RRV_HANDLER RR_HANDLER-5;
-Constant RRV_DESCRIPTION RR_DESCRIPTION-5;
-Constant RRV_USED 6;
-Constant RRV_FILLED 7;
-Constant RRV_DATA_BASE 8;
+Constant RRV_NAME RR_NAME-5;
+Constant RRV_PERMISSIONS RR_PERMISSIONS-5;
+Constant RRV_STORAGE RR_STORAGE-5;
+Constant RRV_KIND RR_KIND-5;
+Constant RRV_HANDLER RR_HANDLER-5;
+Constant RRV_DESCRIPTION RR_DESCRIPTION-5;
+Constant RRV_USED 6;
+Constant RRV_FILLED 7;
+Constant RRV_DATA_BASE 8;
-Constant RRVAL_V_TO_V 0;
-Constant RRVAL_V_TO_O RELS_Y_UNIQUE;
-Constant RRVAL_O_TO_V RELS_X_UNIQUE;
-Constant RRVAL_O_TO_O RELS_X_UNIQUE+RELS_Y_UNIQUE;
-Constant RRVAL_EQUIV RELS_EQUIVALENCE+RELS_SYMMETRIC;
-Constant RRVAL_SYM_V_TO_V RELS_SYMMETRIC;
-Constant RRVAL_SYM_O_TO_O RELS_SYMMETRIC+RELS_X_UNIQUE+RELS_Y_UNIQUE;
+Constant RRVAL_V_TO_V 0;
+Constant RRVAL_V_TO_O RELS_Y_UNIQUE;
+Constant RRVAL_O_TO_V RELS_X_UNIQUE;
+Constant RRVAL_O_TO_O RELS_X_UNIQUE+RELS_Y_UNIQUE;
+Constant RRVAL_EQUIV RELS_EQUIVALENCE+RELS_SYMMETRIC;
+Constant RRVAL_SYM_V_TO_V RELS_SYMMETRIC;
+Constant RRVAL_SYM_O_TO_O RELS_SYMMETRIC+RELS_X_UNIQUE+RELS_Y_UNIQUE;
-Constant RRF_USED $0001;
-Constant RRF_DELETED $0002;
-Constant RRF_SINGLE $0004;
-Constant RRF_HASX $0010;
-Constant RRF_HASY $0020;
-Constant RRF_ENTKEYX $0040;
-Constant RRF_ENTKEYY $0080;
+Constant RRF_USED $0001;
+Constant RRF_DELETED $0002;
+Constant RRF_SINGLE $0004;
+Constant RRF_HASX $0010;
+Constant RRF_HASY $0020;
+Constant RRF_ENTKEYX $0040;
+Constant RRF_ENTKEYY $0080;
@@ -411,14 +411,14 @@ been added yet.
}
cur = BlkValueRead(rel, RRV_HANDLER);
switch (val) {
- RRVAL_V_TO_V: handler = ChooseRelationHandler(kov, false);
- RRVAL_V_TO_O: handler = HashTableRelationHandler;
- RRVAL_O_TO_V: handler = ReversedHashTableRelationHandler;
- RRVAL_O_TO_O: handler = TwoInOneHashTableRelationHandler;
- RRVAL_EQUIV: handler = EquivHashTableRelationHandler;
- RRVAL_SYM_V_TO_V: handler = ChooseRelationHandler(kov, true);
- RRVAL_SYM_O_TO_O: handler = Sym2in1HashTableRelationHandler;
- default: RunTimeProblem(RTP_RELATIONCHANGEIMPOSSIBLE); rfalse;
+ RRVAL_V_TO_V: handler = ChooseRelationHandler(kov, false);
+ RRVAL_V_TO_O: handler = HashTableRelationHandler;
+ RRVAL_O_TO_V: handler = ReversedHashTableRelationHandler;
+ RRVAL_O_TO_O: handler = TwoInOneHashTableRelationHandler;
+ RRVAL_EQUIV: handler = EquivHashTableRelationHandler;
+ RRVAL_SYM_V_TO_V: handler = ChooseRelationHandler(kov, true);
+ RRVAL_SYM_O_TO_O: handler = Sym2in1HashTableRelationHandler;
+ default: RunTimeProblem(RTP_RELATIONCHANGEIMPOSSIBLE); rfalse;
}
if (cur == handler) rtrue;
@@ -1120,8 +1120,8 @@ the existing pair \((X, Y)\).
break;
}
- fl = BlkValueRead(rel, RRV_DATA_BASE + 3*at);
- tmp = BlkValueRead(rel, RRV_DATA_BASE + 3*at + 2);
+ fl = BlkValueRead(rel, RRV_DATA_BASE + 3*at);
+ tmp = BlkValueRead(rel, RRV_DATA_BASE + 3*at + 2);
if (fl & RRF_SINGLE) {
if (KOVIsBlockValue(ky)) {
@@ -1132,11 +1132,11 @@ the existing pair \((X, Y)\).
if (mult) {
- fl = BlkValueCreate(LIST_OF_TY);
+ fl = BlkValueCreate(LIST_OF_TY);
BlkValueWrite(fl, LIST_ITEM_KOV_F, ky);
LIST_OF_TY_SetLength(fl, 2);
- BlkValueWrite(fl, LIST_ITEM_BASE, tmp);
- LIST_OF_TY_PutItem(fl, 2, Y);
+ BlkValueWrite(fl, LIST_ITEM_BASE, tmp);
+ LIST_OF_TY_PutItem(fl, 2, Y);
BlkValueWrite(rel, RRV_DATA_BASE + 3*at + 2, fl);
BlkValueWrite(rel, RRV_DATA_BASE + 3*at, RRF_USED);
} else {
@@ -1154,8 +1154,8 @@ the existing pair \((X, Y)\).
RELS_ASSERT_FALSE:
if (at < 0) rtrue;
- fl = BlkValueRead(rel, RRV_DATA_BASE + 3*at);
- tmp = BlkValueRead(rel, RRV_DATA_BASE + 3*at + 2);
+ fl = BlkValueRead(rel, RRV_DATA_BASE + 3*at);
+ tmp = BlkValueRead(rel, RRV_DATA_BASE + 3*at + 2);
if (fl & RRF_SINGLE) {
if (KOVIsBlockValue(ky)) {
@@ -1358,8 +1358,8 @@ situation would be inefficient, so we keep the \(Y\) entry regardless.
for (at=0, X=RRV_DATA_BASE, fl=0: at<=ext: at++, X=X+3, fl=0) {
if (BlkValueRead(rel, X) & RRF_USED) {
fl = BlkValueRead(rel, X + 2);
- if (fl > 0) continue;
- BlkValueWrite(rel, X + 2, -fl);
+ if (fl > 0) continue;
+ BlkValueWrite(rel, X + 2, -fl);
tmp = BlkValueRead(rel, X + 1);
@@ -1440,7 +1440,7 @@ situation would be inefficient, so we keep the \(Y\) entry regardless.
if (at < 0) {
if (at2 < 0) {
- tmp = 0;
+ tmp = 0;
ext = BlkValueRead(rel, RRV_STORAGE);
for (i=0: i<=ext: i++) {
fl = BlkValueRead(rel, RRV_DATA_BASE + 3*i);
@@ -1449,7 +1449,7 @@ situation would be inefficient, so we keep the \(Y\) entry regardless.
if (fl > tmp) tmp = fl;
}
}
- tmp++;
+ tmp++;
BlkValueWrite(rel, RRV_USED, BlkValueRead(rel, RRV_USED) + 2);
at = ~at;
@@ -1499,8 +1499,8 @@ situation would be inefficient, so we keep the \(Y\) entry regardless.
jump CheckResize;
}
- tmp = BlkValueRead(rel, RRV_DATA_BASE + 3*at + 2);
- fl = BlkValueRead(rel, RRV_DATA_BASE + 3*at2 + 2);
+ tmp = BlkValueRead(rel, RRV_DATA_BASE + 3*at + 2);
+ fl = BlkValueRead(rel, RRV_DATA_BASE + 3*at2 + 2);
if (tmp < fl) { i = tmp; tmp = fl; fl = i; }
ext = BlkValueRead(rel, RRV_STORAGE);
for (at=0: at<=ext: at++) {
diff --git a/docs/BasicInformKit/S-rlt2.html b/docs/BasicInformKit/S-rlt2.html
index e5575c44a..2094d42aa 100644
--- a/docs/BasicInformKit/S-rlt2.html
+++ b/docs/BasicInformKit/S-rlt2.html
@@ -62,12 +62,12 @@ MathJax = {
-Constant RR_NAME 5;
-Constant RR_PERMISSIONS 6;
-Constant RR_STORAGE 7;
-Constant RR_KIND 8;
-Constant RR_HANDLER 9;
-Constant RR_DESCRIPTION 10;
+Constant RR_NAME 5;
+Constant RR_PERMISSIONS 6;
+Constant RR_STORAGE 7;
+Constant RR_KIND 8;
+Constant RR_HANDLER 9;
+Constant RR_DESCRIPTION 10;
Array CheckTableEntryIsBlank_LU
- -> $$00000001
+ -> $$00000001
$$00000010
$$00000100
$$00001000
@@ -203,7 +203,7 @@ so we use two arrays of bitmaps:
$$01000000
$$10000000;
Array CheckTableEntryIsNonBlank_LU
- -> $$11111110
+ -> $$11111110
$$11111101
$$11111011
$$11110111
@@ -520,16 +520,16 @@ an error if that doesn't exist.
}
if (write_flag) {
switch(write_flag) {
- 1: ForceTableEntryNonBlank(tab,col,index);
+ 1: ForceTableEntryNonBlank(tab,col,index);
(tab-->col)-->(index+COL_HSIZE) = write_value;
- 2: ForceTableEntryNonBlank(tab,col,index);
+ 2: ForceTableEntryNonBlank(tab,col,index);
(tab-->col)-->(index+COL_HSIZE) =
((tab-->col)-->(index+COL_HSIZE)) + write_value;
- 3: ForceTableEntryNonBlank(tab,col,index);
+ 3: ForceTableEntryNonBlank(tab,col,index);
(tab-->col)-->(index+COL_HSIZE) =
((tab-->col)-->(index+COL_HSIZE)) - write_value;
- 4: ForceTableEntryBlank(tab,col,index);
- 5: ForceTableEntryNonBlank(tab,col,index);
+ 4: ForceTableEntryBlank(tab,col,index);
+ 5: ForceTableEntryNonBlank(tab,col,index);
return ((tab-->col)-->(index+COL_HSIZE));
}
rfalse;
diff --git a/docs/BasicInformKit/S-txt.html b/docs/BasicInformKit/S-txt.html
index a8ef6f5c9..b1c5da49a 100644
--- a/docs/BasicInformKit/S-txt.html
+++ b/docs/BasicInformKit/S-txt.html
@@ -126,7 +126,7 @@ special to copy or destroy a text.
CAST_KOVS: TEXT_TY_Cast(arg1, arg2, arg3);
MAKEMUTABLE_KOVS: return TEXT_TY_Mutable(arg1);
COPYQUICK_KOVS: rtrue;
- COPYSB_KOVS: TEXT_TY_CopySB(arg1, arg2);
+ COPYSB_KOVS: TEXT_TY_CopySB(arg1, arg2);
KINDDATA_KOVS: return 0;
EXTENT_KOVS: return TEXT_TY_Extent(arg1);
COMPARE_KOVS: return TEXT_TY_Compare(arg1, arg2);
diff --git a/docs/assertions-module/4-ass.html b/docs/assertions-module/4-ass.html
index b6ec0207a..48c396e57 100644
--- a/docs/assertions-module/4-ass.html
+++ b/docs/assertions-module/4-ass.html
@@ -331,7 +331,7 @@ of and
int pc = problem_count;
- if (Plugins::Call::intervene_in_assertion(px, py)) return;
+ if (PluginCalls::intervene_in_assertion(px, py)) return;
if (problem_count > pc) return;
diff --git a/docs/if-module/1-im.html b/docs/if-module/1-im.html
index 02d8521dd..283821bc8 100644
--- a/docs/if-module/1-im.html
+++ b/docs/if-module/1-im.html
@@ -64,7 +64,7 @@
Setting up the use of this module.
-
+
+
+
+plugin *if_plugin, *parsing_plugin, *actions_plugin,
+ *spatial_plugin, *map_plugin, *persons_plugin,
+ *player_plugin, *regions_plugin, *backdrops_plugin,
+ *devices_plugin, *showme_plugin,
+ *times_plugin, *scenes_plugin, *scoring_plugin,
+ *bibliographic_plugin, *chronology_plugin;
+
+
@@ -164,8 +174,9 @@ foundation module does that automatically.)
COMPILE_WRITER(action_name *, PL::Actions::log)
void IFModule::start(void) {
- Register this module's debugging log aspects3.2;
- Register this module's debugging log writers3.3;
+ Create this module's plugins4.1;
+ Register this module's debugging log aspects4.3;
+ Register this module's debugging log writers4.4;
WherePredicates::start();
PL::SpatialRelations::start();
PL::MapDirections::start();
@@ -173,7 +184,29 @@ foundation module does that automatically.)
void IFModule::end(void) {
}
-
+
+
+
+ if_plugin = PluginManager::new(NULL, I"interactive fiction", NULL);
+ parsing_plugin = PluginManager::new(&PL::Parsing::Visibility::start, I"command", if_plugin);
+ actions_plugin = PluginManager::new(&PL::Actions::start, I"actions", if_plugin);
+ spatial_plugin = PluginManager::new(&PL::Spatial::start, I"spatial model", if_plugin);
+ map_plugin = PluginManager::new(&PL::Map::start, I"mapping", if_plugin);
+ persons_plugin = PluginManager::new(&PL::Persons::start, I"persons", if_plugin);
+ player_plugin = PluginManager::new(&PL::Player::start, I"player", if_plugin);
+ scoring_plugin = PluginManager::new(&PL::Score::start, I"scoring", if_plugin);
+ regions_plugin = PluginManager::new(&PL::Regions::start, I"regions", if_plugin);
+ backdrops_plugin = PluginManager::new(&PL::Backdrops::start, I"backdrops", if_plugin);
+ devices_plugin = PluginManager::new(&PL::Devices::start, I"devices", if_plugin);
+ showme_plugin = PluginManager::new(&PL::Showme::start, I"showme", if_plugin);
+ times_plugin = PluginManager::new(TimesOfDay::start, I"times of day", if_plugin);
+ scenes_plugin = PluginManager::new(&PL::Scenes::start, I"scenes", if_plugin);
+ bibliographic_plugin = PluginManager::new(&PL::Bibliographic::start, I"bibliographic data", if_plugin);
+ chronology_plugin = PluginManager::new(NULL, I"chronology", if_plugin);
+
+
+
enum ACTION_CREATIONS_DA
enum ACTION_PATTERN_COMPILATION_DA
@@ -184,7 +217,7 @@ foundation module does that automatically.)
enum SPATIAL_MAP_DA
enum SPATIAL_MAP_WORKINGS_DA
-
@@ -197,8 +230,8 @@ foundation module does that automatically.)
Log::declare_aspect(SPATIAL_MAP_DA, L"spatial map", FALSE, FALSE);
Log::declare_aspect(SPATIAL_MAP_WORKINGS_DA, L"spatial map workings", FALSE, FALSE);
-
-
+
@@ -208,8 +241,8 @@ foundation module does that automatically.)
REGISTER_WRITER('L', PL::Actions::ConstantLists::log);
REGISTER_WRITER('l', PL::Actions::log);
-
-
+
enum ACTION_NT
@@ -221,7 +254,7 @@ foundation module does that automatically.)
NodeType::new(TOKEN_NT, I"TOKEN_NT", 0, INFTY, L3_NCAT, 0);
}
-
enum action_meaning_ANNOT
@@ -244,7 +277,7 @@ foundation module does that automatically.)
DECLARE_ANNOTATION_FUNCTIONS(constant_named_action_pattern, named_action_pattern)
DECLARE_ANNOTATION_FUNCTIONS(constant_scene, scene)
-
+
MAKE_ANNOTATION_FUNCTIONS(action_meaning, action_pattern)
@@ -254,21 +287,21 @@ foundation module does that automatically.)
MAKE_ANNOTATION_FUNCTIONS(constant_named_action_pattern, named_action_pattern)
MAKE_ANNOTATION_FUNCTIONS(constant_scene, scene)
-
+
void IFModule::declare_annotations(void) {
- Annotations::declare_type(action_meaning_ANNOT, IFModule::write_action_meaning_ANNOT);
- Annotations::declare_type(constant_action_name_ANNOT, IFModule::write_constant_action_name_ANNOT);
- Annotations::declare_type(constant_action_pattern_ANNOT, IFModule::write_constant_action_pattern_ANNOT);
- Annotations::declare_type(constant_grammar_verb_ANNOT, IFModule::write_constant_grammar_verb_ANNOT);
- Annotations::declare_type(constant_named_action_pattern_ANNOT, IFModule::write_constant_named_action_pattern_ANNOT);
- Annotations::declare_type(constant_scene_ANNOT, IFModule::write_constant_scene_ANNOT);
- Annotations::declare_type(grammar_token_literal_ANNOT, IFModule::write_grammar_token_literal_ANNOT);
- Annotations::declare_type(grammar_token_relation_ANNOT, IFModule::write_grammar_token_relation_ANNOT);
- Annotations::declare_type(grammar_value_ANNOT, IFModule::write_grammar_value_ANNOT);
- Annotations::declare_type(slash_class_ANNOT, IFModule::write_slash_class_ANNOT);
- Annotations::declare_type(slash_dash_dash_ANNOT, IFModule::write_slash_dash_dash_ANNOT);
+ Annotations::declare_type(action_meaning_ANNOT, IFModule::write_action_meaning_ANNOT);
+ Annotations::declare_type(constant_action_name_ANNOT, IFModule::write_constant_action_name_ANNOT);
+ Annotations::declare_type(constant_action_pattern_ANNOT, IFModule::write_constant_action_pattern_ANNOT);
+ Annotations::declare_type(constant_grammar_verb_ANNOT, IFModule::write_constant_grammar_verb_ANNOT);
+ Annotations::declare_type(constant_named_action_pattern_ANNOT, IFModule::write_constant_named_action_pattern_ANNOT);
+ Annotations::declare_type(constant_scene_ANNOT, IFModule::write_constant_scene_ANNOT);
+ Annotations::declare_type(grammar_token_literal_ANNOT, IFModule::write_grammar_token_literal_ANNOT);
+ Annotations::declare_type(grammar_token_relation_ANNOT, IFModule::write_grammar_token_relation_ANNOT);
+ Annotations::declare_type(grammar_value_ANNOT, IFModule::write_grammar_value_ANNOT);
+ Annotations::declare_type(slash_class_ANNOT, IFModule::write_slash_class_ANNOT);
+ Annotations::declare_type(slash_dash_dash_ANNOT, IFModule::write_slash_dash_dash_ANNOT);
}
void IFModule::write_action_meaning_ANNOT(text_stream *OUT, parse_node *p) {
if (Node::get_action_meaning(p)) {
diff --git a/docs/if-module/2-bd.html b/docs/if-module/2-bd.html
index 366e2bbeb..758930e5a 100644
--- a/docs/if-module/2-bd.html
+++ b/docs/if-module/2-bd.html
@@ -103,8 +103,8 @@ effect is only to make a small number of variables special.
-void PL::Bibliographic::start(void) {
- PLUGIN_REGISTER(PLUGIN_NEW_VARIABLE_NOTIFY, PL::Bibliographic::bibliographic_new_variable_notify);
+void PL::Bibliographic::start(void) {
+ REGISTER(NEW_VARIABLE_NOTIFY_PCALL, PL::Bibliographic::bibliographic_new_variable_notify);
}
-int PL::Bibliographic::bibliographic_new_variable_notify(nonlocal_variable *q) {
+int PL::Bibliographic::bibliographic_new_variable_notify(nonlocal_variable *q) {
if (<notable-bibliographic-variables>(q->name)) {
switch (<<r>>) {
case STORY_TITLE_BIBV: story_title_VAR = q; break;
@@ -254,7 +254,7 @@ which must match:
-int PL::Bibliographic::episode_SMF(int task, parse_node *V, wording *NPs) {
+int PL::Bibliographic::episode_SMF(int task, parse_node *V, wording *NPs) {
wording SW = (NPs)?(NPs[0]):EMPTY_WORDING;
wording OW = (NPs)?(NPs[1]):EMPTY_WORDING;
switch (task) {
@@ -426,7 +426,7 @@ simplified form of the iFiction record, without the XML overhead.
-void PL::Bibliographic::library_card_entry(OUTPUT_STREAM, char *field, nonlocal_variable *nlv, text_stream *t) {
+void PL::Bibliographic::library_card_entry(OUTPUT_STREAM, char *field, nonlocal_variable *nlv, text_stream *t) {
text_stream *col = I"303030";
if (nlv == story_title_VAR) col = I"803030";
HTML::first_html_column_nowrap(OUT, 0, NULL);
@@ -465,7 +465,7 @@ Contents listing, so:
-void PL::Bibliographic::index_bibliographic_variable(OUTPUT_STREAM, nonlocal_variable *nlv, text_stream *t) {
+void PL::Bibliographic::index_bibliographic_variable(OUTPUT_STREAM, nonlocal_variable *nlv, text_stream *t) {
BEGIN_COMPILATION_MODE;
COMPILATION_MODE_ENTER(COMPILE_TEXT_TO_XML_CMODE);
if ((nlv) && (VariableSubjects::has_initial_value_set(nlv))) {
@@ -486,7 +486,7 @@ therefore splits into one of three independent methods.
-void PL::Bibliographic::compile_bibliographic_text(OUTPUT_STREAM, wchar_t *p) {
+void PL::Bibliographic::compile_bibliographic_text(OUTPUT_STREAM, wchar_t *p) {
if (p == NULL) return;
if (TEST_COMPILATION_MODE(COMPILE_TEXT_TO_XML_CMODE))
Compile bibliographic text as XML respecting Treaty of Babel rules14.1;
diff --git a/docs/if-module/3-bck.html b/docs/if-module/3-bck.html
index 83bf59e91..eee6ec257 100644
--- a/docs/if-module/3-bck.html
+++ b/docs/if-module/3-bck.html
@@ -104,18 +104,18 @@ inferences to avoid piling up bogus inconsistencies.
-void PL::Backdrops::start(void) {
+void PL::Backdrops::start(void) {
FOUND_IN_INF = Inferences::new_family(I"FOUND_IN_INF");
METHOD_ADD(FOUND_IN_INF, LOG_DETAILS_INF_MTID, PL::Backdrops::log);
METHOD_ADD(FOUND_IN_INF, COMPARE_INF_MTID, PL::Backdrops::cmp);
FOUND_EVERYWHERE_INF = Inferences::new_family(I"FOUND_EVERYWHERE_INF");
- PLUGIN_REGISTER(PLUGIN_NEW_BASE_KIND_NOTIFY, PL::Backdrops::backdrops_new_base_kind_notify);
- PLUGIN_REGISTER(PLUGIN_NEW_PROPERTY_NOTIFY, PL::Backdrops::backdrops_new_property_notify);
- PLUGIN_REGISTER(PLUGIN_COMPLETE_MODEL, PL::Backdrops::backdrops_complete_model);
- PLUGIN_REGISTER(PLUGIN_ESTIMATE_PROPERTY_USAGE, PL::Backdrops::backdrops_estimate_property_usage);
- PLUGIN_REGISTER(PLUGIN_INTERVENE_IN_ASSERTION, PL::Backdrops::backdrops_intervene_in_assertion);
+ REGISTER(NEW_BASE_KIND_NOTIFY_PCALL, PL::Backdrops::backdrops_new_base_kind_notify);
+ REGISTER(NEW_PROPERTY_NOTIFY_PCALL, PL::Backdrops::backdrops_new_property_notify);
+ REGISTER(COMPLETE_MODEL_PCALL, PL::Backdrops::backdrops_complete_model);
+ REGISTER(ESTIMATE_PROPERTY_USAGE_PCALL, PL::Backdrops::backdrops_estimate_property_usage);
+ REGISTER(INTERVENE_IN_ASSERTION_PCALL, PL::Backdrops::backdrops_intervene_in_assertion);
}
typedef struct found_in_inference_data {
@@ -123,7 +123,7 @@ inferences to avoid piling up bogus inconsistencies.
CLASS_DEFINITION
} found_in_inference_data;
-inference *PL::Backdrops::new_found_in_inference(inference_subject *loc, int certitude) {
+inference *PL::Backdrops::new_found_in_inference(inference_subject *loc, int certitude) {
PROTECTED_MODEL_PROCEDURE;
found_in_inference_data *data = CREATE(found_in_inference_data);
data->location = InferenceSubjects::divert(loc);
@@ -149,7 +149,7 @@ inferences to avoid piling up bogus inconsistencies.
return CI_IDENTICAL;
}
-instance *PL::Backdrops::get_inferred_location(inference *i) {
+instance *PL::Backdrops::get_inferred_location(inference *i) {
if ((i == NULL) || (i->family != FOUND_IN_INF))
internal_error("not a FOUND_IN_INF inf");
found_in_inference_data *data = RETRIEVE_POINTER_found_in_inference_data(i->data);
@@ -170,7 +170,7 @@ there is no need to translate this to other languages.)
-int PL::Backdrops::backdrops_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
+int PL::Backdrops::backdrops_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
if (<notable-backdrops-kinds>(W)) {
K_backdrop = new_base; return TRUE;
}
@@ -180,8 +180,8 @@ there is no need to translate this to other languages.)
-int PL::Backdrops::object_is_a_backdrop(instance *I) {
- if ((Plugins::Manage::plugged_in(regions_plugin)) && (K_backdrop) && (I) &&
+int PL::Backdrops::object_is_a_backdrop(instance *I) {
+ if ((PluginManager::active(regions_plugin)) && (K_backdrop) && (I) &&
(Instances::of_kind(I, K_backdrop))) return TRUE;
return FALSE;
}
@@ -199,13 +199,13 @@ Standard Rules. (So there is no need to translate this to other languages.)
-int PL::Backdrops::backdrops_new_property_notify(property *prn) {
+int PL::Backdrops::backdrops_new_property_notify(property *prn) {
if (<notable-backdrops-properties>(prn->name))
P_scenery = prn;
return FALSE;
}
-int PL::Backdrops::object_is_scenery(instance *I) {
+int PL::Backdrops::object_is_scenery(instance *I) {
if (PropertyInferences::either_or_state(Instances::as_subject(I), P_scenery) > 0)
return TRUE;
return FALSE;
@@ -215,7 +215,7 @@ Standard Rules. (So there is no need to translate this to other languages.)
-int PL::Backdrops::backdrops_estimate_property_usage(kind *k, int *words_used) {
+int PL::Backdrops::backdrops_estimate_property_usage(kind *k, int *words_used) {
if (Kinds::eq(k, K_backdrop)) *words_used += 2;
return FALSE;
}
@@ -234,7 +234,7 @@ and text like
-int PL::Backdrops::assert_relations(binary_predicate *relation,
+int PL::Backdrops::assert_relations(binary_predicate *relation,
instance *I0, instance *I1) {
if ((Instances::of_kind(I1, K_backdrop)) &&
@@ -273,7 +273,7 @@ is .
-void PL::Backdrops::index_object_further(OUTPUT_STREAM, instance *loc, int depth,
+void PL::Backdrops::index_object_further(OUTPUT_STREAM, instance *loc, int depth,
int details, int how) {
int discoveries = 0;
instance *bd;
@@ -324,7 +324,7 @@ can be said to be "everywhere", which nothing else can).
-int PL::Backdrops::backdrops_intervene_in_assertion(parse_node *px, parse_node *py) {
+int PL::Backdrops::backdrops_intervene_in_assertion(parse_node *px, parse_node *py) {
if ((Node::get_type(py) == EVERY_NT) &&
(<notable-backdrops-noun-phrases>(Node::get_text(py)))) {
inference_subject *left_subject = Node::get_subject(px);
@@ -352,7 +352,7 @@ been asserted true:
-void PL::Backdrops::infer_presence_everywhere(instance *I) {
+void PL::Backdrops::infer_presence_everywhere(instance *I) {
if ((I == NULL) || (Instances::of_kind(I, K_backdrop) == FALSE)) {
StandardProblems::sentence_problem(Task::syntax_tree(), _p_(PM_EverywhereNonBackdrop),
"only a backdrop can be everywhere",
@@ -368,7 +368,7 @@ been asserted true:
-int PL::Backdrops::backdrops_complete_model(int stage) {
+int PL::Backdrops::backdrops_complete_model(int stage) {
if (stage == WORLD_STAGE_II) {
P_absent = EitherOrProperties::new_nameless(L"absent");
RTProperties::implement_as_attribute(P_absent, TRUE);
diff --git a/docs/if-module/3-dvc.html b/docs/if-module/3-dvc.html
index 012efa6f9..8faadb833 100644
--- a/docs/if-module/3-dvc.html
+++ b/docs/if-module/3-dvc.html
@@ -86,9 +86,9 @@ age of Inter we want to avoid that sort of tomfoolery.
-void PL::Devices::start(void) {
- PLUGIN_REGISTER(PLUGIN_NEW_BASE_KIND_NOTIFY, PL::Devices::devices_new_base_kind_notify);
- PLUGIN_REGISTER(PLUGIN_COMPLETE_MODEL, PL::Devices::IF_complete_model);
+void PL::Devices::start(void) {
+ REGISTER(NEW_BASE_KIND_NOTIFY_PCALL, PL::Devices::devices_new_base_kind_notify);
+ REGISTER(COMPLETE_MODEL_PCALL, PL::Devices::IF_complete_model);
}
@@ -101,7 +101,7 @@ age of Inter we want to avoid that sort of tomfoolery.
-int PL::Devices::devices_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
+int PL::Devices::devices_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
if (<notable-device-kinds>(W)) { K_device = new_base; return TRUE; }
return FALSE;
}
@@ -109,7 +109,7 @@ age of Inter we want to avoid that sort of tomfoolery.
-int PL::Devices::IF_complete_model(int stage) {
+int PL::Devices::IF_complete_model(int stage) {
if (stage == WORLD_STAGE_III) {
P_switchable = EitherOrProperties::new_nameless(L"switchable");
RTProperties::implement_as_attribute(P_switchable, TRUE);
diff --git a/docs/if-module/3-enah.html b/docs/if-module/3-enah.html
index 7a17ee4eb..9c4134608 100644
--- a/docs/if-module/3-enah.html
+++ b/docs/if-module/3-enah.html
@@ -88,7 +88,7 @@ function togglePopup(material_id) {
-void WherePredicates::start(void) {
+void WherePredicates::start(void) {
everywhere_up_family = UnaryPredicateFamilies::new();
METHOD_ADD(everywhere_up_family, STOCK_UPF_MTID, WherePredicates::stock_everywhere);
METHOD_ADD(everywhere_up_family, LOG_UPF_MTID, WherePredicates::log_everywhere);
diff --git a/docs/if-module/3-mcr.html b/docs/if-module/3-mcr.html
index f7c9fd0ff..c93e7437f 100644
--- a/docs/if-module/3-mcr.html
+++ b/docs/if-module/3-mcr.html
@@ -80,7 +80,7 @@ function togglePopup(material_id) {
bp_family *map_connecting_bp_family = NULL;
-void PL::MapDirections::start(void) {
+void PL::MapDirections::start(void) {
map_connecting_bp_family = BinaryPredicateFamilies::new();
METHOD_ADD(map_connecting_bp_family, TYPECHECK_BPF_MTID, PL::MapDirections::typecheck);
METHOD_ADD(map_connecting_bp_family, ASSERT_BPF_MTID, PL::MapDirections::assert);
@@ -400,7 +400,7 @@ such.
instance *PL::MapDirections::get_mapping_relationship(parse_node *p) {
binary_predicate *bp = Node::get_relationship(p);
- if ((bp) && (Plugins::Manage::plugged_in(map_plugin))) {
+ if ((bp) && (PluginManager::active(map_plugin))) {
instance *dir = PL::MapDirections::get_mapping_direction(
BinaryPredicates::get_reversal(bp));
if (dir == NULL) dir = PL::MapDirections::get_mapping_direction(bp);
diff --git a/docs/if-module/3-prs.html b/docs/if-module/3-prs.html
index 457b18010..9f9d40d43 100644
--- a/docs/if-module/3-prs.html
+++ b/docs/if-module/3-prs.html
@@ -86,14 +86,14 @@ sort of tomfoolery.
-void PL::Persons::start(void) {
- PLUGIN_REGISTER(PLUGIN_COMPLETE_MODEL, PL::Persons::IF_complete_model);
+void PL::Persons::start(void) {
+ REGISTER(COMPLETE_MODEL_PCALL, PL::Persons::IF_complete_model);
}
-int PL::Persons::IF_complete_model(int stage) {
+int PL::Persons::IF_complete_model(int stage) {
if ((stage == WORLD_STAGE_III) && (K_person)) {
P_animate = EitherOrProperties::new_nameless(L"animate");
RTProperties::implement_as_attribute(P_animate, TRUE);
diff --git a/docs/if-module/3-rgn.html b/docs/if-module/3-rgn.html
index ca503dbc2..17987cbc3 100644
--- a/docs/if-module/3-rgn.html
+++ b/docs/if-module/3-rgn.html
@@ -111,25 +111,25 @@ following minimal structure, though it will only be relevant for instances of
-void PL::Regions::start(void) {
- PLUGIN_REGISTER(PLUGIN_CREATE_INFERENCES, PL::Regions::create_inference_subjects);
- PLUGIN_REGISTER(PLUGIN_NEW_BASE_KIND_NOTIFY, PL::Regions::regions_new_base_kind_notify);
- PLUGIN_REGISTER(PLUGIN_SET_SUBKIND_NOTIFY, PL::Regions::regions_set_subkind_notify);
- PLUGIN_REGISTER(PLUGIN_NEW_SUBJECT_NOTIFY, PL::Regions::regions_new_subject_notify);
- PLUGIN_REGISTER(PLUGIN_NEW_PROPERTY_NOTIFY, PL::Regions::regions_new_property_notify);
- PLUGIN_REGISTER(PLUGIN_COMPLETE_MODEL, PL::Regions::regions_complete_model);
- PLUGIN_REGISTER(PLUGIN_MORE_SPECIFIC, PL::Regions::regions_more_specific);
- PLUGIN_REGISTER(PLUGIN_ESTIMATE_PROPERTY_USAGE, PL::Regions::regions_estimate_property_usage);
- PLUGIN_REGISTER(PLUGIN_INTERVENE_IN_ASSERTION, PL::Regions::regions_intervene_in_assertion);
- PLUGIN_REGISTER(PLUGIN_NAME_TO_EARLY_INFS, PL::Regions::regions_name_to_early_infs);
- PLUGIN_REGISTER(PLUGIN_ADD_TO_WORLD_INDEX, PL::Regions::regions_add_to_World_index);
+void PL::Regions::start(void) {
+ REGISTER(CREATE_INFERENCES_PCALL, PL::Regions::create_inference_subjects);
+ REGISTER(NEW_BASE_KIND_NOTIFY_PCALL, PL::Regions::regions_new_base_kind_notify);
+ REGISTER(SET_SUBKIND_NOTIFY_PCALL, PL::Regions::regions_set_subkind_notify);
+ REGISTER(NEW_SUBJECT_NOTIFY_PCALL, PL::Regions::regions_new_subject_notify);
+ REGISTER(NEW_PROPERTY_NOTIFY_PCALL, PL::Regions::regions_new_property_notify);
+ REGISTER(COMPLETE_MODEL_PCALL, PL::Regions::regions_complete_model);
+ REGISTER(MORE_SPECIFIC_PCALL, PL::Regions::regions_more_specific);
+ REGISTER(ESTIMATE_PROPERTY_USAGE_PCALL, PL::Regions::regions_estimate_property_usage);
+ REGISTER(INTERVENE_IN_ASSERTION_PCALL, PL::Regions::regions_intervene_in_assertion);
+ REGISTER(NAME_TO_EARLY_INFS_PCALL, PL::Regions::regions_name_to_early_infs);
+ REGISTER(ADD_TO_WORLD_INDEX_PCALL, PL::Regions::regions_add_to_World_index);
}
void PL::Regions::create_inference_subjects(void) {
infs_region = InferenceSubjects::new_fundamental(global_constants, "region(early)");
}
-regions_data *PL::Regions::new_data(inference_subject *subj) {
+regions_data *PL::Regions::new_data(inference_subject *subj) {
regions_data *rd = CREATE(regions_data);
rd->in_region = NULL;
rd->in_region_set_at = NULL;
@@ -137,7 +137,7 @@ following minimal structure, though it will only be relevant for instances of
return rd;
}
-inter_name *PL::Regions::found_in_iname(instance *I) {
+inter_name *PL::Regions::found_in_iname(instance *I) {
if (REGIONS_DATA(I)->in_region_iname == NULL)
REGIONS_DATA(I)->in_region_iname = Hierarchy::make_iname_in(REGION_FOUND_IN_FN_HL, RTInstances::package(I));
return REGIONS_DATA(I)->in_region_iname;
@@ -156,14 +156,14 @@ there is no need to translate this to other languages.)
-int PL::Regions::regions_new_base_kind_notify(kind *new_base, char *text_stream, wording W) {
+int PL::Regions::regions_new_base_kind_notify(kind *new_base, char *text_stream, wording W) {
if (<notable-regions-kinds>(W)) {
K_region = new_base; return TRUE;
}
return FALSE;
}
-int PL::Regions::regions_new_subject_notify(inference_subject *subj) {
+int PL::Regions::regions_new_subject_notify(inference_subject *subj) {
ATTACH_PLUGIN_DATA_TO_SUBJECT(regions, subj, PL::Regions::new_data(subj));
return FALSE;
}
@@ -172,7 +172,7 @@ there is no need to translate this to other languages.)
-int PL::Regions::regions_set_subkind_notify(kind *sub, kind *super) {
+int PL::Regions::regions_set_subkind_notify(kind *sub, kind *super) {
if ((sub == K_region) && (super != K_object)) {
if (problem_count == 0)
StandardProblems::sentence_problem(Task::syntax_tree(), _p_(PM_RegionAdrift),
@@ -188,8 +188,8 @@ there is no need to translate this to other languages.)
-int PL::Regions::object_is_a_region(instance *I) {
- if ((Plugins::Manage::plugged_in(regions_plugin)) && (K_region) && (I) &&
+int PL::Regions::object_is_a_region(instance *I) {
+ if ((PluginManager::active(regions_plugin)) && (K_region) && (I) &&
(Instances::of_kind(I, K_region))) return TRUE;
return FALSE;
}
@@ -201,7 +201,7 @@ domains.)
-int PL::Regions::regions_more_specific(instance *I1, instance *I2) {
+int PL::Regions::regions_more_specific(instance *I1, instance *I2) {
int r1 = Instances::of_kind(I1, K_room);
int r2 = Instances::of_kind(I2, K_room);
int reg1 = Instances::of_kind(I1, K_region);
@@ -228,7 +228,7 @@ Standard Rules. (So there is no need to translate this to other languages.)
-int PL::Regions::regions_new_property_notify(property *prn) {
+int PL::Regions::regions_new_property_notify(property *prn) {
if (<notable-regions-properties>(prn->name))
P_map_region = prn;
return FALSE;
@@ -237,7 +237,7 @@ Standard Rules. (So there is no need to translate this to other languages.)
-int PL::Regions::regions_estimate_property_usage(kind *k, int *words_used) {
+int PL::Regions::regions_estimate_property_usage(kind *k, int *words_used) {
if (Kinds::eq(k, K_region)) *words_used += 2;
return FALSE;
}
@@ -247,7 +247,7 @@ messages which would have been less helpful if core Inform had produced them.
-int PL::Regions::regions_intervene_in_assertion(parse_node *px, parse_node *py) {
+int PL::Regions::regions_intervene_in_assertion(parse_node *px, parse_node *py) {
if ((Node::get_type(px) == PROPER_NOUN_NT) &&
(Node::get_type(py) == COMMON_NOUN_NT)) {
inference_subject *left_subject = Node::get_subject(px);
@@ -288,7 +288,7 @@ messages which would have been less helpful if core Inform had produced them.
-int PL::Regions::regions_name_to_early_infs(wording W, inference_subject **infs) {
+int PL::Regions::regions_name_to_early_infs(wording W, inference_subject **infs) {
if ((<notable-regions-kinds>(W)) && (K_region == NULL)) *infs = infs_region;
return FALSE;
}
@@ -296,7 +296,7 @@ messages which would have been less helpful if core Inform had produced them.
-void PL::Regions::create_relations(void) {
+void PL::Regions::create_relations(void) {
R_regional_containment =
BinaryPredicates::make_pair(spatial_bp_family,
BPTerms::new(infs_region),
@@ -315,7 +315,7 @@ to participate in nonspatial relations.)
-int PL::Regions::assert_relations(binary_predicate *relation,
+int PL::Regions::assert_relations(binary_predicate *relation,
instance *I0, instance *I1) {
int I0_is_region = FALSE;
if (Instances::of_kind(I0, K_region)) I0_is_region = TRUE;
@@ -394,7 +394,7 @@ region is either the next broadest region containing it, or else
-instance *PL::Regions::enclosing(instance *reg) {
+instance *PL::Regions::enclosing(instance *reg) {
instance *P = NULL;
if (PL::Spatial::object_is_a_room(reg)) P = REGIONS_DATA(reg)->in_region;
if (PL::Regions::object_is_a_region(reg)) P = PL::Spatial::progenitor(reg);
@@ -405,7 +405,7 @@ region is either the next broadest region containing it, or else §18. Model completion.
-int PL::Regions::regions_complete_model(int stage) {
+int PL::Regions::regions_complete_model(int stage) {
if (stage == WORLD_STAGE_II) Assert map-region properties of rooms and regions18.1;
if (stage == WORLD_STAGE_III) Assert regional-found-in properties of regions18.2;
return FALSE;
@@ -482,7 +482,7 @@ region is either the next broadest region containing it, or else §20.
-int PL::Regions::regions_add_to_World_index(OUTPUT_STREAM, instance *O) {
+int PL::Regions::regions_add_to_World_index(OUTPUT_STREAM, instance *O) {
if ((O) && (Instances::of_kind(O, K_room))) {
instance *R = PL::Regions::enclosing(O);
if (R) PL::HTMLMap::colour_chip(OUT, O, R, REGIONS_DATA(O)->in_region_set_at);
diff --git a/docs/if-module/3-sc.html b/docs/if-module/3-sc.html
index 71594d356..0b813609d 100644
--- a/docs/if-module/3-sc.html
+++ b/docs/if-module/3-sc.html
@@ -79,7 +79,7 @@ plugged in.
-void PL::Showme::start(void) {
+void PL::Showme::start(void) {
}
void PL::Showme::compile_SHOWME_details(void) {
- if (Plugins::Manage::plugged_in(showme_plugin) == FALSE) return;
+ if (PluginManager::active(showme_plugin) == FALSE) return;
inter_name *iname = Hierarchy::find(SHOWMEDETAILS_HL);
packaging_state save = Routines::begin(iname);
inter_symbol *t_0_s = LocalVariables::add_named_call_as_symbol(I"t_0");
@@ -209,11 +209,11 @@ second of just one from "person".
-int PL::Showme::is_property_worth_SHOWME(inference_subject *subj, property *prn, inter_symbol *t_0_s, inter_symbol *na_s) {
+int PL::Showme::is_property_worth_SHOWME(inference_subject *subj, property *prn, inter_symbol *t_0_s, inter_symbol *na_s) {
return PL::Showme::SHOWME_primitive(subj, prn, FALSE, t_0_s, na_s);
}
-void PL::Showme::compile_property_SHOWME(inference_subject *subj, property *prn, inter_symbol *t_0_s, inter_symbol *na_s) {
+void PL::Showme::compile_property_SHOWME(inference_subject *subj, property *prn, inter_symbol *t_0_s, inter_symbol *na_s) {
PL::Showme::SHOWME_primitive(subj, prn, TRUE, t_0_s, na_s);
}
@@ -221,7 +221,7 @@ second of just one from "person".
-int PL::Showme::SHOWME_primitive(inference_subject *subj, property *prn, int comp, inter_symbol *t_0_s, inter_symbol *na_s) {
+int PL::Showme::SHOWME_primitive(inference_subject *subj, property *prn, int comp, inter_symbol *t_0_s, inter_symbol *na_s) {
if (IXProperties::is_shown_in_index(prn) == FALSE) return FALSE;
if (RTProperties::can_be_compiled(prn) == FALSE) return FALSE;
diff --git a/docs/if-module/3-scn.html b/docs/if-module/3-scn.html
index c7066628b..d1090942c 100644
--- a/docs/if-module/3-scn.html
+++ b/docs/if-module/3-scn.html
@@ -170,17 +170,17 @@ including bit 1 which records whether the scene has started.
-void PL::Scenes::start(void) {
- PLUGIN_REGISTER(PLUGIN_NEW_PROPERTY_NOTIFY, PL::Scenes::scenes_new_property_notify);
- PLUGIN_REGISTER(PLUGIN_NEW_INSTANCE_NOTIFY, PL::Scenes::scenes_new_named_instance_notify);
- PLUGIN_REGISTER(PLUGIN_NEW_BASE_KIND_NOTIFY, PL::Scenes::scenes_new_base_kind_notify);
+void PL::Scenes::start(void) {
+ REGISTER(NEW_PROPERTY_NOTIFY_PCALL, PL::Scenes::scenes_new_property_notify);
+ REGISTER(NEW_INSTANCE_NOTIFY_PCALL, PL::Scenes::scenes_new_named_instance_notify);
+ REGISTER(NEW_BASE_KIND_NOTIFY_PCALL, PL::Scenes::scenes_new_base_kind_notify);
}
-int PL::Scenes::scenes_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
+int PL::Scenes::scenes_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
if (Str::eq_wide_string(name, L"SCENE_TY")) {
K_scene = new_base; return TRUE;
}
@@ -200,7 +200,7 @@ Standard Rules. (So there is no need to translate this to other languages.)
-int PL::Scenes::scenes_new_property_notify(property *prn) {
+int PL::Scenes::scenes_new_property_notify(property *prn) {
if (<notable-scene-properties>(prn->name)) {
switch (<<r>>) {
case 0: P_recurring = prn; break;
@@ -214,7 +214,7 @@ kind "scene" is created, and this is where that happens.
-int PL::Scenes::scenes_new_named_instance_notify(instance *I) {
+int PL::Scenes::scenes_new_named_instance_notify(instance *I) {
if ((K_scene) && (Kinds::eq(Instances::to_kind(I), K_scene))) {
PL::Scenes::new_scene(I);
return TRUE;
@@ -227,7 +227,7 @@ is created:
-void PL::Scenes::new_scene(instance *I) {
+void PL::Scenes::new_scene(instance *I) {
scene *sc = CREATE(scene);
Connect the scene structure to the instance12.3;
Initialise the scene structure12.1;
@@ -277,21 +277,21 @@ to translate this to other languages.)
-scene *PL::Scenes::from_named_constant(instance *I) {
+scene *PL::Scenes::from_named_constant(instance *I) {
if (K_scene == NULL) return NULL;
kind *K = Instances::to_kind(I);
if (Kinds::eq(K, K_scene)) return PLUGIN_DATA_ON_SUBJECT(scenes, I->as_subject);
return NULL;
}
-wording PL::Scenes::get_name(scene *sc) {
+wording PL::Scenes::get_name(scene *sc) {
return Instances::get_name(sc->as_instance, FALSE);
}
-int PL::Scenes::parse_scene_end_name(scene *sc, wording EW, int create) {
+int PL::Scenes::parse_scene_end_name(scene *sc, wording EW, int create) {
int i;
for (i=2; i<sc->no_ends; i++)
if (Wordings::match(EW, sc->end_names[i]))
@@ -326,7 +326,7 @@ to translate this to other languages.)
-void PL::Scenes::new_scene_rulebook(scene *sc, int end) {
+void PL::Scenes::new_scene_rulebook(scene *sc, int end) {
wording RW = EMPTY_WORDING, AW = EMPTY_WORDING;
Compose a name and alternate name for the new scene end rulebook15.1;
@@ -409,7 +409,7 @@ begins when...".
-int PL::Scenes::begins_when_SMF(int task, parse_node *V, wording *NPs) {
+int PL::Scenes::begins_when_SMF(int task, parse_node *V, wording *NPs) {
wording SW = (NPs)?(NPs[0]):EMPTY_WORDING;
wording OW = (NPs)?(NPs[1]):EMPTY_WORDING;
switch (task) {
@@ -435,7 +435,7 @@ two noun phrases and sometimes three.
-int PL::Scenes::ends_when_SMF(int task, parse_node *V, wording *NPs) {
+int PL::Scenes::ends_when_SMF(int task, parse_node *V, wording *NPs) {
wording SW = (NPs)?(NPs[0]):EMPTY_WORDING;
wording OW = (NPs)?(NPs[1]):EMPTY_WORDING;
wording O2W = (NPs)?(NPs[2]):EMPTY_WORDING;
@@ -623,7 +623,7 @@ ends" the other end.
-void PL::Scenes::new_scene_anchor(parse_node *p, int phase, int given_end) {
+void PL::Scenes::new_scene_anchor(parse_node *p, int phase, int given_end) {
scene *this_scene = NULL;
int end = -1;
@@ -861,7 +861,7 @@ below.
-void PL::Scenes::test_scene_end(scene *sc, int end, inter_symbol *ch_s, inter_symbol *CScene_l) {
+void PL::Scenes::test_scene_end(scene *sc, int end, inter_symbol *ch_s, inter_symbol *CScene_l) {
if ((end == 0) && (sc->start_of_play)) {
Produce::inv_primitive(Emit::tree(), IF_BIP);
Produce::down(Emit::tree());
@@ -954,7 +954,7 @@ for this purpose.
-void PL::Scenes::compile_scene_end(scene *sc, int end) {
+void PL::Scenes::compile_scene_end(scene *sc, int end) {
scene *sc2;
LOOP_OVER(sc2, scene) sc2->marker = 0;
PL::Scenes::compile_scene_end_dash(sc, end);
@@ -970,7 +970,7 @@ take effect first.
-void PL::Scenes::compile_scene_end_dash(scene *sc, int end) {
+void PL::Scenes::compile_scene_end_dash(scene *sc, int end) {
int ix = sc->allocation_id;
sc->marker++;
if (end >= 2) {
diff --git a/docs/if-module/3-sm.html b/docs/if-module/3-sm.html
index b648adbc3..a36dcf2c9 100644
--- a/docs/if-module/3-sm.html
+++ b/docs/if-module/3-sm.html
@@ -275,7 +275,7 @@ timing issue to get around (see below).
-void PL::Spatial::start(void) {
+void PL::Spatial::start(void) {
IS_ROOM_INF = Inferences::new_family(I"IS_ROOM_INF");
METHOD_ADD(IS_ROOM_INF, EXPLAIN_CONTRADICTION_INF_MTID, PL::Spatial::is_room_explain_contradiction);
CONTAINS_THINGS_INF = Inferences::new_family(I"CONTAINS_THINGS_INF");
@@ -291,19 +291,19 @@ timing issue to get around (see below).
METHOD_ADD(PART_OF_INF, LOG_DETAILS_INF_MTID, PL::Spatial::log_part_of_inference);
METHOD_ADD(PART_OF_INF, COMPARE_INF_MTID, PL::Spatial::cmp_part_of_inference);
- PLUGIN_REGISTER(PLUGIN_CREATE_INFERENCES, PL::Spatial::create_inference_subjects);
- PLUGIN_REGISTER(PLUGIN_NEW_BASE_KIND_NOTIFY, PL::Spatial::spatial_new_base_kind_notify);
- PLUGIN_REGISTER(PLUGIN_ACT_ON_SPECIAL_NPS, PL::Spatial::spatial_act_on_special_NPs);
- PLUGIN_REGISTER(PLUGIN_COMPLETE_MODEL, PL::Spatial::IF_complete_model);
- PLUGIN_REGISTER(PLUGIN_DEFAULT_APPEARANCE, PL::Spatial::spatial_default_appearance);
- PLUGIN_REGISTER(PLUGIN_NAME_TO_EARLY_INFS, PL::Spatial::spatial_name_to_early_infs);
- PLUGIN_REGISTER(PLUGIN_NEW_SUBJECT_NOTIFY, PL::Spatial::spatial_new_subject_notify);
- PLUGIN_REGISTER(PLUGIN_NEW_PROPERTY_NOTIFY, PL::Spatial::spatial_new_property_notify);
- PLUGIN_REGISTER(PLUGIN_PARSE_COMPOSITE_NQS, PL::Spatial::spatial_parse_composite_NQs);
- PLUGIN_REGISTER(PLUGIN_SET_KIND_NOTIFY, PL::Spatial::spatial_set_kind_notify);
- PLUGIN_REGISTER(PLUGIN_SET_SUBKIND_NOTIFY, PL::Spatial::spatial_set_subkind_notify);
- PLUGIN_REGISTER(PLUGIN_ADD_TO_WORLD_INDEX, PL::Spatial::spatial_add_to_World_index);
- PLUGIN_REGISTER(PLUGIN_INTERVENE_IN_ASSERTION, PL::Spatial::spatial_intervene_in_assertion);
+ REGISTER(CREATE_INFERENCES_PCALL, PL::Spatial::create_inference_subjects);
+ REGISTER(NEW_BASE_KIND_NOTIFY_PCALL, PL::Spatial::spatial_new_base_kind_notify);
+ REGISTER(ACT_ON_SPECIAL_NPS_PCALL, PL::Spatial::spatial_act_on_special_NPs);
+ REGISTER(COMPLETE_MODEL_PCALL, PL::Spatial::IF_complete_model);
+ REGISTER(DEFAULT_APPEARANCE_PCALL, PL::Spatial::spatial_default_appearance);
+ REGISTER(NAME_TO_EARLY_INFS_PCALL, PL::Spatial::spatial_name_to_early_infs);
+ REGISTER(NEW_SUBJECT_NOTIFY_PCALL, PL::Spatial::spatial_new_subject_notify);
+ REGISTER(NEW_PROPERTY_NOTIFY_PCALL, PL::Spatial::spatial_new_property_notify);
+ REGISTER(PARSE_COMPOSITE_NQS_PCALL, PL::Spatial::spatial_parse_composite_NQs);
+ REGISTER(SET_KIND_NOTIFY_PCALL, PL::Spatial::spatial_set_kind_notify);
+ REGISTER(SET_SUBKIND_NOTIFY_PCALL, PL::Spatial::spatial_set_subkind_notify);
+ REGISTER(ADD_TO_WORLD_INDEX_PCALL, PL::Spatial::spatial_add_to_World_index);
+ REGISTER(INTERVENE_IN_ASSERTION_PCALL, PL::Spatial::spatial_intervene_in_assertion);
}
int PL::Spatial::is_room_explain_contradiction(inference_family *f, inference *A,
@@ -316,7 +316,7 @@ timing issue to get around (see below).
return TRUE;
}
-instance *PL::Spatial::get_inferred_parent(inference *inf) {
+instance *PL::Spatial::get_inferred_parent(inference *inf) {
if (inf->family == PARENTAGE_INF) {
parentage_inference_data *data = RETRIEVE_POINTER_parentage_inference_data(inf->data);
return InstanceSubjects::to_object_instance(data->parent);
@@ -377,7 +377,7 @@ after stage (d) when they exist.
-void PL::Spatial::create_inference_subjects(void) {
+void PL::Spatial::create_inference_subjects(void) {
infs_room = InferenceSubjects::new_fundamental(global_constants, "room(early)");
infs_thing = InferenceSubjects::new_fundamental(global_constants, "thing(early)");
infs_supporter = InferenceSubjects::new_fundamental(global_constants, "supporter(early)");
@@ -392,7 +392,7 @@ pointers to it remain consistent and valid.)
-int PL::Spatial::spatial_name_to_early_infs(wording W, inference_subject **infs) {
+int PL::Spatial::spatial_name_to_early_infs(wording W, inference_subject **infs) {
if (<notable-spatial-kinds>(W)) {
switch (<<r>>) {
case 0: if (K_room == NULL) *infs = infs_room; break;
@@ -409,7 +409,7 @@ pointers to it remain consistent and valid.)
-spatial_data *PL::Spatial::new_data(inference_subject *subj) {
+spatial_data *PL::Spatial::new_data(inference_subject *subj) {
spatial_data *sd = CREATE(spatial_data);
sd->progenitor = NULL; sd->progenitor_set_at = NULL; sd->part_flag = FALSE;
sd->object_tree_parent = NULL; sd->object_tree_child = NULL; sd->object_tree_sibling = NULL;
@@ -437,7 +437,7 @@ Rules. (So there is no need to translate this to other languages.)
-int PL::Spatial::spatial_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
+int PL::Spatial::spatial_new_base_kind_notify(kind *new_base, text_stream *name, wording W) {
if (<notable-spatial-kinds>(W)) {
switch (<<r>>) {
case 0: K_room = new_base; return TRUE;
@@ -451,7 +451,7 @@ Rules. (So there is no need to translate this to other languages.)
return FALSE;
}
-int PL::Spatial::spatial_new_subject_notify(inference_subject *subj) {
+int PL::Spatial::spatial_new_subject_notify(inference_subject *subj) {
ATTACH_PLUGIN_DATA_TO_SUBJECT(spatial, subj, PL::Spatial::new_data(subj));
return FALSE;
}
@@ -462,7 +462,7 @@ if it turns out to be news, we infer
diff --git a/docs/inform7/preform-diagnostics.txt b/docs/inform7/preform-diagnostics.txt
index 5c360724f..c2b65a2ff 100644
--- a/docs/inform7/preform-diagnostics.txt
+++ b/docs/inform7/preform-diagnostics.txt
@@ -1,10 +1,10 @@
- internal nti 19 constraint (none) extremes [1, 1]
+ internal nti 18 constraint (none) extremes [1, 1]
- internal hits 904/5712 nti 20 constraint (none) extremes [0, 0]
+ internal hits 1152/6782 nti 19 constraint (none) extremes [0, 0]
- internal hits 3873/7958 nti 21 constraint (none) extremes [0, 0]
+ internal hits 3873/7958 nti 20 constraint (none) extremes [0, 0]
- hits 746/1492 nti 22 constraint (none) extremes [1, infinity)
+ hits 746/1492 nti 21 constraint (none) extremes [1, infinity)
English:
{......}
(hits 746/746) (matched long text) constraint (none) extremes [1, infinity)
@@ -14,24 +14,24 @@
{......} , {......}
(hits 6/13) (matched long text) constraint DS = {15} extremes [3, infinity)
- internal nti 23 constraint (none) extremes [1, 1]
+ internal nti 22 constraint (none) extremes [1, 1]
- internal hits 2894/22686 nti 24 constraint (none) extremes [1, 1]
+ internal hits 2894/22582 nti 23 constraint (none) extremes [1, 1]
- internal nti 25 constraint (none) extremes [1, 1]
+ internal nti 24 constraint (none) extremes [1, 1]
- internal hits 25/50 nti 26 constraint (none) extremes [1, 1]
+ internal hits 25/50 nti 25 constraint (none) extremes [1, 1]
- internal nti 27 constraint (none) extremes [1, 1]
+ internal nti 26 constraint (none) extremes [1, 1]
- internal hits 2/12958 nti 28 constraint (none) extremes [0, 0]
+ internal hits 2/12958 nti 27 constraint (none) extremes [0, 0]
hits 0/18 nti 16 constraint DS = {16} extremes [3, infinity)
English:
{......} , _or {......}
- (hits 0/9) constraint DS = {16} extremes [4, infinity)
+ (hits 0/7) constraint DS = {16} extremes [4, infinity)
{......} _or {......}
- (hits 0/9) constraint DS = {16} extremes [3, infinity)
+ (hits 0/7) constraint DS = {16} extremes [3, infinity)
nti 17 constraint DS = {17} extremes [3, infinity)
English:
@@ -73,11 +73,11 @@
{...} than
constraint DS = {22} extremes [2, infinity)
- internal nti 29 constraint (none) extremes [1, infinity)
+ internal nti 28 constraint (none) extremes [1, infinity)
- internal nti 30 constraint (none) extremes [1, infinity)
+ internal nti 29 constraint (none) extremes [1, infinity)
- nti 31 constraint CW = {23, 24, 25} extremes [2, 2]
+ nti 30 constraint CW = {23, 24, 25} extremes [2, 2]
English:
constraint CS = {23} extremes [2, 2]
@@ -339,7 +339,7 @@
yw* an
constraint CS = {25} extremes [2, 2]
- nti 6 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [3, infinity)
+ nti 31 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [3, infinity)
English:
{...}
constraint DS = {26} extremes [3, infinity)
@@ -1499,7 +1499,7 @@
shouldn't shouldn't
constraint CS = {25} extremes [2, 2]
- nti 7 constraint DW = {12, 13, 14, 15, 16} extremes [3, infinity)
+ nti 6 constraint DW = {12, 13, 14, 15, 16} extremes [3, infinity)
English:
{...}
constraint DS = {12} extremes [3, infinity)
@@ -2025,7 +2025,7 @@
* 0ing
constraint CS = {16} extremes [2, 2]
- nti 8 constraint DW = {17, 18, 19, 20, 21, 22} extremes [2, infinity)
+ nti 7 constraint DW = {17, 18, 19, 20, 21, 22} extremes [2, infinity)
English:
constraint CS = {17} extremes [2, 2]
@@ -2337,7 +2337,7 @@
write written
constraint CS = {17} extremes [2, 2]
- nti 9 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [2, infinity)
+ nti 8 constraint DW = {6, 7, 26, 27, 28, 29, 30, 31} extremes [2, infinity)
English:
constraint CS = {30} extremes [2, 2]
@@ -2353,7 +2353,7 @@
do does
constraint CS = {30} extremes [2, 2]
- nti 10 constraint DW = {18, 19, 20, 21, 22} extremes [3, infinity)
+ nti 9 constraint DW = {18, 19, 20, 21, 22} extremes [3, infinity)
English:
{...}
constraint DS = {18} extremes [3, infinity)
@@ -3595,7 +3595,7 @@
* 0ed
constraint CS = {22} extremes [2, 2]
- nti 11 constraint DW = {9, 10, 11} extremes [2, infinity)
+ nti 10 constraint DW = {9, 10, 11} extremes [2, infinity)
English:
constraint CS = {9} extremes [2, 2]
@@ -4642,7 +4642,7 @@
* 1
constraint CS = {21} extremes [2, 2]
- nti 12 constraint CS = {22} extremes [1, 1]
+ nti 11 constraint CS = {22} extremes [1, 1]
English:
constraint CS = {22} extremes [1, 1]
@@ -4728,45 +4728,45 @@
twelfth
constraint CS = {27} extremes [1, 1]
- internal hits 200/24320 nti r0 constraint CS = {r0} extremes [1, 1]
+ internal hits 200/24854 nti r0 constraint CS = {r0} extremes [1, 1]
internal nti r1 constraint CS = {r1} extremes [1, 1]
- internal hits 36/72 nti 13 constraint (none) extremes [1, 1]
+ internal hits 36/72 nti 12 constraint (none) extremes [1, 1]
- internal hits 0/258 nti 18 constraint (none) extremes [1, infinity)
+ internal hits 0/258 nti 17 constraint (none) extremes [1, infinity)
- hits 36075/72150 nti 14 constraint (none) extremes [1, infinity)
+ hits 36149/72298 nti 13 constraint (none) extremes [1, infinity)
English:
{...}
- (hits 7694/36075) (matched long text) constraint (none) extremes [2, infinity)
+ (hits 7696/36149) (matched long text) constraint (none) extremes [2, infinity)
{...}
- (hits 28381/28381) (matched long text) constraint (none) extremes [1, infinity)
+ (hits 28453/28453) (matched long text) constraint (none) extremes [1, infinity)
- nti 15 constraint (none) extremes [1, infinity)
+ nti 14 constraint (none) extremes [1, infinity)
English:
{...}
constraint (none) extremes [2, infinity)
{...}
constraint (none) extremes [1, infinity)
- hits 81396/162792 nti 16 constraint (none) extremes [1, infinity)
+ hits 81310/162620 nti 15 constraint (none) extremes [1, infinity)
English:
{...}
- (hits 15779/46532) (matched long text) constraint (none) extremes [2, infinity)
+ (hits 15777/46498) (matched long text) constraint (none) extremes [2, infinity)
{...}
- (hits 65617/65617) (matched long text) constraint (none) extremes [1, infinity)
+ (hits 65533/65533) (matched long text) constraint (none) extremes [1, infinity)
- nti 17 constraint (none) extremes [2, infinity)
+ nti 16 constraint (none) extremes [2, infinity)
English:
{...}
constraint (none) extremes [2, infinity)
- internal hits 16202/96586 nti r2 constraint (none) extremes [1, 1]
+ internal hits 16200/96518 nti r2 constraint (none) extremes [1, 1]
- internal hits 21511/254058 nti r2 constraint (none) extremes [1, 1]
+ internal hits 21513/254408 nti r2 constraint (none) extremes [1, 1]
- internal hits 2324/40848 nti r2 constraint (none) extremes [1, 1]
+ internal hits 2234/40600 nti r2 constraint (none) extremes [1, 1]
nti r2 constraint CS = {r2} extremes [6, 6]
English:
@@ -4830,37 +4830,37 @@
hits 16/21706 nti 29 constraint DS = {29} extremes [2, infinity)
English:
not {...}
- (hits 16/6996) (matched long text) constraint DS = {29} extremes [2, infinity)
+ (hits 16/5426) (matched long text) constraint DS = {29} extremes [2, infinity)
hits 79/158 nti 30 constraint (none) extremes [1, infinity)
English:
of the {...}
(hits 0/16) constraint DS = {30} extremes [3, infinity)
of {...}
- (hits 0/28) constraint DS = {30} extremes [2, infinity)
+ (hits 0/24) constraint DS = {30} extremes [2, infinity)
{...}
(hits 79/79) (matched: 'dvd carried by the person asked') constraint (none) extremes [1, infinity)
hits 0/21422 nti 31 constraint DS = {31} extremes [2, infinity)
English:
no one {***}
- (hits 0/6031) constraint DS = {31} extremes [2, infinity)
+ (hits 0/5390) constraint DS = {31} extremes [2, infinity)
- internal hits 92/1190 nti 18 constraint (none) extremes [1, 1]
+ internal hits 92/1190 nti 17 constraint (none) extremes [1, 1]
- internal hits 7/56 nti 19 constraint (none) extremes [1, 1]
+ internal hits 7/56 nti 18 constraint (none) extremes [1, 1]
- internal hits 490/20500 nti 20 constraint (none) extremes [1, 1]
+ internal hits 490/20500 nti 19 constraint (none) extremes [1, 1]
- internal nti 21 constraint (none) extremes [1, 1]
+ internal nti 20 constraint (none) extremes [1, 1]
- internal nti 22 constraint (none) extremes [1, 1]
+ internal nti 21 constraint (none) extremes [1, 1]
- internal hits 0/444 nti 23 constraint (none) extremes [1, 1]
+ internal hits 0/444 nti 22 constraint (none) extremes [1, 1]
- internal hits 0/172 nti 24 constraint (none) extremes [1, 1]
+ internal hits 0/172 nti 23 constraint (none) extremes [1, 1]
- internal hits 0/690 nti 25 constraint (none) extremes [1, 1]
+ internal hits 0/690 nti 24 constraint (none) extremes [1, 1]
nti 6 constraint CS = {6} extremes [6, 6]
English:
@@ -4911,51 +4911,51 @@
here here here here here here
constraint CS = {12} extremes [6, 6]
- internal hits 3902/8516 nti 6 constraint FS = {6} extremes [1, infinity)
+ internal hits 3986/8928 nti 6 constraint FS = {6} extremes [1, infinity)
internal hits 16/128 nti 7 constraint FS = {7} extremes [1, infinity)
- internal hits 1/5826 nti 8 constraint FS = {8} extremes [1, infinity)
+ internal hits 1/8730 nti 8 constraint FS = {8} extremes [1, infinity)
- internal hits 0/2350 nti 9 constraint FS = {9} extremes [1, infinity)
+ internal hits 0/1480 nti 9 constraint FS = {9} extremes [1, infinity)
internal nti 10 constraint FS = {10} extremes [1, infinity)
internal nti 11 constraint FS = {11} extremes [1, infinity)
- internal hits 210/5162 nti 26 constraint (none) extremes [1, infinity)
+ internal hits 210/5162 nti 25 constraint (none) extremes [1, infinity)
- internal hits 59/4030 nti 27 constraint (none) extremes [1, infinity)
+ internal hits 59/4030 nti 26 constraint (none) extremes [1, infinity)
- internal hits 1/2 nti 28 constraint (none) extremes [1, infinity)
+ internal hits 1/2 nti 27 constraint (none) extremes [1, infinity)
- internal nti 29 constraint (none) extremes [1, infinity)
+ internal nti 28 constraint (none) extremes [1, infinity)
- internal hits 58/118 nti 30 constraint (none) extremes [1, infinity)
+ internal hits 58/118 nti 29 constraint (none) extremes [1, infinity)
internal nti 12 constraint DS = {12} extremes [1, infinity)
- internal hits 635/18276 nti 13 constraint DS = {13} extremes [1, infinity)
+ internal hits 635/17878 nti 13 constraint DS = {13} extremes [1, infinity)
- internal hits 258/7900 nti 14 constraint DS = {14} extremes [1, infinity)
+ internal hits 258/8202 nti 14 constraint DS = {14} extremes [1, infinity)
- hits 67/4072 nti 13 constraint CS = {13} extremes [1, 1]
+ hits 67/4430 nti 13 constraint CS = {13} extremes [1, 1]
English:
always/certainly
- (hits 10/829) (matched: 'always') constraint CS = {13} extremes [1, 1]
+ (hits 10/1136) (matched: 'always') constraint CS = {13} extremes [1, 1]
usually/normally
- (hits 53/819) (matched: 'usually') constraint CS = {13} extremes [1, 1]
+ (hits 53/1126) (matched: 'usually') constraint CS = {13} extremes [1, 1]
rarely/seldom
- (hits 0/766) constraint CS = {13} extremes [1, 1]
+ (hits 0/1073) constraint CS = {13} extremes [1, 1]
never
- (hits 4/766) (matched: 'never') constraint CS = {13} extremes [1, 1]
+ (hits 4/1073) (matched: 'never') constraint CS = {13} extremes [1, 1]
initially
- (hits 0/762) constraint CS = {13} extremes [1, 1]
+ (hits 0/1069) constraint CS = {13} extremes [1, 1]
hits 0/4304 nti 14 constraint DS = {14} extremes [1, infinity)
English:
{***} once/twice/thrice/turn/turns/time/times
- (hits 0/1645) constraint DS = {14} extremes [1, infinity)
+ (hits 0/1589) constraint DS = {14} extremes [1, infinity)
nti 18 constraint DW = {15, 16, 17, 18} extremes [1, 9]
English:
@@ -4983,7 +4983,7 @@
constraint DW = {15, 16} extremes [1, 6]
- nti 31 constraint DW = {15, 16} extremes [1, 6]
+ nti 30 constraint DW = {15, 16} extremes [1, 6]
English:
constraint DS = {15} extremes [1, 6]
@@ -5010,7 +5010,7 @@
turn/turns
constraint DS = {16} extremes [2, 3]
- nti 6 constraint (none) extremes [1, 2]
+ nti 31 constraint (none) extremes [1, 2]
English:
constraint (none) extremes [2, 2]
@@ -5019,24 +5019,24 @@
constraint CS = {r0} extremes [1, 1]
- hits 3152/6304 nti 7 constraint (none) extremes [1, infinity)
+ hits 3152/6304 nti 6 constraint (none) extremes [1, infinity)
English:
{...}
(hits 3152/3152) (matched long text) constraint (none) extremes [1, infinity)
- hits 60/120 nti 8 constraint (none) extremes [0, infinity)
+ hits 60/120 nti 7 constraint (none) extremes [0, infinity)
English:
^
(hits 0/60) constraint (none) extremes [0, infinity)
(hits 60/60) (matched: 'fixed in place') constraint (none) extremes [1, infinity)
- hits 33/108210 nti 19 constraint CS = {19} extremes [1, 1]
+ hits 33/109970 nti 19 constraint CS = {19} extremes [1, 1]
English:
there
- (hits 33/42) (matched: 'there') constraint CS = {19} extremes [1, 1]
+ (hits 33/317) (matched: 'there') constraint CS = {19} extremes [1, 1]
- hits 2081/4162 nti 9 constraint (none) extremes [1, infinity)
+ hits 2081/4162 nti 8 constraint (none) extremes [1, infinity)
English:
{...}
(hits 99/2081) (matched: '"(considering the first sixteen objects only)[command clarification break]" ( a )') constraint (none) extremes [1, infinity)
@@ -5047,46 +5047,46 @@
(hits 999/999) (matched long text) constraint (none) extremes [1, infinity)
- hits 255/510 nti 10 constraint (none) extremes [0, infinity)
+ hits 255/510 nti 9 constraint (none) extremes [0, infinity)
English:
^
(hits 0/255) constraint (none) extremes [0, infinity)
(hits 255/255) (matched long text) constraint (none) extremes [1, infinity)
- hits 279/558 nti 11 constraint (none) extremes [1, infinity)
+ hits 279/558 nti 10 constraint (none) extremes [1, infinity)
English:
{...}
(hits 99/279) (matched long text) constraint (none) extremes [1, infinity)
- (hits 99/152) (matched long text) constraint DS = {20} extremes [2, infinity)
+ (hits 99/135) (matched long text) constraint DS = {20} extremes [2, infinity)
(hits 81/81) (matched long text) constraint (none) extremes [1, infinity)
- hits 198/1292 nti 20 constraint DS = {20} extremes [2, infinity)
+ hits 198/1204 nti 20 constraint DS = {20} extremes [2, infinity)
English:
, _{and}
- (hits 0/538) constraint DS = {20} extremes [3, infinity)
+ (hits 0/530) constraint DS = {20} extremes [3, infinity)
_{,/and}
- (hits 198/589) (matched long text) constraint DS = {20} extremes [2, infinity)
+ (hits 198/566) (matched long text) constraint DS = {20} extremes [2, infinity)
- hits 103/206 nti 12 constraint (none) extremes [1, infinity)
+ hits 103/206 nti 11 constraint (none) extremes [1, infinity)
English:
{...}
(hits 30/103) (matched: 'unmarked for listing') constraint (none) extremes [1, infinity)
- (hits 30/33) (matched: 'marked for listing or unmarked for listing') constraint DS = {21} extremes [2, infinity)
+ (hits 30/32) (matched: 'marked for listing or unmarked for listing') constraint DS = {21} extremes [2, infinity)
(hits 43/43) (matched: 'pushable between rooms') constraint (none) extremes [1, infinity)
- hits 60/144 nti 21 constraint DS = {21} extremes [2, infinity)
+ hits 60/142 nti 21 constraint DS = {21} extremes [2, infinity)
English:
, _{or}
(hits 0/13) constraint DS = {21} extremes [3, infinity)
_{,/or}
(hits 60/69) (matched: 'or unmarked for listing') constraint DS = {21} extremes [2, infinity)
- hits 460/920 nti 13 constraint (none) extremes [1, infinity)
+ hits 460/920 nti 12 constraint (none) extremes [1, infinity)
English:
constraint CS = {19} extremes [1, 1]
@@ -5095,26 +5095,26 @@
(hits 460/460) (matched long text) constraint (none) extremes [1, infinity)
- hits 576/1152 nti 14 constraint (none) extremes [1, infinity)
+ hits 576/1152 nti 13 constraint (none) extremes [1, infinity)
English:
(hits 0/576) constraint (none) extremes [1, infinity)
(hits 576/576) (matched long text) constraint (none) extremes [1, infinity)
- hits 0/920 nti 15 constraint (none) extremes [1, infinity)
+ hits 0/920 nti 14 constraint (none) extremes [1, infinity)
English:
- (hits 0/2) constraint CS = {22} extremes [1, 2]
+ (hits 0/1) constraint CS = {22} extremes [1, 2]
{***}
(hits 0/453) constraint (none) extremes [1, infinity)
- (hits 0/368) constraint DS = {14} extremes [2, infinity)
+ (hits 0/381) constraint DS = {14} extremes [2, infinity)
- hits 0/1962 nti 16 constraint (none) extremes [1, infinity)
+ hits 0/1962 nti 15 constraint (none) extremes [1, infinity)
English:
- constraint CS = {22} extremes [1, 2]
+ (hits 0/3) constraint CS = {22} extremes [1, 2]
(hits 0/981) constraint (none) extremes [1, infinity)
@@ -5123,38 +5123,38 @@
thing/something
(hits 61/61) (matched: 'thing') constraint CS = {29} extremes [1, 1]
- internal hits 388/16686 nti 17 constraint (none) extremes [1, 1]
+ internal hits 388/16686 nti 16 constraint (none) extremes [1, 1]
- hits 0/4 nti 22 constraint CS = {22} extremes [1, 2]
+ hits 0/8 nti 22 constraint CS = {22} extremes [1, 2]
English:
worn
- (hits 0/2) constraint CS = {22} extremes [1, 1]
+ (hits 0/4) constraint CS = {22} extremes [1, 1]
carried
- (hits 0/2) constraint CS = {22} extremes [1, 1]
+ (hits 0/4) constraint CS = {22} extremes [1, 1]
initially carried
constraint CS = {22} extremes [2, 2]
- hits 0/2698 nti 28 constraint DS = {14} extremes [2, infinity)
+ hits 0/2724 nti 28 constraint DS = {14} extremes [2, infinity)
English:
_,/and {...}
- (hits 0/382) constraint DS = {14, 28} extremes [3, infinity)
+ (hits 0/561) constraint DS = {14, 28} extremes [3, infinity)
_,/and
- (hits 0/417) constraint DS = {14, 28} extremes [2, infinity)
+ (hits 0/674) constraint DS = {14, 28} extremes [2, infinity)
- (hits 0/876) constraint DS = {14} extremes [2, infinity)
+ (hits 0/940) constraint DS = {14} extremes [2, infinity)
hits 1467/2934 nti 27 constraint (none) extremes [1, infinity)
English:
{...}
(hits 174/1467) (matched long text) constraint (none) extremes [1, infinity)
{called}
- (hits 57/774) (matched long text) constraint DS = {27} extremes [1, infinity)
+ (hits 57/725) (matched long text) constraint DS = {27} extremes [1, infinity)
- (hits 0/719) constraint DS = {24} extremes [2, infinity)
+ (hits 0/751) constraint DS = {24} extremes [2, infinity)
- (hits 87/289) (matched long text) constraint DS = {25} extremes [1, infinity)
+ (hits 87/381) (matched long text) constraint DS = {25} extremes [1, infinity)
- (hits 30/218) (matched: 'a kind of supporter that is portable') constraint DS = {26} extremes [1, infinity)
+ (hits 30/266) (matched: 'a kind of supporter that is portable') constraint DS = {26} extremes [1, infinity)
(hits 4/349) (matched: 'it') constraint (none) extremes [1, 1]
@@ -5162,7 +5162,7 @@
(hits 1115/1115) (matched long text) constraint (none) extremes [1, infinity)
- hits 431/862 nti 18 constraint (none) extremes [0, infinity)
+ hits 431/862 nti 17 constraint (none) extremes [0, infinity)
English:
(hits 0/431) constraint (none) extremes [1, infinity)
@@ -5171,18 +5171,18 @@
(hits 431/431) (matched long text) constraint (none) extremes [1, infinity)
- hits 0/10806 nti 24 constraint DS = {24} extremes [2, infinity)
+ hits 0/10898 nti 24 constraint DS = {24} extremes [2, infinity)
English:
it with action {***}
- (hits 0/3908) constraint DS = {24} extremes [3, infinity)
+ (hits 0/3893) constraint DS = {24} extremes [3, infinity)
{with/having} (/) {***}
- (hits 0/4114) constraint DS = {24} extremes [2, infinity)
+ (hits 0/4092) constraint DS = {24} extremes [2, infinity)
{with/having} {...} ( )
- (hits 0/3509) constraint DS = {24} extremes [5, infinity)
+ (hits 0/3503) constraint DS = {24} extremes [5, infinity)
{with/having}
- (hits 0/4114) constraint DS = {24} extremes [2, infinity)
+ (hits 0/4092) constraint DS = {24} extremes [2, infinity)
- nti 19 constraint (none) extremes [1, infinity)
+ nti 18 constraint (none) extremes [1, infinity)
English:
{...}
constraint (none) extremes [1, infinity)
@@ -5198,55 +5198,55 @@
_{,/and}
constraint DS = {23} extremes [2, infinity)
- nti 20 constraint (none) extremes [1, infinity)
+ nti 19 constraint (none) extremes [1, infinity)
English:
{...}
constraint (none) extremes [1, infinity)
- hits 174/2106 nti 25 constraint DS = {25} extremes [1, infinity)
+ hits 174/2936 nti 25 constraint DS = {25} extremes [1, infinity)
English:
, _{and}
- (hits 8/752) (matched: ', and didn't understand addressee's last name error') constraint DS = {25} extremes [2, infinity)
+ (hits 8/855) (matched: ', and didn't understand addressee's last name error') constraint DS = {25} extremes [2, infinity)
_{,/and}
- (hits 166/882) (matched long text) constraint DS = {25} extremes [1, infinity)
+ (hits 166/906) (matched long text) constraint DS = {25} extremes [1, infinity)
- hits 30/436 nti 21 constraint DS = {26} extremes [1, infinity)
+ hits 30/532 nti 20 constraint DS = {26} extremes [1, infinity)
English:
- (hits 30/214) (matched: 'a kind of supporter that is portable') constraint DS = {26} extremes [2, infinity)
+ (hits 30/266) (matched: 'a kind of supporter that is portable') constraint DS = {26} extremes [2, infinity)
- (hits 0/188) constraint DS = {26} extremes [1, infinity)
+ (hits 0/236) constraint DS = {26} extremes [1, infinity)
- hits 30/464 nti 26 constraint DS = {26} extremes [1, infinity)
+ hits 30/636 nti 26 constraint DS = {26} extremes [1, infinity)
English:
kind/kinds
- (hits 4/10) (matched: 'kind') constraint CS = {26} extremes [1, 1]
+ (hits 4/38) (matched: 'kind') constraint CS = {26} extremes [1, 1]
kind/kinds of
- (hits 26/222) (matched: 'kind of supporter that is portable') constraint DS = {26} extremes [2, infinity)
+ (hits 26/280) (matched: 'kind of supporter that is portable') constraint DS = {26} extremes [2, infinity)
- internal nti 22 constraint (none) extremes [1, infinity)
+ internal nti 21 constraint (none) extremes [1, infinity)
- internal hits 1357/2714 nti 23 constraint (none) extremes [1, infinity)
+ internal hits 1357/2714 nti 22 constraint (none) extremes [1, infinity)
- hits 0/2764 nti 24 constraint DS = {13} extremes [2, infinity)
+ hits 0/2764 nti 23 constraint DS = {13} extremes [2, infinity)
English:
{...}
- (hits 0/924) constraint DS = {13} extremes [2, infinity)
+ (hits 0/1029) constraint DS = {13} extremes [2, infinity)
- hits 67/2764 nti 25 constraint DS = {13} extremes [2, infinity)
+ hits 67/2764 nti 24 constraint DS = {13} extremes [2, infinity)
English:
{...}
- (hits 67/1112) (matched: 'usually table of general chitchat') constraint DS = {13} extremes [2, infinity)
+ (hits 67/1186) (matched: 'usually table of general chitchat') constraint DS = {13} extremes [2, infinity)
- hits 739/25832 nti 30 constraint CS = {30} extremes [1, 1]
+ hits 667/25436 nti 30 constraint CS = {30} extremes [1, 1]
English:
which/who/that
- (hits 739/6361) (matched: 'which') constraint CS = {30} extremes [1, 1]
+ (hits 667/6132) (matched: 'which') constraint CS = {30} extremes [1, 1]
- hits 2/2742 nti 26 constraint DS = {30} extremes [2, infinity)
+ hits 2/2742 nti 25 constraint DS = {30} extremes [2, infinity)
English:
{...}
- (hits 2/843) (matched: 'answering it that') constraint DS = {30} extremes [2, infinity)
+ (hits 2/803) (matched: 'answering it that') constraint DS = {30} extremes [2, infinity)
nti 31 constraint DS = {31} extremes [3, infinity)
English:
@@ -5256,7 +5256,7 @@
hits 196/9062 nti 6 constraint DS = {6} extremes [2, infinity)
English:
of {...}
- (hits 196/2198) (matched: 'of day -- documented at var_time --') constraint DS = {6} extremes [2, infinity)
+ (hits 196/2387) (matched: 'of day -- documented at var_time --') constraint DS = {6} extremes [2, infinity)
hits 5/60 nti 7 constraint CS = {7} extremes [2, 2]
English:
@@ -5271,9 +5271,9 @@
grammatical case
(hits 1/1) (matched: 'grammatical case') constraint CS = {7} extremes [2, 2]
- internal hits 2474/40954 nti 27 constraint (none) extremes [0, 0]
+