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

Merge branch 'master' of https://github.com/ganelson/inform

Browse source
This commit is contained in:
Graham Nelson 2023-06-21 09:28:30 +01:00
parent 782007a34e f01799966f
commit 9f01aa6337
6 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
inbuild/supervisor-module/Chapter 3/Incremental Building.w
View file

@ -239,16 +239,16 @@ created during the same second.
if (last_up_to_date_at == Platform::never_time())
needs_building = TRUE;
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) {
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)
needs_building = TRUE;
}
if (gb & USE_DEPENDENCIES_MATTER_GB) {
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)
needs_building = TRUE;
}

1
inform7/imperative-module/Chapter 2/Compile Lvalues.w
View file

@ -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);
inter_symbol *lvar_s = LocalVariables::declare(lvar);
if (lvar == NULL) {
LOG("Bad: %08x\n", spec_found);
internal_error("Compiled never-specified LOCAL VARIABLE SP");
}
EmitCode::val_symbol(K_value, lvar_s);

2
inform7/imperative-module/Chapter 3/Stack Frames.w
View file

@ -413,7 +413,7 @@ void Frames::emit_new_local_value(kind *K) {
void Frames::log(stack_frame *frame) {
if (frame == NULL) { LOG("<null stack frame>\n"); return; }
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->determines_past_conditions)?"yes":"no");
local_variable *lvar;

3
services/arch-module/Chapter 3/Feature Manager.w
View file

@ -159,8 +159,7 @@ void Features::run_activation_function(compiler_feature *F) {
if ((allow_activation_functions_to_be_run) && (F) &&
(F->activation_function_run == FALSE)) {
F->activation_function_run = TRUE;
void (*start)() = (void (*)()) F->activation_function;
if (start) (*start)();
if (F->activation_function) (*(F->activation_function))();
}
}

6
services/calculus-module/Chapter 3/Compilation Schemas.w
View file

@ -166,17 +166,11 @@ so it would not be safe to store only the textual identifier.
#ifdef CORE_MODULE
RTKindIDs::write_weak_identifier(OUT, va_arg(ap, kind *));
#endif
#ifndef CORE_MODULE
WRITE("{%u}", va_arg(ap, kind *));
#endif
break;
case 'L':
#ifdef CORE_MODULE
WRITE("%~L", va_arg(ap, local_variable *)); break;
#endif
#ifndef CORE_MODULE
WRITE("%08x", va_arg(ap, void *)); break;
#endif
break;
case 'n': {
int N = sch->no_quoted_inames++;

2
services/lexicon-module/Chapter 2/Excerpt Meanings.w
View file

@ -128,7 +128,7 @@ void ExcerptMeanings::log_all(void) {
int i = 0;
excerpt_meaning *em;
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.