diff options
| author | Federico Ceratto <federico.ceratto@gmail.com> | 2019-09-27 06:02:54 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-09-27 07:02:54 +0200 |
| commit | 39290cf88c5047e86dc4894e3190c63d5985f56f (patch) | |
| tree | f37c9e0a5491fb9b11266ce08bddc297b57f37fc | |
| parent | 9dd297f613768bb170e05dcaf361015d9448c582 (diff) | |
| download | Nim-39290cf88c5047e86dc4894e3190c63d5985f56f.tar.gz | |
Fix spellings (#12277) [backport]
110 files changed, 166 insertions, 166 deletions
diff --git a/compiler/asciitables.nim b/compiler/asciitables.nim index c25d54bde..39bb26a5c 100644 --- a/compiler/asciitables.nim +++ b/compiler/asciitables.nim @@ -71,7 +71,7 @@ iterator parseTableCells*(s: string, delim = '\t'): Cell = proc alignTable*(s: string, delim = '\t', fill = ' ', sep = " "): string = ## formats a `delim`-delimited `s` representing a table; each cell is aligned ## to a width that's computed for each column; consecutive columns are - ## delimted by `sep`, and alignment space is filled using `fill`. + ## delimited by `sep`, and alignment space is filled using `fill`. ## More customized formatting can be done by calling `parseTableCells` directly. for cell in parseTableCells(s, delim): result.add cell.text diff --git a/compiler/ast.nim b/compiler/ast.nim index fdd91ef5e..a2598dae4 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -185,7 +185,7 @@ type nkStmtListExpr, # a statement list followed by an expr; this is used # to allow powerful multi-line templates nkBlockExpr, # a statement block ending in an expr; this is used - # to allowe powerful multi-line templates that open a + # to allow powerful multi-line templates that open a # temporary scope nkStmtListType, # a statement list ending in a type; for macros nkBlockType, # a statement block ending in a type; for macros @@ -272,7 +272,7 @@ type sfNamedParamCall, # symbol needs named parameter call syntax in target # language; for interfacing with Objective C sfDiscardable, # returned value may be discarded implicitly - sfOverriden, # proc is overriden + sfOverriden, # proc is overridden sfCallsite # A flag for template symbols to tell the # compiler it should use line information from # the calling side of the macro, not from the @@ -535,8 +535,8 @@ type tfTriggersCompileTime # uses the NimNode type which make the proc # implicitly '.compiletime' tfRefsAnonObj # used for 'ref object' and 'ptr object' - tfCovariant # covariant generic param mimicing a ptr type - tfWeakCovariant # covariant generic param mimicing a seq/array type + tfCovariant # covariant generic param mimicking a ptr type + tfWeakCovariant # covariant generic param mimicking a seq/array type tfContravariant # contravariant generic param tfCheckedForDestructor # type was checked for having a destructor. # If it has one, t.destructor is not nil. @@ -1250,7 +1250,7 @@ proc skipTypes*(t: PType, kinds: TTypeKinds): PType = proc newIntTypeNode*(intVal: BiggestInt, typ: PType): PNode = - # this is dirty. abstractVarRange isn't defined yet and therefor it + # this is dirty. abstractVarRange isn't defined yet and therefore it # is duplicated here. const abstractVarRange = {tyGenericInst, tyRange, tyVar, tyDistinct, tyOrdinal, tyTypeDesc, tyAlias, tyInferred, tySink, tyOwned} diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index f29995202..7a84fb1a2 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -1027,7 +1027,7 @@ proc genAndOr(p: BProc, e: PNode, d: var TLoc, m: TMagic) = dec p.splitDecls proc genEcho(p: BProc, n: PNode) = - # this unusal way of implementing it ensures that e.g. ``echo("hallo", 45)`` + # this unusual way of implementing it ensures that e.g. ``echo("hallo", 45)`` # is threadsafe. internalAssert p.config, n.kind == nkBracket if p.config.target.targetOS == osGenode: diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim index ec579d9e7..6ff7cf91c 100644 --- a/compiler/ccgstmts.nim +++ b/compiler/ccgstmts.nim @@ -784,7 +784,7 @@ proc genStringCase(p: BProc, t: PNode, d: var TLoc) = var branches: seq[Rope] newSeq(branches, bitMask + 1) var a: TLoc - initLocExpr(p, t.sons[0], a) # fist pass: gnerate ifs+goto: + initLocExpr(p, t.sons[0], a) # fist pass: generate ifs+goto: var labId = p.labels for i in 1 ..< len(t): inc(p.labels) diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim index 3b8d93a5a..3cb508968 100644 --- a/compiler/ccgtypes.nim +++ b/compiler/ccgtypes.nim @@ -61,7 +61,7 @@ proc mangleParamName(m: BModule; s: PSym): Rope = var res = s.name.s.mangle # Take into account if HCR is on because of the following scenario: # if a module gets imported and it has some more importc symbols in it, - # some param names might recieve the "_0" suffix to distinguish from what + # some param names might receive the "_0" suffix to distinguish from what # is newly available. That might lead to changes in the C code in nimcache # that contain only a parameter name change, but that is enough to mandate # recompilation of that source file and thus a new shared object will be diff --git a/compiler/cgen.nim b/compiler/cgen.nim index 625e48328..d1ac70d03 100644 --- a/compiler/cgen.nim +++ b/compiler/cgen.nim @@ -1255,7 +1255,7 @@ proc hcrGetProcLoadCode(m: BModule, sym, prefix, handle, getProcFunc: string): R proc genMainProc(m: BModule) = ## this function is called in cgenWriteModules after all modules are closed, - ## it means raising dependency on the symbols is too late as it will not propogate + ## it means raising dependency on the symbols is too late as it will not propagate ## into other modules, only simple rope manipulations are allowed var preMainCode: Rope @@ -1514,7 +1514,7 @@ proc registerModuleToMain(g: BModuleList; m: BModule) = proc genDatInitCode(m: BModule) = ## this function is called in cgenWriteModules after all modules are closed, - ## it means raising dependency on the symbols is too late as it will not propogate + ## it means raising dependency on the symbols is too late as it will not propagate ## into other modules, only simple rope manipulations are allowed var moduleDatInitRequired = m.hcrOn @@ -1558,7 +1558,7 @@ proc hcrGetProcLoadCode(m: BModule, sym, prefix, handle, getProcFunc: string): R proc genInitCode(m: BModule) = ## this function is called in cgenWriteModules after all modules are closed, - ## it means raising dependency on the symbols is too late as it will not propogate + ## it means raising dependency on the symbols is too late as it will not propagate ## into other modules, only simple rope manipulations are allowed var moduleInitRequired = m.hcrOn let initname = getInitName(m) @@ -1746,7 +1746,7 @@ proc rawNewModule(g: BModuleList; module: PSym, filename: AbsoluteFile): BModule result.typeNodesName = getTempName(result) result.nimTypesName = getTempName(result) # no line tracing for the init sections of the system module so that we - # don't generate a TFrame which can confuse the stack botton initialization: + # don't generate a TFrame which can confuse the stack bottom initialization: if sfSystemModule in module.flags: incl result.flags, preventStackTrace excl(result.preInitProc.options, optStackTrace) diff --git a/compiler/cgendata.nim b/compiler/cgendata.nim index 0035931f0..6e451e953 100644 --- a/compiler/cgendata.nim +++ b/compiler/cgendata.nim @@ -58,7 +58,7 @@ type id*: int # the ID of the label; positive means that it label*: Rope # generated text for the label # nil if label is not used - sections*: TCProcSections # the code beloging + sections*: TCProcSections # the code belonging isLoop*: bool # whether block is a loop nestedTryStmts*: int16 # how many try statements is it nested into nestedExceptStmts*: int16 # how many except statements is it nested into @@ -150,7 +150,7 @@ type initProc*: BProc # code for init procedure preInitProc*: BProc # code executed before the init proc hcrCreateTypeInfosProc*: Rope # type info globals are in here when HCR=on - inHcrInitGuard*: bool # We are currently withing a HCR reloading guard. + inHcrInitGuard*: bool # We are currently within a HCR reloading guard. typeStack*: TTypeSeq # used for type generation dataCache*: TNodeTable typeNodes*, nimTypes*: int # used for type info generation diff --git a/compiler/closureiters.nim b/compiler/closureiters.nim index ed4a2857f..84da6a84d 100644 --- a/compiler/closureiters.nim +++ b/compiler/closureiters.nim @@ -1288,7 +1288,7 @@ proc transformClosureIterator*(g: ModuleGraph; fn: PSym, n: PNode): PNode = if getEnvParam(fn).isNil: # Lambda lifting was not done yet. Use temporary :state sym, which will # be handled specially by lambda lifting. Local temp vars (if needed) - # should folllow the same logic. + # should follow the same logic. ctx.stateVarSym = newSym(skVar, getIdent(ctx.g.cache, ":state"), fn, fn.info) ctx.stateVarSym.typ = g.createClosureIterStateType(fn) ctx.stateLoopLabel = newSym(skLabel, getIdent(ctx.g.cache, ":stateLoop"), fn, fn.info) @@ -1309,7 +1309,7 @@ proc transformClosureIterator*(g: ModuleGraph; fn: PSym, n: PNode): PNode = # Optimize empty states away ctx.deleteEmptyStates() - # Make new body by concating the list of states + # Make new body by concatenating the list of states result = newNodeI(nkStmtList, n.info) for s in ctx.states: assert(s.len == 2) diff --git a/compiler/cmdlinehelper.nim b/compiler/cmdlinehelper.nim index 26320d9cd..e44163d14 100644 --- a/compiler/cmdlinehelper.nim +++ b/compiler/cmdlinehelper.nim @@ -87,7 +87,7 @@ proc loadConfigsAndRunMainCommand*(self: NimProg, cache: IdentCache; conf: Confi discard # now process command line arguments again, because some options in the - # command line can overwite the config file's settings + # command line can overwrite the config file's settings extccomp.initVars(conf) self.processCmdLine(passCmd2, "", conf) if conf.command == "": diff --git a/compiler/dfa.nim b/compiler/dfa.nim index 2805e42fb..4016820e6 100644 --- a/compiler/dfa.nim +++ b/compiler/dfa.nim @@ -513,7 +513,7 @@ proc genTry(c: var Con; n: PNode) = let f = c.tryStmtFixups[i] c.patch(f) # we also need to produce join instructions - # for the 'fork' that might preceed the goto instruction + # for the 'fork' that might precede the goto instruction if f.int-1 >= 0 and c.code[f.int-1].kind == fork: c.joinI(TPosition(f.int-1), n) diff --git a/compiler/evaltempl.nim b/compiler/evaltempl.nim index 1fc7fd3db..90e309f80 100644 --- a/compiler/evaltempl.nim +++ b/compiler/evaltempl.nim @@ -135,7 +135,7 @@ proc evalTemplateArgs(n: PNode, s: PSym; conf: ConfigRef; fromHlo: bool): PNode else: addSon(result, default.copyTree) - # add any generic paramaters + # add any generic parameters for i in 1 .. genericParams: result.addSon n.sons[givenRegularParams + i] diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim index d65ab82fd..4c531e894 100644 --- a/compiler/extccomp.nim +++ b/compiler/extccomp.nim @@ -404,7 +404,7 @@ proc getConfigVar(conf: ConfigRef; c: TSystemCC, suffix: string): string = CC[c].name & fullSuffix result = getConfigVar(conf, fullCCname) if result.len == 0: - # not overriden for this cross compilation setting? + # not overridden for this cross compilation setting? result = getConfigVar(conf, CC[c].name & fullSuffix) else: result = getConfigVar(conf, CC[c].name & fullSuffix) @@ -757,7 +757,7 @@ proc getLinkCmd(conf: ConfigRef; output: AbsoluteFile, # way of being able to debug and rebuild the program at the same time. This # is accomplished using the /PDB:<filename> flag (there also exists the # /PDBALTPATH:<filename> flag). The only downside is that the .pdb files are - # atleast 300kb big (when linking statically to the runtime - or else 5mb+) + # at least 300kb big (when linking statically to the runtime - or else 5mb+) # and will quickly accumulate. There is a hacky solution: we could try to # delete all .pdb files with a pattern and swallow exceptions. # diff --git a/compiler/filter_tmpl.nim b/compiler/filter_tmpl.nim index 490c184cf..54218d73c 100644 --- a/compiler/filter_tmpl.nim +++ b/compiler/filter_tmpl.nim @@ -22,7 +22,7 @@ type info: TLineInfo indent, emitPar: int x: string # the current input line - outp: PLLStream # the ouput will be parsed by pnimsyn + outp: PLLStream # the output will be parsed by pnimsyn subsChar, nimDirective: char emit, conc, toStr: string curly, bracket, par: int diff --git a/compiler/hlo.nim b/compiler/hlo.nim index 8ebc1ec35..3ff2dd410 100644 --- a/compiler/hlo.nim +++ b/compiler/hlo.nim @@ -14,7 +14,7 @@ proc hlo(c: PContext, n: PNode): PNode proc evalPattern(c: PContext, n, orig: PNode): PNode = internalAssert c.config, n.kind == nkCall and n.sons[0].kind == nkSym # we need to ensure that the resulting AST is semchecked. However, it's - # aweful to semcheck before macro invocation, so we don't and treat + # awful to semcheck before macro invocation, so we don't and treat # templates and macros as immediate in this context. var rule: string if optHints in c.config.options and hintPattern in c.config.notes: diff --git a/compiler/importer.nim b/compiler/importer.nim index 8d8034735..32a727f4b 100644 --- a/compiler/importer.nim +++ b/compiler/importer.nim @@ -27,7 +27,7 @@ proc importPureEnumField*(c: PContext; s: PSym) = if checkB == nil: strTableAdd(c.pureEnumFields, s) else: - # mark as ambigous: + # mark as ambiguous: incl(c.ambiguousSymbols, checkB.id) incl(c.ambiguousSymbols, s.id) diff --git a/compiler/injectdestructors.nim b/compiler/injectdestructors.nim index e66f4f25b..5354fd740 100644 --- a/compiler/injectdestructors.nim +++ b/compiler/injectdestructors.nim @@ -256,7 +256,7 @@ proc isLastRead(n: PNode; c: var Con): bool = proc initialized(code: ControlFlowGraph; pc: int, init, uninit: var IntSet; comesFrom: int): int = - ## Computes the set of definitely initialized variables accross all code paths + ## Computes the set of definitely initialized variables across all code paths ## as an IntSet of IDs. var pc = pc while pc < code.len: @@ -492,7 +492,7 @@ proc pArg(arg: PNode; c: var Con; isSink: bool): PNode = result.add pArg(arg[i], c, i < L and isSinkTypeForParam(parameters[i])) elif arg.containsConstSeq: # const sequences are not mutable and so we need to pass a copy to the - # sink parameter (bug #11524). Note that the string implemenation is + # sink parameter (bug #11524). Note that the string implementation is # different and can deal with 'const string sunk into var'. result = passCopyToSink(arg, c) elif arg.kind in {nkBracket, nkObjConstr, nkTupleConstr, nkCharLit..nkTripleStrLit}: diff --git a/compiler/lexer.nim b/compiler/lexer.nim index d1e75d314..781f023c3 100644 --- a/compiler/lexer.nim +++ b/compiler/lexer.nim @@ -134,7 +134,7 @@ type TErrorHandler* = proc (conf: ConfigRef; info: TLineInfo; msg: TMsgKind; arg: string) TLexer* = object of TBaseLexer fileIdx*: FileIndex - indentAhead*: int # if > 0 an indendation has already been read + indentAhead*: int # if > 0 an indentation has already been read # this is needed because scanning comments # needs so much look-ahead currLineIndent*: int diff --git a/compiler/lookups.nim b/compiler/lookups.nim index df1d23b9c..57d86c775 100644 --- a/compiler/lookups.nim +++ b/compiler/lookups.nim @@ -233,7 +233,7 @@ proc addInterfaceOverloadableSymAt*(c: PContext, scope: PScope, sym: PSym) = addInterfaceDeclAux(c, sym) when defined(nimfix): - # when we cannot find the identifier, retry with a changed identifer: + # when we cannot find the identifier, retry with a changed identifier: proc altSpelling(x: PIdent): PIdent = case x.s[0] of 'A'..'Z': result = getIdent(toLowerAscii(x.s[0]) & x.s.substr(1)) diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim index 320ce2e81..2dfd79144 100644 --- a/compiler/modulegraphs.nim +++ b/compiler/modulegraphs.nim @@ -64,7 +64,7 @@ type importModuleCallback*: proc (graph: ModuleGraph; m: PSym, fileIdx: FileIndex): PSym {.nimcall.} includeFileCallback*: proc (graph: ModuleGraph; m: PSym, fileIdx: FileIndex): PNode {.nimcall.} recordStmt*: proc (graph: ModuleGraph; m: PSym; n: PNode) {.nimcall.} - cacheSeqs*: Table[string, PNode] # state that is shared to suppor the 'macrocache' API + cacheSeqs*: Table[string, PNode] # state that is shared to support the 'macrocache' API cacheCounters*: Table[string, BiggestInt] cacheTables*: Table[string, BTree[string, PNode]] passes*: seq[TPass] @@ -215,7 +215,7 @@ proc addDep*(g: ModuleGraph; m: PSym, dep: FileIndex) = addModuleDep(g.incr, g.config, m.info.fileIndex, dep, isIncludeFile = false) if g.suggestMode: g.deps.incl m.position.dependsOn(dep.int) - # we compute the transitive closure later when quering the graph lazily. + # we compute the transitive closure later when querying the graph lazily. # this improves efficiency quite a lot: #invalidTransitiveClosure = true diff --git a/compiler/nimeval.nim b/compiler/nimeval.nim index d03b99ba3..882e10fbb 100644 --- a/compiler/nimeval.nim +++ b/compiler/nimeval.nim @@ -46,7 +46,7 @@ proc selectUniqueSymbol*(i: Interpreter; name: string; s = nextIdentIter(it, i.mainModule.tab) proc selectRoutine*(i: Interpreter; name: string): PSym = - ## Selects a declared rountine (proc/func/etc) from the main module. + ## Selects a declared routine (proc/func/etc) from the main module. ## The routine needs to have the export marker ``*``. The only matching ## routine is returned and ``nil`` if it is overloaded. result = selectUniqueSymbol(i, name, {skTemplate, skMacro, skFunc, diff --git a/compiler/nimfix/nimfix.nim b/compiler/nimfix/nimfix.nim index 58b019cd3..96007477f 100644 --- a/compiler/nimfix/nimfix.nim +++ b/compiler/nimfix/nimfix.nim @@ -98,7 +98,7 @@ proc handleCmdLine(config: ConfigRef) = gProjectPath = getCurrentDir() loadConfigs(DefaultConfig, config) # load all config files # now process command line arguments again, because some options in the - # command line can overwite the config file's settings + # command line can overwrite the config file's settings extccomp.initVars() processCmdLine(passCmd2, "", config) mainCommand() diff --git a/compiler/nversion.nim b/compiler/nversion.nim index 8981ae213..2da39b138 100644 --- a/compiler/nversion.nim +++ b/compiler/nversion.nim @@ -15,6 +15,6 @@ const VersionAsString* = system.NimVersion RodFileVersion* = "1223" # modify this if the rod-format changes! - NimCompilerApiVersion* = 3 ## Check for the existance of this before accessing it + NimCompilerApiVersion* = 3 ## Check for the existence of this before accessing it ## as older versions of the compiler API do not ## declare this. diff --git a/compiler/options.nim b/compiler/options.nim index e96c20b7c..f401b1ae5 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -138,7 +138,7 @@ type LegacyFeature* = enum allowSemcheckedAstModification, ## Allows to modify a NimNode where the type has already been - ## flaged with nfSem. If you actually do this, it will cause + ## flagged with nfSem. If you actually do this, it will cause ## bugs. SymbolFilesOption* = enum diff --git a/compiler/parser.nim b/compiler/parser.nim index 101e66ba4..712997fa5 100644 --- a/compiler/parser.nim +++ b/compiler/parser.nim @@ -710,7 +710,7 @@ proc identOrLiteral(p: var TParser, mode: TPrimaryMode): PNode = result = parseCast(p) else: parMessage(p, errExprExpected, p.tok) - getTok(p) # we must consume a token here to prevend endless loops! + getTok(p) # we must consume a token here to prevent endless loops! result = p.emptyNode proc namedParams(p: var TParser, callee: PNode, diff --git a/compiler/procfind.nim b/compiler/procfind.nim index 7247bb301..7e8cd3b8a 100644 --- a/compiler/procfind.nim +++ b/compiler/procfind.nim @@ -29,7 +29,7 @@ proc equalGenericParams(procA, procB: PNode): bool = result = true proc searchForProcOld*(c: PContext, scope: PScope, fn: PSym): PSym = - # Searchs for a forward declaration or a "twin" symbol of fn + # Searches for a forward declaration or a "twin" symbol of fn # in the symbol table. If the parameter lists are exactly # the same the sym in the symbol table is returned, else nil. var it: TIdentIter @@ -108,7 +108,7 @@ when false: result = true proc searchForBorrowProc*(c: PContext, startScope: PScope, fn: PSym): PSym = - # Searchs for the fn in the symbol table. If the parameter lists are suitable + # Searches for the fn in the symbol table. If the parameter lists are suitable # for borrowing the sym in the symbol table is returned, else nil. var it: TIdentIter for scope in walkScopes(startScope): diff --git a/compiler/semcall.nim b/compiler/semcall.nim index 76f0e39af..f9f547c47 100644 --- a/compiler/semcall.nim +++ b/compiler/semcall.nim @@ -640,7 +640,7 @@ proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode = result = explicitGenericInstError(c, n) proc searchForBorrowProc(c: PContext, startScope: PScope, fn: PSym): PSym = - # Searchs for the fn in the symbol table. If the parameter lists are suitable + # Searches for the fn in the symbol table. If the parameter lists are suitable # for borrowing the sym in the symbol table is returned, else nil. # New approach: generate fn(x, y, z) where x, y, z have the proper types # and use the overloading resolution mechanism: diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 2f0eccd8c..7a72f1602 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -2038,7 +2038,7 @@ proc tryExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode = let oldErrorMax = c.config.errorMax let oldCompilesId = c.compilesContextId # if this is a nested 'when compiles', do not increase the ID so that - # generic instantations can still be cached for this level. + # generic instantiations can still be cached for this level. if c.compilesContextId == 0: inc c.compilesContextIdGenerator c.compilesContextId = c.compilesContextIdGenerator diff --git a/compiler/seminst.nim b/compiler/seminst.nim index 0a8a3c3af..a45e1665a 100644 --- a/compiler/seminst.nim +++ b/compiler/seminst.nim @@ -211,7 +211,7 @@ proc instGenericContainer(c: PContext, info: TLineInfo, header: PType, param.typ = makeTypeDesc(c, header[i+1]) # this scope was not created by the user, - # unused params shoudn't be reported. + # unused params shouldn't be reported. param.flags.incl sfUsed addDecl(c, param) diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim index 29f51d578..2d2506223 100644 --- a/compiler/semmagic.nim +++ b/compiler/semmagic.nim @@ -279,7 +279,7 @@ proc semDynamicBindSym(c: PContext, n: PNode): PNode = a.setResult opBindSym(c, scope, a.getNode(0), a.getInt(1).int, a.getNode(2)) let - # altough we use VM callback here, it is not + # although we use VM callback here, it is not # executed like 'normal' VM callback idx = vm.registerCallback("bindSymImpl", bindSymWrapper) # dummy node to carry idx information to VM diff --git a/compiler/semobjconstr.nim b/compiler/semobjconstr.nim index 9f342e3b9..b71198fd8 100644 --- a/compiler/semobjconstr.nim +++ b/compiler/semobjconstr.nim @@ -339,7 +339,7 @@ proc semConstructFields(c: PContext, recNode: PNode, result = initPartial if discriminatorVal.kind == nkIntLit: # When the discriminator is a compile-time value, we also know - # which brach will be selected: + # which branch will be selected: let matchedBranch = recNode.pickCaseBranch discriminatorVal if matchedBranch != nil: checkMissingFields matchedBranch else: diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim index c114dde95..397a710ce 100644 --- a/compiler/sempass2.nim +++ b/compiler/sempass2.nim @@ -575,7 +575,7 @@ proc trackOperand(tracked: PEffects, n: PNode, paramType: PType; caller: PNode) notNilCheck(tracked, n, paramType) proc breaksBlock(n: PNode): bool = - # sematic check doesn't allow statements after raise, break, return or + # semantic check doesn't allow statements after raise, break, return or # call to noreturn proc, so it is safe to check just the last statements var it = n while it.kind in {nkStmtList, nkStmtListExpr} and it.len > 0: diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index 518921d12..1b2f80229 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -76,13 +76,13 @@ type c*: PContext typeMap*: ptr LayeredIdTable # map PType to PType symMap*: TIdTable # map PSym to PSym - localCache*: TIdTable # local cache for remembering alraedy replaced + localCache*: TIdTable # local cache for remembering already replaced # types during instantiation of meta types # (they are not stored in the global cache) info*: TLineInfo allowMetaTypes*: bool # allow types such as seq[Number] # i.e. the result contains unresolved generics - skipTypedesc*: bool # wether we should skip typeDescs + skipTypedesc*: bool # whether we should skip typeDescs isReturnType*: bool owner*: PSym # where this instantiation comes from recursionLimit: int @@ -249,7 +249,7 @@ proc replaceTypeVarsS(cl: var TReplTypeVars, s: PSym): PSym = return s # XXX: Bound symbols in default parameter expressions may reach here. - # We cannot process them, becase `sym.n` may point to a proc body with + # We cannot process them, because `sym.n` may point to a proc body with # cyclic references that will lead to an infinite recursion. # Perhaps we should not use a black-list here, but a whitelist instead # (e.g. skGenericParam and skType). diff --git a/compiler/sizealignoffsetimpl.nim b/compiler/sizealignoffsetimpl.nim index fdca01136..b1c136f2f 100644 --- a/compiler/sizealignoffsetimpl.nim +++ b/compiler/sizealignoffsetimpl.nim @@ -16,7 +16,7 @@ proc align(address, alignment: int): int = result = (address + (alignment - 1)) and not (alignment - 1) const - ## a size is concidered "unknown" when it is an imported type from C + ## a size is considered "unknown" when it is an imported type from C ## or C++. szUnknownSize* = -3 szIllegalRecursion* = -2 diff --git a/compiler/transf.nim b/compiler/transf.nim index f1c89939f..7521fe169 100644 --- a/compiler/transf.nim +++ b/compiler/transf.nim @@ -877,7 +877,7 @@ proc hoistParamsUsedInDefault(c: PTransf, call, letSection, defExpr: PNode): PNo # The recursion may confuse you. It performs two duties: # # 1) extracting all referenced params from default expressions - # into a let section preceeding the call + # into a let section preceding the call # # 2) replacing the "references" within the default expression # with these extracted skLet symbols. @@ -1140,7 +1140,7 @@ proc transformBody*(g: ModuleGraph, prc: PSym, cache = true; let cache = cache or prc.typ.callConv == ccInline if cache: - # genProc for inline procs will be called multiple times from diffrent modules, + # genProc for inline procs will be called multiple times from different modules, # it is important to transform exactly once to get sym ids and locations right prc.transformedBody = result else: diff --git a/compiler/types.nim b/compiler/types.nim index 1ed882cb8..fa5aff245 100644 --- a/compiler/types.nim +++ b/compiler/types.nim @@ -303,7 +303,7 @@ proc analyseObjectWithTypeFieldAux(t: PType, proc analyseObjectWithTypeField*(t: PType): TTypeFieldResult = # this does a complex analysis whether a call to ``objectInit`` needs to be - # made or intializing of the type field suffices or if there is no type field + # made or initializing of the type field suffices or if there is no type field # at all in this type. var marker = initIntSet() result = analyseObjectWithTypeFieldAux(t, marker) diff --git a/compiler/vm.nim b/compiler/vm.nim index 0496e37ca..6be4cbdba 100644 --- a/compiler/vm.nim +++ b/compiler/vm.nim @@ -156,7 +156,7 @@ proc createStrKeepNode(x: var TFullReg; keepNode=true) = x.node = newNode(nkStrLit) # It not only hackey, it is also wrong for tgentemplate. The primary # cause of bugs like these is that the VM does not properly distinguish - # between variable defintions (var foo = e) and variable updates (foo = e). + # between variable definitions (var foo = e) and variable updates (foo = e). include vmhooks @@ -357,7 +357,7 @@ proc cleanUpOnReturn(c: PCtx; f: PStackFrame): int = result = -1 # Traverse the stack starting from the end in order to execute the blocks in - # the inteded order + # the intended order for i in 1 .. f.safePoints.len: var pc = f.safePoints[^i] # Skip the `except` blocks @@ -1189,7 +1189,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg = tos.pushSafePoint(pc + rbx) assert c.code[pc+rbx].opcode in {opcExcept, opcFinally} of opcExcept: - # This opcode is never executed, it only holds informations for the + # This opcode is never executed, it only holds information for the # exception handling routines. doAssert(false) of opcFinally: @@ -1275,7 +1275,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg = regs[ra].node = getNullValue(typ, c.debug[pc], c.config) # opcLdNull really is the gist of the VM's problems: should it load # a fresh null to regs[ra].node or to regs[ra].node[]? This really - # depends on whether regs[ra] represents the variable itself or wether + # depends on whether regs[ra] represents the variable itself or whether # it holds the indirection! Due to the way registers are re-used we cannot # say for sure here! --> The codegen has to deal with it # via 'genAsgnPatch'. diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim index 0bd5cfdeb..ba9f62e3c 100644 --- a/compiler/vmgen.nim +++ b/compiler/vmgen.nim @@ -127,7 +127,7 @@ proc gABC(ctx: PCtx; n: PNode; opc: TOpcode; a, b, c: TRegister = 0) = ctx.debug.add(n.info) proc gABI(c: PCtx; n: PNode; opc: TOpcode; a, b: TRegister; imm: BiggestInt) = - # Takes the `b` register and the immediate `imm`, appies the operation `opc`, + # Takes the `b` register and the immediate `imm`, applies the operation `opc`, # and stores the output value into `a`. # `imm` is signed and must be within [-128, 127] if imm >= -128 and imm <= 127: diff --git a/compiler/vmops.nim b/compiler/vmops.nim index fe3c2516b..a989231dd 100644 --- a/compiler/vmops.nim +++ b/compiler/vmops.nim @@ -7,7 +7,7 @@ # distribution, for details about the copyright. # -# Unforunately this cannot be a module yet: +# Unfortunately this cannot be a module yet: #import vmdeps, vm from math import sqrt, ln, log10, log2, exp, round, arccos, arcsin, arctan, arctan2, cos, cosh, hypot, sinh, sin, tan, tanh, pow, trunc, diff --git a/lib/core/macros.nim b/lib/core/macros.nim index 73f5790fa..408cbb9d6 100644 --- a/lib/core/macros.nim +++ b/lib/core/macros.nim @@ -364,7 +364,7 @@ when defined(nimHasSignatureHashInMacro): proc symBodyHash*(s: NimNode): string {.noSideEffect.} = ## Returns a stable digest for symbols derived not only from type signature - ## and owning module, but also implementation body. All procs/varibles used in + ## and owning module, but also implementation body. All procs/variables used in ## the implementation of this symbol are hashed recursively as well, including ## magics from system module. discard diff --git a/lib/deprecated/pure/LockFreeHash.nim b/lib/deprecated/pure/LockFreeHash.nim index a9e68477a..97e1ef6ad 100644 --- a/lib/deprecated/pure/LockFreeHash.nim +++ b/lib/deprecated/pure/LockFreeHash.nim @@ -391,7 +391,7 @@ proc setVal[K, V](table: var PConcTable[K, V], key: int, val: int, # Done spinning for a new slot var oldVal = atomic_load_n(table[idx].value.addr, ATOMIC_RELAXED) if val == oldVal: - #echo("this val is alredy in the slot") + #echo("this val is already in the slot") return oldVal nextTable = atomic_load_n(table.next.addr, ATOMIC_SEQ_CST) if nextTable == nil and diff --git a/lib/deprecated/pure/parseopt2.nim b/lib/deprecated/pure/parseopt2.nim index 9fd6cd2c7..e57b7e2c9 100644 --- a/lib/deprecated/pure/parseopt2.nim +++ b/lib/deprecated/pure/parseopt2.nim @@ -42,7 +42,7 @@ type ## the option was given a value proc initOptParser*(cmdline: seq[string]): OptParser {.rtl.} = - ## Initalizes option parses with cmdline. cmdline should not contain + ## Initializes option parses with cmdline. cmdline should not contain ## argument 0 - program name. ## If cmdline.len == 0 default to current command line arguments. result.remainingShortOptions = "" diff --git a/lib/experimental/diff.nim b/lib/experimental/diff.nim index 9046d7316..d98999912 100644 --- a/lib/experimental/diff.nim +++ b/lib/experimental/diff.nim @@ -275,9 +275,9 @@ proc createDiffs(dataA, dataB: DiffData): seq[Item] = proc diffInt*(arrayA, arrayB: openArray[int]): seq[Item] = ## Find the difference in 2 arrays of integers. ## - ## ``arrayA`` A-version of the numbers (usualy the old one) + ## ``arrayA`` A-version of the numbers (usually the old one) ## - ## ``arrayB`` B-version of the numbers (usualy the new one) + ## ``arrayB`` B-version of the numbers (usually the new one) ## ## Returns a sequence of Items that describe the differences. @@ -301,7 +301,7 @@ proc diffText*(textA, textB: string): seq[Item] = ## ## The algorithm itself is comparing 2 arrays of numbers so when comparing 2 text documents ## each line is converted into a (hash) number. This hash-value is computed by storing all - ## textlines into a common hashtable so i can find dublicates in there, and generating a + ## textlines into a common hashtable so i can find duplicates in there, and generating a ## new number each time a new textline is inserted. ## ## ``textA`` A-version of the text (usually the old one) diff --git a/lib/impure/db_odbc.nim b/lib/impure/db_odbc.nim index 7b59f8313..a9e304788 100644 --- a/lib/impure/db_odbc.nim +++ b/lib/impure/db_odbc.nim @@ -303,7 +303,7 @@ iterator instantRows*(db: var DbConn, query: SqlQuery, args: varargs[string, `$`]): InstantRow {.tags: [ReadDbEffect, WriteDbEffect].} = ## Same as fastRows but returns a handle that can be used to get column text - ## on demand using []. Returned handle is valid only within the interator body. + ## on demand using []. Returned handle is valid only within the iterator body. var rowRes: Row = @[] sz: TSqlInteger = 0 diff --git a/lib/impure/db_postgres.nim b/lib/impure/db_postgres.nim index 4b156b79f..fde4db119 100644 --- a/lib/impure/db_postgres.nim +++ b/lib/impure/db_postgres.nim @@ -182,7 +182,7 @@ proc setRow(res: PPGresult, r: var Row, line, cols: int32) = iterator fastRows*(db: DbConn, query: SqlQuery, args: varargs[string, `$`]): Row {.tags: [ReadDbEffect].} = ## executes the query and iterates over the result dataset. This is very - ## fast, but potenially dangerous: If the for-loop-body executes another + ## fast, but potentially dangerous: If the for-loop-body executes another ## query, the results can be undefined. For Postgres it is safe though. var res = setupQuery(db, query, args) var L = pqnfields(res) diff --git a/lib/impure/nre.nim b/lib/impure/nre.nim index 8848b8d5b..22f786cd6 100644 --- a/lib/impure/nre.nim +++ b/lib/impure/nre.nim @@ -137,7 +137,7 @@ type ## into PCRE flags. These include ``NEVER_UTF``, ``ANCHORED``, ## ``DOLLAR_ENDONLY``, ``FIRSTLINE``, ``NO_AUTO_CAPTURE``, ## ``JAVASCRIPT_COMPAT``, ``U``, ``NO_STUDY``. In other PCRE wrappers, you - ## will need to pass these as seperate flags to PCRE. + ## will need to pass these as separate flags to PCRE. pattern*: string ## not nil pcreObj: ptr pcre.Pcre ## not nil pcreExtra: ptr pcre.ExtraData ## nil diff --git a/lib/packages/docutils/rstgen.nim b/lib/packages/docutils/rstgen.nim index c5cee9c90..b75ff3ea1 100644 --- a/lib/packages/docutils/rstgen.nim +++ b/lib/packages/docutils/rstgen.nim @@ -101,7 +101,7 @@ proc initRstGenerator*(g: var RstGenerator, target: OutputTarget, ## index hyperlinks to the file, but you can pass an empty string here if you ## are parsing a stream in memory. If `filename` ends with the ``.nim`` ## extension, the title for the document will be set by default to ``Module - ## filename``. This default title can be overriden by the embedded rst, but + ## filename``. This default title can be overridden by the embedded rst, but ## it helps to prettify the generated index if no title is found. ## ## The ``RstParseOptions``, ``FindFileHandler`` and ``MsgHandler`` types @@ -350,7 +350,7 @@ proc hash(n: PRstNode): int = proc renderIndexTerm*(d: PDoc, n: PRstNode, result: var string) = ## Renders the string decorated within \`foobar\`\:idx\: markers. ## - ## Additionally adds the encosed text to the index as a term. Since we are + ## Additionally adds the enclosed text to the index as a term. Since we are ## interested in different instances of the same term to have different ## entries, a table is used to keep track of the amount of times a term has ## previously appeared to give a different identifier value for each. diff --git a/lib/posix/posix.nim b/lib/posix/posix.nim index a285928c2..8fcb9cb5c 100644 --- a/lib/posix/posix.nim +++ b/lib/posix/posix.nim @@ -29,7 +29,7 @@ # Dead code elimination ensures that we don't accidentally generate #includes # for files that might not exist on a specific platform! The user will get an -# error only if they actualy try to use the missing declaration +# error only if they actually try to use the missing declaration {.deadCodeElim: on.} # dce option deprecated when defined(nimHasStyleChecks): diff --git a/lib/posix/posix_utils.nim b/lib/posix/posix_utils.nim index ea6ef60f4..20a71971a 100644 --- a/lib/posix/posix_utils.nim +++ b/lib/posix/posix_utils.nim @@ -83,7 +83,7 @@ proc sendSignal*(pid: Pid, signal: int) = proc mkstemp*(prefix: string): (string, File) = ## Creates a unique temporary file from a prefix string. Adds a six chars suffix. ## The file is created with perms 0600. - ## Returs the filename and a file opened in r/w mode. + ## Returns the filename and a file opened in r/w mode. var tmpl = cstring(prefix & "XXXXXX") let fd = mkstemp(tmpl) var f: File diff --git a/lib/pure/asyncdispatch.nim b/lib/pure/asyncdispatch.nim index f4dc3de39..0eed1b929 100644 --- a/lib/pure/asyncdispatch.nim +++ b/lib/pure/asyncdispatch.nim @@ -198,7 +198,7 @@ proc processTimers( dec count didSomeWork = true - # Return the number of miliseconds in which the next timer will expire. + # Return the number of milliseconds in which the next timer will expire. if p.timers.len == 0: return let millisecs = (p.timers[0].finishAt - getMonoTime()).inMilliseconds diff --git a/lib/pure/asyncstreams.nim b/lib/pure/asyncstreams.nim index 573663f55..7ab4ab4bb 100644 --- a/lib/pure/asyncstreams.nim +++ b/lib/pure/asyncstreams.nim @@ -74,7 +74,7 @@ proc write*[T](future: FutureStream[T], value: T): Future[void] = result.fail(newException(ValueError, msg)) return # TODO: Implement limiting of the streams storage to prevent it growing - # infinitely when no reads are occuring. + # infinitely when no reads are occurring. future.queue.addLast(value) if not future.cb.isNil: future.cb() result.complete() diff --git a/lib/pure/bitops.nim b/lib/pure/bitops.nim index 92e9ddf27..033c54a6a 100644 --- a/lib/pure/bitops.nim +++ b/lib/pure/bitops.nim @@ -23,7 +23,7 @@ ## to force predictable behaviour for all input, causing a small performance hit. ## ## At this time only `fastLog2`, `firstSetBit, `countLeadingZeroBits`, `countTrailingZeroBits` -## may return undefined and/or platform dependant value if given invalid input. +## may return undefined and/or platform dependent value if given invalid input. proc bitnot*[T: SomeInteger](x: T): T {.magic: "BitnotI", noSideEffect.} ## Computes the `bitwise complement` of the integer `x`. diff --git a/lib/pure/collections/sequtils.nim b/lib/pure/collections/sequtils.nim index 3518a7ea0..9ca40de70 100644 --- a/lib/pure/collections/sequtils.nim +++ b/lib/pure/collections/sequtils.nim @@ -848,7 +848,7 @@ template mapIt*(s: typed, op: untyped): untyped = result template mapIt*(s, typ, op: untyped): untyped {.error: - "Deprecated since v0.12; Use 'mapIt(seq1, op)' - without specifying the type of the returned seqence".} = + "Deprecated since v0.12; Use 'mapIt(seq1, op)' - without specifying the type of the returned sequence".} = var result: seq[typ] = @[] for it {.inject.} in items(s): result.add(op) @@ -883,7 +883,7 @@ template newSeqWith*(len: int, init: untyped): untyped = ## or to populate fields of the created sequence. ## runnableExamples: - ## Creates a seqence containing 5 bool sequences, each of length of 3. + ## Creates a sequence containing 5 bool sequences, each of length of 3. var seq2D = newSeqWith(5, newSeq[bool](3)) assert seq2D.len == 5 assert seq2D[0].len == 3 diff --git a/lib/pure/concurrency/atomics.nim b/lib/pure/concurrency/atomics.nim index 32c37236f..83459425b 100644 --- a/lib/pure/concurrency/atomics.nim +++ b/lib/pure/concurrency/atomics.nim @@ -47,7 +47,7 @@ when defined(cpp) or defined(nimdoc): ## Behaves like Acquire when applied to load, like Release when ## applied to a store and like AcquireRelease when applied to a ## read-modify-write operation. - ## Also garantees that all threads observe the same total ordering + ## Also guarantees that all threads observe the same total ordering ## with other moSequentiallyConsistent operations. type diff --git a/lib/pure/concurrency/cpuinfo.nim b/lib/pure/concurrency/cpuinfo.nim index 6fc5eb95b..415b9a787 100644 --- a/lib/pure/concurrency/cpuinfo.nim +++ b/lib/pure/concurrency/cpuinfo.nim @@ -50,7 +50,7 @@ when defined(haiku): header: "<OS.h>".} proc countProcessors*(): int {.rtl, extern: "ncpi$1".} = - ## returns the numer of the processors/cores the machine has. + ## returns the number of the processors/cores the machine has. ## Returns 0 if it cannot be detected. when defined(windows): type diff --git a/lib/pure/htmlparser.nim b/lib/pure/htmlparser.nim index d013c6342..be61bb0d8 100644 --- a/lib/pure/htmlparser.nim +++ b/lib/pure/htmlparser.nim @@ -2025,7 +2025,7 @@ proc parseHtml*(s: Stream, filename: string, #if x.kind != xmlEof: # adderr(errorMsg(x, "EOF expected")) while x.kind != xmlEof: - var oldPos = x.bufpos # little hack to see if we made any progess + var oldPos = x.bufpos # little hack to see if we made any progress result.addNode(parse(x, errors)) if x.bufpos == oldPos: # force progress! diff --git a/lib/pure/json.nim b/lib/pure/json.nim index 3480a76b7..530408b9f 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -30,7 +30,7 @@ ## ``JNull``. You check the kind of this object variant by using the ``kind`` ## accessor. ## -## For a ``JsonNode`` who's kind is ``JObject``, you can acess its fields using +## For a ``JsonNode`` who's kind is ``JObject``, you can access its fields using ## the ``[]`` operator. The following example shows how to do this: ## ## .. code-block:: Nim diff --git a/lib/pure/lenientops.nim b/lib/pure/lenientops.nim index c70e12e5f..cdea780a2 100644 --- a/lib/pure/lenientops.nim +++ b/lib/pure/lenientops.nim @@ -12,7 +12,7 @@ ## which work for mixed float/int operands. ## All operations convert the integer operand into the ## type of the float operand. For numerical expressions, the return -## type is always the type of the float involved in the expresssion, +## type is always the type of the float involved in the expression, ## i.e., there is no auto conversion from float32 to float64. ## ## Note: In general, auto-converting from int to float loses diff --git a/lib/pure/memfiles.nim b/lib/pure/memfiles.nim index 68eacaa36..a6327b12e 100644 --- a/lib/pure/memfiles.nim +++ b/lib/pure/memfiles.nim @@ -303,7 +303,7 @@ when defined(posix) or defined(nimdoc): ## resize and re-map the file underlying an ``allowRemap MemFile``. ## **Note**: this assumes the entire file is mapped read-write at offset zero. ## Also, the value of ``.mem`` will probably change. - ## **Note**: This is not (yet) avaiable on Windows. + ## **Note**: This is not (yet) available on Windows. when defined(posix): if f.handle == -1: raise newException(IOError, diff --git a/lib/pure/net.nim b/lib/pure/net.nim index c337680f1..03a8d3a6b 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -230,7 +230,7 @@ proc newSocket*(domain: Domain = AF_INET, sockType: SockType = SOCK_STREAM, result = newSocket(fd, domain, sockType, protocol, buffered) proc parseIPv4Address(addressStr: string): IpAddress = - ## Parses IPv4 adresses + ## Parses IPv4 addresses ## Raises ValueError on errors var byteCount = 0 @@ -264,7 +264,7 @@ proc parseIPv4Address(addressStr: string): IpAddress = result.address_v4[byteCount] = cast[uint8](currentByte) proc parseIPv6Address(addressStr: string): IpAddress = - ## Parses IPv6 adresses + ## Parses IPv6 addresses ## Raises ValueError on errors result = IpAddress(family: IpAddressFamily.IPv6) if addressStr.len < 2: @@ -1657,7 +1657,7 @@ proc connect*(socket: Socket, address: string, port = Port(0), timeout: int) {.tags: [ReadIOEffect, WriteIOEffect].} = ## Connects to server as specified by ``address`` on port specified by ``port``. ## - ## The ``timeout`` paremeter specifies the time in milliseconds to allow for + ## The ``timeout`` parameter specifies the time in milliseconds to allow for ## the connection to the server to be made. socket.fd.setBlocking(false) diff --git a/lib/pure/os.nim b/lib/pure/os.nim index e59c0962d..e8ece37c1 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -382,7 +382,7 @@ iterator parentDirs*(path: string, fromRoot=false, inclusive=true): string = ## Walks over all parent directories of a given `path`. ## ## If `fromRoot` is true (default: false), the traversal will start from - ## the file system root diretory. + ## the file system root directory. ## If `inclusive` is true (default), the original argument will be included ## in the traversal. ## @@ -781,7 +781,7 @@ proc getTempDir*(): string {.rtl, extern: "nos$1", ## **Please do not use this**: On Android, it currently ## returns ``getHomeDir()``, and on other Unix based systems it can cause ## security problems too. That said, you can override this implementation - ## by adding ``-d:tempDir=mytempname`` to your compiler invokation. + ## by adding ``-d:tempDir=mytempname`` to your compiler invocation. ## ## See also: ## * `getHomeDir proc <#getHomeDir>`_ @@ -1868,7 +1868,7 @@ type proc getCurrentCompilerExe*(): string {.compileTime.} = discard ## This is `getAppFilename() <#getAppFilename>`_ at compile time. ## - ## Can be used to retrive the currently executing + ## Can be used to retrieve the currently executing ## Nim compiler from a Nim or nimscript program, or the nimble binary ## inside a nimble program (likewise with other binaries built from ## compiler API). @@ -2475,7 +2475,7 @@ when defined(nimdoc): ## ## Unlike `argc`:idx: in C, if your binary was called without parameters this ## will return zero. - ## You can query each individual paramater with `paramStr proc <#paramStr,int>`_ + ## You can query each individual parameter with `paramStr proc <#paramStr,int>`_ ## or retrieve all of them in one go with `commandLineParams proc ## <#commandLineParams>`_. ## diff --git a/lib/pure/parsecsv.nim b/lib/pure/parsecsv.nim index 402e3ad31..91c878078 100644 --- a/lib/pure/parsecsv.nim +++ b/lib/pure/parsecsv.nim @@ -318,7 +318,7 @@ proc readHeaderRow*(my: var CsvParser) = my.headers = my.row proc rowEntry*(my: var CsvParser, entry: string): var string = - ## Acceses a specified `entry` from the current row. + ## Accesses a specified `entry` from the current row. ## ## Assumes that `readHeaderRow <#readHeaderRow,CsvParser>`_ has already been ## called. diff --git a/lib/pure/parsesql.nim b/lib/pure/parsesql.nim index 0b4249d2a..042d5374f 100644 --- a/lib/pure/parsesql.nim +++ b/lib/pure/parsesql.nim @@ -711,7 +711,7 @@ proc identOrLiteral(p: var SqlParser): SqlNode = getTok(p) else: sqlError(p, "expression expected") - getTok(p) # we must consume a token here to prevend endless loops! + getTok(p) # we must consume a token here to prevent endless loops! proc primary(p: var SqlParser): SqlNode = if (p.tok.kind == tkOperator and (p.tok.literal == "+" or p.tok.literal == "-")) or isKeyw(p, "not"): diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim index a4032f8f3..e0561116e 100644 --- a/lib/pure/parseutils.nim +++ b/lib/pure/parseutils.nim @@ -634,7 +634,7 @@ iterator interpolatedFragments*(s: string): tuple[kind: InterpolatedKind, kind = ikDollar else: raise newException(ValueError, - "Unable to parse a varible name at " & substr(s, i, s.high)) + "Unable to parse a variable name at " & substr(s, i, s.high)) else: while j < s.len and s[j] != '$': inc j kind = ikStr diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim index 686aad110..c1268bc1d 100644 --- a/lib/pure/parsexml.nim +++ b/lib/pure/parsexml.nim @@ -154,7 +154,7 @@ import # xmlElementCloseEnd, ## ``/>`` type - XmlEventKind* = enum ## enumation of all events that may occur when parsing + XmlEventKind* = enum ## enumeration of all events that may occur when parsing xmlError, ## an error occurred during parsing xmlEof, ## end of file reached xmlCharData, ## character data diff --git a/lib/pure/selectors.nim b/lib/pure/selectors.nim index 9b149e26c..0ab1e7754 100644 --- a/lib/pure/selectors.nim +++ b/lib/pure/selectors.nim @@ -186,7 +186,7 @@ when defined(nimdoc): proc setData*[T](s: Selector[T], fd: SocketHandle|int, data: var T): bool = ## Associate application-defined ``data`` with descriptor ``fd``. ## - ## Returns ``true``, if data was succesfully updated, ``false`` otherwise. + ## Returns ``true``, if data was successfully updated, ``false`` otherwise. template isEmpty*[T](s: Selector[T]): bool = # TODO: Why is this a template? ## Returns ``true``, if there are no registered events or descriptors @@ -316,7 +316,7 @@ else: proc verifySelectParams(timeout: int) = # Timeout of -1 means: wait forever - # Anything higher is the time to wait in miliseconds. + # Anything higher is the time to wait in milliseconds. doAssert(timeout >= -1, "Cannot select with a negative value, got " & $timeout) when defined(linux): diff --git a/lib/pure/smtp.nim b/lib/pure/smtp.nim index 577f6174e..cfe532ba4 100644 --- a/lib/pure/smtp.nim +++ b/lib/pure/smtp.nim @@ -206,7 +206,7 @@ proc auth*(smtp: Smtp | AsyncSmtp, username, password: string) {.multisync.} = await smtp.checkReply("334") # TODO: Same as above, only "Password:" (I think?) await smtp.debugSend(encode(password) & "\c\L") - await smtp.checkReply("235") # Check whether the authentification was successful. + await smtp.checkReply("235") # Check whether the authentication was successful. proc sendMail*(smtp: Smtp | AsyncSmtp, fromAddr: string, toAddrs: seq[string], msg: string) {.multisync.} = diff --git a/lib/pure/strformat.nim b/lib/pure/strformat.nim index af9568d92..25310c125 100644 --- a/lib/pure/strformat.nim +++ b/lib/pure/strformat.nim @@ -299,7 +299,7 @@ type alternateForm*: bool ## Whether to prefix binary, octal and hex numbers ## with ``0b``, ``0o``, ``0x``. padWithZero*: bool ## Whether to pad with zeros rather than spaces. - minimumWidth*, precision*: int ## Desired minium width and precision. + minimumWidth*, precision*: int ## Desired minimum width and precision. typ*: char ## Type like 'f', 'g' or 'd'. endPosition*: int ## End position in the format specifier after ## ``parseStandardFormatSpecifier`` returned. @@ -617,7 +617,7 @@ when isMainModule: check &"{1f:.3f}", "1.000" check &"Hello, {s}!", "Hello, string!" - # Tests for identifers without parenthesis + # Tests for identifiers without parenthesis check &"{s} works{s}", "string worksstring" check &"{s:>7}", " string" doAssert(not compiles(&"{s_works}")) # parsed as identifier `s_works` diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim index 0726eb15d..a1429a2f7 100644 --- a/lib/pure/strtabs.nim +++ b/lib/pure/strtabs.nim @@ -326,7 +326,7 @@ proc del*(t: StringTableRef, key: string) = ## Removes `key` from `t`. ## ## See also: - ## * `clear proc <#clear,StringTableRef,StringTableMode>`_ for reseting a + ## * `clear proc <#clear,StringTableRef,StringTableMode>`_ for resetting a ## table to be empty ## * `[]= proc <#[]=,StringTableRef,string,string>`_ for inserting a new ## (key, value) pair in the table diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim index c22caa6f2..29a8afa58 100644 --- a/lib/pure/strutils.nim +++ b/lib/pure/strutils.nim @@ -2017,7 +2017,7 @@ proc countLines*(s: string): int {.noSideEffect, ## `character literal <manual.html#lexical-analysis-character-literals>`_ ## newline combination (CR, LF, CR-LF) is supported. ## - ## In this context, a line is any string seperated by a newline combination. + ## In this context, a line is any string separated by a newline combination. ## A line can be an empty string. ## ## See also: @@ -2145,7 +2145,7 @@ proc multiReplace*(s: string, replacements: varargs[(string, string)]): string { ## pass through the input string. ## ## `multiReplace` performs all replacements in a single pass, this means it - ## can be used to swap the occurences of "a" and "b", for instance. + ## can be used to swap the occurrences of "a" and "b", for instance. ## ## If the resulting string is not longer than the original input string, ## only a single memory allocation is required. @@ -2280,14 +2280,14 @@ proc validIdentifier*(s: string): bool {.noSideEffect, return true -# floating point formating: +# floating point formatting: when not defined(js): proc c_sprintf(buf, frmt: cstring): cint {.header: "<stdio.h>", importc: "sprintf", varargs, noSideEffect.} type FloatFormatMode* = enum - ## the different modes of floating point formating + ## the different modes of floating point formatting ffDefault, ## use the shorter floating point notation ffDecimal, ## use decimal floating point notation ffScientific ## use scientific notation (using ``e`` character) @@ -2892,7 +2892,7 @@ proc editDistance*(a, b: string): int {.noSideEffect, inc(len1) inc(len2) var half = len1 shr 1 - # initalize first row: + # initialize first row: #var row = cast[ptr array[0..high(int) div 8, int]](alloc(len2*sizeof(int))) var row: seq[int] newSeq(row, len2) diff --git a/lib/pure/times.nim b/lib/pure/times.nim index 3e2557314..d8e466dc7 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -133,7 +133,7 @@ The ``times`` module exports two similar types that are both used to represent some amount of time: `Duration <#Duration>`_ and `TimeInterval <#TimeInterval>`_. - This section explains how they differ and when one should be prefered over the + This section explains how they differ and when one should be preferred over the other (short answer: use ``Duration`` unless support for months and years is needed). @@ -152,7 +152,7 @@ A ``TimeInterval`` represents an amount of time expressed in calendar units, for example "1 year and 2 days". Since some units cannot be normalized (the length of a year is different for leap years for example), - the ``TimeInterval`` type uses seperate fields for every unit. The + the ``TimeInterval`` type uses separate fields for every unit. The ``TimeInterval``'s returned from this module generally don't normalize **anything**, so even units that could be normalized (like seconds, milliseconds and so on) are left untouched. @@ -393,7 +393,7 @@ type years*: int ## The number of years Timezone* = ref object ## \ - ## Timezone interface for supporting `DateTime <#DateTime>`_\s of arbritary + ## Timezone interface for supporting `DateTime <#DateTime>`_\s of arbitrary ## timezones. The ``times`` module only supplies implementations for the ## systems local time and UTC. zonedTimeFromTimeImpl: proc (x: Time): ZonedTime @@ -2526,7 +2526,7 @@ when not defined(JS): ## because sub-second resolution is likely to be supported (depending ## on the hardware/OS). ## - ## ``getTime`` should generally be prefered over this proc. + ## ``getTime`` should generally be preferred over this proc. when defined(macosx): var a: Timeval gettimeofday(a) diff --git a/lib/pure/unittest.nim b/lib/pure/unittest.nim index 46d63db8b..df2424e57 100644 --- a/lib/pure/unittest.nim +++ b/lib/pure/unittest.nim @@ -134,7 +134,7 @@ type ## non-js target to true or false respectively. ## The deprecated environment variable ## ``NIMTEST_NO_COLOR``, when set, - ## changes the defualt to true, if + ## changes the default to true, if ## ``NIMTEST_COLOR`` is undefined. outputLevel: OutputLevel ## Set the verbosity of test results. diff --git a/lib/std/editdistance.nim b/lib/std/editdistance.nim index 1e200e332..6acb7388f 100644 --- a/lib/std/editdistance.nim +++ b/lib/std/editdistance.nim @@ -210,7 +210,7 @@ proc editDistanceAscii*(a, b: string): int {.noSideEffect.} = inc(len1) inc(len2) var half = len1 shr 1 - # initalize first row: + # initialize first row: #var row = cast[ptr array[0..high(int) div 8, int]](alloc(len2*sizeof(int))) var row: seq[int] newSeq(row, len2) diff --git a/lib/system.nim b/lib/system.nim index 3042b0693..28d2e4be6 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -477,14 +477,14 @@ when defined(nimArrIdx): x: S) {.noSideEffect, magic: "ArrPut".} proc `=destroy`*[T](x: var T) {.inline, magic: "Destroy".} = - ## Generic `destructor`:idx: implementation that can be overriden. + ## Generic `destructor`:idx: implementation that can be overridden. discard proc `=sink`*[T](x: var T; y: T) {.inline, magic: "Asgn".} = - ## Generic `sink`:idx: implementation that can be overriden. + ## Generic `sink`:idx: implementation that can be overridden. shallowCopy(x, y) type - HSlice*[T, U] = object ## "Heterogenous" slice type. + HSlice*[T, U] = object ## "Heterogeneous" slice type. a*: T ## The lower bound (inclusive). b*: U ## The upper bound (inclusive). Slice*[T] = HSlice[T, T] ## An alias for ``HSlice[T, T]``. @@ -2314,7 +2314,7 @@ proc addQuitProc*(quitProc: proc() {.noconv.}) {. ## registered. # Support for addQuitProc() is done by Ansi C's facilities here. -# In case of an unhandled exeption the exit handlers should +# In case of an unhandled exception the exit handlers should # not be called explicitly! The user may decide to do this manually though. when not defined(nimscript) and not defined(JS): @@ -3974,7 +3974,7 @@ proc `[]=`*[Idx, T, U, V](a: var array[Idx, T], x: HSlice[U, V], b: openArray[T] if L == b.len: for i in 0..<L: a[Idx(i + xa)] = b[i] else: - sysFatal(RangeError, "diferent lengths for slice assignment") + sysFatal(RangeError, "different lengths for slice assignment") proc `[]`*[T, U, V](s: openArray[T], x: HSlice[U, V]): seq[T] = ## Slice operation for sequences. @@ -4224,7 +4224,7 @@ proc addEscapedChar*(s: var string, c: char) {.noSideEffect, inline.} = ## by ``\xHH`` where ``HH`` is its hexadecimal value. ## ## The procedure has been designed so that its output is usable for many - ## diferent common syntaxes. + ## different common syntaxes. ## ## **Note**: This is **not correct** for producing Ansi C code! case c @@ -4254,7 +4254,7 @@ proc addQuoted*[T](s: var string, x: T) = ## See `addEscapedChar <#addEscapedChar,string,char>`_ ## for the escaping scheme. When `x` is a string, characters in the ## range ``{\128..\255}`` are never escaped so that multibyte UTF-8 - ## characters are untouched (note that this behavior is diferent from + ## characters are untouched (note that this behavior is different from ## ``addEscapedChar``). ## ## The Nim standard library uses this function on the elements of @@ -4315,7 +4315,7 @@ when hasAlloc: x.add(y) proc safeAdd*(x: var string, y: string) {.noSideEffect, deprecated.} = - ## Adds ``y`` to ``x`` unless ``x`` is not yet initalized; in that + ## Adds ``y`` to ``x`` unless ``x`` is not yet initialized; in that ## case, ``x`` becomes ``y``. when defined(nimNoNilSeqs): x.add(y) diff --git a/lib/system/gc.nim b/lib/system/gc.nim index 1aea9d27b..911b49fdb 100644 --- a/lib/system/gc.nim +++ b/lib/system/gc.nim @@ -244,7 +244,7 @@ proc asgnRefNoCycle(dest: PPointer, src: pointer) {.compilerproc, inline, proc unsureAsgnRef(dest: PPointer, src: pointer) {.compilerproc.} = # unsureAsgnRef updates the reference counters only if dest is not on the - # stack. It is used by the code generator if it cannot decide wether a + # stack. It is used by the code generator if it cannot decide whether a # reference is in the stack or not (this can happen for var parameters). if not isOnStack(dest): if src != nil: incRef(usrToCell(src)) diff --git a/lib/system/gc2.nim b/lib/system/gc2.nim index cdf472b43..4da9b4f94 100644 --- a/lib/system/gc2.nim +++ b/lib/system/gc2.nim @@ -240,7 +240,7 @@ proc asgnRefNoCycle(dest: PPointer, src: pointer) {.compilerproc, inline, proc unsureAsgnRef(dest: PPointer, src: pointer) {.compilerproc.} = # unsureAsgnRef marks 'src' as grey only if dest is not on the - # stack. It is used by the code generator if it cannot decide wether a + # stack. It is used by the code generator if it cannot decide whether a # reference is in the stack or not (this can happen for var parameters). if src != nil: let s = usrToCell(src) diff --git a/lib/system/mmdisp.nim b/lib/system/mmdisp.nim index d2edacce7..ae30dbc73 100644 --- a/lib/system/mmdisp.nim +++ b/lib/system/mmdisp.nim @@ -42,7 +42,7 @@ type # CPU this needs to be changed: const PageShift = when defined(cpu16): 8 else: 12 # \ - # my tests showed no improvments for using larger page sizes. + # my tests showed no improvements for using larger page sizes. PageSize = 1 shl PageShift PageMask = PageSize-1 diff --git a/lib/wrappers/sqlite3.nim b/lib/wrappers/sqlite3.nim index 45ccbe6c0..b96a70ef3 100644 --- a/lib/wrappers/sqlite3.nim +++ b/lib/wrappers/sqlite3.nim @@ -62,7 +62,7 @@ const SQLITE_EMPTY* = 16 # Database is empty SQLITE_SCHEMA* = 17 # The database schema changed SQLITE_TOOBIG* = 18 # Too much data for one row of a table - SQLITE_CONSTRAINT* = 19 # Abort due to contraint violation + SQLITE_CONSTRAINT* = 19 # Abort due to constraint violation SQLITE_MISMATCH* = 20 # Data type mismatch SQLITE_MISUSE* = 21 # Library used incorrectly SQLITE_NOLFS* = 22 # Uses OS features not supported on host diff --git a/nimpretty/tests/expected/tevil_spaces.nim b/nimpretty/tests/expected/tevil_spaces.nim index 7d3a72dfd..6bafa611e 100644 --- a/nimpretty/tests/expected/tevil_spaces.nim +++ b/nimpretty/tests/expected/tevil_spaces.nim @@ -13,7 +13,7 @@ type ccInline, # proc should be inlined ccNoInline, # proc should not be inlined # - # continueing here + # continuing here ccFastCall, # fastcall (pass parameters in registers) ccClosure, # proc has a closure ccNoConvention # needed for generating proper C procs sometimes diff --git a/nimpretty/tests/tevil_spaces.nim b/nimpretty/tests/tevil_spaces.nim index 33a13e559..20d10a801 100644 --- a/nimpretty/tests/tevil_spaces.nim +++ b/nimpretty/tests/tevil_spaces.nim @@ -13,7 +13,7 @@ type ccInline, # proc should be inlined ccNoInline, # proc should not be inlined # - # continueing here + # continuing here ccFastCall, # fastcall (pass parameters in registers) ccClosure, # proc has a closure ccNoConvention # needed for generating proper C procs sometimes diff --git a/nimsuggest/nimsuggest.nim b/nimsuggest/nimsuggest.nim index 1a60c3fb6..af87c9e7f 100644 --- a/nimsuggest/nimsuggest.nim +++ b/nimsuggest/nimsuggest.nim @@ -13,7 +13,7 @@ when not defined(nimcore): {.error: "nimcore MUST be defined for Nim's core tooling".} import strutils, os, parseopt, parseutils, sequtils, net, rdstdin, sexp -# Do NOT import suggest. It will lead to wierd bugs with +# Do NOT import suggest. It will lead to weird bugs with # suggestionResultHook, because suggest.nim is included by sigmatch. # So we import that one instead. import compiler / [options, commands, modules, sem, diff --git a/nimsuggest/tester.nim b/nimsuggest/tester.nim index 21292367b..d0870347e 100644 --- a/nimsuggest/tester.nim +++ b/nimsuggest/tester.nim @@ -140,7 +140,7 @@ proc runCmd(cmd, dest: string): bool = of "!del": del(x) else: - quit "unkown command: " & cmd + quit "unknown command: " & cmd proc smartCompare(pattern, x: string): bool = if pattern.contains('*'): diff --git a/testament/categories.nim b/testament/categories.nim index 1b785776f..49cf97494 100644 --- a/testament/categories.nim +++ b/testament/categories.nim @@ -569,7 +569,7 @@ proc quoted(a: string): string = result.addQuoted(a) proc runJoinedTest(r: var TResults, cat: Category, testsDir: string) = - ## returs a list of tests that have problems + ## returns a list of tests that have problems var specs: seq[TSpec] = @[] for kind, dir in walkDir(testsDir): assert testsDir.startsWith(testsDir) diff --git a/tests/assert/tfailedassert.nim b/tests/assert/tfailedassert.nim index 94de2743a..32600c82d 100644 --- a/tests/assert/tfailedassert.nim +++ b/tests/assert/tfailedassert.nim @@ -24,7 +24,7 @@ type echo("") -# NOTE: when entering newlines, adjust `expectedEnd` ouptuts +# NOTE: when entering newlines, adjust `expectedEnd` outputs try: doAssert(false, "msg1") # doAssert test diff --git a/tests/astspec/tastspec.nim b/tests/astspec/tastspec.nim index f9e35804d..e2cfed277 100644 --- a/tests/astspec/tastspec.nim +++ b/tests/astspec/tastspec.nim @@ -2,7 +2,7 @@ discard """ action: compile """ -# this test should ensure that the AST doesn't change slighly without it getting noticed. +# this test should ensure that the AST doesn't change slightly without it getting noticed. import ../ast_pattern_matching @@ -12,7 +12,7 @@ template expectNimNode(arg: untyped): NimNode = arg ## type `NimNode`. proc substitudeComments(symbols, values, n: NimNode): NimNode = - ## substitudes all nodes of kind nnkCommentStmt to parameter + ## substitutes all nodes of kind nnkCommentStmt to parameter ## symbols. Consumes the argument `n`. if n.kind == nnkCommentStmt: values.add newCall(bindSym"newCommentStmtNode", newLit(n.strVal)) diff --git a/tests/async/tasyncdial.nim b/tests/async/tasyncdial.nim index 815520294..bbff7028d 100644 --- a/tests/async/tasyncdial.nim +++ b/tests/async/tasyncdial.nim @@ -10,7 +10,7 @@ import nativesockets, os, asyncdispatch proc setupServerSocket(hostname: string, port: Port, domain: Domain): AsyncFD = - ## Creates a socket, binds it to the specified address, and starts listening for connecitons. + ## Creates a socket, binds it to the specified address, and starts listening for connections. ## Registers the descriptor with the dispatcher of the current thread ## Raises OSError in case of an error. let fd = newNativeSocket(domain) diff --git a/tests/casestmt/tcasestmt.nim b/tests/casestmt/tcasestmt.nim index 1efa46e8e..b7454ef99 100644 --- a/tests/casestmt/tcasestmt.nim +++ b/tests/casestmt/tcasestmt.nim @@ -163,7 +163,7 @@ block tcasestm: of "N": false else: echo "no good" - quit("quiting") + quit("quitting") proc toBool(s: string): bool = case s: diff --git a/tests/compilerapi/exposed.nim b/tests/compilerapi/exposed.nim index 73becd93d..25a858ec9 100644 --- a/tests/compilerapi/exposed.nim +++ b/tests/compilerapi/exposed.nim @@ -1,3 +1,3 @@ proc addFloats*(x, y, z: float): float = - discard "implementation overriden by tcompilerapi.nim" + discard "implementation overridden by tcompilerapi.nim" diff --git a/tests/converter/tgenericconverter2.nim b/tests/converter/tgenericconverter2.nim index 6d1d3d859..97b7846c1 100644 --- a/tests/converter/tgenericconverter2.nim +++ b/tests/converter/tgenericconverter2.nim @@ -79,7 +79,7 @@ for j, y in stepIt(2.0, -0.0375 * 4, 107 div 4): errors += 1 row.add(c) - # Printing aparently makes the test fail when joined. + # Printing apparently makes the test fail when joined. # echo row doAssert errors < 10, "total errors: " & $errors diff --git a/tests/cpp/tcovariancerules.nim b/tests/cpp/tcovariancerules.nim index acde1b288..e1769b0e6 100644 --- a/tests/cpp/tcovariancerules.nim +++ b/tests/cpp/tcovariancerules.nim @@ -164,7 +164,7 @@ vcat.x = "cat value" reject: vcat = vdog -# XXX: The next two cases seem incosistent, perhaps we should change the rules +# XXX: The next two cases seem inconsistent, perhaps we should change the rules accept: # truncating copies are allowed var vanimal: Animal = vdog diff --git a/tests/macros/tmacro3.nim b/tests/macros/tmacro3.nim index a1dc4f371..38e8349e7 100644 --- a/tests/macros/tmacro3.nim +++ b/tests/macros/tmacro3.nim @@ -18,7 +18,7 @@ test: macro test2*(a: untyped): untyped = proc testproc(recurse: int) = - echo "Thats weird" + echo "That's weird" var o : NimNode = nil echo " no its not!" o = newNimNode(nnkNone) diff --git a/tests/macros/ttemplatesymbols.nim b/tests/macros/ttemplatesymbols.nim index 8d9c9ec02..280b34ff1 100644 --- a/tests/macros/ttemplatesymbols.nim +++ b/tests/macros/ttemplatesymbols.nim @@ -122,7 +122,7 @@ template overloadedTemplate(x: string) = """ inspectUntyped bindSym("overloadedTemplate"), """bindSym("overloadedTemplate")""" - # binSym is active only in the presense of `typed` params. + # binSym is active only in the presence of `typed` params. # `untyped` params still get the raw AST inspectSymbol normalProc, """ diff --git a/tests/manyloc/keineschweine/dependencies/chipmunk/chipmunk.nim b/tests/manyloc/keineschweine/dependencies/chipmunk/chipmunk.nim index ac425c7a0..552b3e756 100644 --- a/tests/manyloc/keineschweine/dependencies/chipmunk/chipmunk.nim +++ b/tests/manyloc/keineschweine/dependencies/chipmunk/chipmunk.nim @@ -455,7 +455,7 @@ proc removeCollisionHandler*(space: PSpace; a: TCollisionType; #/ If the shape is attached to a static body, it will be added as a static shape. proc addShape*(space: PSpace; shape: PShape): PShape{. cdecl, importc: "cpSpaceAddShape", dynlib: Lib.} -#/ Explicity add a shape as a static shape to the simulation. +#/ Explicitly add a shape as a static shape to the simulation. proc addStaticShape*(space: PSpace; shape: PShape): PShape{. cdecl, importc: "cpSpaceAddStaticShape", dynlib: Lib.} #/ Add a rigid body to the simulation. @@ -1028,12 +1028,12 @@ proc getCircleRadius*(shape: PShape): CpFloat {. proc allocPolyShape*(): PPolyShape {. cdecl, importc: "cpPolyShapeAlloc", dynlib: Lib.} #/ Initialize a polygon shape. -#/ A convex hull will be created from the vertexes. +#/ A convex hull will be created from the vertices. proc init*(poly: PPolyShape; body: PBody, numVerts: cint; verts: ptr TVector; offset: TVector): PPolyShape {. cdecl, importc: "cpPolyShapeInit", dynlib: Lib.} #/ Allocate and initialize a polygon shape. -#/ A convex hull will be created from the vertexes. +#/ A convex hull will be created from the vertices. proc newPolyShape*(body: PBody; numVerts: cint; verts: ptr TVector; offset: TVector): PShape {. cdecl, importc: "cpPolyShapeNew", dynlib: Lib.} @@ -1050,7 +1050,7 @@ proc newBoxShape*(body: PBody; width, height: CpFloat): PShape {. proc newBoxShape*(body: PBody; box: TBB): PShape {. cdecl, importc: "cpBoxShapeNew2", dynlib: Lib.} -#/ Check that a set of vertexes is convex and has a clockwise winding. +#/ Check that a set of vertices is convex and has a clockwise winding. #/ NOTE: Due to floating point precision issues, hulls created with cpQuickHull() are not guaranteed to validate! proc validatePoly*(verts: ptr TVector; numVerts: cint): bool {. cdecl, importc: "cpPolyValidate", dynlib: Lib.} diff --git a/tests/manyloc/keineschweine/server/sg_lobby.nim b/tests/manyloc/keineschweine/server/sg_lobby.nim index f130e1b54..d83f35726 100644 --- a/tests/manyloc/keineschweine/server/sg_lobby.nim +++ b/tests/manyloc/keineschweine/server/sg_lobby.nim @@ -51,7 +51,7 @@ proc setConnected(state: bool) = for b in connectionButtons: disable(b) proc setActiveZone(ind: int; zone: ScZoneRecord) = - #hilight it or something + #highlight it or something dispmessage("Selected " & zone.name) connectZone(zone.ip, zone.port) playBtn.enable() diff --git a/tests/metatype/ttypeselectors.nim b/tests/metatype/ttypeselectors.nim index 52e5415be..5385a1be9 100644 --- a/tests/metatype/ttypeselectors.nim +++ b/tests/metatype/ttypeselectors.nim @@ -45,7 +45,7 @@ proc t6*(x: type(t3(0))): type(t1(0)) = proc t7*(x: int): type($x) = result = "test" -# This is a more compicated example involving a type +# This is a more complicated example involving a type # selection through a macro: # https://github.com/nim-lang/Nim/issues/7230 diff --git a/tests/mmaptest.nim b/tests/mmaptest.nim index 7abdab45f..7a93cdd45 100644 --- a/tests/mmaptest.nim +++ b/tests/mmaptest.nim @@ -20,7 +20,7 @@ proc `+!!`(p: pointer, size: int): pointer {.inline.} = const PageShift = when defined(cpu16): 8 else: 12 # \ - # my tests showed no improvments for using larger page sizes. + # my tests showed no improvements for using larger page sizes. PageSize = 1 shl PageShift var p = osAllocPages(3 * PageSize) diff --git a/tests/notnil/tnotnil_in_objconstr.nim b/tests/notnil/tnotnil_in_objconstr.nim index f0d5c1ae2..fb8ac8d6f 100644 --- a/tests/notnil/tnotnil_in_objconstr.nim +++ b/tests/notnil/tnotnil_in_objconstr.nim @@ -9,6 +9,6 @@ type foo: ref int bar: ref int not nil var x: ref int = new(int) -# Create instance without initializaing the `bar` field +# Create instance without initializing the `bar` field var f = Foo(foo: x) echo f.bar.isNil # true diff --git a/tests/objects/tobject3.nim b/tests/objects/tobject3.nim index 0a3df02ea..bec2582fe 100644 --- a/tests/objects/tobject3.nim +++ b/tests/objects/tobject3.nim @@ -4,7 +4,7 @@ TFoo ''' """ -## XXX this output needs to be adapated for VCC which produces different results. +## XXX this output needs to be adapted for VCC which produces different results. # It turned out that it's hard to generate correct for these two test cases at # the same time. diff --git a/tests/stdlib/tgetfileinfo.nim b/tests/stdlib/tgetfileinfo.nim index e0b73da0c..d5ccdea56 100644 --- a/tests/stdlib/tgetfileinfo.nim +++ b/tests/stdlib/tgetfileinfo.nim @@ -14,7 +14,7 @@ import os, strutils # 8 - Handle : Invalid Handle proc genBadFileName(limit = 100): string = - ## Generates a filename of a nonexistant file. + ## Generates a filename of a nonexistent file. ## Returns "" if generation fails. result = "a" var hitLimit = true diff --git a/tests/stdlib/tjsonmacro.nim b/tests/stdlib/tjsonmacro.nim index 85530065d..8dc5a32d2 100644 --- a/tests/stdlib/tjsonmacro.nim +++ b/tests/stdlib/tjsonmacro.nim @@ -90,7 +90,7 @@ when true: doAssert result.other == node["other"].getBiggestInt() # TODO: Test object variant with set in of branch. - # TODO: Should we support heterogenous arrays? + # TODO: Should we support heterogeneous arrays? # Tests that verify the error messages for invalid data. block: diff --git a/tests/stdlib/tosproc.nim b/tests/stdlib/tosproc.nim index 363de9096..1859877e7 100644 --- a/tests/stdlib/tosproc.nim +++ b/tests/stdlib/tosproc.nim @@ -35,7 +35,7 @@ when defined(case_testfile): # compiled test file for child process # failed. The shell (and lldb debugger) solves that by inserting a # helpful msg: `segmentation fault` when it detects a signal killed # the child. - # todo: expose an API that will show more diagnostic, returing + # todo: expose an API that will show more diagnostic, returning # (exitCode, signal) instead of just `shellExitCode`. if true: quit(139) of "exit_recursion": # stack overflow by infinite recursion diff --git a/tests/stdlib/trepr2.nim b/tests/stdlib/trepr2.nim index 89379da96..7b9f9db28 100644 --- a/tests/stdlib/trepr2.nim +++ b/tests/stdlib/trepr2.nim @@ -2,7 +2,7 @@ discard """ outputsub: "" """ -# output not testable because repr prints pointer adresses +# output not testable because repr prints pointer addresses # test the new "repr" built-in proc type diff --git a/tests/stdlib/ttimes.nim b/tests/stdlib/ttimes.nim index ef6712171..97945b21d 100644 --- a/tests/stdlib/ttimes.nim +++ b/tests/stdlib/ttimes.nim @@ -95,7 +95,7 @@ template runTimezoneTests() = # Bug with parse not setting DST properly if the current local DST differs from # the date being parsed. Need to test parse dates both in and out of DST. We - # are testing that be relying on the fact that tranforming a TimeInfo to a Time + # are testing that be relying on the fact that transforming a TimeInfo to a Time # and back again will correctly set the DST value. With the incorrect parse # behavior this will introduce a one hour offset from the named time and the # parsed time if the DST value differs between the current time and the date we @@ -155,7 +155,7 @@ suite "ttimes": # impossible time period check initDateTime(26, mMar, 2017, 02, 30, 00).format(f) == "2017-03-26 03:30 +02:00" - # In case of an ambiguous time, the earlier time is choosen + # In case of an ambiguous time, the earlier time is chosen check initDateTime(29, mOct, 2017, 02, 00, 00).format(f) == "2017-10-29 02:00 +02:00" # These are just dates on either side of the dst switch diff --git a/tests/template/t_otemplates.nim b/tests/template/t_otemplates.nim index 8d2ac38a6..b278bea0f 100644 --- a/tests/template/t_otemplates.nim +++ b/tests/template/t_otemplates.nim @@ -312,7 +312,7 @@ proc parse_until_symbol(node: NimNode, value: string, index: var int): bool {.co proc parse_template(node: NimNode, value: string) = - ## Parses through entire template, outputing valid + ## Parses through entire template, outputting valid ## Nim code into the input `node` AST. var index = 0 while index < value.len and diff --git a/tests/tuples/tuple_with_nil.nim b/tests/tuples/tuple_with_nil.nim index 1b210b2bf..67d45254f 100644 --- a/tests/tuples/tuple_with_nil.nim +++ b/tests/tuples/tuple_with_nil.nim @@ -49,7 +49,7 @@ type precision: int ## floating point precision width: int ## minimal width fill: string ## the fill character, UTF8 - align: FmtAlign ## aligment + align: FmtAlign ## alignment sign: FmtSign ## sign notation baseprefix: bool ## whether binary, octal, hex should be prefixed by 0b, 0x, 0o upcase: bool ## upper case letters in hex or exponential formats @@ -207,7 +207,7 @@ proc writefill(o: var Writer; fmt: Format; n: int; signum: int = 0) = ## `add` ## output function ## `fmt` - ## format to be used (important for padding aligment) + ## format to be used (important for padding alignment) ## `n` ## the number of filling characters to be written ## `signum` diff --git a/tests/vm/tcastint.nim b/tests/vm/tcastint.nim index 35d15b08b..acff0d2b1 100644 --- a/tests/vm/tcastint.nim +++ b/tests/vm/tcastint.nim @@ -288,7 +288,7 @@ proc test_float32_castB() = doAssert b == -1024049152 doAssert cast[uint64](b) == 18446744072685502464'u64 doAssert c == 3270918144'u32 - # ensure the unsused bits in the internal representation don't have + # ensure the unused bits in the internal representation don't have # any surprising content. doAssert cast[uint64](c) == 3270918144'u64 diff --git a/tools/dochack/fuzzysearch.nim b/tools/dochack/fuzzysearch.nim index 40575b998..1e5c8f0ef 100644 --- a/tools/dochack/fuzzysearch.nim +++ b/tools/dochack/fuzzysearch.nim @@ -24,9 +24,9 @@ type CharDiff = -1 ## An unmatched character was found. CharMatch = 0 ## A matched character was found. ConsecutiveMatch = 5 ## A consecutive match was found. - LeadingCharMatch = 10 ## The character matches the begining of the + LeadingCharMatch = 10 ## The character matches the beginning of the ## string or the first character of a word - ## or camel case boundry. + ## or camel case boundary. WordBoundryMatch = 20 ## The last ConsecutiveCharMatch that ## immediately precedes the end of the string, ## end of the pattern, or a LeadingCharMatch. diff --git a/tools/heapdumprepl.nim b/tools/heapdumprepl.nim index ffa153f5d..dbaef2f2c 100644 --- a/tools/heapdumprepl.nim +++ b/tools/heapdumprepl.nim @@ -49,7 +49,7 @@ const Help = """ quit -- quits this REPL locals, l -- output the list of local stack roots globals, g -- output the list of global roots -alias name addr -- give addr a name. start 'addr' with 'x' for hexidecimal +alias name addr -- give addr a name. start 'addr' with 'x' for hexadecimal notation print name|addr -- print a node by name or address reachable,r l|g|node dest -- outputs TRUE or FALSE depending on whether diff --git a/tools/vccexe/vccenv.nim b/tools/vccexe/vccenv.nim index 12a6e6b3d..216760e54 100644 --- a/tools/vccexe/vccenv.nim +++ b/tools/vccexe/vccenv.nim @@ -8,7 +8,7 @@ type ## Valid versions are Versions of Visual Studio that permanently set a COMNTOOLS ## environment variable. That includes Visual Studio version up to and including ## Visual Studio 2015 - vsUndefined = (0, ""), ## Version not specified, use latest recogized version on the system + vsUndefined = (0, ""), ## Version not specified, use latest recognized version on the system vs90 = (90, "VS90COMNTOOLS"), ## Visual Studio 2008 vs100 = (100, "VS100COMNTOOLS"), ## Visual Studio 2010 vs110 = (110, "VS110COMNTOOLS"), ## Visual Studio 2012 diff --git a/tools/vccexe/vccexe.nim b/tools/vccexe/vccexe.nim index feea6c0c0..e78f9da5e 100644 --- a/tools/vccexe/vccexe.nim +++ b/tools/vccexe/vccexe.nim @@ -30,7 +30,7 @@ proc discoverVccVcVarsAllPath*(version: VccVersion = vccUndefined): string = if result.len > 0: return - # All attempts to dicover vcc failed + # All attempts to discover vcc failed const vccversionPrefix = "--vccversion" @@ -73,11 +73,11 @@ Options: of the VCC version specified with the --vccversion argument. For each specified version the utility prints a line with the following format: <version>: <path> - --noCommand Flag to supress VCC secondary command execution - Useful in conjuction with --vccversion and --printPath to - only perfom VCC discovery, but without executing VCC tools + --noCommand Flag to suppress VCC secondary command execution + Useful in conjunction with --vccversion and --printPath to + only perform VCC discovery, but without executing VCC tools --vcvarsall:<path> Path to the Developer Command Prompt utility vcvarsall.bat that selects - the appropiate devlopment settings. + the appropriate development settings. Usual path for Visual Studio 2015 and below: %VSInstallDir%\VC\vcvarsall Usual path for Visual Studio 2017 and above: @@ -174,7 +174,7 @@ when isMainModule: head = "latest" echo "$1: $2" % [head, vcvarsallArg] - # Call vcvarsall to get the appropiate VCC process environment + # Call vcvarsall to get the appropriate VCC process environment var vcvars = vccVarsAll(vcvarsallArg, platformArg, sdkTypeArg, sdkVersionArg, verboseArg) if vcvars != nil: for vccEnvKey, vccEnvVal in vcvars: diff --git a/tools/vccexe/vcvarsall.nim b/tools/vccexe/vcvarsall.nim index 945fb90a6..29d13cc7e 100644 --- a/tools/vccexe/vcvarsall.nim +++ b/tools/vccexe/vcvarsall.nim @@ -88,7 +88,7 @@ proc vccVarsAll*(path: string, arch: VccArch = vccarchUnspecified, platform_type result = newStringTable(modeCaseInsensitive) # Parse the output of the final SET command to construct a String Table - # with the appropiate environment variables + # with the appropriate environment variables for line in comSpecOut.splitLines: let idx = line.find('=') if idx > 0: |