diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2017-06-30 18:19:37 +0300 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-08-19 08:57:43 +0200 |
| commit | c3e5c6c326747cf0acbe0e4f3d8dc71f9332a76e (patch) | |
| tree | 64b3ed75bc954dd33ad168e1cedc100c2a403ef1 /compiler | |
| parent | 4483cefa0cceffd2d5013e3e1e0127f1a5f02a9a (diff) | |
| download | Nim-c3e5c6c326747cf0acbe0e4f3d8dc71f9332a76e.tar.gz | |
treat var modifiers inside the concept body correctly: #1033
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/semexprs.nim | 7 | ||||
| -rw-r--r-- | compiler/semtypes.nim | 17 |
2 files changed, 16 insertions, 8 deletions
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 9322b0873..291e02505 100644 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -2206,9 +2206,14 @@ proc semExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode = message(n.info, warnDeprecated, "bind") result = semExpr(c, n.sons[0], flags) of nkTypeOfExpr, nkTupleTy, nkTupleClassTy, nkRefTy..nkEnumTy, nkStaticTy: + if c.matchedConcept != nil and n.len == 1: + let modifier = n.modifierTypeKindOfNode + if modifier != tyNone: + var baseType = semExpr(c, n[0]).typ.skipTypes({tyTypeDesc}) + result.typ = c.makeTypeDesc(c.newTypeWithSons(modifier, @[baseType])) + return var typ = semTypeNode(c, n, nil).skipTypes({tyTypeDesc}) result.typ = makeTypeDesc(c, typ) - #result = symNodeFromType(c, typ, n.info) of nkCall, nkInfix, nkPrefix, nkPostfix, nkCommand, nkCallStrLit: # check if it is an expression macro: checkMinSonsLen(n, 1) diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index de71f1632..6804a65f7 100644 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -1202,6 +1202,15 @@ proc freshType(res, prev: PType): PType {.inline.} = else: result = res +template modifierTypeKindOfNode(n: PNode): TTypeKind = + case n.kind + of nkVarTy: tyVar + of nkRefTy: tyRef + of nkPtrTy: tyPtr + of nkStaticTy: tyStatic + of nkTypeOfExpr: tyTypeDesc + else: tyNone + proc semTypeClass(c: PContext, n: PNode, prev: PType): PType = # if n.sonsLen == 0: return newConstraint(c, tyTypeClass) if nfBase2 in n.flags: @@ -1227,13 +1236,7 @@ proc semTypeClass(c: PContext, n: PNode, prev: PType): PType = dummyName: PNode dummyType: PType - let modifier = case param.kind - of nkVarTy: tyVar - of nkRefTy: tyRef - of nkPtrTy: tyPtr - of nkStaticTy: tyStatic - of nkTypeOfExpr: tyTypeDesc - else: tyNone + let modifier = param.modifierTypeKindOfNode if modifier != tyNone: dummyName = param[0] |