diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 10:46:30 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 10:46:30 +0100 |
| commit | 1eaeccc15d15d15d2f62ea1648f7dd64722dbd37 (patch) | |
| tree | b922cdabc780fa3a8837a6804d2df31793d9e2ca /compiler/semdata.nim | |
| parent | e9243a16167b24899d4fcf051f3252b3a5804811 (diff) | |
| parent | bd19b5f4d36bb40b4af93d7e15fdfa582e9fe3b7 (diff) | |
| download | Nim-1eaeccc15d15d15d2f62ea1648f7dd64722dbd37.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'compiler/semdata.nim')
| -rw-r--r-- | compiler/semdata.nim | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler/semdata.nim b/compiler/semdata.nim index a3f0f715b..5057260a4 100644 --- a/compiler/semdata.nim +++ b/compiler/semdata.nim @@ -37,7 +37,6 @@ type # in standalone ``except`` and ``finally`` next*: PProcCon # used for stacking procedure contexts wasForwarded*: bool # whether the current proc has a separate header - bracketExpr*: PNode # current bracket expression (for ^ support) mapping*: TIdTable TMatchedConcept* = object @@ -70,6 +69,7 @@ type TTypeAttachedOp* = enum attachedAsgn, + attachedSink, attachedDeepCopy, attachedDestructor @@ -131,6 +131,11 @@ type recursiveDep*: string suggestionsMade*: bool inTypeContext*: int + typesWithOps*: seq[(PType, PType)] #\ + # We need to instantiate the type bound ops lazily after + # the generic type has been constructed completely. See + # tests/destructor/topttree.nim for an example that + # would otherwise fail. proc makeInstPair*(s: PSym, inst: PInstantiation): TInstantiationPair = result.genericSym = s @@ -218,6 +223,7 @@ proc newContext*(graph: ModuleGraph; module: PSym; cache: IdentCache): PContext result.cache = cache result.graph = graph initStrTable(result.signatures) + result.typesWithOps = @[] proc inclSym(sq: var TSymSeq, s: PSym) = @@ -333,7 +339,7 @@ proc makeNotType*(c: PContext, t1: PType): PType = proc nMinusOne*(n: PNode): PNode = result = newNode(nkCall, n.info, @[ - newSymNode(getSysMagic("<", mUnaryLt)), + newSymNode(getSysMagic("pred", mPred)), n]) # Remember to fix the procs below this one when you make changes! |