From a26dbe0dfceec9dacf827dd00f39708627b5d323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Thu, 5 Nov 2015 16:38:18 +0000 Subject: [PATCH] init spelling and remove debugging --- C/c_interface.c | 14 +++++++------- C/exec.c | 2 +- C/globals.c | 6 +++--- C/heapgc.c | 1 - C/index.c | 14 +++++++------- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/C/c_interface.c b/C/c_interface.c index f1cf8589d..e3de08cff 100755 --- a/C/c_interface.c +++ b/C/c_interface.c @@ -261,10 +261,10 @@ *appropriate. * * Revision 1.57 2004/11/18 22:32:31 vsc -* fix situation where we might assume nonextsing double initialisation of C +* fix situation where we might assume nonextsing double initialization of C *predicates (use * Hidden Pred Flag). -* $host_type was double initialised. +* $host_type was double initialized. * * Revision 1.56 2004/10/31 02:18:03 vsc * fix bug in handling Yap heap overflow while adding new clause. @@ -2631,12 +2631,12 @@ X_API Int YAP_Init(YAP_init_args *yap_init) { int do_bootstrap = (yap_init->YapPrologBootFile != NULL); CELL Trail = 0, Stack = 0, Heap = 0, Atts = 0; char boot_file[256]; - static int initialised = FALSE; + static int initialized = FALSE; /* ignore repeated calls to YAP_Init */ - if (initialised) + if (initialized) return YAP_BOOT_DONE_BEFOREHAND; - initialised = TRUE; + initialized = TRUE; Yap_InitPageSize(); /* init memory page size, required by later functions */ #if defined(YAPOR_COPY) || defined(YAPOR_COW) || defined(YAPOR_SBA) @@ -2814,7 +2814,7 @@ X_API Int YAP_Init(YAP_init_args *yap_init) { else Yap_AttsSize = 2048 * sizeof(CELL); if (restore_result == DO_ONLY_CODE) { - /* first, initialise the saved state */ + /* first, initialize the saved state */ Term t_goal = MkAtomTerm(AtomInitProlog); YAP_RunGoalOnce(t_goal); return YAP_BOOT_FROM_SAVED_CODE; @@ -2831,7 +2831,7 @@ X_API Int YAP_Init(YAP_init_args *yap_init) { } do_bootfile(yap_init->YapPrologBootFile ? yap_init->YapPrologBootFile : BootFile PASS_REGS); - /* initialise the top-level */ + /* initialize the top-level */ if (!do_bootstrap) { char init_file[256]; Atom atfile; diff --git a/C/exec.c b/C/exec.c index aad1bba8e..9498943fa 100755 --- a/C/exec.c +++ b/C/exec.c @@ -1550,7 +1550,7 @@ bool Yap_Reset(yap_reset_t mode) { // B shoul lead to CP with _ystop0,, P = FAILCODE; res = Yap_exec_absmi(true, mode); - /* reinitialise the engine */ + /* reinitialize the engine */ // Yap_InitYaamRegs( worker_id ); GLOBAL_Initialised = true; ENV = LCL0; diff --git a/C/globals.c b/C/globals.c index e6b6e782e..fff869057 100644 --- a/C/globals.c +++ b/C/globals.c @@ -50,7 +50,7 @@ scoping in future versions. Both b_setval/2 and nb_setval/2 implicitly create a variable if the referenced name does not already refer to a variable. -Global variables may be initialised from directives to make them +Global variables may be initialized from directives to make them available during the program lifetime, but some considerations are necessary for saved-states and threads. Saved-states to not store global variables, which implies they have to be declared with @@ -59,7 +59,7 @@ state. Each thread has its own set of global variables, starting with an empty set. Using `thread_initialization/1` to define a global variable it will be defined, restored after reloading a saved state and created in all threads that are created after the -registration. Finally, global variables can be initialised using the +registration. Finally, global variables can be initialized using the exception hook called exception/3. The latter technique is used by CHR. @@ -89,7 +89,7 @@ consider module scoping in future versions. Both b_setval/2 and nb_setval/2 implicitly create a variable if the referenced name does not already refer to a variable. -Global variables may be initialised from directives to make them +Global variables may be initialized from directives to make them available during the program lifetime, but some considerations are necessary for saved-states and threads. Saved-states to not store global variables, which implies they have to be declared with initialization/1 diff --git a/C/heapgc.c b/C/heapgc.c index f54fa9a82..f77f80bda 100644 --- a/C/heapgc.c +++ b/C/heapgc.c @@ -1580,7 +1580,6 @@ mark_regs(tr_fr_ptr old_TR USES_REGS) for (trail_ptr = old_TR; trail_ptr < tr; trail_ptr++) { mark_external_reference(&TrailTerm(trail_ptr) PASS_REGS); } - printf(" %p TR=%p\n",trail_ptr,TR); } diff --git a/C/index.c b/C/index.c index 03f0511e8..58bafe309 100755 --- a/C/index.c +++ b/C/index.c @@ -131,7 +131,7 @@ * extend interface * * Revision 1.167 2006/05/02 16:44:11 vsc -* avoid uninitialised memory at overflow. +* avoid uninitialized memory at overflow. * * Revision 1.166 2006/05/02 16:39:06 vsc * bug in indexing code @@ -344,9 +344,9 @@ * a few fixes for 64 bit compiling. * * Revision 1.106 2004/11/18 22:32:36 vsc -* fix situation where we might assume nonextsing double initialisation of C predicates (use +* fix situation where we might assume nonextsing double initialization of C predicates (use * Hidden Pred Flag). -* $host_type was double initialised. +* $host_type was double initialized. * * Revision 1.105 2004/11/04 18:22:32 vsc * don't ever use memory that has been freed (that was done by LU). @@ -994,7 +994,7 @@ sort_group(GroupDef *grp, CELL *top, struct intermediates *cint) } #endif pt = base; - /* initialise vector */ + /* initialize vector */ for (i=0; i < max; i++) { *pt = i; pt += 2; @@ -2430,7 +2430,7 @@ do_nonvar_group(GroupDef *grp, Term t, UInt compound_term, CELL *sreg, UInt arit return NULL; } type_sw = emit_type_switch(switch_on_type_op, cint); - /* have these first so that we will have something initialised here */ + /* have these first so that we will have something initialized here */ type_sw->ConstEntry = type_sw->FuncEntry = type_sw->PairEntry = @@ -4490,7 +4490,7 @@ expand_ctable(yamop *pc, ClauseUnion *blk, struct intermediates *cint, Term at) if (cases == pc->y_u.sssl.s) { return fetch_centry(old_ae, at, n-1, n); } - /* initialise */ + /* initialize */ target = (AtomSwiEntry *)emit_switch_space(cases, sizeof(AtomSwiEntry), cint, 0); pc->opc = Yap_opcode(_switch_on_cons); pc->y_u.sssl.s = cases; @@ -4554,7 +4554,7 @@ expand_ftable(yamop *pc, ClauseUnion *blk, struct intermediates *cint, Functor f pc->y_u.sssl.s = cases; pc->y_u.sssl.e = n; pc->y_u.sssl.w = 0; - /* initialise */ + /* initialize */ target = (FuncSwiEntry *)emit_switch_space(cases, sizeof(FuncSwiEntry), cint, FuncSwitchMask); for (i=0; i