recycle tyOptDeprecated => tyAliasSym

timotheecour · Jun 22, 2020 · 4273f45 · 4273f45
1 parent 92e0046
commit 4273f45
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 18 deletions.
diff --git a/compiler/ast.nim b/compiler/ast.nim
@@ -434,19 +434,15 @@ type
       # instantiation and prior to this it has the potential to
       # be any type.
 
-    tyOptDeprecated
-      # deadcode: was `tyOpt`, Builtin optional type
-
+    tyAliasSym
     tyVoid
       # now different from tyEmpty, hurray!
 
-    tyAliasSym
-
 static:
-  when false:
+  assert TTypeKind.high.ord <= 63
     # remind us when TTypeKind stops to fit in a single 64-bit word
-    assert TTypeKind.high.ord <= 63
-      # consider merging some types if profiling shows a slowdown
+    # consider merging some types if profiling shows a slowdown (though it's
+    # unlikely)
 
 const
   tyPureObject* = tyTuple

diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
@@ -210,7 +210,6 @@ proc mapType(typ: PType): TJSTypeKind =
     else: result = etyNone
   of tyProc: result = etyProc
   of tyCString: result = etyString
-  of tyOptDeprecated: doAssert false
 
 proc mapType(p: PProc; typ: PType): TJSTypeKind =
   result = mapType(typ)

diff --git a/compiler/liftdestructors.nim b/compiler/liftdestructors.nim
@@ -785,7 +785,6 @@ proc fillBody(c: var TLiftCtx; t: PType; body, x, y: PNode) =
   of tyOrdinal, tyRange, tyInferred,
      tyGenericInst, tyAlias, tySink:
     fillBody(c, lastSon(t), body, x, y)
-  of tyOptDeprecated: doAssert false
 
 proc produceSymDistinctType(g: ModuleGraph; c: PContext; typ: PType;
                             kind: TTypeAttachedOp; info: TLineInfo): PSym =

diff --git a/compiler/types.nim b/compiler/types.nim
@@ -438,8 +438,8 @@ const
     "lent ", "varargs[$1]", "UncheckedArray[$1]", "Error Type",
     "BuiltInTypeClass", "UserTypeClass",
     "UserTypeClassInst", "CompositeTypeClass", "inferred",
-    "and", "or", "not", "any", "static", "TypeFromExpr", "FieldAccessor",
-    "void", "aliasSym"]
+    "and", "or", "not", "any", "static", "TypeFromExpr", "aliasSym",
+    "void"]
 
 const preferToResolveSymbols = {preferName, preferTypeName, preferModuleInfo,
   preferGenericArg, preferResolved, preferMixed}
@@ -1177,7 +1177,6 @@ proc sameTypeAux(x, y: PType, c: var TSameTypeClosure): bool =
     cycleCheck()
     result = sameTypeAux(a.lastSon, b.lastSon, c)
   of tyNone: result = false
-  of tyOptDeprecated: doAssert false
 
 proc sameBackendType*(x, y: PType): bool =
   var c = initSameTypeClosure()
@@ -1415,7 +1414,6 @@ proc typeAllowedAux(marker: var IntSet, typ: PType, kind: TSymKind,
       result = typeAllowedAux(marker, t.lastSon, kind, flags+{taHeap})
     else:
       result = t
-  of tyOptDeprecated: doAssert false
 
 proc typeAllowed*(t: PType, kind: TSymKind; flags: TTypeAllowedFlags = {}): PType =
   # returns 'nil' on success and otherwise the part of the type that is

diff --git a/compiler/vmdeps.nim b/compiler/vmdeps.nim
@@ -298,7 +298,6 @@ proc mapTypeToAstX(cache: IdentCache; t: PType; info: TLineInfo;
       if t.n != nil:
         result.add t.n.copyTree
   of tyOwned: result = mapTypeToBracket("owned", mBuiltinType, t, info)
-  of tyOptDeprecated: doAssert false
 
 proc opMapTypeToAst*(cache: IdentCache; t: PType; info: TLineInfo): PNode =
   result = mapTypeToAstX(cache, t, info, inst=false, allowRecursionX=true)

diff --git a/lib/core/macros.nim b/lib/core/macros.nim
@@ -106,7 +106,7 @@ type
     ntyError,
     ntyBuiltinTypeClass, ntyUserTypeClass, ntyUserTypeClassInst,
     ntyCompositeTypeClass, ntyInferred, ntyAnd, ntyOr, ntyNot,
-    ntyAnything, ntyStatic, ntyFromExpr, ntyOptDeprecated, ntyVoid
+    ntyAnything, ntyStatic, ntyFromExpr, ntyAliasSym, ntyVoid
 
   TNimTypeKinds* {.deprecated.} = set[NimTypeKind]
   NimSymKind* = enum

diff --git a/lib/system/hti.nim b/lib/system/hti.nim
@@ -69,9 +69,8 @@ type
     tyAnythingHidden,
     tyStaticHidden,
     tyFromExprHidden,
-    tyOptDeprecated,
-    tyVoidHidden,
     tyAliasSym,
+    tyVoidHidden,
 
   TNimNodeKind = enum nkNone, nkSlot, nkList, nkCase
   TNimNode {.compilerproc.} = object