jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct the spelling of the word 'overridden'. (#5212)

Browse source
This commit is contained in:
mfxmfx 2017-01-11 13:40:10 +01:00 • committed by Andreas Rumpf
commit 8699372109
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/options.nim
View file

@ -200,7 +200,7 @@ proc getOutFile*(filename, ext: string): string =
proc getPrefixDir*(): string = proc getPrefixDir*(): string =
## Gets the prefix dir, usually the parent directory where the binary resides. ## Gets the prefix dir, usually the parent directory where the binary resides.
## ##
## This is overrided by some tools (namely nimsuggest) via the ``gPrefixDir`` ## This is overridden by some tools (namely nimsuggest) via the ``gPrefixDir``
## global. ## global.
if gPrefixDir != "": result = gPrefixDir if gPrefixDir != "": result = gPrefixDir
else: else:

6
tests/generics/t88.nim
View file

@ -8,7 +8,7 @@ proc new[V](t: typedesc[BaseClass], v: V): BaseClass[V] =
BaseClass[V](b: v) BaseClass[V](b: v)
proc baseMethod[V](v: BaseClass[V]): V = v.b proc baseMethod[V](v: BaseClass[V]): V = v.b
proc overridedMethod[V](v: BaseClass[V]): V = v.baseMethod proc overriddenMethod[V](v: BaseClass[V]): V = v.baseMethod
type type
ChildClass[V] = object of BaseClass[V] ChildClass[V] = object of BaseClass[V]
@ -17,12 +17,12 @@ type
proc new[V](t: typedesc[ChildClass], v1, v2: V): ChildClass[V] = proc new[V](t: typedesc[ChildClass], v1, v2: V): ChildClass[V] =
ChildClass[V](b: v1, c: v2) ChildClass[V](b: v1, c: v2)
proc overridedMethod[V](v: ChildClass[V]): V = v.c proc overriddenMethod[V](v: ChildClass[V]): V = v.c
let c = ChildClass[string].new("Base", "Child") let c = ChildClass[string].new("Base", "Child")
assert c.baseMethod == "Base" assert c.baseMethod == "Base"
assert c.overridedMethod == "Child" assert c.overriddenMethod == "Child"
# bug #4528 # bug #4528