diff options
author | reactormonk <hafnersimon@gmail.com> | 2016-02-29 12:59:05 +0100 |
---|---|---|
committer | reactormonk <hafnersimon@gmail.com> | 2016-02-29 12:59:05 +0100 |
commit | ba16d423e0d0f95851a032f7d5705c244d8f6604 (patch) | |
tree | ef91d7dd981d91b4632cc1c9a0069d28a75464ce | |
parent | bd95bf58bfab31034db346d946e8e3b6bb5d19cc (diff) | |
parent | d9cb85c2d81a447130307d0004b0ef515f3ff241 (diff) | |
download | Nim-ba16d423e0d0f95851a032f7d5705c244d8f6604.tar.gz |
Merge pull request #3913 from FedericoCeratto/devel
Spellcheck
-rw-r--r-- | compiler/ast.nim | 2 | ||||
-rw-r--r-- | compiler/canonicalizer.nim | 2 | ||||
-rw-r--r-- | compiler/sem.nim | 2 | ||||
-rw-r--r-- | compiler/transf.nim | 2 | ||||
-rw-r--r-- | lib/impure/nre.nim | 4 | ||||
-rw-r--r-- | lib/pure/net.nim | 2 | ||||
-rw-r--r-- | lib/pure/parsecfg.nim | 6 | ||||
-rw-r--r-- | lib/pure/poly.nim | 2 | ||||
-rw-r--r-- | lib/pure/securehash.nim | 2 | ||||
-rw-r--r-- | lib/pure/streams.nim | 2 | ||||
-rw-r--r-- | lib/pure/times.nim | 2 | ||||
-rw-r--r-- | lib/system/gc_common.nim | 4 | ||||
-rw-r--r-- | lib/system/nimscript.nim | 4 | ||||
-rw-r--r-- | tests/stdlib/nre/init.nim | 2 | ||||
-rw-r--r-- | tests/tuples/tuple_with_nil.nim | 4 |
15 files changed, 21 insertions, 21 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 5c2349daa..fecbefd7e 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -463,7 +463,7 @@ type tfNotNil, # type cannot be 'nil' tfNeedsInit, # type constains a "not nil" constraint somewhere or some - # other type so that it requires initalization + # other type so that it requires initialization tfVarIsPtr, # 'var' type is translated like 'ptr' even in C++ mode tfHasMeta, # type contains "wildcard" sub-types such as generic params # or other type classes diff --git a/compiler/canonicalizer.nim b/compiler/canonicalizer.nim index 85dbe7536..089bce302 100644 --- a/compiler/canonicalizer.nim +++ b/compiler/canonicalizer.nim @@ -275,7 +275,7 @@ proc encodeType(w: PRodWriter, t: PType, result: var string) = return # we need no surrounding [] here because the type is in a line of its own if t.kind == tyForward: internalError("encodeType: tyForward") - # for the new rodfile viewer we use a preceeding [ so that the data section + # for the new rodfile viewer we use a preceding [ so that the data section # can easily be disambiguated: add(result, '[') encodeVInt(ord(t.kind), result) diff --git a/compiler/sem.nim b/compiler/sem.nim index cddd763ce..e09d49f88 100644 --- a/compiler/sem.nim +++ b/compiler/sem.nim @@ -191,7 +191,7 @@ proc newSymG*(kind: TSymKind, n: PNode, c: PContext): PSym = proc semIdentVis(c: PContext, kind: TSymKind, n: PNode, allowed: TSymFlags): PSym - # identifier with visability + # identifier with visibility proc semIdentWithPragma(c: PContext, kind: TSymKind, n: PNode, allowed: TSymFlags): PSym proc semStmtScope(c: PContext, n: PNode): PNode diff --git a/compiler/transf.nim b/compiler/transf.nim index b2bbdcec3..a4a15ea4a 100644 --- a/compiler/transf.nim +++ b/compiler/transf.nim @@ -12,7 +12,7 @@ # # * inlines iterators # * inlines constants -# * performes constant folding +# * performs constant folding # * converts "continue" to "break"; disambiguates "break" # * introduces method dispatchers # * performs lambda lifting for closure support diff --git a/lib/impure/nre.nim b/lib/impure/nre.nim index 10700b59b..c8f690461 100644 --- a/lib/impure/nre.nim +++ b/lib/impure/nre.nim @@ -1,6 +1,6 @@ # # Nim's Runtime Library -# (c) Copyright 2015 Nim Contributers +# (c) Copyright 2015 Nim Contributors # # See the file "copying.txt", included in this # distribution, for details about the copyright. @@ -508,7 +508,7 @@ iterator findIter*(str: string, pattern: Regex, start = 0, endpos = int.high): R ## Variants: ## ## - ``proc findAll(...)`` returns a ``seq[string]`` - # see pcredemo for explaination + # see pcredemo for explanation let matchesCrLf = pattern.matchesCrLf() let unicode = uint32(getinfo[culong](pattern, pcre.INFO_OPTIONS) and pcre.UTF8) > 0u32 diff --git a/lib/pure/net.nim b/lib/pure/net.nim index 346b656a0..dbb78c4de 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -616,7 +616,7 @@ proc readIntoBuf(socket: Socket, flags: int32): int = else: result = recv(socket.fd, addr(socket.buffer), cint(socket.buffer.high), flags) if result < 0: - # Save it in case it gets reset (the Nim codegen occassionally may call + # Save it in case it gets reset (the Nim codegen occasionally may call # Win API functions which reset it). socket.lastError = osLastError() if result <= 0: diff --git a/lib/pure/parsecfg.nim b/lib/pure/parsecfg.nim index f680d4fef..9bcac0a50 100644 --- a/lib/pure/parsecfg.nim +++ b/lib/pure/parsecfg.nim @@ -288,19 +288,19 @@ proc rawGetTok(c: var CfgParser, tok: var Token) = else: getSymbol(c, tok) proc errorStr*(c: CfgParser, msg: string): string {.rtl, extern: "npc$1".} = - ## returns a properly formated error message containing current line and + ## returns a properly formatted error message containing current line and ## column information. result = `%`("$1($2, $3) Error: $4", [c.filename, $getLine(c), $getColumn(c), msg]) proc warningStr*(c: CfgParser, msg: string): string {.rtl, extern: "npc$1".} = - ## returns a properly formated warning message containing current line and + ## returns a properly formatted warning message containing current line and ## column information. result = `%`("$1($2, $3) Warning: $4", [c.filename, $getLine(c), $getColumn(c), msg]) proc ignoreMsg*(c: CfgParser, e: CfgEvent): string {.rtl, extern: "npc$1".} = - ## returns a properly formated warning message containing that + ## returns a properly formatted warning message containing that ## an entry is ignored. case e.kind of cfgSectionStart: result = c.warningStr("section ignored: " & e.section) diff --git a/lib/pure/poly.nim b/lib/pure/poly.nim index b20e9f9d0..e286c5d17 100644 --- a/lib/pure/poly.nim +++ b/lib/pure/poly.nim @@ -344,7 +344,7 @@ proc roots*(p:Poly,tol=1.0e-9,zerotol=1.0e-6,mergetol=1.0e-12,maxiter=1000):seq[ ## `tol` is the tolerance used to break searching for each root when reached. ## `zerotol` is the tolerance, which is 'close enough' to zero to be considered a root ## and is used to find roots for curves that only 'touch' the x-axis. - ## `mergetol` is the tolerance, of which two x-values are considered beeing the same root. + ## `mergetol` is the tolerance, of which two x-values are considered being the same root. ## `maxiter` can be used to limit the number of iterations for each root. ## Returns a (possibly empty) sorted sequence with the solutions. var deg=p.degree diff --git a/lib/pure/securehash.nim b/lib/pure/securehash.nim index 657782889..a30fad92a 100644 --- a/lib/pure/securehash.nim +++ b/lib/pure/securehash.nim @@ -1,7 +1,7 @@ # # # The Nim Compiler -# (c) Copyright 2015 Nim Contributers +# (c) Copyright 2015 Nim Contributors # # See the file "copying.txt", included in this # distribution, for details about the copyright. diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim index bb6175a12..c606b4680 100644 --- a/lib/pure/streams.nim +++ b/lib/pure/streams.nim @@ -189,7 +189,7 @@ proc readBool*(s: Stream): bool = read(s, result) proc peekBool*(s: Stream): bool = - ## peeks a bool from the stream `s`. Raises `EIO` if an error occured. + ## peeks a bool from the stream `s`. Raises `EIO` if an error occurred. peek(s, result) proc readInt8*(s: Stream): int8 = diff --git a/lib/pure/times.nim b/lib/pure/times.nim index e39756696..29ae52d47 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -1245,7 +1245,7 @@ proc getDayOfWeek*(day, month, year: int): WeekDay = result = (d-1).WeekDay proc getDayOfWeekJulian*(day, month, year: int): WeekDay = - ## Returns the day of the week enum from day, month and year, according to the Julian calender. + ## Returns the day of the week enum from day, month and year, according to the Julian calendar. # Day & month start from one. let a = (14 - month) div 12 diff --git a/lib/system/gc_common.nim b/lib/system/gc_common.nim index 013dc55f8..a4676d26e 100644 --- a/lib/system/gc_common.nim +++ b/lib/system/gc_common.nim @@ -91,7 +91,7 @@ when allowForeignThreadGc: ## this thread will only be initialized once per thread, no matter how often ## it is called. ## - ## This function is availble only when ``--threads:on`` and ``--tlsEmulation:off`` + ## This function is available only when ``--threads:on`` and ``--tlsEmulation:off`` ## switches are used if not localGcInitialized: localGcInitialized = true @@ -100,7 +100,7 @@ when allowForeignThreadGc: initGC() else: template setupForeignThreadGc*(): stmt = - {.error: "setupForeignThreadGc is availble only when ``--threads:on`` and ``--tlsEmulation:off`` are used".} + {.error: "setupForeignThreadGc is available only when ``--threads:on`` and ``--tlsEmulation:off`` are used".} # ----------------- stack management -------------------------------------- # inspired from Smart Eiffel diff --git a/lib/system/nimscript.nim b/lib/system/nimscript.nim index 772d25343..d587d772f 100644 --- a/lib/system/nimscript.nim +++ b/lib/system/nimscript.nim @@ -74,7 +74,7 @@ proc getEnv*(key: string): string {.tags: [ReadIOEffect].} = builtin proc existsEnv*(key: string): bool {.tags: [ReadIOEffect].} = - ## Checks for the existance of an environment variable named `key`. + ## Checks for the existence of an environment variable named `key`. builtin proc fileExists*(filename: string): bool {.tags: [ReadIOEffect].} = @@ -189,7 +189,7 @@ proc get*(key: string): string = builtin proc exists*(key: string): bool = - ## Checks for the existance of a configuration 'key' + ## Checks for the existence of a configuration 'key' ## like 'gcc.options.always'. builtin diff --git a/tests/stdlib/nre/init.nim b/tests/stdlib/nre/init.nim index 1a1470842..26e668104 100644 --- a/tests/stdlib/nre/init.nim +++ b/tests/stdlib/nre/init.nim @@ -2,7 +2,7 @@ import unittest include nre suite "Test NRE initialization": - test "correct intialization": + test "correct initialization": check(re("[0-9]+") != nil) check(re("(?i)[0-9]+") != nil) diff --git a/tests/tuples/tuple_with_nil.nim b/tests/tuples/tuple_with_nil.nim index 26e4ae85e..442fbab92 100644 --- a/tests/tuples/tuple_with_nil.nim +++ b/tests/tuples/tuple_with_nil.nim @@ -345,7 +345,7 @@ proc writeformat(o: var Writer; p: pointer; fmt: Format) = ## Write pointer `i` according to format `fmt` using output object ## `o` and output function `add`. ## - ## Pointers are casted to unsigned int and formated as hexadecimal + ## Pointers are casted to unsigned int and formatted as hexadecimal ## with prefix unless specified otherwise. var f = fmt if f.typ == 0.char: @@ -584,7 +584,7 @@ proc splitfmt(s: string): seq[Part] {.compiletime, nosideeffect.} = ## Each part is either a literal string or a format specification. A ## format specification is a substring of the form ## "{[arg][:format]}" where `arg` is either empty or a number - ## refering to the arg-th argument and an additional field or array + ## referring to the arg-th argument and an additional field or array ## index. The format string is a string accepted by `parse`. let subpeg = sequence(capture(digits()), capture(?sequence(charSet({'.'}), *pegs.identStartChars(), *identChars())), |