diff options
| -rw-r--r-- | compiler/options.nim | 2 | ||||
| -rw-r--r-- | tests/generics/t88.nim | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/options.nim b/compiler/options.nim index e7c9346a7..746ee9044 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -200,7 +200,7 @@ proc getOutFile*(filename, ext: string): string = proc getPrefixDir*(): string = ## 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. if gPrefixDir != "": result = gPrefixDir else: diff --git a/tests/generics/t88.nim b/tests/generics/t88.nim index 35bdeb8f1..280a346c5 100644 --- a/tests/generics/t88.nim +++ b/tests/generics/t88.nim @@ -8,7 +8,7 @@ proc new[V](t: typedesc[BaseClass], v: V): BaseClass[V] = BaseClass[V](b: v) 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 ChildClass[V] = object of BaseClass[V] @@ -17,12 +17,12 @@ type proc new[V](t: typedesc[ChildClass], v1, v2: V): ChildClass[V] = 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") assert c.baseMethod == "Base" -assert c.overridedMethod == "Child" +assert c.overriddenMethod == "Child" # bug #4528 |