Index: doc/example-scripts/per-object-mixins.tcl =================================================================== diff -u -N -r49ae7bc3bd38bc19c69d950a8e4c93c141003f1c -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- doc/example-scripts/per-object-mixins.tcl (.../per-object-mixins.tcl) (revision 49ae7bc3bd38bc19c69d950a8e4c93c141003f1c) +++ doc/example-scripts/per-object-mixins.tcl (.../per-object-mixins.tcl) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -37,7 +37,7 @@ # ---- # There are many ways to extend the behavior NX classes at -# runtime. The easiest thing is to add methods dynamically to +# run time. The easiest thing is to add methods dynamically to # classes. E.g. we can extend the BaseClass with the method unknown, # which is called whenever an unknown method is called. Index: doc/example-scripts/rosetta-add-variable.tcl =================================================================== diff -u -N -re33e0a21665f86b608997099ded597777f9e0954 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- doc/example-scripts/rosetta-add-variable.tcl (.../rosetta-add-variable.tcl) (revision e33e0a21665f86b608997099ded597777f9e0954) +++ doc/example-scripts/rosetta-add-variable.tcl (.../rosetta-add-variable.tcl) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -1,7 +1,7 @@ # -# == Rosetta example: Add a variable to a class instance at runtime +# == Rosetta example: Add a variable to a class instance at run time # -# Demonstrate how to dynamically add variables to an object (a class instance) at runtime. +# Demonstrate how to dynamically add variables to an object (a class instance) at run time. # https://rosettacode.org/wiki/Add_a_variable_to_a_class_instance_at_runtime#Tcl # Index: doc/example-scripts/rosetta-multiple-distinct.tcl =================================================================== diff -u -N -rae081c0f1926da915e0584d8561abaa8a2a022a4 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- doc/example-scripts/rosetta-multiple-distinct.tcl (.../rosetta-multiple-distinct.tcl) (revision ae081c0f1926da915e0584d8561abaa8a2a022a4) +++ doc/example-scripts/rosetta-multiple-distinct.tcl (.../rosetta-multiple-distinct.tcl) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -4,7 +4,7 @@ # # Create a sequence (array, list, whatever) consisting of "n" # distinct, initialized items of the same type. The value of "n" -# should be determined at runtime. +# should be determined at run time. # # https://rosettacode.org/wiki/Multiple_distinct_objects # @@ -18,7 +18,7 @@ # nx::Class create Foo -set n 100; # runtime parameter +set n 100; # run time parameter # # Wrong: Only a single item (object) is created, its (command) name is Index: doc/next-migration.txt =================================================================== diff -u -N -r308645320ba8b2d4fa4d34b07ab8b6bf6c353738 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- doc/next-migration.txt (.../next-migration.txt) (revision 308645320ba8b2d4fa4d34b07ab8b6bf6c353738) +++ doc/next-migration.txt (.../next-migration.txt) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -1017,7 +1017,7 @@ instance variables (also called _properties_) and non configurable instance variables (called _variables_), which might have as well e.g. default values. The values of configurable properties can be -queried at runtime via +cget+, and their values can be altered via +queried at run time via +cget+, and their values can be altered via +configure+. When the value of a configure parameter is provided or changed, the value checkers from the variable definition are used to ensure, the value is permissible (i.e. it is for example an integer @@ -1321,7 +1321,7 @@ # # User defined value constraints are possible. # All parameter value checkers can be turned on -# and off at runtime. +# and off at run time. # # Define a required boolean property "a" # and an integer property "b" with a default. @@ -1384,7 +1384,7 @@ NX supports in contrary to XOTcl to define the _multiplicity_ of values per parameter. In NX, one can specify that a parameter can accept the value "" (empty) in addition to e.g. an integer, or one can specify that the -value is an empty or non-empty list of values via the multiplicity. For +value is an empty or nonempty list of values via the multiplicity. For every specified value, the value checkers are applied. [options="header",cols="asciidoc,asciidoc",frame="none",valign="middle"] @@ -1400,7 +1400,7 @@ ---------------- # Parameter with multiplicity # ints is a list of integers, with default -# objs is a non-empty list of objects +# objs is a nonempty list of objects # obj is a single object, maybe empty Class create Foo -properties { @@ -1710,7 +1710,7 @@ :forward ++ -returns integer ::expr 1 + # Define a method that has to return a - # non-empty list of objects + # nonempty list of objects :public object method instances {} \ -returns object,1..n { return [:info instances] @@ -2249,7 +2249,7 @@ ==== List Configure Parameters The way, how newly created objects can be configured is determined in NX via properties. The configuration happens during creation via the -methods +create+ or +new+ or during runtime via +configure+. These +methods +create+ or +new+ or during run time via +configure+. These methods have therefore virtual argument lists, depending on the object or class on which they are applied. Index: doc/next-tutorial/next-tutorial.txt =================================================================== diff -u -N -r308645320ba8b2d4fa4d34b07ab8b6bf6c353738 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- doc/next-tutorial/next-tutorial.txt (.../next-tutorial.txt) (revision 308645320ba8b2d4fa4d34b07ab8b6bf6c353738) +++ doc/next-tutorial/next-tutorial.txt (.../next-tutorial.txt) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -682,7 +682,7 @@ The term configurable means that (a) one can provide at creation time of an instance a value for this variable, and (b), one can query the value via the accessor function +cget+ and (c), one can change the -value of the variable via +configure+ at runtime. Since the general +value of the variable via +configure+ at run time. Since the general accessor function +cget+ and +configure+ are available, an application developer does not have to program own accessor methods. When value checkers are provided, each time, the value of the variable is to be @@ -756,7 +756,7 @@ tailored constructor methods significantly. Note that the property +matnr+ of class +Student+ is required. This -means, that if we try to create an instance of +Student+, a runtime +means, that if we try to create an instance of +Student+, a run time exception will be triggered. The property +oncamups+ is boolean and contains a default value. Providing a default value means that whenever we create an instance of this class the object will contain @@ -2011,7 +2011,7 @@ } # - # Positional parameter with a non-empty + # Positional parameter with a nonempty # list of values # :public object method baz {x:integer,1..n} { @@ -2081,7 +2081,7 @@ default, all substitution kinds of Tcl are active: command, variable, and backslash substitution. +substdefault+ can be parametrized to include or to exclude any combination of substitution -kinds by providing a bitmask: +kinds by providing a bit mask: - +substdefault=0b111+: all substitutions active (default) - +substdefault=0b100+: substitute backslashes only (like +subst -novariables -nocommands+) @@ -2239,7 +2239,7 @@ -------------------------------------------------- The given parameter show, how (a) objects can be configured -at runtime or (b) how new instances can be configured +at run time or (b) how new instances can be configured at creation time via the +new+ or +create+ methods. Introspection can be used to obtain the configuration parameters from an object via Index: generic/nsf.c =================================================================== diff -u -N -r0aae129621a59088bba8470cd7aef9ce2221c4b7 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- generic/nsf.c (.../nsf.c) (revision 0aae129621a59088bba8470cd7aef9ce2221c4b7) +++ generic/nsf.c (.../nsf.c) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -126,7 +126,7 @@ /* * TclCmdClientdata is an incomplete type containing the common * field(s) of ForwardCmdClientData, AliasCmdClientData and - * SetterCmdClientData used for filling in at runtime the actual + * SetterCmdClientData used for filling in at run time the actual * object. */ typedef struct TclCmdClientData { @@ -974,7 +974,7 @@ * * ParseContextExtendObjv -- * - * Extend Tcl_Obj array at runtime, when more elements are + * Extend Tcl_Obj array at run time, when more elements are * needed. This function is called to extend an already * initialized ParseContext. * @@ -2656,7 +2656,7 @@ NsfClasses *prevPtr = NULL; /* - * List is non-empty. + * List is nonempty. */ for (entryPtr = *firstPtrPtr; entryPtr != NULL; @@ -8488,7 +8488,7 @@ /* * Do not check assertion modifying methods, otherwise we cannot react in - * catch on a runtime assertion check failure + * catch on a run time assertion check failure */ #if 1 @@ -15974,7 +15974,7 @@ if (unlikely(rst == NULL)) { /* - * There is no runtime state in this interpreter. + * There is no run time state in this interpreter. */ if ((Tcl_Interp_flags(interp) & DELETED)) { @@ -15984,7 +15984,7 @@ result = TCL_OK; } else { /* - * In all other cases we expect a runtime state. If this is violated, + * In all other cases we expect a run time state. If this is violated, * something substantial must be wrong, so panic. */ @@ -20231,7 +20231,7 @@ nobjv = (Tcl_Obj **)ckalloc((unsigned)sizeof(Tcl_Obj *) * (unsigned)nobjc); MEM_COUNT_ALLOC("nextArgumentVector", nobjv); /* - * Copy the ensemble path name + * Copy the ensemble pathname */ memcpy((char *)nobjv, cscPtr->objv, sizeof(Tcl_Obj *) * (size_t)methodNameLength); @@ -22950,7 +22950,7 @@ * * Helper function to print either an error message directly to call the * forwarder specific callback method specified in - * tcd->onerror. Background: ForwardArg() is called at runtime to + * tcd->onerror. Background: ForwardArg() is called at run time to * substitute the argument list. Catching such errors is not conveniently * doable via catch, since it would be necessary to wrap every possible * usage of a forwarder in a catch. Therefore, the callback function can be @@ -30518,7 +30518,7 @@ /* TODO: Need to remove these properties? - Allow one to delete a class system at runtime? + Allow one to delete a class system at run time? */ } @@ -35334,9 +35334,9 @@ #endif /* - * Free runtime state. + * Free run time state. */ - /*fprintf(stderr, "+++ ExiHandler frees runtime state of interp %p\n", interp);*/ + /*fprintf(stderr, "+++ ExiHandler frees run time state of interp %p\n", interp);*/ ckfree((char *) rst); #if defined(USE_ASSOC_DATA) Tcl_DeleteAssocData(interp, "NsfRuntimeState"); @@ -35719,7 +35719,7 @@ * The file "predefined.h" contains some methods and library procs * implemented in Tcl - they could go in .tcl file, but they are embedded * here with Tcl_Eval to avoid the need to carry around a separate file at - * runtime. + * run time. */ #include "predefined.h" Index: generic/nsfInt.h =================================================================== diff -u -N -r37833d2979f789fc14627e6c1f38ca3cb0ceac01 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- generic/nsfInt.h (.../nsfInt.h) (revision 37833d2979f789fc14627e6c1f38ca3cb0ceac01) +++ generic/nsfInt.h (.../nsfInt.h) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -125,7 +125,7 @@ * ANSI versions. * * Note: It is sufficient to test for __MINGW32__ to trap all MinGW - * tool chains, including 64bit versions. See + * tool chains, including 64-bit versions. See * https://sourceforge.net/p/predef/wiki/Compilers/#mingw-and-mingw-w64 */ Index: generic/nsfStack.c =================================================================== diff -u -N -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- generic/nsfStack.c (.../nsfStack.c) (revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9) +++ generic/nsfStack.c (.../nsfStack.c) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -904,7 +904,7 @@ * CallStackNextFrameOfType -- * * Return the next frame on the call stack being of a specified type. The - * type is specified by a bitmask passed as flags. + * type is specified by a bit mask passed as flags. * * Results: * Tcl_CallFrame Index: library/lib/nx-shell.tcl =================================================================== diff -u -N -ra963e8896fd07c345ccfa034cbd043344edbf083 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- library/lib/nx-shell.tcl (.../nx-shell.tcl) (revision a963e8896fd07c345ccfa034cbd043344edbf083) +++ library/lib/nx-shell.tcl (.../nx-shell.tcl) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -106,7 +106,7 @@ fileevent stdin readable {} :onExit -shell ${:forever} } else { - # non-interactive modes + # noninteractive modes :nonInteract {*}$argv } :exitOff @@ -115,7 +115,7 @@ :protected object method nonInteract {-c:switch args} { if {$c} { - # non-interactive mode: arg command xor stdin + # noninteractive mode: arg command xor stdin if {[llength $args]} { # arg command plus argc/argv set args [lassign $args script] @@ -129,7 +129,7 @@ } :evalScript -exit $script } else { - # non-interactive mode: script + # noninteractive mode: script set ::argv [lassign $args argv0] incr ::argc -1 if {[catch {uplevel #0 [list source $argv0]} msg opts]} { Index: library/lib/nx-zip.tcl =================================================================== diff -u -N -r1001159512509e6643f66aa1b72340b6f7608cdc -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- library/lib/nx-zip.tcl (.../nx-zip.tcl) (revision 1001159512509e6643f66aa1b72340b6f7608cdc) +++ library/lib/nx-zip.tcl (.../nx-zip.tcl) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -1,5 +1,5 @@ # -# Zip file generator - Create a Zip-file from a list of input file names +# Zip file generator - Create a Zip-file from a list of input filenames # # This implementation is based on the zip file builder of Artur # Trzewik (https://wiki.tcl-lang.org/15158), but was simplified, refactored, @@ -38,7 +38,7 @@ # # - # Add a file from the file system to the zip archive + # Add a file from the filesystem to the zip archive # :public method addFile {inputFileName outputFileName:optional} { # inputFileName - source file to archive @@ -136,7 +136,7 @@ # relative offset of local header :writeLong $(offset) - # file name + # filename :writeString $(fileNameInternal) :writeExtraFieldUPATH $(fileName) $(fileNameInternal) @@ -243,7 +243,7 @@ :writeFileHeaderBlock [array get ""] - # file name + # filename :writeString $(fileNameInternal) :writeExtraFieldUPATH $(fileName) $(fileNameInternal) @@ -276,15 +276,15 @@ :writeLong $(csize) :writeLong $(size) - # file name length + # filename length :writeShort [string length $(fileNameInternal)] # extra field length :writeShort $(extraFieldLength) } # - # Convert the provided time stamp to DOS time. + # Convert the provided timestamp to DOS time. # :method toDosTime {time} { foreach {year month day hour minute second} \ Index: library/mongodb/nsfmongo.c =================================================================== diff -u -N -rec5702daf07d4f8ed37deb09198ebff5b3fbb1bf -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- library/mongodb/nsfmongo.c (.../nsfmongo.c) (revision ec5702daf07d4f8ed37deb09198ebff5b3fbb1bf) +++ library/mongodb/nsfmongo.c (.../nsfmongo.c) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -1666,7 +1666,7 @@ /*********************************************************************** * GridFile interface * - * Currently offsets and sizes are limited to 32bit integers, we should + * Currently offsets and sizes are limited to 32-bit integers, we should * relax this later. ***********************************************************************/ Index: library/mongodb/tests/nsf-gridfs.test =================================================================== diff -u -N -r1aebb8d6a681373d71a10a22184086b97dab9420 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- library/mongodb/tests/nsf-gridfs.test (.../nsf-gridfs.test) (revision 1aebb8d6a681373d71a10a22184086b97dab9420) +++ library/mongodb/tests/nsf-gridfs.test (.../nsf-gridfs.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -2,7 +2,7 @@ # # This test suite tests some basic interactions from the nsf mongo # interface with gridFS. It connects to mongoDB, opens a GridFS named -# "myfs" and inserts a file into the file systems. Run the script +# "myfs" and inserts a file into the filesystems. Run the script # with the current directory of nsfmongo, such it can find the README # file. # Index: library/serialize/serializer.tcl =================================================================== diff -u -N -r39197485bb3bf3b52b16bccda51800cd801b8f4b -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- library/serialize/serializer.tcl (.../serializer.tcl) (revision 39197485bb3bf3b52b16bccda51800cd801b8f4b) +++ library/serialize/serializer.tcl (.../serializer.tcl) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -875,7 +875,7 @@ # interpreter when the blueprint script was changed. In the # latter case, we have already in the current interpreter # predefined objects and classes. When objects are created at - # runtime and staying the connection threads, these object will + # run time and staying the connection threads, these object will # be turned into base class objects, when the classes are # deleted and newly defined. Therefore, we cleanup the interp in # a first step. Alternate approaches could be to handle these Index: tests/alias.test =================================================================== diff -u -N -rf10f6e087eba19df21585a1776e095862306855d -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/alias.test (.../alias.test) (revision f10f6e087eba19df21585a1776e095862306855d) +++ tests/alias.test (.../alias.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -791,7 +791,7 @@ # we can define currently the recursive definition ? [list [:] public object alias foo $handle] "::o::foo" } - # at runtime, we get an exception + # at run time, we get an exception #puts stderr ====== ? {o foo} {target "::o::foo" of alias foo apparently disappeared} Index: tests/disposition.test =================================================================== diff -u -N -r9e281d5110f397a9e9b8317325d0675f1793246d -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/disposition.test (.../disposition.test) (revision 9e281d5110f397a9e9b8317325d0675f1793246d) +++ tests/disposition.test (.../disposition.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -1252,7 +1252,7 @@ "Calling defaultmethod via alias+noarg combo with empty default" T setObjectParams [list [list z:alias,noarg "XXX"]] ? {T create t; ::obj eval {info exists :defaultmethod}} 1 \ - "Calling defaultmethod via alias+noarg non-empty with \ + "Calling defaultmethod via alias+noarg nonempty with \ default combo (default is not passed)" # # b) intermediary object aliases, non-fully qualified selector Index: tests/doc.test =================================================================== diff -u -N -r8024df76962dab57646dc206e07a7ae66e7990ad -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/doc.test (.../doc.test) (revision 8024df76962dab57646dc206e07a7ae66e7990ad) +++ tests/doc.test (.../doc.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -427,7 +427,7 @@ $prj destroy } - # TODO: how to realise scanning and parsing for mixed ex- and + # TODO: how to realize scanning and parsing for mixed ex- and # in-situ documentation? That is, how to differentiate between # absolutely and relatively qualified comment blocks in line-based # scanning phase (or later)? Index: tests/methods.test =================================================================== diff -u -N -r5bcb005ea31a89167ea237f47dffb0c0166bd2c9 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/methods.test (.../methods.test) (revision 5bcb005ea31a89167ea237f47dffb0c0166bd2c9) +++ tests/methods.test (.../methods.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -305,10 +305,10 @@ :object method foo {a b c args} { return [current method]-ok } ## Expansion to valid method calls (messages) - :object method expand-non-empty-list-1 {} { + :object method expand-nonempty-list-1 {} { {*}[list :foo 1 2 3 4 5 6]; } - :object method expand-non-empty-list-2 {} { + :object method expand-nonempty-list-2 {} { : {*}[list foo 1 2 3 4 5 6]; } :object method expand-self-call-1 {} { @@ -336,8 +336,8 @@ } }] - ? [list $o expand-non-empty-list-1] "foo-ok" - ? [list $o expand-non-empty-list-2] "foo-ok" + ? [list $o expand-nonempty-list-1] "foo-ok" + ? [list $o expand-nonempty-list-2] "foo-ok" ? [list $o expand-self-call-1] $o ? [list $o expand-self-call-2] $o Index: tests/parameters.test =================================================================== diff -u -N -r308645320ba8b2d4fa4d34b07ab8b6bf6c353738 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/parameters.test (.../parameters.test) (revision 308645320ba8b2d4fa4d34b07ab8b6bf6c353738) +++ tests/parameters.test (.../parameters.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -149,8 +149,8 @@ # do not allow "currently unknown" user defined types in parametercheck ? {::nsf::is -complain in1 aaa} {invalid value constraints "in1"} - ? {::nsf::is -complain lower c} 1 "lower case char" - ? {::nsf::is -complain lower abc} 1 "lower case chars" + ? {::nsf::is -complain lower c} 1 "lowercase char" + ? {::nsf::is -complain lower abc} 1 "lowercase chars" ? {::nsf::is -complain lower Abc} {expected lower but got "Abc"} ? {string is lower abc} 1 "tcl command 'string is lower'" Index: tests/shells.test =================================================================== diff -u -N -r8e2e356e9bcef39f43dfe3690b82d9586c7adc72 -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/shells.test (.../shells.test) (revision 8e2e356e9bcef39f43dfe3690b82d9586c7adc72) +++ tests/shells.test (.../shells.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -43,7 +43,7 @@ } ? [list getFirstLine [list exec $nxsh NXSCRIPT.tcl << "$run; exit"]] \ "couldn't read file \"NXSCRIPT.tcl\": no such file or directory" - ## non-interactive mode (-c) + ## noninteractive mode (-c) ? [list exec $nxsh -c "$run" NXSCRIPT.tcl] \ "1-NXSCRIPT.tcl" ? [list exec $nxsh -c << $run] "0-" Index: tests/tcloo.test =================================================================== diff -u -N -r8024df76962dab57646dc206e07a7ae66e7990ad -r78c12b94b4cdcd5edb70a546b7bbb7c0a4724668 --- tests/tcloo.test (.../tcloo.test) (revision 8024df76962dab57646dc206e07a7ae66e7990ad) +++ tests/tcloo.test (.../tcloo.test) (revision 78c12b94b4cdcd5edb70a546b7bbb7c0a4724668) @@ -15,7 +15,7 @@ # visibility/accessibility modifiers; it is also about extending or # reducing the public method interface of an object along the # linearization path (or of derived, intermediary classes in an -# inheritance hierarchy). This export|unexport can be realised by +# inheritance hierarchy). This export|unexport can be realized by # assembling some NSF building blocks: method call protection, # selective next forwarding, ... #