From 9574d318ae1e4cf648f7384d99afadd8a2d89520 Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Fri, 27 Jan 2017 01:21:35 +0200 Subject: [PATCH] use lower-case proc names --- compiler/semmagic.nim | 8 ++++---- doc/manual/generics.txt | 2 +- lib/pure/typetraits.nim | 10 +++++----- tests/concepts/matrixalgo.nim | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim index ee6329125b..3e1989eafe 100644 --- a/compiler/semmagic.nim +++ b/compiler/semmagic.nim @@ -91,7 +91,7 @@ proc toNode(t: PType, i: TLineInfo): PNode = const # these are types that use the bracket syntax for instantiation - # they can be subjected to the type traits `GenericHead` and + # they can be subjected to the type traits `genericHead` and # `Uninstantiated` tyUserDefinedGenerics* = {tyGenericInst, tyGenericInvocation, tyUserTypeClassInst} @@ -120,15 +120,15 @@ proc evalTypeTrait(trait: PNode, operand: PType, context: PSym): PNode = result = newIntNode(nkIntLit, typ.len - ord(typ.kind==tyProc)) result.typ = newType(tyInt, context) result.info = trait.info - of "GenericHead": + of "genericHead": var res = uninstantiate(typ) if res == typ and res.kind notin tyMagicGenerics: localError(trait.info, - "GenericHead expects a generic type. The given type was " & + "genericHead expects a generic type. The given type was " & typeToString(typ)) return newType(tyError, context).toNode(trait.info) result = res.base.toNode(trait.info) - of "StripGenericParams": + of "stripGenericParams": result = uninstantiate(typ).toNode(trait.info) else: internalAssert false diff --git a/doc/manual/generics.txt b/doc/manual/generics.txt index d1af6d962b..d0a60b62a9 100644 --- a/doc/manual/generics.txt +++ b/doc/manual/generics.txt @@ -317,7 +317,7 @@ The concept types can be parametric just like the regular generic types: m[int, int] is T mvar[int, int] = T - type TransposedType = StripGenericParams(M)[C, R, T] + type TransposedType = stripGenericParams(M)[C, R, T] AnySquareMatrix*[N: static[int], T] = AnyMatrix[N, N, T] diff --git a/lib/pure/typetraits.nim b/lib/pure/typetraits.nim index cc7fb9f72b..55c4bf0385 100644 --- a/lib/pure/typetraits.nim +++ b/lib/pure/typetraits.nim @@ -34,18 +34,18 @@ proc name*(t: typedesc): string {.magic: "TypeTrait".} proc arity*(t: typedesc): int {.magic: "TypeTrait".} ## Returns the arity of the given type -proc GenericHead*(t: typedesc): typedesc {.magic: "TypeTrait".} +proc genericHead*(t: typedesc): typedesc {.magic: "TypeTrait".} ## Accepts an instantiated generic type and returns its ## uninstantiated form. ## ## For example: - ## seq[int].GenericHead will be just seq - ## seq[int].GenericHead[float] will be seq[float] + ## seq[int].genericHead will be just seq + ## seq[int].genericHead[float] will be seq[float] ## ## A compile-time error will be produced if the supplied type ## is not generic -proc StripGenericParams*(t: typedesc): typedesc {.magic: "TypeTrait".} - ## This trait is similar to `GenericHead`, but instead of producing +proc stripGenericParams*(t: typedesc): typedesc {.magic: "TypeTrait".} + ## This trait is similar to `genericHead`, but instead of producing ## error for non-generic types, it will just return them unmodified diff --git a/tests/concepts/matrixalgo.nim b/tests/concepts/matrixalgo.nim index d02c70d378..39cf16685c 100644 --- a/tests/concepts/matrixalgo.nim +++ b/tests/concepts/matrixalgo.nim @@ -9,7 +9,7 @@ type m[int, int] is T mvar[int, int] = T - type TransposedType = StripGenericParams(M)[C, R, T] + type TransposedType = stripGenericParams(M)[C, R, T] AnySquareMatrix*[N: static[int], T] = AnyMatrix[N, N, T]