From: Mehdi Dogguy Date: Mon, 2 Jan 2012 14:36:52 +0100 Subject: Fix spelling-error-in-binary --- Changelog | 8 ++++---- cil/src/cil.ml | 2 +- cil/src/ext/cfg.mli | 2 +- cil/src/frontc/cabs2cil.ml | 2 +- cil/src/logic/logic_typing.ml | 6 +++--- man/frama-c.1 | 2 +- src/impact/register.ml | 4 ++-- src/kernel/cmdline.mli | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Changelog b/Changelog index e527189..909b359 100644 --- a/Changelog +++ b/Changelog @@ -576,7 +576,7 @@ o* Cil [2010/12/20] Fixed bug #645. Ast_info.constant_expr, mkAddrOrStartOf,mkString,parseInt,sizeOf] no longer use an optional argument ?loc. It is now a non optional labeled argument. Previous default value of loc was - ~loc:Cil_datatype.Location.unkown which is most of the time + ~loc:Cil_datatype.Location.unknown which is most of the time not accurate. ################################### @@ -729,7 +729,7 @@ o Cil [2010/06/04] Support for custom extension in grammar of behaviors. -* Cil [2010/05/31] Extended grammar of pragma lines. o* Cil [2010/05/28] Fix bug #489: constant literal present in original source are preserved in the AST. NB: this implies that they might - be explicitely cast when an integer conversion occur. + be explicitly cast when an integer conversion occur. -* Kernel [2010/05/28] Fixed bug in handling of -cpp-command o! Cil [2010/05/21] Remove deprecated annotation_status of AAssert in the AST @@ -908,7 +908,7 @@ o! Kernel [2009/11/24] Use of global logic constants is now a - Value [2009/11/24] Handling of behavior-specific assertions now correct (albeit imprecise). -! Kernel [2009/11/19] The journal is generated only if the GUI is - crashing, or if the option -journal-enable is explicitely + crashing, or if the option -journal-enable is explicitly set (fixed issue #!330). +- Value [2009/11/19] New option -slevel-exclude f for fine-tuning semantic unrolling. @@ -1206,7 +1206,7 @@ o! Kernel [2009/01/23] File.pretty does not take anymore a formatter -* Journal [2009/01/19] Fixed bug with -disable-journal and type with no pretty-printer. - Configure [2009/01/19] New option -with-all-static in order to - statically link all plug-ins, except those explicitely + statically link all plug-ins, except those explicitly specified as dynamic (bts #?430). -* Journal [2009/01/19] Fixed bug in journalisation of non-functional values. -* Makefile [2009/01/19] Fixed bug whenever all plug-ins should be static. diff --git a/cil/src/cil.ml b/cil/src/cil.ml index 8fb03a2..ea04622 100644 --- a/cil/src/cil.ml +++ b/cil/src/cil.ml @@ -8880,7 +8880,7 @@ let rec mkCastT ~(e: exp) ~(oldt: typ) ~(newt: typ) = (* Watch out for constants *) match newt, e.enode with (* In the case were we have a representation for the literal, - add explicitely the cast. *) + add explicitly the cast. *) TInt(newik, []), Const(CInt64(i, _, None)) -> kinteger64 ~loc newik i | _ -> new_exp diff --git a/cil/src/ext/cfg.mli b/cil/src/ext/cfg.mli index 1467255..f40ad47 100644 --- a/cil/src/ext/cfg.mli +++ b/cil/src/ext/cfg.mli @@ -51,7 +51,7 @@ open Cil_types (** Compute the CFG for an entire file, by calling cfgFun on each function. *) val computeFileCFG: file -> unit -(** clear the sid (except when clear_id is explicitely set to false), +(** clear the sid (except when clear_id is explicitly set to false), succs, and preds fields of each statement. *) val clearFileCFG: ?clear_id:bool -> file -> unit diff --git a/cil/src/frontc/cabs2cil.ml b/cil/src/frontc/cabs2cil.ml index fabb198..a69c921 100644 --- a/cil/src/frontc/cabs2cil.ml +++ b/cil/src/frontc/cabs2cil.ml @@ -2257,7 +2257,7 @@ let makeGlobalVarinfo (isadef: bool) (vi: varinfo) : varinfo * bool = * local. This can happen when we declare an extern variable with * global scope but we are in a local scope. *) - (* We lookup in the environement. If this is extern inline then the name + (* We lookup in the environment. If this is extern inline then the name * was already changed to foo__extinline. We lookup with the old name *) let lookupname = if vi.vstorage = Static then diff --git a/cil/src/logic/logic_typing.ml b/cil/src/logic/logic_typing.ml index 88d686f..8f76da6 100644 --- a/cil/src/logic/logic_typing.ml +++ b/cil/src/logic/logic_typing.ml @@ -1803,7 +1803,7 @@ struct info.ctor_name with Not_found -> (* We have a global logic variable. It may depend on - a single state (multiple labels need to be explicitely + a single state (multiple labels need to be explicitly instantiated and are treated as PLapp below). NB: for now, if we have a real function (with parameters other than labels) and a label, @@ -1832,7 +1832,7 @@ struct Tapp(f,[l,curr],[]), typ | _ -> error loc - "%s labels must be explicitely instantiated" x + "%s labels must be explicitly instantiated" x in match C.find_all_logic_functions x with @@ -2581,7 +2581,7 @@ struct | [l] -> [l,find_current_label loc env] | _ -> error loc - "%s labels must be explicitely instantiated" x + "%s labels must be explicitly instantiated" x in papp ~loc (info,labels,[]) | Some _ -> boolean_to_predicate env p0 diff --git a/man/frama-c.1 b/man/frama-c.1 index 4c90286..7bfb92d 100644 --- a/man/frama-c.1 +++ b/man/frama-c.1 @@ -356,7 +356,7 @@ removes break, continue and switch statement before analyses. Defaults to no. .TP .B -then -allows to compose analyzes: a first run of Frama-C will occur with the +allows one to compose analyzes: a first run of Frama-C will occur with the options before .B -then and a second run will be done with the options after diff --git a/src/impact/register.ml b/src/impact/register.ml index 42778b7..6b160a4 100644 --- a/src/impact/register.ml +++ b/src/impact/register.ml @@ -41,12 +41,12 @@ let from_stmt s = with | Dynamic.Incompatible_type _ -> error "versions of plug-ins `impact' and `Security_slicing' seem \ -incompatible.\nCheck the environement variable FRAMAC_PLUGIN.\n\ +incompatible.\nCheck the environment variable FRAMAC_PLUGIN.\n\ Analysis discarded."; [] | Dynamic.Unbound_value _ -> error "cannot access to plug-in `Security_slicing'.\n\ -Are you sure that it is loaded? Check the environement variable \ +Are you sure that it is loaded? Check the environment variable \ FRAMAC_PLUGIN.\n\ Analysis discarded."; [] diff --git a/src/kernel/cmdline.mli b/src/kernel/cmdline.mli index 7bf4673..cb5cdb7 100644 --- a/src/kernel/cmdline.mli +++ b/src/kernel/cmdline.mli @@ -274,7 +274,7 @@ val journal_enable: bool (** @since Beryllium-20090601-beta1 *) val journal_isset: bool - (** -journal-enable/disable explicitely set on the command line. + (** -journal-enable/disable explicitly set on the command line. @since Boron-20100401 *) val journal_name: string --