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

Remove mStaticTy and mTypeTy

Browse source
This commit is contained in:
Clyybber 2019-05-04 12:57:54 +02:00
commit 9ffab44c35
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/semtypes.nim
View file

@ -38,12 +38,6 @@ const
errNoGenericParamsAllowedForX = "no generic parameters allowed for $1" errNoGenericParamsAllowedForX = "no generic parameters allowed for $1"
errInOutFlagNotExtern = "the '$1' modifier can be used only with imported types" errInOutFlagNotExtern = "the '$1' modifier can be used only with imported types"
const
mStaticTy = {mStatic}
mTypeTy = {mType, mTypeOf}
# XXX: This should be needed only temporarily until the C
# sources are rebuilt
proc newOrPrevType(kind: TTypeKind, prev: PType, c: PContext): PType = proc newOrPrevType(kind: TTypeKind, prev: PType, c: PContext): PType =
if prev == nil: if prev == nil:
result = newTypeS(kind, c) result = newTypeS(kind, c)
@ -386,7 +380,7 @@ proc semTypeIdent(c: PContext, n: PNode): PSym =
else: else:
localError(c.config, n.info, errTypeExpected) localError(c.config, n.info, errTypeExpected)
return errorSym(c, n) return errorSym(c, n)
if result.kind != skType and result.magic notin (mStaticTy + mTypeTy): if result.kind != skType and result.magic notin {mStatic, mType, mTypeOf}:
# this implements the wanted ``var v: V, x: V`` feature ... # this implements the wanted ``var v: V, x: V`` feature ...
var ov: TOverloadIter var ov: TOverloadIter
var amb = initOverloadIter(ov, c, n) var amb = initOverloadIter(ov, c, n)
@ -1637,10 +1631,10 @@ proc semTypeNode(c: PContext, n: PNode, prev: PType): PType =
incl result.flags, tfHasAsgn incl result.flags, tfHasAsgn
of mOpt: result = semContainer(c, n, tyOpt, "opt", prev) of mOpt: result = semContainer(c, n, tyOpt, "opt", prev)
of mVarargs: result = semVarargs(c, n, prev) of mVarargs: result = semVarargs(c, n, prev)
of mTypeDesc, mTypeTy: of mTypeDesc, mType, mTypeOf:
result = makeTypeDesc(c, semTypeNode(c, n[1], nil)) result = makeTypeDesc(c, semTypeNode(c, n[1], nil))
result.flags.incl tfExplicit result.flags.incl tfExplicit
of mStaticTy: of mStatic:
result = semStaticType(c, n[1], prev) result = semStaticType(c, n[1], prev)
of mExpr: of mExpr:
result = semTypeNode(c, n.sons[0], nil) result = semTypeNode(c, n.sons[0], nil)