mirror of
https://github.com/ganelson/inform.git
synced 2024-07-07 17:44:22 +03:00
Merge branch 'master' of https://github.com/ganelson/inform
This commit is contained in:
commit
9f01aa6337
|
@ -239,16 +239,16 @@ created during the same second.
|
||||||
if (last_up_to_date_at == Platform::never_time())
|
if (last_up_to_date_at == Platform::never_time())
|
||||||
needs_building = TRUE;
|
needs_building = TRUE;
|
||||||
else {
|
else {
|
||||||
if (T) { WRITE_TO(T, "Last built at: %08x\n", last_up_to_date_at); }
|
if (T) { WRITE_TO(T, "Last built at: %s\n", ctime(&last_up_to_date_at)); }
|
||||||
if (gb & BUILD_DEPENDENCIES_MATTER_GB) {
|
if (gb & BUILD_DEPENDENCIES_MATTER_GB) {
|
||||||
time_t t = IncrementalBuild::time_of_latest_build_dependency(V);
|
time_t t = IncrementalBuild::time_of_latest_build_dependency(V);
|
||||||
if (T) { WRITE_TO(T, "Most recent build dependency: %08x\n", t); }
|
if (T) { WRITE_TO(T, "Most recent build dependency: %s\n", ctime(&t)); }
|
||||||
if (IncrementalBuild::timecmp(t, last_up_to_date_at) >= 0)
|
if (IncrementalBuild::timecmp(t, last_up_to_date_at) >= 0)
|
||||||
needs_building = TRUE;
|
needs_building = TRUE;
|
||||||
}
|
}
|
||||||
if (gb & USE_DEPENDENCIES_MATTER_GB) {
|
if (gb & USE_DEPENDENCIES_MATTER_GB) {
|
||||||
time_t t = IncrementalBuild::time_of_latest_use_dependency(V);
|
time_t t = IncrementalBuild::time_of_latest_use_dependency(V);
|
||||||
if (T) { WRITE_TO(T, "Most recent use dependency: %08x\n", t); }
|
if (T) { WRITE_TO(T, "Most recent use dependency: %s\n", ctime(&t)); }
|
||||||
if (IncrementalBuild::timecmp(t, last_up_to_date_at) >= 0)
|
if (IncrementalBuild::timecmp(t, last_up_to_date_at) >= 0)
|
||||||
needs_building = TRUE;
|
needs_building = TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,6 @@ void CompileLvalues::compile_in_mode(value_holster *VH, parse_node *spec_found,
|
||||||
local_variable *lvar = Node::get_constant_local_variable(spec_found);
|
local_variable *lvar = Node::get_constant_local_variable(spec_found);
|
||||||
inter_symbol *lvar_s = LocalVariables::declare(lvar);
|
inter_symbol *lvar_s = LocalVariables::declare(lvar);
|
||||||
if (lvar == NULL) {
|
if (lvar == NULL) {
|
||||||
LOG("Bad: %08x\n", spec_found);
|
|
||||||
internal_error("Compiled never-specified LOCAL VARIABLE SP");
|
internal_error("Compiled never-specified LOCAL VARIABLE SP");
|
||||||
}
|
}
|
||||||
EmitCode::val_symbol(K_value, lvar_s);
|
EmitCode::val_symbol(K_value, lvar_s);
|
||||||
|
|
|
@ -413,7 +413,7 @@ void Frames::emit_new_local_value(kind *K) {
|
||||||
void Frames::log(stack_frame *frame) {
|
void Frames::log(stack_frame *frame) {
|
||||||
if (frame == NULL) { LOG("<null stack frame>\n"); return; }
|
if (frame == NULL) { LOG("<null stack frame>\n"); return; }
|
||||||
LOG("Stack frame at %08x: it:%s, dpc:%s\n",
|
LOG("Stack frame at %08x: it:%s, dpc:%s\n",
|
||||||
frame,
|
(unsigned int)(pointer_sized_int)frame,
|
||||||
(frame->local_variables.it_variable_exists)?"yes":"no",
|
(frame->local_variables.it_variable_exists)?"yes":"no",
|
||||||
(frame->determines_past_conditions)?"yes":"no");
|
(frame->determines_past_conditions)?"yes":"no");
|
||||||
local_variable *lvar;
|
local_variable *lvar;
|
||||||
|
|
|
@ -159,8 +159,7 @@ void Features::run_activation_function(compiler_feature *F) {
|
||||||
if ((allow_activation_functions_to_be_run) && (F) &&
|
if ((allow_activation_functions_to_be_run) && (F) &&
|
||||||
(F->activation_function_run == FALSE)) {
|
(F->activation_function_run == FALSE)) {
|
||||||
F->activation_function_run = TRUE;
|
F->activation_function_run = TRUE;
|
||||||
void (*start)() = (void (*)()) F->activation_function;
|
if (F->activation_function) (*(F->activation_function))();
|
||||||
if (start) (*start)();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -166,17 +166,11 @@ so it would not be safe to store only the textual identifier.
|
||||||
#ifdef CORE_MODULE
|
#ifdef CORE_MODULE
|
||||||
RTKindIDs::write_weak_identifier(OUT, va_arg(ap, kind *));
|
RTKindIDs::write_weak_identifier(OUT, va_arg(ap, kind *));
|
||||||
#endif
|
#endif
|
||||||
#ifndef CORE_MODULE
|
|
||||||
WRITE("{%u}", va_arg(ap, kind *));
|
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
case 'L':
|
case 'L':
|
||||||
#ifdef CORE_MODULE
|
#ifdef CORE_MODULE
|
||||||
WRITE("%~L", va_arg(ap, local_variable *)); break;
|
WRITE("%~L", va_arg(ap, local_variable *)); break;
|
||||||
#endif
|
#endif
|
||||||
#ifndef CORE_MODULE
|
|
||||||
WRITE("%08x", va_arg(ap, void *)); break;
|
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
case 'n': {
|
case 'n': {
|
||||||
int N = sch->no_quoted_inames++;
|
int N = sch->no_quoted_inames++;
|
||||||
|
|
|
@ -128,7 +128,7 @@ void ExcerptMeanings::log_all(void) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
excerpt_meaning *em;
|
excerpt_meaning *em;
|
||||||
LOOP_OVER(em, excerpt_meaning)
|
LOOP_OVER(em, excerpt_meaning)
|
||||||
LOG("%02d: %08x $M\n", i++, (pointer_sized_int) em, em);
|
LOG("%02d: $M\n", i++, em);
|
||||||
}
|
}
|
||||||
|
|
||||||
@h Hashing excerpts.
|
@h Hashing excerpts.
|
||||||
|
|
Loading…
Reference in a new issue