diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2020-06-12 02:03:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 11:03:52 +0200 |
| commit | e30a08103da14d5b1e02d6c04dc2d5afb5b9368d (patch) | |
| tree | 225c8dd21b8097b2938b3cf9796d8ba2d5c3c783 /compiler/ast.nim | |
| parent | 82e424189ee4bf0f05fcf5695fe1c3e2d2dfc51f (diff) | |
| download | Nim-e30a08103da14d5b1e02d6c04dc2d5afb5b9368d.tar.gz | |
remove tyOpt, mOpt (#14636)
* remove tyOpt, mOpt * fixup
Diffstat (limited to 'compiler/ast.nim')
| -rw-r--r-- | compiler/ast.nim | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 76b1d8c91..bc26defd4 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -434,8 +434,8 @@ type # instantiation and prior to this it has the potential to # be any type. - tyOpt - # Builtin optional type + tyOptDeprecated + # deadcode: was `tyOpt`, Builtin optional type tyVoid # now different from tyEmpty, hurray! @@ -658,7 +658,7 @@ type mNewString, mNewStringOfCap, mParseBiggestFloat, mMove, mWasMoved, mDestroy, mDefault, mUnown, mAccessEnv, mReset, - mArray, mOpenArray, mRange, mSet, mSeq, mOpt, mVarargs, + mArray, mOpenArray, mRange, mSet, mSeq, mVarargs, mRef, mPtr, mVar, mDistinct, mVoid, mTuple, mOrdinal, mInt, mInt8, mInt16, mInt32, mInt64, @@ -1492,7 +1492,7 @@ proc isGCedMem*(t: PType): bool {.inline.} = t.kind == tyProc and t.callConv == ccClosure proc propagateToOwner*(owner, elem: PType; propagateHasAsgn = true) = - const HaveTheirOwnEmpty = {tySequence, tyOpt, tySet, tyPtr, tyRef, tyProc} + const HaveTheirOwnEmpty = {tySequence, tySet, tyPtr, tyRef, tyProc} owner.flags = owner.flags + (elem.flags * {tfHasMeta, tfTriggersCompileTime}) if tfNotNil in elem.flags: if owner.kind in {tyGenericInst, tyGenericBody, tyGenericInvocation}: @@ -1505,7 +1505,7 @@ proc propagateToOwner*(owner, elem: PType; propagateHasAsgn = true) = if mask != {} and propagateHasAsgn: let o2 = owner.skipTypes({tyGenericInst, tyAlias, tySink}) if o2.kind in {tyTuple, tyObject, tyArray, - tySequence, tyOpt, tySet, tyDistinct, tyOpenArray, tyVarargs}: + tySequence, tySet, tyDistinct, tyOpenArray, tyVarargs}: o2.flags.incl mask owner.flags.incl mask |