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

Refactored inter symbols once again

Browse source
This commit is contained in:
Graham Nelson 2019-04-17 10:03:07 +01:00
parent 346218caac
commit 1d0e102c99
59 changed files with 290 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
inform7/core-module/Chapter 12/Compile Deferred Propositions.w
View file

@ -1000,7 +1000,7 @@ In the next case, we want to form the list of all $x$ for which $\phi(x)$
is true. The local |list| holds the list so far, and already exists.
@<Initialisation before LIST search@> =
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUEWRITE_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUEWRITE_HL));
Emit::down();
Emit::val_symbol(K_value, list_s);
Emit::val_iname(K_value, Hierarchy::find(LIST_ITEM_KOV_F_HL));
@ -1010,7 +1010,7 @@ is true. The local |list| holds the list so far, and already exists.
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, total_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, list_s);
Emit::up();
@ -1059,7 +1059,7 @@ syntax to break or continue a loop other than the innermost one.
Emit::up();
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, list_s);
Emit::val_symbol(K_value, total_s);
@ -1067,7 +1067,7 @@ syntax to break or continue a loop other than the innermost one.
Emit::up();
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUEWRITE_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUEWRITE_HL));
Emit::down();
Emit::val_symbol(K_value, list_s);
Emit::inv_primitive(minus_interp);
@ -1090,7 +1090,7 @@ is what we do for multipurpose deferred propositions -- the labels do
not have clashing names.
@<Winding-up after LIST search@> =
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, list_s);
Emit::val_symbol(K_value, counter_s);

22
inform7/core-module/Chapter 12/Deciding to Defer.w
View file

@ -191,7 +191,7 @@ and the function header of |Prop_19| might then look like so:
The value of |cinder_count| would then be 2.
@<Compile the call to the test-proposition routine@> =
Emit::inv_call(InterNames::to_symbol(pdef->ppd_iname));
Emit::inv_call_iname(pdef->ppd_iname);
Emit::down();
Calculus::Deferrals::Cinders::find_emit(prop, pdef);
if (substitution) Specifications::Compiler::emit_as_val(K_value, substitution);
@ -443,7 +443,7 @@ void Calculus::Deferrals::emit_now_proposition(pcalc_prop *prop) {
if (quantifier_count > 0) {
pcalc_prop_deferral *pdef = Calculus::Deferrals::new_deferred_proposition(prop, NOW_ASSERTION_DEFER);
Emit::inv_call(InterNames::to_symbol(pdef->ppd_iname));
Emit::inv_call_iname(pdef->ppd_iname);
Emit::down();
Calculus::Deferrals::Cinders::find_emit(prop, pdef);
Emit::up();
@ -670,7 +670,7 @@ void Calculus::Deferrals::emit_call_to_deferred_desc(pcalc_prop *prop,
=
void Calculus::Deferrals::emit_list_of_S(parse_node *spec, kind *K) {
if (Calculus::Deferrals::spec_is_variable_of_kind_description(spec)) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_DESC_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_DESC_HL));
Emit::down();
Frames::emit_allocation(K);
Specifications::Compiler::emit_as_val(K_value, spec);
@ -1120,15 +1120,15 @@ void Calculus::Deferrals::emit_loop_over_list_S(parse_node *spec, local_variable
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, val_var_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUECREATE_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUECREATE_HL));
Emit::down();
Kinds::RunTime::emit_strong_id_as_val(CK);
Emit::up();
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUECOPYAZ_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUECOPYAZ_HL));
Emit::down();
Emit::val_symbol(K_value, val_var_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETITEM_HL));
Emit::down();
Emit::val_symbol(K_value, copy_var_s);
Emit::val_symbol(K_value, index_var_s);
@ -1140,7 +1140,7 @@ void Calculus::Deferrals::emit_loop_over_list_S(parse_node *spec, local_variable
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, val_var_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETITEM_HL));
Emit::down();
Emit::val_symbol(K_value, copy_var_s);
Emit::val_symbol(K_value, index_var_s);
@ -1154,7 +1154,7 @@ void Calculus::Deferrals::emit_loop_over_list_S(parse_node *spec, local_variable
Emit::inv_primitive(le_interp);
Emit::down();
Emit::val_symbol(K_value, index_var_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, copy_var_s);
Emit::up();
@ -1167,10 +1167,10 @@ void Calculus::Deferrals::emit_loop_over_list_S(parse_node *spec, local_variable
Emit::ref_symbol(K_value, index_var_s);
Emit::up();
if (pointery) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUECOPYAZ_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUECOPYAZ_HL));
Emit::down();
Emit::val_symbol(K_value, val_var_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETITEM_HL));
Emit::down();
Emit::val_symbol(K_value, copy_var_s);
Emit::val_symbol(K_value, index_var_s);
@ -1181,7 +1181,7 @@ void Calculus::Deferrals::emit_loop_over_list_S(parse_node *spec, local_variable
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, val_var_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETITEM_HL));
Emit::down();
Emit::val_symbol(K_value, copy_var_s);
Emit::val_symbol(K_value, index_var_s);

32
inform7/core-module/Chapter 13/Compile Arithmetic.w
View file

@ -19,7 +19,7 @@ void Kinds::Compile::perform_arithmetic_emit(int op, equation *eqn,
}
@<Choose which form of arithmetic and promotion@>;
if (reduce_modulo_1440) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NUMBER_TY_TO_TIME_TY_HL)));
Emit::inv_call_iname(Hierarchy::find(NUMBER_TY_TO_TIME_TY_HL));
Emit::down();
}
switch (op) {
@ -77,7 +77,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit plus@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_PLUS_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_PLUS_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;
@ -96,7 +96,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit minus@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_MINUS_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_MINUS_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;
@ -115,7 +115,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit times@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_TIMES_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_TIMES_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;
@ -136,7 +136,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit divide@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_DIVIDE_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_DIVIDE_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;
@ -146,7 +146,7 @@ and the other operand is promoted from integer to real if necessary.
if (promote_Y) Kinds::FloatingPoint::end_flotation_emit(KY);
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(INTEGERDIVIDE_HL)));
Emit::inv_call_iname(Hierarchy::find(INTEGERDIVIDE_HL));
Emit::down();
Kinds::Dimensions::kind_rescale_division_emit_op(KX, KY);
@<Emit the X-operand@>;
@ -157,7 +157,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit remainder@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_REMAINDER_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_REMAINDER_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;
@ -167,7 +167,7 @@ and the other operand is promoted from integer to real if necessary.
if (promote_Y) Kinds::FloatingPoint::end_flotation_emit(KY);
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(INTEGERREMAINDER_HL)));
Emit::inv_call_iname(Hierarchy::find(INTEGERREMAINDER_HL));
Emit::down();
@<Emit the X-operand@>;
@<Emit the Y-operand@>;
@ -176,7 +176,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit approximation@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_APPROXIMATE_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_APPROXIMATE_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;
@ -186,7 +186,7 @@ and the other operand is promoted from integer to real if necessary.
if (promote_Y) Kinds::FloatingPoint::end_flotation_emit(KY);
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(ROUNDOFFTIME_HL)));
Emit::inv_call_iname(Hierarchy::find(ROUNDOFFTIME_HL));
Emit::down();
@<Emit the X-operand@>;
@<Emit the Y-operand@>;
@ -195,12 +195,12 @@ and the other operand is promoted from integer to real if necessary.
@<Emit root@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_ROOT_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_ROOT_HL));
Emit::down();
@<Emit the X-operand@>;
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(SQUAREROOT_HL)));
Emit::inv_call_iname(Hierarchy::find(SQUAREROOT_HL));
Emit::down();
Kinds::Dimensions::kind_rescale_root_emit_op(KX, 2);
@<Emit the X-operand@>;
@ -210,12 +210,12 @@ and the other operand is promoted from integer to real if necessary.
@<Emit cube root@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_CUBE_ROOT_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_CUBE_ROOT_HL));
Emit::down();
@<Emit the X-operand@>;
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(CUBEROOT_HL)));
Emit::inv_call_iname(Hierarchy::find(CUBEROOT_HL));
Emit::down();
Kinds::Dimensions::kind_rescale_root_emit_op(KX, 3);
@<Emit the X-operand@>;
@ -237,7 +237,7 @@ and the other operand is promoted from integer to real if necessary.
@<Emit unary minus@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_NEGATE_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_NEGATE_HL));
Emit::down();
@<Emit the X-operand@>;
Emit::up();
@ -254,7 +254,7 @@ always be small, partly because of the need for scaling to come out right.
@<Emit a power of the left operand@> =
if (use_fp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_POW_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_POW_HL));
Emit::down();
if (promote_X) Kinds::FloatingPoint::begin_flotation_emit(KX);
@<Emit the X-operand@>;

30
inform7/core-module/Chapter 13/Runtime Support for Kinds.w
View file

@ -391,7 +391,7 @@ int Kinds::RunTime::emit_cast_call(kind *from, kind *to, int *down) {
Kinds::Behaviour::get_name_in_template_code(to));
inter_name *iname = Hierarchy::find_by_name(N);
DISCARD_TEXT(N);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
*down = TRUE;
Emit::down();
if (Kinds::Behaviour::uses_pointer_values(to)) {
@ -462,7 +462,7 @@ void Kinds::RunTime::emit_weak_id_as_val(kind *K) {
if (K == NULL) internal_error("cannot emit null kind as val");
kind_constructor *con = Kinds::get_construct(K);
inter_name *iname = Kinds::Constructors::iname(con);
if (iname) Emit::val_symbol(K_value, InterNames::to_symbol(iname));
if (iname) Emit::val_iname(K_value, iname);
else Emit::val(K_value, LITERAL_IVAL, (inter_t) (Kinds::RunTime::weak_id(K)));
}
@ -519,7 +519,7 @@ void Kinds::RunTime::emit_strong_id(kind *K) {
void Kinds::RunTime::emit_strong_id_as_val(kind *K) {
runtime_kind_structure *rks = Kinds::RunTime::get_rks(K);
if (rks) {
Emit::val_symbol(K_value, InterNames::to_symbol(rks->rks_iname));
Emit::val_iname(K_value, rks->rks_iname);
} else {
Kinds::RunTime::emit_weak_id_as_val(K);
}
@ -846,14 +846,14 @@ heap_allocation Kinds::RunTime::make_heap_allocation(kind *K, int multiplier,
void Kinds::RunTime::emit_heap_allocation(heap_allocation ha) {
if (ha.stack_offset >= 0) {
inter_name *iname = Hierarchy::find(BLKVALUECREATEONSTACK_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) ha.stack_offset);
Kinds::RunTime::emit_strong_id_as_val(ha.allocated_kind);
Emit::up();
} else {
inter_name *iname = Hierarchy::find(BLKVALUECREATE_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_strong_id_as_val(ha.allocated_kind);
Emit::up();
@ -1034,7 +1034,7 @@ void Kinds::RunTime::emit(kind *K) {
dt = ENUM_IDT;
}
Emit::kind(Kinds::RunTime::iname(K), dt, S?Kinds::RunTime::iname(S):NULL, BASE_ICON, 0, NULL);
if (K == K_object) InterNames::translate(Kinds::RunTime::iname(K), I"K0_kind");
if (K == K_object) InterNames::change_translation(Kinds::RunTime::iname(K), I"K0_kind");
}
void Kinds::RunTime::kind_declarations(void) {
@ -1429,7 +1429,7 @@ deduced from its value alone, |K| must explicitly be supplied.)
Emit::down();
Emit::ref_symbol(K_value, k_s);
inter_name *iname = Hierarchy::find(KINDATOMIC_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, k_s);
Emit::up();
@ -1449,7 +1449,7 @@ deduced from its value alone, |K| must explicitly be supplied.)
Emit::code();
Emit::down();
inter_name *pname = Kinds::Behaviour::get_iname(K);
Emit::inv_call(InterNames::to_symbol(pname));
Emit::inv_call_iname(pname);
Emit::down();
Emit::val_symbol(K_value, v_s);
Emit::up();
@ -1485,7 +1485,7 @@ which have to be given some type-safe value to start out at.
Emit::down();
Emit::ref_symbol(K_value, k_s);
inter_name *iname = Hierarchy::find(KINDATOMIC_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, sk_s);
Emit::up();
@ -1509,7 +1509,7 @@ which have to be given some type-safe value to start out at.
Emit::down();
if (Kinds::Behaviour::uses_pointer_values(K)) {
inter_name *iname = Hierarchy::find(BLKVALUECREATE_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, sk_s);
Emit::up();
@ -1554,7 +1554,7 @@ unless the two values are genuinely equal.
Emit::down();
Emit::ref_symbol(K_value, k_s);
inter_name *iname = Hierarchy::find(KINDATOMIC_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, k_s);
Emit::up();
@ -1608,7 +1608,7 @@ unless the two values are genuinely equal.
Emit::down();
Emit::ref_symbol(K_value, k_s);
inter_name *iname = Hierarchy::find(KINDATOMIC_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, k_s);
Emit::up();
@ -1663,7 +1663,7 @@ storing pointers to blocks on the heap.
Emit::down();
Emit::ref_symbol(K_value, k_s);
inter_name *iname = Hierarchy::find(KINDATOMIC_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, k_s);
Emit::up();
@ -1705,7 +1705,7 @@ such a function does, see "BlockValues.i6t".
Emit::down();
Emit::ref_symbol(K_value, k_s);
inter_name *iname = Hierarchy::find(KINDATOMIC_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, k_s);
Emit::up();
@ -1741,7 +1741,7 @@ such a function does, see "BlockValues.i6t".
Emit::val_symbol(K_value, fail_s);
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUEERROR_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUEERROR_HL));
Emit::down();
Emit::val_symbol(K_value, fail_s);
Emit::up();

2
inform7/core-module/Chapter 14/Compiling from Specifications.w
View file

@ -106,7 +106,7 @@ void Specifications::Compiler::spec_compile_primitive(value_holster *VH, parse_n
if (TEST_COMPILATION_MODE(DEREFERENCE_POINTERS_CMODE)) {
kind *K = Specifications::to_kind(spec);
if ((K) && (Kinds::Behaviour::uses_pointer_values(K))) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUECOPY_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUECOPY_HL));
Emit::down();
Frames::emit_allocation(K);
dereffed = TRUE;

10
inform7/core-module/Chapter 14/Lvalues.w
View file

@ -310,7 +310,7 @@ void Lvalues::compile(value_holster *VH, parse_node *spec_found) {
Emit::val_iname(K_value, Hierarchy::find(GPROPERTY_HL));
} else {
if (!(TEST_COMPILATION_MODE(TREAT_AS_LVALUE_CMODE))) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(GPROPERTY_HL)));
Emit::inv_call_iname(Hierarchy::find(GPROPERTY_HL));
Emit::down();
}
Kinds::RunTime::emit_weak_id_as_val(owner_kind);
@ -377,7 +377,7 @@ object as produced the original text containing the substitution.
Emit::val_iname(K_value, Hierarchy::find(LIST_OF_TY_GETITEM_HL));
} else {
if (!(TEST_COMPILATION_MODE(TREAT_AS_LVALUE_CMODE))) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_GETITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_GETITEM_HL));
Emit::down();
}
BEGIN_COMPILATION_MODE;
@ -409,7 +409,7 @@ object as produced the original text containing the substitution.
LocalVariables::used_stack_selection();
LocalVariables::add_table_lookup();
if (!(TEST_COMPILATION_MODE(TREAT_AS_LVALUE_CMODE))) {
Emit::inv_call(InterNames::to_symbol(lookup));
Emit::inv_call_iname(lookup);
Emit::down();
}
local_variable *ct_0_lv = LocalVariables::by_name(I"ct_0");
@ -435,7 +435,7 @@ object as produced the original text containing the substitution.
Emit::val_iname(K_value, lookup);
} else {
if (!(TEST_COMPILATION_MODE(TREAT_AS_LVALUE_CMODE))) {
Emit::inv_call(InterNames::to_symbol(lookup));
Emit::inv_call_iname(lookup);
Emit::down();
}
Specifications::Compiler::emit_as_val(K_value, spec_found->down->next->next);
@ -454,7 +454,7 @@ object as produced the original text containing the substitution.
Emit::val_iname(K_value, lookup_corr);
} else {
if (!(TEST_COMPILATION_MODE(TREAT_AS_LVALUE_CMODE))) {
Emit::inv_call(InterNames::to_symbol(lookup_corr));
Emit::inv_call_iname(lookup_corr);
Emit::down();
}
Specifications::Compiler::emit_as_val(K_value, spec_found->down->next->next->next);

6
inform7/core-module/Chapter 15/Either-Or Properties.w
View file

@ -86,10 +86,8 @@ relies on adjectival meanings.
=
property *Properties::EitherOr::new_nameless(wchar_t *I6_form) {
wording W = Feeds::feed_text(I6_form);
property *prn = Properties::create(EMPTY_WORDING, NULL);
inter_name *iname = Properties::iname(prn);
Packaging::house(iname, Hierarchy::template());
InterNames::attach_memo(iname, W);
inter_name *iname = Hierarchy::make_iname_with_memo(PROPERTY_HL, Hierarchy::template(), W);
property *prn = Properties::create(EMPTY_WORDING, iname);
prn->either_or = TRUE;
Properties::exclude_from_index(prn);
Properties::set_translation(prn, I6_form);

3
inform7/core-module/Chapter 15/Emit Property Values.w
View file

@ -218,6 +218,9 @@ want the fastest possible access and know that it will be valid, we can use
the following.
=
void Properties::Emit::emit_iname_has_property(kind *K, inter_name *N, property *prn) {
Properties::Emit::emit_has_property(K, InterNames::to_symbol(N), prn);
}
void Properties::Emit::emit_has_property(kind *K, inter_symbol *S, property *prn) {
if (Properties::EitherOr::implemented_as_attribute(prn)) {
if (Properties::EitherOr::stored_in_negation(prn)) {

15
inform7/core-module/Chapter 15/Properties.w
View file

@ -498,7 +498,7 @@ void Properties::set_translation(property *prn, wchar_t *t) {
else
PUT_TO(T, '_');
}
Inter::Symbols::set_translate(InterNames::to_symbol(prn->prop_iname), T);
InterNames::change_translation(prn->prop_iname, T);
DISCARD_TEXT(T);
prn->translated = TRUE;
}
@ -519,7 +519,7 @@ void Properties::set_translation_S(property *prn, text_stream *t) {
PUT_TO(T, '_');
}
Str::truncate(T, 31);
Inter::Symbols::set_translate(InterNames::to_symbol(prn->prop_iname), T);
InterNames::change_translation(prn->prop_iname, T);
DISCARD_TEXT(T);
prn->translated = TRUE;
}
@ -555,7 +555,8 @@ void Properties::translates(wording W, parse_node *p2) {
"so cannot be translated.");
return;
}
if ((prn->translated) && (Str::eq_wide_string(Inter::Symbols::get_translate(InterNames::to_symbol(Properties::iname(prn))), text) == FALSE)) {
if ((prn->translated) &&
(Str::eq_wide_string(InterNames::get_translation(Properties::iname(prn)), text) == FALSE)) {
Problems::Issue::sentence_problem(_p_(PM_TranslatedTwice),
"this property has already been translated",
"so there must be some duplication somewhere.");
@ -704,11 +705,7 @@ void Properties::emit_single(property *prn) {
Emit::property(iname, K);
if (prn->run_time_only) Emit::permission(prn, K_object, NULL);
if (prn->translated) {
InterNames::annotate_i(iname, EXPLICIT_ATTRIBUTE_IANN, 1);
} else {
Inter::Symbols::set_flag(InterNames::to_symbol(iname), MAKE_NAME_UNIQUE);
}
if (prn->translated) InterNames::annotate_i(iname, EXPLICIT_ATTRIBUTE_IANN, 1);
InterNames::annotate_i(iname, SOURCE_ORDER_IANN, (inter_t) prn->allocation_id);
Packaging::exit(save);
@ -723,7 +720,7 @@ void Properties::emit(void) {
if (prn->stored_in_negation) continue;
K = K_truth_state;
}
if (K == NULL) { LOG("Is $Y %n\n", prn, prn->prop_iname); internal_error("kindless property"); }
if (K == NULL) internal_error("kindless property");
Properties::emit_single(prn);
property_permission *pp;
LOOP_OVER_PERMISSIONS_FOR_PROPERTY(pp, prn) {

5
inform7/core-module/Chapter 15/Valued Properties.w
View file

@ -61,8 +61,9 @@ Core Inform creates no such properties, but many of the plugins do.
property *Properties::Valued::new_nameless(text_stream *I6_form, kind *K) {
wording W = Feeds::feed_stream(I6_form);
if (K == NULL) internal_error("new nameless property without kind");
property *prn = Properties::create(EMPTY_WORDING, NULL);
InterNames::attach_memo(Properties::iname(prn), W);
package_request *R = Hierarchy::package(Modules::find(current_sentence), PROPERTIES_HAP);
inter_name *using_iname = Hierarchy::make_iname_with_memo(PROPERTY_HL, R, W);
property *prn = Properties::create(EMPTY_WORDING, using_iname);
Properties::exclude_from_index(prn);
prn->either_or = FALSE;
Properties::set_translation_S(prn, I6_form);

6
inform7/core-module/Chapter 17/Responses.w
View file

@ -113,7 +113,7 @@ a call to an activity based on that value:
resp->responding_rule, resp->response_marker);
inter_name *rname = Hierarchy::find(RESPONSEVIAACTIVITY_HL);
Emit::inv_call(InterNames::to_symbol(rname));
Emit::inv_call_iname(rname);
Emit::down();
Emit::val_iname(K_value, iname);
Emit::up();
@ -262,7 +262,7 @@ essence here.
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TEXT_TY_SAY_HL)));
Emit::inv_call_iname(Hierarchy::find(TEXT_TY_SAY_HL));
Emit::down();
Emit::val_symbol(K_value, str_s);
Emit::up();
@ -352,7 +352,7 @@ say |R_14_RESP_B|, we print its current text, say response (B) for |R_14|.
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Rules::RulePrintingRule()));
Emit::inv_call_iname(Rules::RulePrintingRule());
Emit::down();
Emit::val_iname(K_value, Rules::iname(resp->responding_rule));
Emit::up();

6
inform7/core-module/Chapter 17/Text Literals.w
View file

@ -107,7 +107,7 @@ literal_text *Strings::TextLiterals::lt_new(int w1, int colour) {
x->lt_sba_iname = NULL;
package_request *PR = Hierarchy::package_in_enclosure(LITERALS_HAP);
x->lt_iname = Hierarchy::make_iname_in(TEXT_LITERAL_HL, PR);
Emit::annotate_symbol_i(InterNames::to_symbol(x->lt_iname), TEXT_LITERAL_IANN, 1);
InterNames::annotate_i(x->lt_iname, TEXT_LITERAL_IANN, 1);
if ((wn_quote_suppressed >= 0) && (w1 == wn_quote_suppressed)) x->unexpanded = TRUE;
return x;
}
@ -252,10 +252,8 @@ int Strings::TextLiterals::CCOUNT_QUOTATIONS(void) {
=
void Strings::TextLiterals::compile_literal_from_text(inter_t *v1, inter_t *v2, wchar_t *p) {
literal_text *lt = Strings::TextLiterals::compile_literal(NULL, TRUE, Feeds::feed_text(p));
inter_name *iname = lt->lt_sba_iname;
InterNames::to_symbol(iname);
inter_reading_state *IRS = Emit::IRS();
InterNames::to_ival(IRS->read_into, IRS->current_package, v1, v2, iname);
InterNames::to_ival(IRS->read_into, IRS->current_package, v1, v2, lt->lt_sba_iname);
}
@ The above gradually piled up the need for |TX_L_*| constants/routines,

3
inform7/core-module/Chapter 17/Text Substitutions.w
View file

@ -109,7 +109,6 @@ void Strings::TextSubstitutions::allow_no_further_text_subs(void) {
=
inter_name *Strings::TextSubstitutions::text_substitution_iname(text_substitution *ts) {
if (ts->ts_sb_needed == FALSE) InterNames::to_symbol(ts->ts_iname);
ts->ts_sb_needed = TRUE;
return ts->ts_iname;
}
@ -137,7 +136,7 @@ void Strings::TextSubstitutions::text_substitution_cue(value_holster *VH, wordin
if (phsf == NULL) phsf = Frames::current_stack_frame();
downs = LocalVariables::emit_storage(phsf);
phsf = Frames::boxed_frame(phsf);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TEXT_TY_EXPANDIFPERISHABLE_HL)));
Emit::inv_call_iname(Hierarchy::find(TEXT_TY_EXPANDIFPERISHABLE_HL));
Emit::down();
Frames::emit_allocation(K_text);
}

2
inform7/core-module/Chapter 19/Table Columns.w
View file

@ -172,7 +172,7 @@ void Tables::Columns::compile_run_time_support(void) {
Emit::up();
Emit::inv_primitive(return_interp);
Emit::down();
Emit::val_symbol(K_value, InterNames::to_symbol(Kinds::Constructors::UNKNOWN_iname()));
Emit::val_iname(K_value, Kinds::Constructors::UNKNOWN_iname());
Emit::up();
Routines::end(save);
}

2
inform7/core-module/Chapter 20/Equations.w
View file

@ -1753,7 +1753,7 @@ void Equations::enode_compile_by_emission(equation *eqn, equation_node *tok) {
Specifications::Compiler::emit_as_val(K_value, tok->leaf_symbol->var_const);
else if (tok->leaf_symbol->local_map) {
if (tok->leaf_symbol->promote_local_to_real) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NUMBER_TY_TO_REAL_NUMBER_TY_HL)));
Emit::inv_call_iname(Hierarchy::find(NUMBER_TY_TO_REAL_NUMBER_TY_HL));
Emit::down();
}
inter_symbol *tok_s = LocalVariables::declare_this(tok->leaf_symbol->local_map, FALSE, 8);

2
inform7/core-module/Chapter 21/Activities.w
View file

@ -584,7 +584,7 @@ void Activities::emit_activity_list(activity_list *al) {
while (al != NULL) {
if (++ncl < cl) { Emit::inv_primitive(or_interp); Emit::down(); downs++; }
if (al->activity != NULL) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTACTIVITY_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTACTIVITY_HL));
Emit::down();
Emit::val_iname(K_value, al->activity->av_iname);
if (al->acting_on) {

12
inform7/core-module/Chapter 21/Focus and Outcome.w
View file

@ -239,7 +239,7 @@ void Rulebooks::Outcomes::compile_default_outcome(outcomes *outs) {
switch(rbo->kind_of_outcome) {
case SUCCESS_OUTCOME: {
inter_name *iname = Hierarchy::find(RULEBOOKSUCCEEDS_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_rulebook_outcome);
Emit::val_iname(K_value, rbo->outcome_name->nro_iname);
@ -249,7 +249,7 @@ void Rulebooks::Outcomes::compile_default_outcome(outcomes *outs) {
}
case FAILURE_OUTCOME: {
inter_name *iname = Hierarchy::find(RULEBOOKFAILS_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_rulebook_outcome);
Emit::val_iname(K_value, rbo->outcome_name->nro_iname);
@ -262,7 +262,7 @@ void Rulebooks::Outcomes::compile_default_outcome(outcomes *outs) {
switch(outs->default_rule_outcome) {
case SUCCESS_OUTCOME: {
inter_name *iname = Hierarchy::find(RULEBOOKSUCCEEDS_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val(K_number, LITERAL_IVAL, 0);
Emit::val(K_number, LITERAL_IVAL, 0);
@ -272,7 +272,7 @@ void Rulebooks::Outcomes::compile_default_outcome(outcomes *outs) {
}
case FAILURE_OUTCOME: {
inter_name *iname = Hierarchy::find(RULEBOOKFAILS_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val(K_number, LITERAL_IVAL, 0);
Emit::val(K_number, LITERAL_IVAL, 0);
@ -341,7 +341,7 @@ void Rulebooks::Outcomes::compile_outcome(named_rulebook_outcome *rbno) {
switch(rbo->kind_of_outcome) {
case SUCCESS_OUTCOME: {
inter_name *iname = Hierarchy::find(RULEBOOKSUCCEEDS_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_rulebook_outcome);
Emit::val_iname(K_value, rbno->nro_iname);
@ -351,7 +351,7 @@ void Rulebooks::Outcomes::compile_outcome(named_rulebook_outcome *rbno) {
}
case FAILURE_OUTCOME: {
inter_name *iname = Hierarchy::find(RULEBOOKFAILS_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_rulebook_outcome);
Emit::val_iname(K_value, rbno->nro_iname);

2
inform7/core-module/Chapter 21/Rule Bookings.w
View file

@ -985,7 +985,7 @@ than once for each rule.
Emit::val_iname(K_number, Hierarchy::find(SAY__P_HL));
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RULEBOOKPARBREAK_HL)));
Emit::inv_call_iname(Hierarchy::find(RULEBOOKPARBREAK_HL));
Emit::down();
Emit::val_symbol(K_value, forbid_breaks_s);
Emit::up();

7
inform7/core-module/Chapter 21/Rules.w
View file

@ -315,11 +315,10 @@ failing; so it doesn't terminate the following of its rulebook.
Emit::down();
if (acl->substituted_rule) {
inter_name *subbed = Rules::iname(acl->substituted_rule);
inter_symbol *ss = InterNames::to_symbol(subbed);
if (Inter::Constant::is_routine(ss) == FALSE) {
if (Inter::Constant::is_routine(InterNames::to_symbol(subbed)) == FALSE) {
Emit::val(K_number, LITERAL_IVAL, 0);
} else {
Emit::inv_call(ss);
Emit::inv_call_iname(subbed);
}
} else {
Emit::val(K_number, LITERAL_IVAL, 0);
@ -718,7 +717,7 @@ as the definition of the rule in future.
if (Rules::compile_constraint(R->first_applicability_condition) == FALSE) {
Emit::inv_primitive(return_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(R->rule_extern_iname));
Emit::inv_call_iname(R->rule_extern_iname);
Emit::up();
}
Routines::end(save);

2
inform7/core-module/Chapter 21/Stacked Variables.w
View file

@ -269,7 +269,7 @@ int StackedVariables::compile_frame_creator(stacked_variable_owner *stvo, inter_
nonlocal_variable *q = StackedVariables::get_variable(stvl->the_stv);
kind *K = NonlocalVariables::kind(q);
if (Kinds::Behaviour::uses_pointer_values(K)) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUEFREE_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUEFREE_HL));
Emit::down();
Emit::inv_primitive(lookup_interp);
Emit::down();

4
inform7/core-module/Chapter 22/Phrase Runtime Context Data.w
View file

@ -339,7 +339,7 @@ int Phrases::Context::compile_test_head(phrase *ph, applicability_condition *acl
Emit::val_iname(K_number, Hierarchy::find(DEBUG_RULES_HL));
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DB_RULE_HL)));
Emit::inv_call_iname(Hierarchy::find(DB_RULE_HL));
Emit::down();
Emit::val_iname(K_value, identifier);
Emit::val(K_number, LITERAL_IVAL, (inter_t) ph->allocation_id);
@ -470,7 +470,7 @@ void Phrases::Context::compile_test_tail(phrase *ph, applicability_condition *ac
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DB_RULE_HL)));
Emit::inv_call_iname(Hierarchy::find(DB_RULE_HL));
Emit::down();
Emit::val_iname(K_value, identifier);
Emit::val(K_number, LITERAL_IVAL, (inter_t) ph->allocation_id);

2
inform7/core-module/Chapter 22/Phrases as Values.w
View file

@ -206,7 +206,7 @@ made above.
if (Kinds::Behaviour::uses_pointer_values(result)) {
inter_name *iname = Hierarchy::find(BLKVALUECREATE_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_strong_id_as_val(result);
Emit::up();

2
inform7/core-module/Chapter 24/Chronology.w
View file

@ -231,7 +231,7 @@ void Chronology::compile_past_tense_condition(value_holster *VH, parse_node *spe
@<Emit the op@>;
Emit::down();
}
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTSINGLEPASTSTATE_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTSINGLEPASTSTATE_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) past_flag);
Emit::val(K_number, LITERAL_IVAL, (inter_t) no_past_tenses);

2
inform7/core-module/Chapter 24/Local Variables.w
View file

@ -948,7 +948,7 @@ void LocalVariables::end_scope(int s) {
if (lvar->free_at_end_of_scope) {
inter_name *iname = Hierarchy::find(BLKVALUEFREE_HL);
inter_symbol *LN = LocalVariables::declare_this(lvar, FALSE, 2);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, LN);
Emit::up();

2
inform7/core-module/Chapter 25/Compile Invocations As Calls.w
View file

@ -40,7 +40,7 @@ void Invocations::AsCalls::emit_function_call(
COMPILATION_MODE_ENTER(DEREFERENCE_POINTERS_CMODE);
if (identifier) {
Emit::inv_call(InterNames::to_symbol(identifier));
Emit::inv_call_iname(identifier);
Emit::down();
} else if (indirect_spec) {
int arity = tokens->tokens_count;

18
inform7/core-module/Chapter 25/Compile Invocations Inline.w
View file

@ -728,7 +728,7 @@ the problem messages are phrased differently if something goes wrong.
if (allow_me == ALWAYS_MATCH) {
Specifications::Compiler::emit_to_kind(supplied, kind_needed);
} else if ((allow_me == SOMETIMES_MATCH) && (Kinds::Compare::le(kind_needed, K_object))) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(CHECKKINDRETURNED_HL)));
Emit::inv_call_iname(Hierarchy::find(CHECKKINDRETURNED_HL));
Emit::down();
Specifications::Compiler::emit_to_kind(supplied, kind_needed);
Emit::val_iname(K_value, Kinds::RunTime::I6_classname(kind_needed));
@ -778,7 +778,7 @@ the problem messages are phrased differently if something goes wrong.
action_pattern *ap = ParseTree::get_constant_action_pattern(supplied);
PL::Actions::Patterns::emit_try(ap, FALSE);
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(STORED_ACTION_TY_TRY_HL)));
Emit::inv_call_iname(Hierarchy::find(STORED_ACTION_TY_TRY_HL));
Emit::down();
Specifications::Compiler::emit_as_val(K_stored_action, supplied);
Emit::up();
@ -806,12 +806,12 @@ the problem messages are phrased differently if something goes wrong.
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(SAY__PC_HL));
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(CLEARPARAGRAPHING_HL)));
Emit::inv_call_iname(Hierarchy::find(CLEARPARAGRAPHING_HL));
Emit::down();
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
PL::Actions::Patterns::emit_try(ap, FALSE);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DIVIDEPARAGRAPHPOINT_HL)));
Emit::inv_call_iname(Hierarchy::find(DIVIDEPARAGRAPHPOINT_HL));
Emit::inv_primitive(pull_interp);
Emit::down();
Emit::ref_iname(K_value, Hierarchy::find(SAY__PC_HL));
@ -820,13 +820,13 @@ the problem messages are phrased differently if something goes wrong.
Emit::down();
Emit::ref_iname(K_value, Hierarchy::find(SAY__P_HL));
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(ADJUSTPARAGRAPHPOINT_HL)));
Emit::inv_call_iname(Hierarchy::find(ADJUSTPARAGRAPHPOINT_HL));
Emit::inv_primitive(pull_interp);
Emit::down();
Emit::ref_iname(K_value, Hierarchy::find(KEEP_SILENT_HL));
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(STORED_ACTION_TY_TRY_HL)));
Emit::inv_call_iname(Hierarchy::find(STORED_ACTION_TY_TRY_HL));
Emit::down();
Specifications::Compiler::emit_as_val(K_stored_action, supplied);
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -1055,7 +1055,7 @@ default values when created, so they are always typesafe anyway.
if (Kinds::Behaviour::uses_pointer_values(K)) {
if (Frames::Blocks::inside_a_loop_body()) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUECOPY_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUECOPY_HL));
Emit::down();
inter_symbol *lvar_s = LocalVariables::declare_this(lvar, FALSE, 8);
Emit::val_symbol(K_value, lvar_s);
@ -1294,7 +1294,7 @@ result would be the same without the optimisation.
if (Kinds::Compare::eq(K, K_number)) @<Inline say number@>;
if (Kinds::Compare::eq(K, K_unicode_character)) @<Inline say unicode character@>;
if (K) {
Emit::inv_call(InterNames::to_symbol(Kinds::Behaviour::get_iname(K)));
Emit::inv_call_iname(Kinds::Behaviour::get_iname(K));
Emit::down();
BEGIN_COMPILATION_MODE;
COMPILATION_MODE_EXIT(DEREFERENCE_POINTERS_CMODE);
@ -1320,7 +1320,7 @@ result would be the same without the optimisation.
kind *K = Specifications::to_kind(to_say);
BEGIN_COMPILATION_MODE;
COMPILATION_MODE_EXIT(DEREFERENCE_POINTERS_CMODE);
Emit::inv_call(InterNames::to_symbol(Kinds::Behaviour::get_iname(K)));
Emit::inv_call_iname(Kinds::Behaviour::get_iname(K));
Emit::down();
Specifications::Compiler::emit_to_kind(to_say, K);
Emit::up();

2
inform7/core-module/Chapter 25/Compile Invocations.w
View file

@ -384,7 +384,7 @@ no subsequent lines are looked at.
Emit::code();
Emit::down();
}
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(ARGUMENTTYPEFAILED_HL)));
Emit::inv_call_iname(Hierarchy::find(ARGUMENTTYPEFAILED_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) sl.line_number);
extension_file *ef = SourceFiles::get_extension_corresponding(sl.file_of_origin);

2
inform7/core-module/Chapter 25/Compile Phrases.w
View file

@ -583,7 +583,7 @@ void Routines::Compile::line(parse_node *p, int already_parsed, int vhm) {
(ParseTree::get_phrase_invoked(inv)) &&
(Phrases::TypeData::is_a_say_phrase(ParseTree::get_phrase_invoked(inv))) &&
(ParseTree::get_phrase_invoked(inv)->type_data.as_say.say_control_structure == NO_SAY_CS)) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARACONTENT_HL)));
Emit::inv_call_iname(Hierarchy::find(PARACONTENT_HL));
}
} else {
ExParser::parse_void_phrase(p);

9
inform7/core-module/Chapter 26/Routines.w
View file

@ -85,7 +85,6 @@ void Routines::end_in_current_package(void) {
(currently_compiling_in_frame->no_formal_parameters_needed > 0)) {
if (Packaging::houseed_in_function(public_name)) {
kernel_name = Hierarchy::make_kernel_iname(public_name->eventual_owner);
Inter::Symbols::set_flag(InterNames::to_symbol(kernel_name), MAKE_NAME_UNIQUE);
} else {
internal_error("routine not housed in function");
}
@ -146,7 +145,7 @@ after the call parameters, and is used only as a scratch variable.
if (pall->offset_past > NBV) NBV = pall->offset_past;
}
inter_name *iname = Hierarchy::find(STACKFRAMECREATE_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) NBV);
Emit::up();
@ -165,12 +164,12 @@ after the call parameters, and is used only as a scratch variable.
Emit::ref_symbol(K_value, I7RBLK_symbol);
if (returns_block_value) {
inter_name *iname = Hierarchy::find(BLKVALUECOPY_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_number,I7RBLK_symbol);
}
Emit::inv_call(InterNames::to_symbol(kernel_name));
Emit::inv_call_iname(kernel_name);
Emit::down();
LocalVariables::emit_parameter_list(currently_compiling_in_frame);
Emit::up();
@ -190,7 +189,7 @@ after the call parameters, and is used only as a scratch variable.
for (pointer_allocation *pall=currently_compiling_in_frame->allocated_pointers; pall; pall=pall->next_in_frame) {
inter_name *iname = Hierarchy::find(BLKVALUEFREEONSTACK_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) pall->offset_index);
Emit::up();

6
inform7/core-module/Chapter 26/Test Scripts.w
View file

@ -331,7 +331,7 @@ void PL::Parsing::TestScripts::TestScriptSub_routine(void) {
DISCARD_TEXT(W);
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTSTART_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTSTART_HL));
Emit::down();
Emit::val_iname(K_value, test->text_iname);
Emit::val_iname(K_value, test->req_iname);
@ -565,7 +565,7 @@ void PL::Parsing::TestScripts::emit_showme(parse_node *spec) {
DISCARD_TEXT(OUT);
if (Kinds::get_construct(K) == CON_list_of) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_SAY_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_SAY_HL));
Emit::down();
Specifications::Compiler::emit_as_val(K_value, spec);
Emit::val(K_number, LITERAL_IVAL, 1);
@ -573,7 +573,7 @@ void PL::Parsing::TestScripts::emit_showme(parse_node *spec) {
} else {
BEGIN_COMPILATION_MODE;
COMPILATION_MODE_EXIT(DEREFERENCE_POINTERS_CMODE);
Emit::inv_call(InterNames::to_symbol(Kinds::Behaviour::get_iname(K)));
Emit::inv_call_iname(Kinds::Behaviour::get_iname(K));
Emit::down();
Specifications::Compiler::emit_as_val(K_value, spec);
Emit::up();

11
inform7/core-module/Chapter 27/Emit.w
View file

@ -399,11 +399,6 @@ void Emit::append(inter_name *iname, text_stream *text) {
Emit::guard(Inter::Append::new(default_bookmark, symbol, ID, Emit::baseline(default_bookmark), NULL));
}
void Emit::translate(inter_name *iname, text_stream *text) {
inter_symbol *symbol = InterNames::to_symbol(iname);
Inter::Symbols::set_translate(symbol, text);
}
void Emit::import(inter_name *iname, wording W) {
inter_symbol *symbol = InterNames::to_symbol(iname);
inter_t ID = Inter::create_text(Emit::repository());
@ -1054,6 +1049,12 @@ void Emit::inv_call(inter_symbol *prim_symb) {
Emit::guard(Inter::Inv::new_call(Emit::at(), current_inter_routine, prim_symb, (inter_t) Emit::level(), NULL));
}
void Emit::inv_call_iname(inter_name *iname) {
if (current_inter_routine == NULL) internal_error("not in an inter routine");
inter_symbol *prim_symb = InterNames::to_symbol(iname);
Emit::guard(Inter::Inv::new_call(Emit::at(), current_inter_routine, prim_symb, (inter_t) Emit::level(), NULL));
}
void Emit::inv_indirect_call(int arity) {
switch (arity) {
case 0: Emit::inv_primitive(indirect0_interp); break;

20
inform7/core-module/Chapter 27/Hierarchy Locations.w
View file

@ -179,7 +179,7 @@ inter_name *HierarchyLocations::find_by_name(text_stream *name) {
inter_name *HierarchyLocations::function(package_request *R, text_stream *name, text_stream *trans) {
inter_name *iname = Packaging::function(InterNames::one_off(name, R), R, NULL);
if (trans) Inter::Symbols::set_translate(InterNames::to_symbol(iname), trans);
if (trans) InterNames::change_translation(iname, trans);
return iname;
}
@ -227,9 +227,11 @@ inter_name *HierarchyLocations::find_in_package(int id, package_request *P, word
if (Inter::Symbols::read_annotation(P->eventual_type, ENCLOSING_IANN) != 1)
internal_error("subpackage not in enclosing superpackage");
} else if ((P == NULL) || (P->eventual_type != nrl->requirements.any_package_of_this_type)) {
LOG("AN: %S, FPN: %S\n", nrl->access_name, nrl->function_package_name);
LOG("Have type: $3, required: $3\n", P->eventual_type, nrl->requirements.any_package_of_this_type);
internal_error("constant in wrong superpackage");
if (P != Hierarchy::template()) {
LOG("AN: %S, FPN: %S\n", nrl->access_name, nrl->function_package_name);
LOG("Have type: $3, required: $3\n", P->eventual_type, nrl->requirements.any_package_of_this_type);
internal_error("constant in wrong superpackage");
}
}
inter_name *iname = NULL;
@ -259,8 +261,7 @@ inter_name *HierarchyLocations::find_in_package(int id, package_request *P, word
@<Make the actual iname@>;
}
if (nrl->trans.then_make_unique)
Inter::Symbols::set_flag(InterNames::to_symbol(iname), MAKE_NAME_UNIQUE);
if (nrl->trans.then_make_unique) InterNames::set_flag(iname, MAKE_NAME_UNIQUE);
return iname;
}
@ -275,7 +276,7 @@ inter_name *HierarchyLocations::find_in_package(int id, package_request *P, word
else iname = InterNames::one_off(nrl->access_name, P);
}
if (!Wordings::empty(W)) InterNames::attach_memo(iname, W);
if ((Str::len(T) > 0) && (nrl->access_name)) InterNames::translate(iname, T);
if ((Str::len(T) > 0) && (nrl->access_name)) InterNames::change_translation(iname, T);
@ =
package_request *HierarchyLocations::package_in_package(int id, package_request *P) {
@ -345,8 +346,9 @@ package_request *HierarchyLocations::attach_new_package(compilation_module *C, p
else if (hap->requirements.this_exotic_package >= 0)
R = Hierarchy::exotic_package(hap->requirements.this_exotic_package);
else if (hap->requirements.any_package_of_this_type) {
if ((R == NULL) || (R->eventual_type != hap->requirements.any_package_of_this_type))
internal_error("subpackage in wrong superpackage");
if (R != Hierarchy::template())
if ((R == NULL) || (R->eventual_type != hap->requirements.any_package_of_this_type))
internal_error("subpackage in wrong superpackage");
}
return Packaging::request(Packaging::supply_iname(R, hap->counter), R, hap->type);

4
inform7/core-module/Chapter 27/Hierarchy.w
View file

@ -1606,7 +1606,9 @@ inter_name *Hierarchy::make_block_iname(package_request *P) {
}
inter_name *Hierarchy::make_kernel_iname(package_request *P) {
return Packaging::supply_iname(P, 1);
inter_name *kernel_name = Packaging::supply_iname(P, 1);
InterNames::set_flag(kernel_name, MAKE_NAME_UNIQUE);
return kernel_name;
}
inter_name *Hierarchy::make_iname_with_memo(int id, package_request *P, wording W) {

20
inform7/core-module/Chapter 27/Inter Namespace.w
View file

@ -171,6 +171,14 @@ void InterNames::attach_memo(inter_name *N, wording W) {
if (L > 28) Str::truncate(N->memo, Str::len(N->memo) - (L - 28));
}
void InterNames::change_translation(inter_name *N, text_stream *new_text) {
Inter::Symbols::set_translate(InterNames::to_symbol(N), new_text);
}
text_stream *InterNames::get_translation(inter_name *N) {
return Inter::Symbols::get_translate(InterNames::to_symbol(N));
}
inter_symbol *InterNames::to_symbol(inter_name *N) {
if (N->symbol) {
if (N->to_mark) Inter::Symbols::set_flag(N->symbol, N->to_mark);
@ -255,6 +263,14 @@ void InterNames::writer(OUTPUT_STREAM, char *format_string, void *vI) {
}
}
void InterNames::set_flag(inter_name *iname, int f) {
Inter::Symbols::set_flag(InterNames::to_symbol(iname), f);
}
void InterNames::clear_flag(inter_name *iname, int f) {
Inter::Symbols::clear_flag(InterNames::to_symbol(iname), f);
}
void InterNames::annotate_i(inter_name *iname, inter_t annot_ID, inter_t V) {
if (iname) Emit::annotate_symbol_i(InterNames::to_symbol(iname), annot_ID, V);
}
@ -496,10 +512,6 @@ inter_name *InterNames::template_weak_ID_name(text_stream *name) {
return iname;
}
void InterNames::translate(inter_name *iname, text_stream *text) {
Emit::translate(iname, text);
}
@
@e FIRST_INSTANCE_INDERIV from 26

7
inform7/core-module/Chapter 27/Packaging.w
View file

@ -333,7 +333,7 @@ inter_name *Packaging::function(inter_name *function_iname, package_request *R2,
if (temp_iname) {
TEMPORARY_TEXT(T);
WRITE_TO(T, "%n", temp_iname);
Inter::Symbols::set_translate(InterNames::to_symbol(iname), T);
InterNames::change_translation(iname, T);
DISCARD_TEXT(T);
}
return iname;
@ -343,9 +343,8 @@ inter_name *Packaging::function_text(inter_name *function_iname, package_request
package_request *R3 = Packaging::request(function_iname, R2, function_ptype);
inter_name *iname = InterNames::one_off(I"call", R3);
Packaging::house(iname, R3);
if (translation) {
Inter::Symbols::set_translate(InterNames::to_symbol(iname), translation);
}
if (translation)
InterNames::change_translation(iname, translation);
return iname;
}

4
inform7/core-module/Chapter 4/Adjective Meanings.w
View file

@ -1332,7 +1332,7 @@ void Adjectives::Meanings::agreements(void) {
Emit::down();
Emit::ref_symbol(K_value, gna_s);
inter_name *iname = Hierarchy::find(GETGNAOFOBJECT_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Emit::val_symbol(K_value, o_s);
Emit::up();
@ -1422,7 +1422,7 @@ void Adjectives::Meanings::agreements(void) {
}
void Adjectives::Meanings::emit(adjectival_phrase *aph) {
Emit::inv_call(InterNames::to_symbol(aph->aph_iname));
Emit::inv_call_iname(aph->aph_iname);
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(PRIOR_NAMED_NOUN_HL));
Emit::inv_primitive(ge_interp);

1
inform7/core-module/Chapter 5/Instances.w
View file

@ -289,7 +289,6 @@ inter_name *Instances::iname(instance *I) {
if (I == NULL) return NULL;
package_request *R = Hierarchy::local_package(INSTANCES_HAP);
UseNouns::noun_compose_identifier(R, I->tag, I->allocation_id);
InterNames::to_symbol(UseNouns::iname(I->tag));
return UseNouns::iname(I->tag);
}

29
inform7/core-module/Chapter 5/Literal Patterns.w
View file

@ -711,7 +711,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_word_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::up();
Emit::inv_primitive(postdecrement_interp);
Emit::down();
@ -800,8 +800,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::up();
Kinds::Scalings::compile_quanta_to_value(lp->scaling,
InterNames::to_symbol(Hierarchy::find(PARSED_NUMBER_HL)),
gprk->sgn_s, gprk->x_s, failed_label);
Hierarchy::find(PARSED_NUMBER_HL), gprk->sgn_s, gprk->x_s, failed_label);
Emit::inv_primitive(ifdebug_interp);
Emit::down();
@ -1023,7 +1022,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_word_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::up();
Emit::inv_primitive(store_interp);
Emit::down();
@ -1094,7 +1093,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_word_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::up();
Emit::inv_primitive(store_interp);
Emit::down();
@ -1160,7 +1159,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_word_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::up();
Emit::inv_primitive(store_interp);
Emit::down();
@ -1305,7 +1304,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->x_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(FLOATPARSE_HL)));
Emit::inv_call_iname(Hierarchy::find(FLOATPARSE_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->x_s);
Emit::val_symbol(K_value, gprk->f_s);
@ -1364,7 +1363,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::up();
Emit::inv_primitive(ge_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DIGITTOVALUE_HL)));
Emit::inv_call_iname(Hierarchy::find(DIGITTOVALUE_HL));
Emit::down();
Emit::inv_primitive(lookupbyte_interp);
Emit::down();
@ -1411,7 +1410,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::up();
Emit::inv_primitive(ge_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DIGITTOVALUE_HL)));
Emit::inv_call_iname(Hierarchy::find(DIGITTOVALUE_HL));
Emit::down();
Emit::inv_primitive(lookupbyte_interp);
Emit::down();
@ -1427,7 +1426,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->f_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DIGITTOVALUE_HL)));
Emit::inv_call_iname(Hierarchy::find(DIGITTOVALUE_HL));
Emit::down();
Emit::inv_primitive(lookupbyte_interp);
Emit::down();
@ -1508,7 +1507,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_word_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::up();
Emit::inv_primitive(store_interp);
Emit::down();
@ -1575,7 +1574,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::up();
Emit::inv_primitive(ge_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DIGITTOVALUE_HL)));
Emit::inv_call_iname(Hierarchy::find(DIGITTOVALUE_HL));
Emit::down();
Emit::inv_primitive(lookupbyte_interp);
Emit::down();
@ -1596,7 +1595,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::down();
Emit::inv_primitive(times_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DIGITTOVALUE_HL)));
Emit::inv_call_iname(Hierarchy::find(DIGITTOVALUE_HL));
Emit::down();
Emit::inv_primitive(lookupbyte_interp);
Emit::down();
@ -1655,7 +1654,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_addr_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(WORDADDRESS_HL)));
Emit::inv_call_iname(Hierarchy::find(WORDADDRESS_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(WN_HL));
Emit::up();
@ -1663,7 +1662,7 @@ void LiteralPatterns::gpr(gpr_kit *gprk, literal_pattern *lp) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->cur_len_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(WORDLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(WORDLENGTH_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(WN_HL));
Emit::up();

2
inform7/core-module/Chapter 5/Nonlocal Variables.w
View file

@ -283,7 +283,7 @@ void NonlocalVariables::emit_lvalue(nonlocal_variable *nlv) {
Emit::val_iname(K_value, Hierarchy::find(MSTACK_HL));
int ex = MSTVO_HL;
if (nlv->lvalue_nve.allow_outside) ex = MSTVON_HL;
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(ex)));
Emit::inv_call_iname(Hierarchy::find(ex));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) nlv->lvalue_nve.stv_ID);
Emit::val(K_number, LITERAL_IVAL, (inter_t) nlv->lvalue_nve.stv_index);

4
inform7/core-module/Chapter 5/Using Nametags.w
View file

@ -45,8 +45,8 @@ void UseNouns::noun_set_I6_representation(noun *t, text_stream *new) {
Str::delete_first_character(t->nt_I6_identifier);
if (Str::get_last_char(t->nt_I6_identifier) == '"')
Str::delete_last_character(t->nt_I6_identifier);
InterNames::translate(t->nt_iname, t->nt_I6_identifier);
Inter::Symbols::clear_flag(InterNames::to_symbol(t->nt_iname), MAKE_NAME_UNIQUE);
InterNames::change_translation(t->nt_iname, t->nt_I6_identifier);
InterNames::clear_flag(t->nt_iname, MAKE_NAME_UNIQUE);
}
@ The identifiers are created all at once, but the process is complicated by

2
inform7/core-module/Chapter 6/Binary Predicates.w
View file

@ -699,7 +699,7 @@ void BinaryPredicates::SUBJ_compile(inference_subject *infs) {
parse_node *spec0, *spec1;
World::Inferences::get_references_spec(i, &spec0, &spec1);
BinaryPredicates::mark_as_needed(bp);
Emit::inv_call(InterNames::to_symbol(rtiname));
Emit::inv_call_iname(rtiname);
Emit::down();
Emit::val_iname(K_value, bp->bp_iname);
Emit::val_iname(K_value, Hierarchy::find(RELS_ASSERT_TRUE_HL));

18
inform7/core-module/Chapter 6/New Verbs.w
View file

@ -658,35 +658,35 @@ void NewVerbs::ConjugateVerb_invoke_emit(verb_conjugation *vc,
inter_name *cv_neg = Hierarchy::find(CV_NEG_HL);
if (modal) {
if (negated) {
Emit::inv_call(InterNames::to_symbol(Conjugation::conj_iname(modal)));
Emit::inv_call_iname(Conjugation::conj_iname(modal));
Emit::down();
Emit::val_iname(K_value, cv_neg);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PNTOVP_HL)));
Emit::inv_call_iname(Hierarchy::find(PNTOVP_HL));
Emit::val_iname(K_value, Hierarchy::find(STORY_TENSE_HL));
Emit::val_iname(K_value, Conjugation::conj_iname(vc));
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Conjugation::conj_iname(modal)));
Emit::inv_call_iname(Conjugation::conj_iname(modal));
Emit::down();
Emit::val_iname(K_value, cv_pos);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PNTOVP_HL)));
Emit::inv_call_iname(Hierarchy::find(PNTOVP_HL));
Emit::val_iname(K_value, Hierarchy::find(STORY_TENSE_HL));
Emit::val_iname(K_value, Conjugation::conj_iname(vc));
Emit::up();
}
} else {
if (negated) {
Emit::inv_call(InterNames::to_symbol(Conjugation::conj_iname(vc)));
Emit::inv_call_iname(Conjugation::conj_iname(vc));
Emit::down();
Emit::val_iname(K_value, cv_neg);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PNTOVP_HL)));
Emit::inv_call_iname(Hierarchy::find(PNTOVP_HL));
Emit::val_iname(K_value, Hierarchy::find(STORY_TENSE_HL));
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Conjugation::conj_iname(vc)));
Emit::inv_call_iname(Conjugation::conj_iname(vc));
Emit::down();
Emit::val_iname(K_value, cv_pos);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PNTOVP_HL)));
Emit::inv_call_iname(Hierarchy::find(PNTOVP_HL));
Emit::val_iname(K_value, Hierarchy::find(STORY_TENSE_HL));
Emit::up();
}
@ -852,7 +852,7 @@ void NewVerbs::ConjugateVerb(void) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, t_s);
Emit::inv_call(InterNames::to_symbol(Conjugation::conj_iname(vc)));
Emit::inv_call_iname(Conjugation::conj_iname(vc));
Emit::down();
Emit::val_symbol(K_value, fn_s);
Emit::val_symbol(K_value, vp_s);

41
inform7/core-module/Chapter 6/Relations.w
View file

@ -904,13 +904,13 @@ void Relations::compile_relation_records(void) {
LOOP_OVER(bp, binary_predicate) {
if ((bp->dynamic_memory) && (bp->right_way_round)) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(BLKVALUECREATE_HL)));
Emit::inv_call_iname(Hierarchy::find(BLKVALUECREATE_HL));
Emit::down();
Kinds::RunTime::emit_strong_id_as_val(BinaryPredicates::kind(bp));
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_NAME_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_NAME_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
TEMPORARY_TEXT(A);
@ -921,40 +921,40 @@ void Relations::compile_relation_records(void) {
switch(bp->form_of_relation) {
case Relation_OtoO:
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_OTOOADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_OTOOADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
break;
case Relation_OtoV:
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_OTOVADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_OTOVADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
break;
case Relation_VtoO:
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_VTOOADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_VTOOADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
break;
case Relation_Sym_OtoO:
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_OTOOADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_OTOOADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_SYMMETRICADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_SYMMETRICADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
break;
case Relation_Equiv:
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_EQUIVALENCEADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_EQUIVALENCEADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -962,7 +962,7 @@ void Relations::compile_relation_records(void) {
break;
case Relation_VtoV: break;
case Relation_Sym_VtoV:
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELATION_TY_SYMMETRICADJECTIVE_HL)));
Emit::inv_call_iname(Hierarchy::find(RELATION_TY_SYMMETRICADJECTIVE_HL));
Emit::down();
Emit::val_iname(K_value, BinaryPredicates::iname(bp));
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -1071,7 +1071,6 @@ void Relations::compile_relation_records(void) {
Emit::array_iname_entry(dbp->v2v_bitmap_iname);
break;
case Relation_ByRoutine: /* Field 0 is the routine used to test the relation */
InterNames::to_symbol(dbp->bp_by_routine_iname);
Emit::array_iname_entry(dbp->bp_by_routine_iname);
break;
default:
@ -1265,7 +1264,7 @@ void Relations::compile_relation_records(void) {
Routines::end(save);
@<The default case for minimal relations only@> =
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RUNTIMEPROBLEM_HL)));
Emit::inv_call_iname(Hierarchy::find(RUNTIMEPROBLEM_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(RTP_RELMINIMAL_HL));
Emit::val_symbol(K_value, task_s);
@ -1342,7 +1341,7 @@ void Relations::compile_relation_records(void) {
@<Expand the ID operand@> =
if (id_flag) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RLNGETF_HL)));
Emit::inv_call_iname(Hierarchy::find(RLNGETF_HL));
Emit::down();
Emit::val_symbol(K_value, rr_s);
Emit::val_iname(K_value, Hierarchy::find(RR_STORAGE_HL));
@ -1355,7 +1354,7 @@ void Relations::compile_relation_records(void) {
Emit::inv_primitive(return_interp);
Emit::down();
if (follow) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RELFOLLOWVECTOR_HL)));
Emit::inv_call_iname(Hierarchy::find(RELFOLLOWVECTOR_HL));
Emit::down();
Emit::inv_primitive(indirect3_interp);
Emit::down();
@ -1433,7 +1432,7 @@ void Relations::compile_relation_records(void) {
Emit::up();
@<The LOOKUP ALL X task@> =
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, Y_s);
Emit::val(K_number, LITERAL_IVAL, 0);
@ -1448,7 +1447,7 @@ void Relations::compile_relation_records(void) {
Emit::up();
@<The LOOKUP ALL Y task@> =
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, Y_s);
Emit::val(K_number, LITERAL_IVAL, 0);
@ -1463,7 +1462,7 @@ void Relations::compile_relation_records(void) {
Emit::up();
@<The LIST task@> =
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_SETLENGTH_HL));
Emit::down();
Emit::val_symbol(K_value, X_s);
Emit::val(K_number, LITERAL_IVAL, 0);
@ -1597,7 +1596,7 @@ void Relations::compile_relation_records(void) {
else {
Emit::inv_primitive(return_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DEFAULTVALUEOFKOV_HL)));
Emit::inv_call_iname(Hierarchy::find(DEFAULTVALUEOFKOV_HL));
Emit::down();
Kinds::RunTime::emit_strong_id_as_val(K);
Emit::up();
@ -1630,7 +1629,7 @@ void Relations::compile_relation_records(void) {
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_INSERTITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_INSERTITEM_HL));
Emit::down();
Emit::val_symbol(K_value, Y_s);
Emit::val_symbol(K_value, Z1_s);
@ -1668,7 +1667,7 @@ void Relations::compile_relation_records(void) {
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LIST_OF_TY_INSERTITEM_HL)));
Emit::inv_call_iname(Hierarchy::find(LIST_OF_TY_INSERTITEM_HL));
Emit::down();
if (t == 0) {
Emit::val_symbol(K_value, X_s);
@ -2530,7 +2529,7 @@ void Relations::compile_defined_relations(void) {
if (downs > 0) { Emit::up(); Emit::up(); }
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RUNTIMEPROBLEM_HL)));
Emit::inv_call_iname(Hierarchy::find(RUNTIMEPROBLEM_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(RTP_RELKINDVIOLATION_HL));
Emit::val_symbol(K_value, L_s);
@ -2585,7 +2584,7 @@ void Relations::compile_defined_relations(void) {
if (downs > 0) { Emit::up(); Emit::up(); }
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(RUNTIMEPROBLEM_HL)));
Emit::inv_call_iname(Hierarchy::find(RUNTIMEPROBLEM_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(RTP_RELKINDVIOLATION_HL));
Emit::val_symbol(K_value, L_s);

3
inform7/if-module/Chapter 3/Backdrops.w
View file

@ -302,7 +302,6 @@ code, derived from the old I6 library, requires |absent| to be set. So:
notice->backdrop = I;
package_request *R = Instances::package(I);
notice->found_in_routine_iname = Hierarchy::make_iname_in(BACKDROP_FOUND_IN_FN_HL, R);
InterNames::to_symbol(notice->found_in_routine_iname);
notice->many_places = FALSE;
FOUNDIN = notice->found_in_routine_iname;
Properties::EitherOr::assert(
@ -328,7 +327,7 @@ void PL::Backdrops::write_found_in_routines(void) {
Emit::inv_primitive(if_interp);
Emit::down();
if ((K_region) && (Instances::of_kind(loc, K_region))) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTREGIONALCONTAINMENT_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTREGIONALCONTAINMENT_HL));
Emit::down();
Emit::val_iname(K_object, Hierarchy::find(LOCATION_HL));
Emit::val_iname(K_object, Instances::iname(loc));

3
inform7/if-module/Chapter 3/Regions.w
View file

@ -332,7 +332,6 @@ int PL::Regions::regions_complete_model(int stage) {
LOOP_OVER_OBJECT_INSTANCES(I)
if (Instances::of_kind(I, K_region)) {
inter_name *iname = PL::Regions::found_in_iname(I);
InterNames::to_symbol(iname);
Properties::Valued::assert(P_regional_found_in, Instances::as_subject(I),
Rvalues::from_iname(iname), CERTAIN_CE);
}
@ -346,7 +345,7 @@ void PL::Regions::write_regional_found_in_routines(void) {
packaging_state save = Routines::begin(iname);
Emit::inv_primitive(if_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTREGIONALCONTAINMENT_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTREGIONALCONTAINMENT_HL));
Emit::down();
Emit::val_iname(K_object, Hierarchy::find(LOCATION_HL));
Emit::val_iname(K_object, Instances::iname(I));

14
inform7/if-module/Chapter 3/Scenes.w
View file

@ -568,7 +568,7 @@ There is no significance to the return value.
void PL::Scenes::DetectSceneChange_routine(void) {
inter_name *iname = Hierarchy::find(DETECTSCENECHANGE_HL);
packaging_state save = Routines::begin(iname);
inter_symbol *self = InterNames::to_symbol(iname);
// inter_symbol *self = InterNames::to_symbol(iname);
inter_symbol *chs_s = LocalVariables::add_internal_local_c_as_symbol(I"chs", "count of changes made");
inter_symbol *ch_s = LocalVariables::add_internal_local_c_as_symbol(I"ch", "flag: change made");
inter_symbol *CScene_l = Emit::reserve_label(I".CScene");
@ -609,7 +609,7 @@ void PL::Scenes::DetectSceneChange_routine(void) {
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(self);
Emit::inv_call_iname(iname);
Emit::down();
Emit::inv_primitive(preincrement_interp);
Emit::down();
@ -809,7 +809,7 @@ end actually occurred.)
Emit::inv_primitive(ifelse_interp);
Emit::down();
inter_name *iname = Hierarchy::find(GPROPERTY_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_scene);
Emit::val(K_number, LITERAL_IVAL, (inter_t) ix+1);
@ -844,18 +844,18 @@ end actually occurred.)
@<Compile code to run the scene end rulebooks@> =
if (end == 0) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(FOLLOWRULEBOOK_HL)));
Emit::inv_call_iname(Hierarchy::find(FOLLOWRULEBOOK_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(WHEN_SCENE_BEGINS_HL));
Emit::val(K_number, LITERAL_IVAL, (inter_t) (sc->allocation_id + 1));
Emit::up();
}
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(FOLLOWRULEBOOK_HL)));
Emit::inv_call_iname(Hierarchy::find(FOLLOWRULEBOOK_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) (sc->end_rulebook[end]->allocation_id));
Emit::up();
if (end == 1) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(FOLLOWRULEBOOK_HL)));
Emit::inv_call_iname(Hierarchy::find(FOLLOWRULEBOOK_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(WHEN_SCENE_ENDS_HL));
Emit::val(K_number, LITERAL_IVAL, (inter_t) (sc->allocation_id + 1));
@ -1152,7 +1152,7 @@ void PL::Scenes::emit_during_clause(parse_node *spec) {
if (Dash::check_value(spec, Kinds::unary_construction(CON_description, K_scene)) == ALWAYS_MATCH) {
parse_node *desc = Descriptions::to_rvalue(spec);
if (desc) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DURINGSCENEMATCHING_HL)));
Emit::inv_call_iname(Hierarchy::find(DURINGSCENEMATCHING_HL));
Emit::down();
Specifications::Compiler::emit_as_val(K_value, desc);
Emit::up();

10
inform7/if-module/Chapter 3/Showme Command.w
View file

@ -177,7 +177,7 @@ routine for colours; and the best thing is to print nothing at all.
Emit::inv_primitive(if_interp);
Emit::down();
inter_name *iname = Hierarchy::find(GPROPERTY_HL);
Emit::inv_call(InterNames::to_symbol(iname));
Emit::inv_call_iname(iname);
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_object);
Emit::val_symbol(K_value, t_0_s);
@ -207,9 +207,9 @@ routine for colours; and the best thing is to print nothing at all.
Emit::down();
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TEXT_TY_COMPARE_HL)));
Emit::inv_call_iname(Hierarchy::find(TEXT_TY_COMPARE_HL));
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(GPROPERTY_HL)));
Emit::inv_call_iname(Hierarchy::find(GPROPERTY_HL));
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_object);
Emit::val_symbol(K_value, t_0_s);
@ -252,7 +252,7 @@ routine for colours; and the best thing is to print nothing at all.
Emit::inv_primitive(indirect1v_interp);
Emit::down();
Emit::val_iname(K_value, Kinds::Behaviour::get_iname(K));
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(GPROPERTY_HL)));
Emit::inv_call_iname(Hierarchy::find(GPROPERTY_HL));
Emit::down();
Kinds::RunTime::emit_weak_id_as_val(K_object);
Emit::val_symbol(K_value, t_0_s);
@ -275,7 +275,7 @@ turn by turn.
Emit::inv_primitive(and_interp);
Emit::down();
if ((this_is_a_release_compile == FALSE) || (this_is_a_debug_compile)) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(ALLOWINSHOWME_HL)));
Emit::inv_call_iname(Hierarchy::find(ALLOWINSHOWME_HL));
Emit::down();
Emit::val_iname(K_value, Properties::iname(prn));
Emit::up();

4
inform7/if-module/Chapter 3/The Naming Thicket.w
View file

@ -443,7 +443,7 @@ void PL::Naming::compile_small_names(void) {
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(porname));
Emit::inv_call_iname(porname);
Emit::down();
Emit::val_iname(K_value, Instances::iname(owner));
Emit::val_iname(K_value, Hierarchy::find(CAPSHORTNAME_HL));
@ -452,7 +452,7 @@ void PL::Naming::compile_small_names(void) {
Emit::up();
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(porname));
Emit::inv_call_iname(porname);
Emit::down();
Emit::val_iname(K_value, Instances::iname(owner));
Emit::val_iname(K_object, Hierarchy::find(SHORT_NAME_HL));

1
inform7/if-module/Chapter 3/The Score.w
View file

@ -40,7 +40,6 @@ void PL::Score::compile_max_score(void) {
(Tables::get_no_columns(t) >= 2) &&
(Kinds::Compare::eq(Tables::kind_of_ith_column(t, 0), K_number)) &&
(Kinds::Compare::eq(Tables::kind_of_ith_column(t, 1), K_text))) {
InterNames::to_symbol(Tables::identifier(t));
inter_name *iname = Hierarchy::find(RANKING_TABLE_HL);
packaging_state save = Packaging::enter_home_of(iname);
Emit::named_iname_constant(iname, K_value, Tables::identifier(t));

26
inform7/if-module/Chapter 4/Action Patterns.w
View file

@ -1384,7 +1384,7 @@ void PL::Actions::Patterns::emit_try(action_pattern *ap, int store_instead) {
if (ap->request) flag_bits += 1;
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TRYACTION_HL)));
Emit::inv_call_iname(Hierarchy::find(TRYACTION_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) flag_bits);
if (spec2) PL::Actions::Patterns::emit_try_action_parameter(spec2, K_object);
@ -1395,7 +1395,7 @@ void PL::Actions::Patterns::emit_try(action_pattern *ap, int store_instead) {
if (spec1) PL::Actions::Patterns::emit_try_action_parameter(spec1, PL::Actions::get_data_type_of_second_noun(an));
else Emit::val(K_number, LITERAL_IVAL, 0);
if (store_instead) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(STORED_ACTION_TY_CURRENT_HL)));
Emit::inv_call_iname(Hierarchy::find(STORED_ACTION_TY_CURRENT_HL));
Emit::down();
Frames::emit_allocation(K_stored_action);
Emit::up();
@ -1531,7 +1531,7 @@ int PL::Actions::Patterns::compile_pattern_match_clause_inner(int f,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, ct_1_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(EXISTSTABLEROWCORR_HL)));
Emit::inv_call_iname(Hierarchy::find(EXISTSTABLEROWCORR_HL));
Emit::down();
Emit::inv_primitive(store_interp);
Emit::down();
@ -1575,7 +1575,7 @@ int PL::Actions::Patterns::compile_pattern_match_clause_inner(int f,
LOGIF(ACTION_PATTERN_PARSING,
"$P on $u : $T\n", spec, verify_as_kind, current_sentence);
if (adapt_region) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTREGIONALCONTAINMENT_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTREGIONALCONTAINMENT_HL));
Emit::down();
Specifications::Compiler::emit_as_val(K_value, I6_var_TS);
Specifications::Compiler::emit_as_val(K_value, spec);
@ -1590,7 +1590,7 @@ int PL::Actions::Patterns::compile_pattern_match_clause_inner(int f,
((Descriptions::to_instance(spec)) &&
(adapt_region) &&
(Instances::of_kind(Descriptions::to_instance(spec), K_region)))) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTREGIONALCONTAINMENT_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTREGIONALCONTAINMENT_HL));
Emit::down();
Specifications::Compiler::emit_as_val(K_value, I6_var_TS);
Specifications::Compiler::emit_as_val(K_value, spec);
@ -1649,7 +1649,6 @@ void PL::Actions::Patterns::as_stored_action(value_holster *VH, action_pattern *
request_bits = request_bits | 16;
TEMPORARY_TEXT(BC);
literal_text *lt = Strings::TextLiterals::compile_literal(NULL, FALSE, ParseTree::get_text(ap->noun_spec));
InterNames::to_symbol(lt->lt_sba_iname);
Emit::array_iname_entry(lt->lt_sba_iname);
DISCARD_TEXT(BC);
} else Specifications::Compiler::emit(ap->noun_spec);
@ -1660,7 +1659,6 @@ void PL::Actions::Patterns::as_stored_action(value_holster *VH, action_pattern *
if (Rvalues::is_CONSTANT_of_kind(ap->second_spec, K_understanding)) {
request_bits = request_bits | 32;
literal_text *lt = Strings::TextLiterals::compile_literal(NULL, TRUE, ParseTree::get_text(ap->second_spec));
InterNames::to_symbol(lt->lt_sba_iname);
Emit::array_iname_entry(lt->lt_sba_iname);
} else Specifications::Compiler::emit(ap->second_spec);
} else {
@ -2061,7 +2059,7 @@ void PL::Actions::Patterns::compile_pattern_match(value_holster *VH, action_patt
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_iname(K_object, Hierarchy::find(ACTOR_LOCATION_HL));
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LOCATIONOF_HL)));
Emit::inv_call_iname(Hierarchy::find(LOCATIONOF_HL));
Emit::down();
Emit::val_iname(K_object, Hierarchy::find(ACTOR_HL));
Emit::up();
@ -2092,7 +2090,7 @@ void PL::Actions::Patterns::compile_pattern_match(value_holster *VH, action_patt
Emit::inv_primitive(lookup_interp);
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(MSTACK_HL));
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(MSTVON_HL)));
Emit::inv_call_iname(Hierarchy::find(MSTVON_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, 20007);
Emit::val(K_number, LITERAL_IVAL, 1);
@ -2115,7 +2113,7 @@ void PL::Actions::Patterns::compile_pattern_match(value_holster *VH, action_patt
Emit::inv_primitive(lookup_interp);
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(MSTACK_HL));
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(MSTVON_HL)));
Emit::inv_call_iname(Hierarchy::find(MSTVON_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, 20007);
Emit::val(K_number, LITERAL_IVAL, 1);
@ -2135,7 +2133,7 @@ void PL::Actions::Patterns::compile_pattern_match(value_holster *VH, action_patt
case PRESENCE_OF_IN_SCOPE_CPMC: {
instance *to_be_present =
Specifications::object_exactly_described_if_any(ap.presence_spec);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTSCOPE_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTSCOPE_HL));
Emit::down();
Emit::val_iname(K_value, Instances::iname(to_be_present));
Emit::val_iname(K_object, Hierarchy::find(ACTOR_HL));
@ -2157,7 +2155,7 @@ void PL::Actions::Patterns::compile_pattern_match(value_holster *VH, action_patt
Emit::up();
Emit::inv_primitive(sequential_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LOOPOVERSCOPE_HL)));
Emit::inv_call_iname(Hierarchy::find(LOOPOVERSCOPE_HL));
Emit::down();
Emit::val_iname(K_value, los->los_iname);
Emit::val_iname(K_object, Hierarchy::find(ACTOR_HL));
@ -2182,7 +2180,7 @@ void PL::Actions::Patterns::compile_pattern_match(value_holster *VH, action_patt
Emit::up();
Emit::inv_primitive(sequential_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(LOOPOVERSCOPE_HL)));
Emit::inv_call_iname(Hierarchy::find(LOOPOVERSCOPE_HL));
Emit::down();
Emit::val_iname(K_value, los->los_iname);
Emit::val_iname(K_object, Hierarchy::find(ACTOR_HL));
@ -2239,7 +2237,7 @@ int PL::Actions::Patterns::makes_callings(action_pattern *ap) {
void PL::Actions::Patterns::emit_past_tense(action_pattern *ap) {
int bad_form = FALSE;
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TESTACTIONBITMAP_HL)));
Emit::inv_call_iname(Hierarchy::find(TESTACTIONBITMAP_HL));
Emit::down();
if (ap->noun_spec == NULL)
Emit::val(K_number, LITERAL_IVAL, 0);

2
inform7/if-module/Chapter 4/Actions.w
View file

@ -1141,7 +1141,7 @@ void PL::Actions::compile_action_routines(void) {
Emit::inv_primitive(return_interp);
Emit::down();
inter_name *generic_iname = Hierarchy::find(GENERICVERBSUB_HL);
Emit::inv_call(InterNames::to_symbol(generic_iname));
Emit::inv_call_iname(generic_iname);
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) an->check_rules->allocation_id);
Emit::val(K_number, LITERAL_IVAL, (inter_t) an->carry_out_rules->allocation_id);

40
inform7/if-module/Chapter 5/General Parsing Routines.w
View file

@ -317,9 +317,9 @@ void PL::Parsing::Tokens::General::top_of_head(gpr_kit *gprk, inter_name *gv_ina
Emit::down();
Emit::inv_primitive(while_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(WORDINPROPERTY_HL)));
Emit::inv_call_iname(Hierarchy::find(WORDINPROPERTY_HL));
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::val_iname(K_value, Hierarchy::find(SELF_HL));
Emit::val_iname(K_value, PL::Parsing::Visibility::name_name());
Emit::up();
@ -385,9 +385,9 @@ void PL::Parsing::Tokens::General::top_of_head(gpr_kit *gprk, inter_name *gv_ina
Emit::down();
Emit::inv_primitive(while_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(WORDINPROPERTY_HL)));
Emit::inv_call_iname(Hierarchy::find(WORDINPROPERTY_HL));
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::val_iname(K_value, Hierarchy::find(SELF_HL));
Emit::val_iname(K_value, PL::Parsing::Visibility::name_name());
Emit::up();
@ -475,9 +475,9 @@ void PL::Parsing::Tokens::General::compile_parse_name_tail(gpr_kit *gprk) {
Emit::inv_primitive(while_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(WORDINPROPERTY_HL)));
Emit::inv_call_iname(Hierarchy::find(WORDINPROPERTY_HL));
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
Emit::val_iname(K_value, Hierarchy::find(SELF_HL));
Emit::val_iname(K_value, PL::Parsing::Visibility::name_name());
Emit::up();
@ -660,7 +660,7 @@ void PL::Parsing::Tokens::General::compile_parse_name_tail(gpr_kit *gprk) {
Emit::up();
Emit::up();
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(DETECTPLURALWORD_HL)));
Emit::inv_call_iname(Hierarchy::find(DETECTPLURALWORD_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->original_wn_s);
Emit::val_symbol(K_value, gprk->n_s);
@ -869,10 +869,10 @@ void PL::Parsing::Tokens::General::distinguish_visible_property(gpr_kit *gprk, p
Emit::down();
Emit::inv_primitive(and_interp);
Emit::down();
Properties::Emit::emit_has_property(K_value, InterNames::to_symbol(Hierarchy::find(PARSER_ONE_HL)), prn);
Properties::Emit::emit_iname_has_property(K_value, Hierarchy::find(PARSER_ONE_HL), prn);
Emit::inv_primitive(not_interp);
Emit::down();
Properties::Emit::emit_has_property(K_value, InterNames::to_symbol(Hierarchy::find(PARSER_TWO_HL)), prn);
Properties::Emit::emit_iname_has_property(K_value, Hierarchy::find(PARSER_TWO_HL), prn);
Emit::up();
Emit::up();
Emit::code();
@ -885,10 +885,10 @@ void PL::Parsing::Tokens::General::distinguish_visible_property(gpr_kit *gprk, p
Emit::down();
Emit::inv_primitive(and_interp);
Emit::down();
Properties::Emit::emit_has_property(K_value, InterNames::to_symbol(Hierarchy::find(PARSER_TWO_HL)), prn);
Properties::Emit::emit_iname_has_property(K_value, Hierarchy::find(PARSER_TWO_HL), prn);
Emit::inv_primitive(not_interp);
Emit::down();
Properties::Emit::emit_has_property(K_value, InterNames::to_symbol(Hierarchy::find(PARSER_ONE_HL)), prn);
Properties::Emit::emit_iname_has_property(K_value, Hierarchy::find(PARSER_ONE_HL), prn);
Emit::up();
Emit::up();
Emit::code();
@ -902,7 +902,7 @@ void PL::Parsing::Tokens::General::distinguish_visible_property(gpr_kit *gprk, p
Emit::inv_primitive(if_interp);
Emit::down();
if (distinguisher) {
Emit::inv_call(InterNames::to_symbol(distinguisher));
Emit::inv_call_iname(distinguisher);
Emit::down();
Emit::inv_primitive(propertyvalue_interp);
Emit::down();
@ -1044,7 +1044,7 @@ void PL::Parsing::Tokens::General::parse_visible_property(gpr_kit *gprk,
if (recog_gpr) {
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(recog_gpr));
Emit::inv_call_iname(recog_gpr);
Emit::down();
Emit::inv_primitive(propertyvalue_interp);
Emit::down();
@ -1061,7 +1061,7 @@ void PL::Parsing::Tokens::General::parse_visible_property(gpr_kit *gprk,
Emit::down();
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(i6_gpr_name));
Emit::inv_call_iname(i6_gpr_name);
Emit::val_iname(K_value, Hierarchy::find(GPR_NUMBER_HL));
Emit::up();
Emit::inv_primitive(eq_interp);
@ -1077,7 +1077,7 @@ void PL::Parsing::Tokens::General::parse_visible_property(gpr_kit *gprk,
} else if (Kinds::Behaviour::is_an_enumeration(K)) {
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Kinds::RunTime::get_instance_GPR_iname(K)));
Emit::inv_call_iname(Kinds::RunTime::get_instance_GPR_iname(K));
Emit::down();
Emit::inv_primitive(propertyvalue_interp);
Emit::down();
@ -1092,7 +1092,7 @@ void PL::Parsing::Tokens::General::parse_visible_property(gpr_kit *gprk,
Emit::down();
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Kinds::RunTime::get_kind_GPR_iname(K)));
Emit::inv_call_iname(Kinds::RunTime::get_kind_GPR_iname(K));
Emit::val_iname(K_value, Hierarchy::find(GPR_NUMBER_HL));
Emit::up();
Emit::inv_primitive(eq_interp);
@ -1152,13 +1152,13 @@ void PL::Parsing::Tokens::General::parse_visible_either_or(gpr_kit *gprk, proper
int j = 0; LOOP_THROUGH_WORDING(i, W) j++;
int ands = 0;
if (j > 0) { Emit::inv_primitive(and_interp); Emit::down(); ands++; }
Properties::Emit::emit_has_property(K_value, InterNames::to_symbol(Hierarchy::find(SELF_HL)), prn);
Properties::Emit::emit_iname_has_property(K_value, Hierarchy::find(SELF_HL), prn);
int k = 0;
LOOP_THROUGH_WORDING(i, W) {
if (k < j-1) { Emit::inv_primitive(and_interp); Emit::down(); ands++; }
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
TEMPORARY_TEXT(N);
WRITE_TO(N, "%N", i);
Emit::val_dword(N);
@ -1180,10 +1180,10 @@ void PL::Parsing::Tokens::General::parse_visible_either_or(gpr_kit *gprk, proper
Emit::down();
Emit::inv_primitive(and_interp);
Emit::down();
Properties::Emit::emit_has_property(K_value, InterNames::to_symbol(Hierarchy::find(SELF_HL)), prn);
Properties::Emit::emit_iname_has_property(K_value, Hierarchy::find(SELF_HL), prn);
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(gv->gv_prn_iname));
Emit::inv_call_iname(gv->gv_prn_iname);
Emit::val_iname(K_value, Hierarchy::find(GPR_PREPOSITION_HL));
Emit::up();
Emit::up();

4
inform7/if-module/Chapter 5/Grammar Lines.w
View file

@ -280,7 +280,7 @@ void PL::Parsing::Lines::gl_compile_extra_token_for_condition(gpr_kit *gprk, gra
Emit::down();
Emit::inv_primitive(eq_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(gl->cond_token_iname));
Emit::inv_call_iname(gl->cond_token_iname);
Emit::val_iname(K_value, Hierarchy::find(GPR_FAIL_HL));
Emit::up();
Emit::code();
@ -400,7 +400,7 @@ void PL::Parsing::Lines::MistakeActionSub_routine(void) {
Emit::val(K_number, LITERAL_IVAL, (inter_t) (100+gl->allocation_id));
Emit::code();
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSERERROR_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSERERROR_HL));
Emit::down();
Specifications::Compiler::emit_constant_to_kind_as_val(spec, K_text);
Emit::up();

30
inform7/if-module/Chapter 5/Grammar Tokens.w
View file

@ -469,7 +469,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::down();
Emit::inv_primitive(ne_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
TEMPORARY_TEXT(N);
WRITE_TO(N, "%N", wn);
Emit::val_dword(N);
@ -488,7 +488,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
bp = ParseTree::get_grammar_token_relation(pn);
if (bp) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(ARTICLEDESCRIPTORS_HL)));
Emit::inv_call_iname(Hierarchy::find(ARTICLEDESCRIPTORS_HL));
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
@ -600,7 +600,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(plus_interp);
Emit::down();
Emit::val_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TRYGIVENOBJECT_HL)));
Emit::inv_call_iname(Hierarchy::find(TRYGIVENOBJECT_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->rv_s);
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -666,7 +666,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(plus_interp);
Emit::down();
Emit::val_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TRYGIVENOBJECT_HL)));
Emit::inv_call_iname(Hierarchy::find(TRYGIVENOBJECT_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->rv_s);
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -754,7 +754,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->rv_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARENT_HL)));
Emit::inv_call_iname(Hierarchy::find(PARENT_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(SELF_HL));
Emit::up();
@ -771,7 +771,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(plus_interp);
Emit::down();
Emit::val_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TRYGIVENOBJECT_HL)));
Emit::inv_call_iname(Hierarchy::find(TRYGIVENOBJECT_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->rv_s);
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -808,7 +808,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(plus_interp);
Emit::down();
Emit::val_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TRYGIVENOBJECT_HL)));
Emit::inv_call_iname(Hierarchy::find(TRYGIVENOBJECT_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->rv_s);
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -990,7 +990,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(plus_interp);
Emit::down();
Emit::val_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(TRYGIVENOBJECT_HL)));
Emit::inv_call_iname(Hierarchy::find(TRYGIVENOBJECT_HL));
Emit::down();
Emit::val_symbol(K_value, gprk->rv_s);
Emit::val(K_truth_state, LITERAL_IVAL, 1);
@ -1055,7 +1055,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(GPR_TT_HL));
if (Str::len(i6_gpr_name) > 0)
@ -1120,7 +1120,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(ELEMENTARY_TT_HL));
Emit::val_iname(K_value, i6_token_iname);
@ -1151,7 +1151,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
PL::Parsing::Tokens::Filters::compile_id(gtc);
Emit::up();
@ -1180,7 +1180,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(GPR_TT_HL));
if (Str::len(i6_gpr_name) > 0)
@ -1214,7 +1214,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
PL::Parsing::Tokens::Filters::compile_id(gtc);
Emit::up();
@ -1247,7 +1247,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
Emit::val_iname(K_value, Hierarchy::find(GPR_TT_HL));
Emit::val_iname(K_value, PL::Parsing::Verbs::i6_token_as_iname(gv));
@ -1289,7 +1289,7 @@ kind *PL::Parsing::Tokens::compile(gpr_kit *gprk, parse_node *pn, int code_mode,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, gprk->w_s);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PARSETOKENSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(PARSETOKENSTOPPED_HL));
Emit::down();
PL::Parsing::Tokens::Filters::compile_id(gtc);
Emit::up();

4
inform7/if-module/Chapter 5/Noun Filter Tokens.w
View file

@ -72,7 +72,7 @@ void PL::Parsing::Tokens::Filters::nft_compile_routine(noun_filter_token *nft) {
Emit::ref_symbol(K_value, v_s);
inter_name *gpr_to_ask = Kinds::Behaviour::get_explicit_I6_GPR_iname(R);
if (gpr_to_ask == NULL) gpr_to_ask = Kinds::RunTime::get_kind_GPR_iname(R);
Emit::inv_call(InterNames::to_symbol(gpr_to_ask));
Emit::inv_call_iname(gpr_to_ask);
Emit::up();
Emit::inv_primitive(if_interp);
@ -177,7 +177,7 @@ void PL::Parsing::Tokens::Filters::nft_compile_routine(noun_filter_token *nft) {
Emit::val(K_truth_state, LITERAL_IVAL, 1);
Emit::up();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(PLACEINSCOPE_HL)));
Emit::inv_call_iname(Hierarchy::find(PLACEINSCOPE_HL));
Emit::down();
Emit::val_symbol(K_value, o2_s);
Emit::val(K_truth_state, LITERAL_IVAL, 1);

2
inform7/if-module/Chapter 5/Tokens Parsing Values.w
View file

@ -242,7 +242,7 @@ void PL::Parsing::Tokens::Values::compile_type_gprs(void) {
Emit::down();
Emit::inv_primitive(ne_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NEXTWORDSTOPPED_HL)));
Emit::inv_call_iname(Hierarchy::find(NEXTWORDSTOPPED_HL));
TEMPORARY_TEXT(W);
WRITE_TO(W, "%N", k);
Emit::val_dword(W);

1
inform7/if-module/Chapter 5/Traverse for Grammar.w
View file

@ -116,7 +116,6 @@ void PL::Parsing::compile_understanding(inter_t *val1, inter_t *val2, wording W,
cu = CREATE(cached_understanding);
cu->understanding_text = W;
cu->cu_iname = iname;
InterNames::to_symbol(iname);
inter_reading_state *IRS = Emit::IRS();
InterNames::to_ival(IRS->read_into, IRS->current_package, val1, val2, iname);
}

12
inform7/kinds-module/Chapter 2/Floating-Point Values.w
View file

@ -97,17 +97,17 @@ void Kinds::FloatingPoint::end_deflotation(OUTPUT_STREAM, kind *K) {
#ifdef CORE_MODULE
void Kinds::FloatingPoint::begin_flotation_emit(kind *K) {
if (Kinds::Behaviour::scale_factor(K) != 1) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_DIVIDE_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_DIVIDE_HL));
Emit::down();
}
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NUMBER_TY_TO_REAL_NUMBER_TY_HL)));
Emit::inv_call_iname(Hierarchy::find(NUMBER_TY_TO_REAL_NUMBER_TY_HL));
Emit::down();
}
void Kinds::FloatingPoint::end_flotation_emit(kind *K) {
Emit::up();
if (Kinds::Behaviour::scale_factor(K) != 1) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NUMBER_TY_TO_REAL_NUMBER_TY_HL)));
Emit::inv_call_iname(Hierarchy::find(NUMBER_TY_TO_REAL_NUMBER_TY_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) Kinds::Behaviour::scale_factor(K));
Emit::up();
@ -116,17 +116,17 @@ void Kinds::FloatingPoint::end_flotation_emit(kind *K) {
}
void Kinds::FloatingPoint::begin_deflotation_emit(kind *K) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_TO_NUMBER_TY_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_TO_NUMBER_TY_HL));
Emit::down();
if (Kinds::Behaviour::scale_factor(K) != 1) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_TIMES_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_TIMES_HL));
Emit::down();
}
}
void Kinds::FloatingPoint::end_deflotation_emit(kind *K) {
if (Kinds::Behaviour::scale_factor(K) != 1) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_TO_NUMBER_TY_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_TO_NUMBER_TY_HL));
Emit::down();
Emit::val(K_number, LITERAL_IVAL, (inter_t) Kinds::Behaviour::scale_factor(K));
Emit::up();

32
inform7/kinds-module/Chapter 2/Scaled Arithmetic Values.w
View file

@ -367,18 +367,18 @@ value is held in the I6 variable named |V_var|.
=
#ifdef CORE_MODULE
void Kinds::Scalings::compile_quanta_to_value(scaling_transformation sc,
inter_symbol *V_var, inter_symbol *sgn_var, inter_symbol *x_var, inter_symbol *label) {
inter_name *V_var, inter_symbol *sgn_var, inter_symbol *x_var, inter_symbol *label) {
if (sc.use_integer_scaling) {
Kinds::Scalings::compile_scale_and_add(
V_var, sgn_var, sc.int_M, sc.int_O, x_var, label);
InterNames::to_symbol(V_var), sgn_var, sc.int_M, sc.int_O, x_var, label);
} else {
if (sc.real_M != 1.0) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, V_var);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_TIMES_HL)));
Emit::ref_iname(K_value, V_var);
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_TIMES_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::val_iname(K_value, V_var);
Emit::val_real(sc.real_M);
Emit::up();
Emit::up();
@ -386,19 +386,19 @@ void Kinds::Scalings::compile_quanta_to_value(scaling_transformation sc,
if (sc.real_O != 0.0) {
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, V_var);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_PLUS_HL)));
Emit::ref_iname(K_value, V_var);
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_PLUS_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::val_iname(K_value, V_var);
Emit::val_real(sc.real_O);
Emit::up();
Emit::up();
}
Emit::inv_primitive(if_interp);
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_NAN_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_NAN_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::val_iname(K_value, V_var);
Emit::up();
Emit::code();
Emit::down();
@ -579,7 +579,7 @@ void Kinds::Scalings::compile_value_to_quanta(scaling_transformation sc,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, V_var);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_MINUS_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_MINUS_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::val_real(sc.real_O);
@ -590,7 +590,7 @@ void Kinds::Scalings::compile_value_to_quanta(scaling_transformation sc,
Emit::inv_primitive(store_interp);
Emit::down();
Emit::ref_symbol(K_value, V_var);
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_DIVIDE_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_DIVIDE_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::val_real(sc.real_M);
@ -613,15 +613,15 @@ void Kinds::Scalings::compile_threshold_test(scaling_transformation sc,
Emit::inv_primitive(op);
Emit::down();
if (sc.use_integer_scaling) {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(NUMBER_TY_ABS_HL)));
Emit::inv_call_iname(Hierarchy::find(NUMBER_TY_ABS_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::up();
Emit::val(K_number, LITERAL_IVAL, (inter_t) Kinds::Scalings::quantum(sc));
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_COMPARE_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_COMPARE_HL));
Emit::down();
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_ABS_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_ABS_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::up();
@ -664,7 +664,7 @@ void Kinds::Scalings::compile_print_in_quanta(scaling_transformation sc,
Emit::up();
Emit::up();
} else {
Emit::inv_call(InterNames::to_symbol(Hierarchy::find(REAL_NUMBER_TY_SAY_HL)));
Emit::inv_call_iname(Hierarchy::find(REAL_NUMBER_TY_SAY_HL));
Emit::down();
Emit::val_symbol(K_value, V_var);
Emit::up();